Add Prismatic Containment Lining and the PrismaticActiveBlock class

NegaNote · NegaNote · commit f6b5797c949e · 2025-03-24T17:14:53.000-04:00
diff --git a/src/generated/resources/assets/monilabs/blockstates/casings/prismatic_casing.json b/src/generated/resources/assets/monilabs/blockstates/casings/prismatic_casing.json
@@ -0,0 +1,10 @@
+{
+  "variants": {
+    "active=false": {
+      "model": "monilabs:block/casings/prismatic_casing"
+    },
+    "active=true": {
+      "model": "monilabs:block/casings/prismatic_casing_active"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/monilabs/blockstates/casings/prismatic_containment_lining.json b/src/generated/resources/assets/monilabs/blockstates/casings/prismatic_containment_lining.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "monilabs:casings/prismatic_containment_lining"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/monilabs/blockstates/prismatic_casing.json b/src/generated/resources/assets/monilabs/blockstates/prismatic_casing.json
diff --git a/src/generated/resources/assets/monilabs/lang/en_ud.json b/src/generated/resources/assets/monilabs/lang/en_ud.json
@@ -1,5 +1,6 @@
 {
-  "block.monilabs.prismatic_casing": "buısɐƆ ɔıʇɐɯsıɹԀ",
+  "block.monilabs.casings.prismatic_casing": "buısɐƆ ɔıʇɐɯsıɹԀ",
+  "block.monilabs.casings.prismatic_containment_lining": "buıuıꞀ ʇuǝɯuıɐʇuoƆ ɔıʇɐɯsıɹԀ",
   "block.monilabs.prismatic_crucible": "ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",
   "block.monilabs.prismatic_focus": "snɔoℲ ɔıʇɐɯsıɹԀ",
   "gtceu.prismatic_crucible": "ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",
diff --git a/src/generated/resources/assets/monilabs/lang/en_us.json b/src/generated/resources/assets/monilabs/lang/en_us.json
@@ -1,5 +1,6 @@
 {
-  "block.monilabs.prismatic_casing": "Prismatic Casing",
+  "block.monilabs.casings.prismatic_casing": "Prismatic Casing",
+  "block.monilabs.casings.prismatic_containment_lining": "Prismatic Containment Lining",
   "block.monilabs.prismatic_crucible": "Prismatic Crucible",
   "block.monilabs.prismatic_focus": "Prismatic Focus",
   "gtceu.prismatic_crucible": "Prismatic Crucible",
diff --git a/src/generated/resources/assets/monilabs/models/casings/prismatic_containment_lining.json b/src/generated/resources/assets/monilabs/models/casings/prismatic_containment_lining.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "monilabs:block/casings/prismatic_containment_lining"
+  }
+}
diff --git a/src/generated/resources/assets/monilabs/models/item/prismatic_casing.json b/src/generated/resources/assets/monilabs/models/item/prismatic_casing.json
diff --git a/src/generated/resources/data/forge/tags/blocks/mineable/wrench.json b/src/generated/resources/data/forge/tags/blocks/mineable/wrench.json
@@ -1,6 +1,7 @@
 {
   "values": [
-    "monilabs:prismatic_casing",
+    "monilabs:casings/prismatic_casing",
+    "monilabs:casings/prismatic_containment_lining",
     "monilabs:prismatic_focus"
   ]
 }
diff --git a/src/generated/resources/data/monilabs/loot_tables/blocks/casings/prismatic_casing.json b/src/generated/resources/data/monilabs/loot_tables/blocks/casings/prismatic_casing.json
@@ -11,11 +11,11 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "monilabs:prismatic_casing"
+          "name": "monilabs:casings/prismatic_casing"
         }
       ],
       "rolls": 1.0
     }
   ],
-  "random_sequence": "monilabs:blocks/prismatic_casing"
+  "random_sequence": "monilabs:blocks/casings/prismatic_casing"
 }
diff --git a/src/generated/resources/data/monilabs/loot_tables/blocks/casings/prismatic_containment_lining.json b/src/generated/resources/data/monilabs/loot_tables/blocks/casings/prismatic_containment_lining.json
@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "monilabs:casings/prismatic_containment_lining"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "monilabs:blocks/casings/prismatic_containment_lining"
+}
diff --git a/src/main/java/net/neganote/monilabs/client/renderer/PrismaticCrucibleRenderer.java b/src/main/java/net/neganote/monilabs/client/renderer/PrismaticCrucibleRenderer.java
@@ -2,7 +2,6 @@
 
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.GTValues;
-import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
 import com.gregtechceu.gtceu.client.renderer.machine.WorkableCasingMachineRenderer;
 
 import net.minecraft.client.Minecraft;
@@ -27,7 +26,7 @@
 // Lots of this is mostly copied from CosmicCore tbh, thanks Ghosti
 public class PrismaticCrucibleRenderer extends WorkableCasingMachineRenderer {
 
-    public static final ResourceLocation BASE_CASING = MoniLabs.id("block/casings/prismatic_casing");
+    public static final ResourceLocation BASE_CASING = MoniLabs.id("block/casings/prismatic_containment_lining");
     public static final ResourceLocation FRONT_TEXTURES = GTCEu.id("block/multiblock/processing_array");
 
     public static final ResourceLocation CUBE_MODEL = MoniLabs.id("block/prismac/cube");
@@ -40,15 +39,15 @@ public PrismaticCrucibleRenderer() {
     @OnlyIn(Dist.CLIENT)
     public void render(BlockEntity blockEntity, float partialTicks, PoseStack poseStack, MultiBufferSource buffer,
                        int combinedLight, int combinedOverlay) {
-        if (blockEntity instanceof IMachineBlockEntity machineBlockEntity &&
-                machineBlockEntity.getMetaMachine() instanceof PrismaticCrucibleMachine machine && machine.isFormed()) {
-            var level = machine.getLevel();
-            var frontFacing = machine.getFrontFacing();
-            var color = machine.getColorState();
-            assert level != null;
-            float tick = level.getGameTime() + partialTicks;
-            renderCube(poseStack, buffer, frontFacing, tick, color, combinedLight, combinedOverlay, machine);
-        }
+        // if (blockEntity instanceof IMachineBlockEntity machineBlockEntity &&
+        // machineBlockEntity.getMetaMachine() instanceof PrismaticCrucibleMachine machine && machine.isFormed()) {
+        // var level = machine.getLevel();
+        // var frontFacing = machine.getFrontFacing();
+        // var color = machine.getColorState();
+        // assert level != null;
+        // float tick = level.getGameTime() + partialTicks;
+        // renderCube(poseStack, buffer, frontFacing, tick, color, combinedLight, combinedOverlay, machine);
+        // }
     }
 
     @SuppressWarnings("unused")
diff --git a/src/main/java/net/neganote/monilabs/common/machine/multiblock/PrismaticCrucibleMachine.java b/src/main/java/net/neganote/monilabs/common/machine/multiblock/PrismaticCrucibleMachine.java
@@ -9,7 +9,7 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.neganote.monilabs.common.machine.part.PrismaticFocusBlock;
+import net.neganote.monilabs.common.machine.part.PrismaticActiveBlock;
 import net.neganote.monilabs.common.machine.trait.NotifiableChromaContainer;
 
 import lombok.Getter;
@@ -64,7 +64,7 @@ public void onStructureFormed() {
 
         for (Long longPos : Objects.requireNonNull(getActiveBlocks())) {
             if (Objects.requireNonNull(getLevel()).getBlockState(BlockPos.of(longPos))
-                    .getBlock() instanceof PrismaticFocusBlock) {
+                    .getBlock() instanceof PrismaticActiveBlock) {
                 BlockPos controllerPos = getPos();
                 BlockPos corePos = BlockPos.of(longPos);
 
diff --git a/src/main/java/net/neganote/monilabs/common/machine/part/PrismaticActiveBlock.java b/src/main/java/net/neganote/monilabs/common/machine/part/PrismaticActiveBlock.java
@@ -11,13 +11,13 @@
 import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
 
 // Despite the name, this only exists for the multi to attach a renderer to it.
-public class PrismaticFocusBlock extends ActiveBlock {
+public class PrismaticActiveBlock extends ActiveBlock {
 
-    public PrismaticFocusBlock(Properties properties) {
+    public PrismaticActiveBlock(Properties properties) {
         super(properties);
     }
 
-    public static NonNullBiConsumer<DataGenContext<Block, PrismaticFocusBlock>, RegistrateBlockstateProvider> createActiveModel(ResourceLocation modelPath) {
+    public static NonNullBiConsumer<DataGenContext<Block, PrismaticActiveBlock>, RegistrateBlockstateProvider> createActiveModel(ResourceLocation modelPath) {
         return (ctx, prov) -> {
             ActiveBlock block = ctx.getEntry();
             ModelFile inactive = prov.models().getExistingFile(modelPath);
diff --git a/src/main/java/net/neganote/monilabs/data/MoniBlocks.java b/src/main/java/net/neganote/monilabs/data/MoniBlocks.java
@@ -2,9 +2,11 @@
 
 import com.gregtechceu.gtceu.common.data.GTModels;
 
+import com.tterrag.registrate.util.nullness.NonNullBiConsumer;
+import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.level.block.Block;
 import net.neganote.monilabs.MoniLabs;
-import net.neganote.monilabs.common.machine.part.PrismaticFocusBlock;
+import net.neganote.monilabs.common.machine.part.PrismaticActiveBlock;
 import net.neganote.monilabs.data.recipe.RecipeTags;
 import net.neganote.monilabs.item.PrismaticFocusItem;
 
@@ -16,20 +18,33 @@ public class MoniBlocks {
 
     public static void init() {}
 
-    public static BlockEntry<Block> PRISMATIC_CASING = REGISTRATE
-            .block("prismatic_casing", Block::new)
+    public static BlockEntry<PrismaticActiveBlock> PRISMATIC_CASING = REGISTRATE
+            .block("casings/prismatic_casing", PrismaticActiveBlock::new)
             .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false))
-            .blockstate(GTModels.cubeAllModel("prismatic_casing", MoniLabs.id("block/casings/prismatic_casing")))
+            .blockstate(PrismaticActiveBlock.createActiveModel(MoniLabs.id("block/casings/prismatic_casing")))
             .tag(RecipeTags.MINEABLE_WITH_WRENCH)
             .lang("Prismatic Casing")
-            .item()
+            .item(BlockItem::new)
+            .model(NonNullBiConsumer.noop())
             .build()
             .register();
 
-    public static BlockEntry<PrismaticFocusBlock> PRISMATIC_FOCUS = REGISTRATE
-            .block("prismatic_focus", PrismaticFocusBlock::new)
+    public static BlockEntry<Block> PRISMATIC_CONTAINMENT_LINING = REGISTRATE
+            .block("casings/prismatic_containment_lining", Block::new)
             .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false))
-            .blockstate(PrismaticFocusBlock.createActiveModel(MoniLabs.id("block/prismatic_focus")))
+            .blockstate(GTModels.cubeAllModel("casings/prismatic_containment_lining",
+                    MoniLabs.id("block/casings/prismatic_containment_lining")))
+            .tag(RecipeTags.MINEABLE_WITH_WRENCH)
+            .lang("Prismatic Containment Lining")
+            .item(BlockItem::new)
+            .model(NonNullBiConsumer.noop())
+            .build()
+            .register();
+
+    public static BlockEntry<PrismaticActiveBlock> PRISMATIC_FOCUS = REGISTRATE
+            .block("prismatic_focus", PrismaticActiveBlock::new)
+            .properties(p -> p.isValidSpawn((state, level, pos, ent) -> false))
+            .blockstate(PrismaticActiveBlock.createActiveModel(MoniLabs.id("block/prismatic_focus")))
             .tag(RecipeTags.MINEABLE_WITH_WRENCH)
             .lang("Prismatic Focus")
             .item(PrismaticFocusItem::new)
diff --git a/src/main/java/net/neganote/monilabs/data/MoniMachines.java b/src/main/java/net/neganote/monilabs/data/MoniMachines.java
@@ -24,17 +24,18 @@ public class MoniMachines {
 
     public static MultiblockMachineDefinition PRISMATIC_CRUCIBLE = REGISTRATE
             .multiblock("prismatic_crucible", PrismaticCrucibleMachine::new)
-            .appearanceBlock(MoniBlocks.PRISMATIC_CASING)
+            .appearanceBlock(MoniBlocks.PRISMATIC_CONTAINMENT_LINING)
             .rotationState(RotationState.NON_Y_AXIS)
             .recipeTypes(MoniRecipeTypes.PRISMATIC_CRUCIBLE_RECIPES)
 
             .pattern(definition -> FactoryBlockPattern.start()
-                    .aisle("CCC", "CCC", "CPC")
-                    .aisle("CCC", "C#C", "C#C")
-                    .aisle("CCC", "CMC", "CCC")
-                    .where('C', blocks(MoniBlocks.PRISMATIC_CASING.get()).setMinGlobalLimited(9)
+                    .aisle("LLL", "LCL", "LPL")
+                    .aisle("LLL", "L#L", "L#L")
+                    .aisle("LLL", "LML", "LLL")
+                    .where('L', blocks(MoniBlocks.PRISMATIC_CONTAINMENT_LINING.get()).setMinGlobalLimited(9)
                             .or(autoAbilities(definition.getRecipeTypes()))
                             .or(autoAbilities(true, false, false)))
+                    .where('C', blocks(MoniBlocks.PRISMATIC_CASING.get()))
                     .where('M', controller(blocks(definition.getBlock())))
                     .where('P', blocks(PRISMATIC_FOCUS.get()))
                     .where('#', any())
diff --git a/src/main/resources/assets/monilabs/models/block/casings/prismatic_casing.json b/src/main/resources/assets/monilabs/models/block/casings/prismatic_casing.json
diff --git a/src/main/resources/assets/monilabs/models/block/casings/prismatic_casing_active.json b/src/main/resources/assets/monilabs/models/block/casings/prismatic_casing_active.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "monilabs:block/casings/prismatic_casing"
+  }
+}
diff --git a/src/main/resources/assets/monilabs/models/item/casings/prismatic_casing.json b/src/main/resources/assets/monilabs/models/item/casings/prismatic_casing.json
@@ -0,0 +1,3 @@
+{
+  "parent": "monilabs:block/casings/prismatic_casing"
+}
diff --git a/src/main/resources/assets/monilabs/models/item/casings/prismatic_containment_lining.json b/src/main/resources/assets/monilabs/models/item/casings/prismatic_containment_lining.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "monilabs:block/casings/prismatic_containment_lining"
+  }
+}
diff --git a/src/main/resources/assets/monilabs/textures/block/casings/prismatic_containment_lining.png b/src/main/resources/assets/monilabs/textures/block/casings/prismatic_containment_lining.png

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "monilabs:casings/prismatic_containment_lining"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`		`- "block.monilabs.prismatic_casing": "buısɐƆ ɔıʇɐɯsıɹԀ",`
	`2`	`+ "block.monilabs.casings.prismatic_casing": "buısɐƆ ɔıʇɐɯsıɹԀ",`
	`3`	`+ "block.monilabs.casings.prismatic_containment_lining": "buıuıꞀ ʇuǝɯuıɐʇuoƆ ɔıʇɐɯsıɹԀ",`
`3`	`4`	`"block.monilabs.prismatic_crucible": "ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",`
`4`	`5`	`"block.monilabs.prismatic_focus": "snɔoℲ ɔıʇɐɯsıɹԀ",`
`5`	`6`	`"gtceu.prismatic_crucible": "ǝןqıɔnɹƆ ɔıʇɐɯsıɹԀ",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`		`- "block.monilabs.prismatic_casing": "Prismatic Casing",`
	`2`	`+ "block.monilabs.casings.prismatic_casing": "Prismatic Casing",`
	`3`	`+ "block.monilabs.casings.prismatic_containment_lining": "Prismatic Containment Lining",`
`3`	`4`	`"block.monilabs.prismatic_crucible": "Prismatic Crucible",`
`4`	`5`	`"block.monilabs.prismatic_focus": "Prismatic Focus",`
`5`	`6`	`"gtceu.prismatic_crucible": "Prismatic Crucible",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"values": [`
`3`		`- "monilabs:prismatic_casing",`
	`3`	`+ "monilabs:casings/prismatic_casing",`
	`4`	`+ "monilabs:casings/prismatic_containment_lining",`
`4`	`5`	`"monilabs:prismatic_focus"`
`5`	`6`	`]`
`6`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,11 @@`
`11`	`11`	`"entries": [`
`12`	`12`	`{`
`13`	`13`	`"type": "minecraft:item",`
`14`		`- "name": "monilabs:prismatic_casing"`
	`14`	`+ "name": "monilabs:casings/prismatic_casing"`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"rolls": 1.0`
`18`	`18`	`}`
`19`	`19`	`],`
`20`		`- "random_sequence": "monilabs:blocks/prismatic_casing"`
	`20`	`+ "random_sequence": "monilabs:blocks/casings/prismatic_casing"`
`21`	`21`	`}`