Adds Flexibility to ShellEntry

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/shell/ShellEntry.java

@@ -1,6 +1,7 @@
 package whocraft.tardis_refined.client.model.blockentity.shell;
 
 import whocraft.tardis_refined.client.model.blockentity.door.interior.ShellDoorModel;
+import whocraft.tardis_refined.patterns.ShellPattern;
 
 public class ShellEntry {
 
@@ -12,19 +13,12 @@ public ShellEntry(ShellModel shellModel, ShellDoorModel shellDoorModel) {
         this.shellDoorModel = shellDoorModel;
     }
 
-    public ShellModel getShellModel() {
+    public ShellModel getShellModel(ShellPattern shellPattern) {
         return shellModel;
     }
 
-    public void setShellModel(ShellModel shellModel) {
-        this.shellModel = shellModel;
-    }
-
-    public ShellDoorModel getShellDoorModel() {
+    public ShellDoorModel getShellDoorModel(ShellPattern shellPattern) {
         return shellDoorModel;
     }
 
-    public void setShellDoorModel(ShellDoorModel shellDoorModel) {
-        this.shellDoorModel = shellDoorModel;
-    }
 }

common/src/main/java/whocraft/tardis_refined/client/model/blockentity/shell/ShellModelCollection.java

@@ -94,6 +94,10 @@ public static void registerShellEntry(ShellTheme theme, ShellModel shellModel, S
         SHELL_MODELS.put(ShellTheme.getKey(theme), new ShellEntry(shellModel, shellDoorModel));
     }
 
+    public static void registerShellEntry(ShellTheme theme, ShellEntry shellEntry){
+        SHELL_MODELS.put(ShellTheme.getKey(theme), shellEntry);
+    }
+
     /**
      * Get the associated shell model from a shell theme.
      * @param themeId The Shell theme Id.

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/console/GlobalConsoleRenderer.java

@@ -63,8 +63,9 @@ private void renderHoloShell(Vec3 offset, int rotation, GlobalConsoleBlockEntity
             TardisClientData reactions = TardisClientData.getInstance(blockEntity.getLevel().dimension());
             ResourceLocation shellTheme = reactions.getShellTheme();
             ResourceLocation shellPattern = reactions.getShellPattern();
+            ShellPattern pattern = ShellPatterns.getPatternOrDefault(shellTheme, shellPattern);
 
-            var model = ShellModelCollection.getInstance().getShellEntry(shellTheme).getShellModel();
+            var model = ShellModelCollection.getInstance().getShellEntry(shellTheme).getShellModel(pattern);
             model.setDoorPosition(false);
 
             poseStack.mulPose(Axis.ZP.rotationDegrees(180F));
@@ -81,7 +82,6 @@ private void renderHoloShell(Vec3 offset, int rotation, GlobalConsoleBlockEntity
                 ShellSelectionScreen.generateDummyGlobalShell();
             }
 
-            ShellPattern pattern = ShellPatterns.getPatternOrDefault(shellTheme, shellPattern);
             model.renderShell(ShellSelectionScreen.globalShellBlockEntity, false, true, poseStack, bufferSource.getBuffer(RenderType.entityTranslucent(pattern.exteriorDoorTexture().texture())), packedLight, OverlayTexture.NO_OVERLAY, (float) color.x, (float) color.y, (float) color.z, 0.25f);
             poseStack.popPose();
         }

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/door/GlobalDoorRenderer.java

@@ -38,7 +38,7 @@ public void render(GlobalDoorBlockEntity blockEntity, float partialTick, PoseSta
 
         // Render slightly off the wall to prevent z-fighting.
         poseStack.translate(0, 0, -0.01);
-        currentModel = ShellModelCollection.getInstance().getShellEntry(theme).getShellDoorModel();
+        currentModel = ShellModelCollection.getInstance().getShellEntry(theme).getShellDoorModel(blockEntity.pattern());
 
         if(theme == ShellTheme.POLICE_BOX.getId()){
             poseStack.scale(1.05f, 1.05f, 1.05f);

common/src/main/java/whocraft/tardis_refined/client/renderer/blockentity/shell/GlobalShellRenderer.java

@@ -45,9 +45,10 @@ public void render(GlobalShellBlockEntity blockEntity, float partialTick, PoseSt
             }
         }
 
-        var currentModel = ShellModelCollection.getInstance().getShellEntry(theme).getShellModel();
         ShellPattern pattern = blockEntity.pattern();
 
+        var currentModel = ShellModelCollection.getInstance().getShellEntry(theme).getShellModel(pattern);
+
         currentModel.renderShell(blockEntity, isOpen, true, poseStack, bufferSource.getBuffer(RenderType.entityTranslucent(currentModel.getShellTexture(pattern, false))), packedLight, OverlayTexture.NO_OVERLAY, 1f, 1f, 1f, 1f);
 
 

common/src/main/java/whocraft/tardis_refined/client/screen/selections/ShellSelectionScreen.java

@@ -155,7 +155,7 @@ public void renderBackground(GuiGraphics guiGraphics, int i, int j, float f) {
     }
 
     private void renderShell(GuiGraphics guiGraphics, int x, int y, float scale) {
-        ShellModel model = ShellModelCollection.getInstance().getShellEntry(this.currentShellTheme).getShellModel();
+        ShellModel model = ShellModelCollection.getInstance().getShellEntry(this.currentShellTheme).getShellModel(pattern);
         model.setDoorPosition(false);
         Lighting.setupForEntityInInventory();
         PoseStack pose = guiGraphics.pose();

forge/src/main/java/whocraft/tardis_refined/common/data/ShellPatternProvider.java

@@ -96,7 +96,7 @@ public ResourceLocation interiorTextureLocation(ResourceLocation themeId) {
     }
 
     protected Path getPath(ResourceLocation themeId) {
-        return generator.getPackOutput().getOutputFolder().resolve("data/" + modid + "/" + modid + "/patterns/shell/" + themeId.getPath() + ".json");
+        return generator.getPackOutput().getOutputFolder().resolve("data/" + TardisRefined.MODID + "/" + modid + "/patterns/shell/" + themeId.getPath() + ".json");
     }
 
     @Override