Skip to content

Commit 4b8bedc

Browse files
committed
move some stuff to use kjs
1 parent 5bfc921 commit 4b8bedc

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/main/java/net/neganote/monilabs/MoniLabs.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,10 @@ private void registerMachines(GTCEuAPI.RegisterEvent<ResourceLocation, MachineDe
114114
MoniMachines.init();
115115
}
116116

117+
public static ResourceLocation kjsResLoc(String path) {
118+
return new ResourceLocation("kubejs", path);
119+
}
120+
117121
private void registerCovers(GTCEuAPI.RegisterEvent<ResourceLocation, CoverDefinition> event) {
118122
MoniCovers.init();
119123
}

src/main/java/net/neganote/monilabs/common/machine/MoniMachines.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.gregtechceu.gtceu.common.data.GTMaterials;
1212

1313
import net.minecraft.network.chat.Component;
14+
import net.minecraftforge.registries.ForgeRegistries;
1415
import net.neganote.monilabs.MoniLabs;
1516
import net.neganote.monilabs.client.renderer.PrismaticCrucibleRenderer;
1617
import net.neganote.monilabs.common.block.MoniBlocks;
@@ -33,7 +34,6 @@ public class MoniMachines {
3334

3435
public static MultiblockMachineDefinition PRISMATIC_CRUCIBLE = REGISTRATE
3536
.multiblock("prismatic_crucible", PrismaticCrucibleMachine::new)
36-
.appearanceBlock(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING)
3737
.rotationState(RotationState.NON_Y_AXIS)
3838
.allowExtendedFacing(false)
3939
.recipeTypes(MoniRecipeTypes.PRISMATIC_CRUCIBLE_RECIPES)
@@ -55,7 +55,9 @@ public class MoniMachines {
5555
.aisle("LLL#######LLL", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############", "#############")
5656
// spotless:on
5757
.where('L',
58-
blocks(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING.get()).setMinGlobalLimited(9)
58+
blocks(ForgeRegistries.BLOCKS
59+
.getValue(MoniLabs.kjsResLoc("dimensional_stabilization_netherite_casing")))
60+
.setMinGlobalLimited(9)
5961
.or(autoAbilities(definition.getRecipeTypes()))
6062
.or(autoAbilities(true, false, false)))
6163
.where('C', blocks(MoniBlocks.CHROMODYNAMIC_CONDUCTION_CASING.get()))
@@ -84,7 +86,6 @@ public class MoniMachines {
8486
public static MultiblockMachineDefinition OMNIC_SYNTHESIZER = REGISTRATE
8587
.multiblock("omnic_synthesizer", OmnicSynthesizerMachine::new)
8688
.recipeTypes(MoniRecipeTypes.OMNIC_SYNTHESIZER_RECIPES)
87-
.appearanceBlock(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING)
8889
.pattern(definition -> FactoryBlockPattern.start()
8990
// spotless:off
9091
.aisle("#CCCCC#", "#CCCCC#", "#CGGGC#", "#CGGGC#", "#CGGGC#", "#CGGGC#", "#CGGGC#", "#CCCCC#", "#CCCCC#")
@@ -121,7 +122,6 @@ public class MoniMachines {
121122
public static MultiblockMachineDefinition CREATIVE_ENERGY_MULTI = REGISTRATE
122123
.multiblock("creative_energy_multi", CreativeEnergyMultiMachine::new)
123124
.langValue("Omnidimensional Power Singularity")
124-
.appearanceBlock(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING)
125125
.rotationState(RotationState.NON_Y_AXIS)
126126
.recipeTypes(MoniRecipeTypes.CREATIVE_ENERGY_RECIPES)
127127
.pattern(definition -> FactoryBlockPattern.start()
@@ -142,8 +142,10 @@ public class MoniMachines {
142142
.aisle("#####NN@NN#####","#####NNNNN#####","#######F#######","#######F#######","#######F#######","###############","###############","###############","###############","#######H#######","#######H#######","#######H#######","#####AAHAA#####","#######H#######","#####AAHAA#####","#######H#######","#######H#######","#######H#######","#######R#######")
143143
.aisle("###############","###############","###############","###############","###############","###############","###############","###############","###############","###############","###############","#######H#######","#######H#######","#######H#######","#######H#######","#######H#######","#######H#######","#######H#######","###############")
144144
// spotless:on
145-
.where("N", blocks(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING.get())
146-
.or(autoAbilities(definition.getRecipeTypes())))
145+
.where("N",
146+
blocks(ForgeRegistries.BLOCKS
147+
.getValue(MoniLabs.kjsResLoc("dimensional_stabilization_netherite_casing")))
148+
.or(autoAbilities(definition.getRecipeTypes())))
147149
.where("A", blocks(GCYMBlocks.CASING_ATOMIC.get()))
148150
.where("F", frames(GTMaterials.NaquadahAlloy))
149151
.where("V", blocks(GCYMBlocks.HEAT_VENT.get()))
@@ -161,7 +163,6 @@ public class MoniMachines {
161163
public static MultiblockMachineDefinition CREATIVE_DATA_MULTI = REGISTRATE
162164
.multiblock("creative_data_multi", CreativeDataMultiMachine::new)
163165
.langValue("Creative Data Multi")
164-
.appearanceBlock(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING)
165166
.rotationState(RotationState.NON_Y_AXIS)
166167
.recipeTypes(MoniRecipeTypes.CREATIVE_DATA_RECIPES)
167168
.pattern(definition -> FactoryBlockPattern.start()
@@ -190,8 +191,9 @@ public class MoniMachines {
190191
.where("I", blocks(GTBlocks.MACHINE_CASING_UIV.get()))
191192
.where("D", blocks(GTBlocks.COMPUTER_CASING.get())
192193
.or(abilities(PartAbility.DATA_ACCESS)))
193-
.where("N", blocks(MoniBlocks.DIMENSIONAL_STABILIZATION_NETHERITE_CASING.get())
194-
.or(autoAbilities(definition.getRecipeTypes())))
194+
.where("N",
195+
blocks(ForgeRegistries.BLOCKS.getValue(MoniLabs.kjsResLoc("bioalloy_casing")))
196+
.or(autoAbilities(definition.getRecipeTypes())))
195197
.build())
196198
.workableCasingRenderer(MoniLabs.id("block/dimensional_stabilization_netherite_casing"),
197199
GTCEu.id("block/multiblock/processing_array"))

0 commit comments

Comments
 (0)