cleanup progress

Author: Caltinor

src/main/java/harmonised/pmmo/client/gui/glossary/Glossary.java

@@ -224,7 +224,7 @@ private void buildContent(List<Positioner<?>> cache, int width, ResponsiveLayout
 
         CompletableFuture<List<Positioner.Layout>> entities = CompletableFuture.supplyAsync(() ->
         access.lookupOrThrow(Registries.ENTITY_TYPE).listElements()
-            .map(ref -> ref.value().create(Minecraft.getInstance().level))
+            .map(ref -> ref.value().create(Minecraft.getInstance().level, EntitySpawnReason.COMMAND))
             .filter(Objects::nonNull)
             .map(entity -> new Positioner.Layout(
                 new EntityObjectPanelWidget(0x88394045, width, entity),

src/main/java/harmonised/pmmo/client/gui/glossary/GlossaryLoadingScreen.java

@@ -35,7 +35,7 @@ protected void init() {
         layout.arrangeElements();
         layout.visitWidgets(this::addRenderableWidget);
         LocalPlayer player = Minecraft.getInstance().player;
-        CreativeModeTabs.tryRebuildTabContents(player.connection.enabledFeatures(), player.canUseGameMasterBlocks(), player.clientLevel.registryAccess());
+        CreativeModeTabs.tryRebuildTabContents(player.connection.enabledFeatures(), player.canUseGameMasterBlocks(), player.registryAccess());
         if (ClientUtils.glossary == null) {
             CompletableFuture.supplyAsync(() -> new Glossary().setTargetedObject(target)).thenAccept(glossary -> ClientUtils.glossary = glossary);
         }

src/main/java/harmonised/pmmo/client/gui/glossary/components/CollapsingPanel.java

@@ -46,13 +46,13 @@ public CollapsingPanel addCallback(Consumer<CollapsingPanel> callback) {
     @Override
     public void renderWidget(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
         guiGraphics.enableScissor(this.getX(), this.getY(), this.getWidth(), this.getHeight());
-        guiGraphics.blit(RenderPipelines.GUI, TEXTURE_LOCATION, this.getX(), this.getY(), this.getWidth(), this.getHeight(),
-                collapsed() ? 140 : 0, 0, collapsed() ? 7 : 147, 165, 256, 256);
+        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, TEXTURE_LOCATION, this.getX(), this.getY(), collapsed() ? 140 : 0, 0,
+                this.getWidth(), this.getHeight(), collapsed() ? 7 : 147, 165, 256, 256);
         int offset = (int) (28d / scale);
         int hScaled = (int) (80d / scale);
-        guiGraphics.blit(RenderPipelines.GUI, collapsed() ? RIGHT : LEFT, this.getX()+this.width-offset,
-                this.getY()+ (this.height/2) - (hScaled/2) - 1, offset, hScaled,
-                0, 0, 7, 20, 7, 20);
+        guiGraphics.blit(RenderPipelines.GUI_TEXTURED, collapsed() ? RIGHT : LEFT, this.getX()+this.width-offset,
+                this.getY()+ (this.height/2) - (hScaled/2) - 1,
+                0, 0, offset, hScaled, 7, 20, 7, 20);
         super.renderWidget(guiGraphics, mouseX, mouseY, partialTick);
         guiGraphics.disableScissor();
     }

src/main/java/harmonised/pmmo/client/gui/glossary/components/panels/BiomeObjectPanelWidget.java

@@ -49,7 +49,7 @@ public BiomeObjectPanelWidget(int color, int width, Holder<Biome> biome) {
         try {
             Minecraft.getInstance().getTextureManager().register(texture, Minecraft.getInstance().getTextureManager().getTexture(texture));
         }catch (Exception e) {
-            texture = ResourceLocation.withDefaultNamespace("textures/biome/plains.png");
+            texture = Identifier.withDefaultNamespace("textures/biome/plains.png");
         }
         LocationData data = core.getLoader().BIOME_LOADER.getData(rl);
         skills.addAll(data.bonusMap().values().stream().map(Map::keySet).flatMap(Set::stream).toList());

src/main/java/harmonised/pmmo/client/gui/glossary/components/panels/DimensionObjectPanelWidget.java

@@ -38,15 +38,15 @@ public class DimensionObjectPanelWidget extends ObjectPanelWidget {
 
     public DimensionObjectPanelWidget(int color, int width, ResourceKey<Level> dimension) {
         super(color, width, Core.get(LogicalSide.CLIENT));
-        ResourceLocation texture = ResourceLocation.fromNamespaceAndPath(
-                dimension.location().getNamespace(),
-                "textures/dimension/" + dimension.location().getPath() + ".png");
+        Identifier texture = Identifier.fromNamespaceAndPath(
+                dimension.identifier().getNamespace(),
+                "textures/dimension/" + dimension.identifier().getPath() + ".png");
         try {
             Minecraft.getInstance().getTextureManager().register(texture, Minecraft.getInstance().getTextureManager().getTexture(texture));
         }catch (Exception e) {
-            texture = ResourceLocation.withDefaultNamespace("textures/dimension/overworld.png");
+            texture = Identifier.withDefaultNamespace("textures/dimension/overworld.png");
         }
-        LocationData data = core.getLoader().BIOME_LOADER.getData(dimension.location());
+        LocationData data = core.getLoader().BIOME_LOADER.getData(dimension.identifier());
         skills.addAll(data.bonusMap().values().stream().map(Map::keySet).flatMap(Set::stream).toList());
         skills.addAll(data.travelReq().keySet());
         this.id = dimension.identifier().toString();