From 91db77d8473c5486a5117b1317e007011be16cb6 Mon Sep 17 00:00:00 2001 From: MartinSVK12 <37455793+MartinSVK12@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:04:12 +0100 Subject: [PATCH] Conduit models now render using dragonfly. --- .../signalindustries/SignalIndustries.java | 62 ++++++++++++ .../signalindustries/blocks/BlockConduit.java | 14 +-- .../blocks/BlockFluidConduit.java | 14 +-- .../signalindustries/blocks/BlockIgnitor.java | 4 +- .../states/ConduitStateInterpreter.java | 43 ++++++++ .../interfaces/IConduitsConnect.java | 4 - .../mixin/RenderBlocksMixin.java | 39 -------- .../render/RenderConduit.java | 62 ------------ .../render/RenderFluidInConduit.java | 53 +++++++--- .../blockstates/awakened_conduit.json | 57 +++++++++++ .../blockstates/basic_conduit.json | 57 +++++++++++ .../blockstates/basic_fluid_conduit.json | 57 +++++++++++ .../blockstates/prototype_conduit.json | 57 +++++++++++ .../blockstates/prototype_fluid_conduit.json | 57 +++++++++++ .../blockstates/reinforced_conduit.json | 57 +++++++++++ .../blockstates/reinforced_fluid_conduit.json | 57 +++++++++++ .../conduit/energy/awakened/conduit_all.json | 6 ++ .../conduit/energy/awakened/conduit_base.json | 6 ++ .../conduit/energy/awakened/conduit_down.json | 6 ++ .../conduit/energy/awakened/conduit_east.json | 6 ++ .../energy/awakened/conduit_north.json | 6 ++ .../energy/awakened/conduit_south.json | 6 ++ .../conduit/energy/awakened/conduit_up.json | 6 ++ .../conduit/energy/awakened/conduit_west.json | 6 ++ .../conduit/energy/basic/conduit_all.json | 6 ++ .../conduit/energy/basic/conduit_base.json | 6 ++ .../conduit/energy/basic/conduit_down.json | 6 ++ .../conduit/energy/basic/conduit_east.json | 6 ++ .../conduit/energy/basic/conduit_north.json | 6 ++ .../conduit/energy/basic/conduit_south.json | 6 ++ .../conduit/energy/basic/conduit_up.json | 6 ++ .../conduit/energy/basic/conduit_west.json | 6 ++ .../conduit/energy/prototype/conduit_all.json | 6 ++ .../energy/prototype/conduit_base.json | 6 ++ .../energy/prototype/conduit_down.json | 6 ++ .../energy/prototype/conduit_east.json | 6 ++ .../energy/prototype/conduit_north.json | 6 ++ .../energy/prototype/conduit_south.json | 6 ++ .../conduit/energy/prototype/conduit_up.json | 6 ++ .../energy/prototype/conduit_west.json | 6 ++ .../energy/reinforced/conduit_all.json | 6 ++ .../energy/reinforced/conduit_base.json | 6 ++ .../energy/reinforced/conduit_down.json | 6 ++ .../energy/reinforced/conduit_east.json | 6 ++ .../energy/reinforced/conduit_north.json | 6 ++ .../energy/reinforced/conduit_south.json | 6 ++ .../conduit/energy/reinforced/conduit_up.json | 6 ++ .../energy/reinforced/conduit_west.json | 6 ++ .../conduit/fluid/basic/conduit_all.json | 6 ++ .../conduit/fluid/basic/conduit_base.json | 6 ++ .../conduit/fluid/basic/conduit_down.json | 6 ++ .../conduit/fluid/basic/conduit_east.json | 6 ++ .../conduit/fluid/basic/conduit_north.json | 6 ++ .../conduit/fluid/basic/conduit_south.json | 6 ++ .../model/conduit/fluid/basic/conduit_up.json | 6 ++ .../conduit/fluid/basic/conduit_west.json | 6 ++ .../conduit/fluid/prototype/conduit_all.json | 6 ++ .../conduit/fluid/prototype/conduit_base.json | 6 ++ .../conduit/fluid/prototype/conduit_down.json | 6 ++ .../conduit/fluid/prototype/conduit_east.json | 6 ++ .../fluid/prototype/conduit_north.json | 6 ++ .../fluid/prototype/conduit_south.json | 6 ++ .../conduit/fluid/prototype/conduit_up.json | 6 ++ .../conduit/fluid/prototype/conduit_west.json | 6 ++ .../conduit/fluid/reinforced/conduit_all.json | 6 ++ .../fluid/reinforced/conduit_base.json | 6 ++ .../fluid/reinforced/conduit_down.json | 6 ++ .../fluid/reinforced/conduit_east.json | 6 ++ .../fluid/reinforced/conduit_north.json | 6 ++ .../fluid/reinforced/conduit_south.json | 6 ++ .../conduit/fluid/reinforced/conduit_up.json | 6 ++ .../fluid/reinforced/conduit_west.json | 6 ++ .../model/conduit/template_conduit_all.json | 99 +++++++++++++++++++ .../model/conduit/template_conduit_base.json | 21 ++++ .../model/conduit/template_conduit_down.json | 21 ++++ .../model/conduit/template_conduit_east.json | 21 ++++ .../model/conduit/template_conduit_north.json | 21 ++++ .../model/conduit/template_conduit_south.json | 21 ++++ .../model/conduit/template_conduit_up.json | 21 ++++ .../model/conduit/template_conduit_west.json | 21 ++++ .../resources/signalindustries.mixins.json | 1 - 81 files changed, 1137 insertions(+), 140 deletions(-) create mode 100644 src/main/java/sunsetsatellite/signalindustries/blocks/states/ConduitStateInterpreter.java delete mode 100644 src/main/java/sunsetsatellite/signalindustries/interfaces/IConduitsConnect.java delete mode 100644 src/main/java/sunsetsatellite/signalindustries/mixin/RenderBlocksMixin.java delete mode 100644 src/main/java/sunsetsatellite/signalindustries/render/RenderConduit.java create mode 100644 src/main/resources/assets/signalindustries/blockstates/awakened_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/basic_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/basic_fluid_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/prototype_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/prototype_fluid_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/reinforced_conduit.json create mode 100644 src/main/resources/assets/signalindustries/blockstates/reinforced_fluid_conduit.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_west.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_all.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_base.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_down.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_east.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_north.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_south.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_up.json create mode 100644 src/main/resources/assets/signalindustries/model/conduit/template_conduit_west.json diff --git a/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java b/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java index ae781ea1..2587d669 100644 --- a/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java +++ b/src/main/java/sunsetsatellite/signalindustries/SignalIndustries.java @@ -18,6 +18,7 @@ import net.minecraft.core.block.*; import net.minecraft.core.block.material.Material; import net.minecraft.core.block.tag.BlockTags; +import net.minecraft.core.data.tag.Tag; import net.minecraft.core.entity.player.EntityPlayer; import net.minecraft.core.item.Item; import net.minecraft.core.item.ItemStack; @@ -50,6 +51,7 @@ import sunsetsatellite.signalindustries.blocks.base.BlockTiered; import sunsetsatellite.signalindustries.blocks.base.BlockUndroppable; import sunsetsatellite.signalindustries.blocks.machines.*; +import sunsetsatellite.signalindustries.blocks.states.ConduitStateInterpreter; import sunsetsatellite.signalindustries.blocks.states.EEPROMProgrammerStateInterpreter; import sunsetsatellite.signalindustries.dim.WorldTypeEternity; import sunsetsatellite.signalindustries.entities.EntityCrystal; @@ -205,6 +207,10 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { //public static final Config config = new Config(MOD_ID, mapOf(new String[]{"PacketOpenMachineGUI_ID","PacketPipeItemSpawn_ID","GuiID"},new String[]{"113","114","9"}), new Class[]{SignalIndustries.class}); public static HashMap>> nameToGuiMap = new HashMap<>(); + + public static final Tag ENERGY_CONDUITS_CONNECT = Tag.of("energy_conduits_connect"); + public static final Tag FLUID_CONDUITS_CONNECT = Tag.of("fluid_conduits_connect"); + public static final Block signalumOre = new BlockBuilder(MOD_ID) .setTextures("signalum_ore.png") .setLuminance(3) @@ -319,6 +325,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/energy/prototype/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"prototype_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockConduit("prototype.conduit",config.getInt("BlockIDs.prototypeConduit"),Tier.PROTOTYPE,Material.glass)); public static final Block basicConduit = new BlockBuilder(MOD_ID) @@ -327,6 +341,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/energy/basic/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"basic_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockConduit("basic.conduit",config.getInt("BlockIDs.basicConduit"),Tier.BASIC,Material.glass)); public static final Block reinforcedConduit = new BlockBuilder(MOD_ID) @@ -335,6 +357,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/energy/reinforced/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"reinforced_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockConduit("reinforced.conduit",config.getInt("BlockIDs.reinforcedConduit"),Tier.REINFORCED,Material.glass)); public static final Block awakenedConduit = new BlockBuilder(MOD_ID) @@ -343,6 +373,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/energy/awakened/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"awakened_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockConduit("awakened.conduit",config.getInt("BlockIDs.awakenedConduit"),Tier.AWAKENED,Material.glass)); @@ -352,6 +390,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/fluid/prototype/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"prototype_fluid_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockFluidConduit("prototype.conduit.fluid",config.getInt("BlockIDs.prototypeFluidConduit"),Tier.PROTOTYPE,Material.glass)); public static final Block basicFluidConduit = new BlockBuilder(MOD_ID) @@ -360,6 +406,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/fluid/basic/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"basic_fluid_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockFluidConduit("basic.conduit.fluid",config.getInt("BlockIDs.basicFluidConduit"),Tier.BASIC,Material.glass)); public static final Block reinforcedFluidConduit = new BlockBuilder(MOD_ID) @@ -368,6 +422,14 @@ public class SignalIndustries implements ModInitializer, GameStartEntrypoint { .setResistance(1) .setHardness(1) .setBlockSound(BlockSounds.GLASS) + .setBlockModel( + new BlockModelDragonFly( + ModelHelper.getOrCreateBlockModel(MOD_ID,"conduit/fluid/reinforced/conduit_all.json"), + ModelHelper.getOrCreateBlockState(MOD_ID,"reinforced_fluid_conduit.json"), + new ConduitStateInterpreter(), + true + ) + ) .build(new BlockFluidConduit("reinforced.conduit.fluid",config.getInt("BlockIDs.reinforcedFluidConduit"),Tier.REINFORCED,Material.glass)); diff --git a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockConduit.java b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockConduit.java index 9f025d42..c45e808f 100644 --- a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockConduit.java +++ b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockConduit.java @@ -1,6 +1,7 @@ package sunsetsatellite.signalindustries.blocks; +import net.minecraft.client.Minecraft; import net.minecraft.core.block.entity.TileEntity; import net.minecraft.core.block.material.Material; import net.minecraft.core.entity.player.EntityPlayer; @@ -21,11 +22,6 @@ protected TileEntity getNewBlockEntity() { return new TileEntityConduit(); } - /*@Override - public int getRenderType() { - return 32; - }*/ - public boolean isSolidRender() { return false; } @@ -39,12 +35,12 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer ent if(entityplayer.isSneaking() && !world.isClientSide){ TileEntityFluidPipe tile = (TileEntityFluidPipe) world.getBlockTileEntity(i,j,k); if(tile.getFluidInSlot(0) != null && tile.getFluidInSlot(0).getLiquid() != null){ - entityplayer.addChatMessage("Liquid: "+tile.getFluidInSlot(0).toString()); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Liquid: "+tile.getFluidInSlot(0).toString()); } else { - entityplayer.addChatMessage("Liquid: Empty"); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Liquid: Empty"); } - entityplayer.addChatMessage("Capacity: "+tile.fluidCapacity[0]); - entityplayer.addChatMessage("Is pressurized? "+tile.isPressurized); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Capacity: "+tile.fluidCapacity[0]); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Is pressurized? "+tile.isPressurized); return false; } return false; diff --git a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockFluidConduit.java b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockFluidConduit.java index 76b3bc08..421912e7 100644 --- a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockFluidConduit.java +++ b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockFluidConduit.java @@ -1,6 +1,7 @@ package sunsetsatellite.signalindustries.blocks; +import net.minecraft.client.Minecraft; import net.minecraft.core.block.entity.TileEntity; import net.minecraft.core.block.material.Material; import net.minecraft.core.entity.player.EntityPlayer; @@ -21,11 +22,6 @@ protected TileEntity getNewBlockEntity() { return new TileEntityFluidConduit(); } - /*@Override - public int getRenderType() { - return 32; - }*/ - public boolean isSolidRender() { return false; } @@ -39,12 +35,12 @@ public boolean blockActivated(World world, int i, int j, int k, EntityPlayer ent if(entityplayer.isSneaking() && !world.isClientSide){ TileEntityFluidPipe tile = (TileEntityFluidPipe) world.getBlockTileEntity(i,j,k); if(tile.getFluidInSlot(0) != null && tile.getFluidInSlot(0).getLiquid() != null){ - entityplayer.addChatMessage("Liquid: "+tile.getFluidInSlot(0).toString()); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Liquid: "+tile.getFluidInSlot(0).toString()); } else { - entityplayer.addChatMessage("Liquid: Empty"); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Liquid: Empty"); } - entityplayer.addChatMessage("Capacity: "+tile.fluidCapacity[0]); - entityplayer.addChatMessage("Is pressurized? "+tile.isPressurized); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Capacity: "+tile.fluidCapacity[0]); + Minecraft.getMinecraft(this).ingameGUI.addChatMessage("Is pressurized? "+tile.isPressurized); return false; } return false; diff --git a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockIgnitor.java b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockIgnitor.java index 6c98f603..12d8adea 100644 --- a/src/main/java/sunsetsatellite/signalindustries/blocks/BlockIgnitor.java +++ b/src/main/java/sunsetsatellite/signalindustries/blocks/BlockIgnitor.java @@ -8,15 +8,15 @@ import net.minecraft.core.world.WorldSource; import sunsetsatellite.signalindustries.SignalIndustries; import sunsetsatellite.signalindustries.blocks.base.BlockContainerTiered; -import sunsetsatellite.signalindustries.interfaces.IConduitsConnect; import sunsetsatellite.signalindustries.inventories.TileEntityIgnitor; import sunsetsatellite.signalindustries.util.Tier; -public class BlockIgnitor extends BlockContainerTiered implements IConduitsConnect { +public class BlockIgnitor extends BlockContainerTiered { public BlockIgnitor(String key, int i, Tier tier, Material material) { super(key, i, tier, material); hasOverbright = true; + withTags(SignalIndustries.ENERGY_CONDUITS_CONNECT); } @Override diff --git a/src/main/java/sunsetsatellite/signalindustries/blocks/states/ConduitStateInterpreter.java b/src/main/java/sunsetsatellite/signalindustries/blocks/states/ConduitStateInterpreter.java new file mode 100644 index 00000000..2e784262 --- /dev/null +++ b/src/main/java/sunsetsatellite/signalindustries/blocks/states/ConduitStateInterpreter.java @@ -0,0 +1,43 @@ +package sunsetsatellite.signalindustries.blocks.states; + +import net.minecraft.core.block.Block; +import net.minecraft.core.block.BlockTileEntity; +import net.minecraft.core.block.entity.TileEntity; +import net.minecraft.core.world.WorldSource; +import sunsetsatellite.catalyst.core.util.Direction; +import sunsetsatellite.catalyst.core.util.Vec3i; +import sunsetsatellite.catalyst.fluids.api.IFluidInventory; +import sunsetsatellite.signalindustries.SignalIndustries; +import sunsetsatellite.signalindustries.blocks.BlockConduit; +import sunsetsatellite.signalindustries.blocks.BlockFluidConduit; +import useless.dragonfly.model.blockstates.processed.MetaStateInterpreter; + +import java.util.HashMap; + +public class ConduitStateInterpreter extends MetaStateInterpreter { + @Override + public HashMap getStateMap(WorldSource worldSource, int i, int j, int k, Block block, int meta) { + HashMap states = new HashMap<>(); + for (Direction direction : Direction.values()) { + boolean show = false; + Vec3i offset = new Vec3i(i,j,k).add(direction.getVec()); + Block neighbouringBlock = worldSource.getBlock(offset.x, offset.y, offset.z); + if(neighbouringBlock != null) { + if(block.getClass().isAssignableFrom(neighbouringBlock.getClass())){ + show = true; + } else if(!(neighbouringBlock instanceof BlockConduit || neighbouringBlock instanceof BlockFluidConduit)) { + if(neighbouringBlock instanceof BlockTileEntity){ + TileEntity neighbouringTile = worldSource.getBlockTileEntity(offset.x, offset.y, offset.z); + if(neighbouringTile instanceof IFluidInventory){ + show = true; + } + } else if (neighbouringBlock.hasTag(SignalIndustries.ENERGY_CONDUITS_CONNECT) || neighbouringBlock.hasTag(SignalIndustries.FLUID_CONDUITS_CONNECT)) { + show = true; + } + } + } + states.put(direction.getName().toLowerCase(), String.valueOf(show)); + } + return states; + } +} diff --git a/src/main/java/sunsetsatellite/signalindustries/interfaces/IConduitsConnect.java b/src/main/java/sunsetsatellite/signalindustries/interfaces/IConduitsConnect.java deleted file mode 100644 index 39a23a68..00000000 --- a/src/main/java/sunsetsatellite/signalindustries/interfaces/IConduitsConnect.java +++ /dev/null @@ -1,4 +0,0 @@ -package sunsetsatellite.signalindustries.interfaces; - -public interface IConduitsConnect { -} diff --git a/src/main/java/sunsetsatellite/signalindustries/mixin/RenderBlocksMixin.java b/src/main/java/sunsetsatellite/signalindustries/mixin/RenderBlocksMixin.java deleted file mode 100644 index 27e42ad2..00000000 --- a/src/main/java/sunsetsatellite/signalindustries/mixin/RenderBlocksMixin.java +++ /dev/null @@ -1,39 +0,0 @@ -package sunsetsatellite.signalindustries.mixin; - - -import net.minecraft.client.render.RenderBlocks; -import net.minecraft.core.block.Block; -import net.minecraft.core.block.entity.TileEntity; -import net.minecraft.core.world.World; -import net.minecraft.core.world.WorldSource; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidPipe; -import sunsetsatellite.signalindustries.render.RenderConduit; - - -@Mixin( - value={RenderBlocks.class}, - remap = false -) - -public class RenderBlocksMixin { - @Shadow private WorldSource blockAccess; - - @Shadow private World world; - - @Inject( - method = "renderBlockByRenderType", - at = @At("HEAD"), - cancellable = true - ) - void renderBlockByRenderType(Block block, int renderType, int x, int y, int z, CallbackInfoReturnable cir) { - TileEntity tile = world.getBlockTileEntity(x,y,z); - if(tile instanceof TileEntityFluidPipe){ - cir.setReturnValue(RenderConduit.render((RenderBlocks) ((Object)this),this.blockAccess,x,y,z,block,0)); - } - } -} diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderConduit.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderConduit.java deleted file mode 100644 index 09169a0f..00000000 --- a/src/main/java/sunsetsatellite/signalindustries/render/RenderConduit.java +++ /dev/null @@ -1,62 +0,0 @@ -package sunsetsatellite.signalindustries.render; - - -import net.minecraft.client.render.RenderBlocks; -import net.minecraft.core.block.Block; -import net.minecraft.core.world.WorldSource; -import sunsetsatellite.catalyst.fluids.api.IFluidInventory; -import sunsetsatellite.signalindustries.interfaces.IConduitsConnect; - -public class RenderConduit { - public static boolean render(RenderBlocks renderblocks, WorldSource blockAccess, int i, int j, int k, Block block, int l) { - float width = 0.35f; - - float halfWidth = (1.0F - width) / 2.0F; - block.setBlockBounds(halfWidth, halfWidth, halfWidth, halfWidth + width, halfWidth + width, halfWidth + width); - renderblocks.renderStandardBlock(block, i, j, k); - boolean flag = blockAccess.getBlockId(i + 1, j, k) == block.id || (blockAccess.getBlock(i + 1, j, k) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i + 1, j, k) instanceof IFluidInventory); - boolean flag1 = blockAccess.getBlockId(i - 1, j, k) == block.id || (blockAccess.getBlock(i - 1, j, k) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i - 1, j, k) instanceof IFluidInventory); - boolean flag2 = blockAccess.getBlockId(i, j + 1, k) == block.id || (blockAccess.getBlock(i, j + 1, k) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i, j + 1, k) instanceof IFluidInventory); - boolean flag3 = blockAccess.getBlockId(i, j - 1, k) == block.id || (blockAccess.getBlock(i, j - 1, k) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i, j - 1, k) instanceof IFluidInventory); - boolean flag4 = blockAccess.getBlockId(i, j, k + 1) == block.id || (blockAccess.getBlock(i, j, k + 1) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i, j, k + 1) instanceof IFluidInventory); - boolean flag5 = blockAccess.getBlockId(i, j, k - 1) == block.id || (blockAccess.getBlock(i, j, k - 1) instanceof IConduitsConnect) || (blockAccess.getBlockTileEntity(i, j, k - 1) instanceof IFluidInventory); - if(flag) - { - block.setBlockBounds(halfWidth + width, halfWidth, halfWidth, 1.0F, halfWidth + width, halfWidth + width); - renderblocks.renderStandardBlock(block, i, j, k); - - } - if(flag2) - { - block.setBlockBounds(halfWidth, halfWidth + width, halfWidth, halfWidth + width, 1.0F, halfWidth + width); - renderblocks.renderStandardBlock(block, i, j, k); - - } - if(flag4) - { - block.setBlockBounds(halfWidth, halfWidth, halfWidth + width, halfWidth + width, halfWidth + width, 1.0F); - renderblocks.renderStandardBlock(block, i, j, k); - - } - if(flag1) - { - block.setBlockBounds(0.0F, halfWidth, halfWidth, halfWidth, halfWidth + width, halfWidth + width); - renderblocks.renderStandardBlock(block, i, j, k); - - } - if(flag3) - { - block.setBlockBounds(halfWidth, 0.0F, halfWidth, halfWidth + width, halfWidth, halfWidth + width); - renderblocks.renderStandardBlock(block, i, j, k); - - } - if(flag5) - { - block.setBlockBounds(halfWidth, halfWidth, 0.0F, halfWidth + width, halfWidth + width, halfWidth); - renderblocks.renderStandardBlock(block, i, j, k); - - } - block.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); - return true; - } -} diff --git a/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java b/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java index dfcdf441..8b95ccaf 100644 --- a/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java +++ b/src/main/java/sunsetsatellite/signalindustries/render/RenderFluidInConduit.java @@ -5,15 +5,22 @@ import net.minecraft.client.render.RenderEngine; import net.minecraft.client.render.tileentity.TileEntityRenderer; import net.minecraft.core.block.Block; +import net.minecraft.core.block.BlockTileEntity; import net.minecraft.core.block.entity.TileEntity; import net.minecraft.core.world.World; import org.lwjgl.opengl.GL11; import sunsetsatellite.catalyst.CatalystFluids; +import sunsetsatellite.catalyst.core.util.Direction; +import sunsetsatellite.catalyst.core.util.Vec3i; import sunsetsatellite.catalyst.fluids.api.IFluidInventory; import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidContainer; import sunsetsatellite.catalyst.fluids.impl.tiles.TileEntityFluidPipe; import sunsetsatellite.catalyst.fluids.render.RenderFluid; import sunsetsatellite.signalindustries.SignalIndustries; +import sunsetsatellite.signalindustries.blocks.BlockConduit; +import sunsetsatellite.signalindustries.blocks.BlockFluidConduit; + +import java.util.HashMap; public class RenderFluidInConduit extends TileEntityRenderer { @Override @@ -25,6 +32,10 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl World blockAccess = this.renderDispatcher.renderEngine.mc.theWorld; Block block = SignalIndustries.prototypeConduit; + if(tileEntity1.getBlockType() != null){ + block = tileEntity1.getBlockType(); + } + GL11.glPushMatrix(); float fluidAmount = 0; @@ -49,13 +60,27 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl fluidAmount = Math.min(fluidAmount,fluidMaxAmount); - boolean flag = blockAccess.getBlockId(i + 1, j, k) == block.id || (blockAccess.getBlockTileEntity(i + 1, j, k) instanceof IFluidInventory); - boolean flag1 = blockAccess.getBlockId(i - 1, j, k) == block.id || (blockAccess.getBlockTileEntity(i - 1, j, k) instanceof IFluidInventory); - boolean flag2 = blockAccess.getBlockId(i, j + 1, k) == block.id || (blockAccess.getBlockTileEntity(i, j + 1, k) instanceof IFluidInventory); - boolean flag3 = blockAccess.getBlockId(i, j - 1, k) == block.id || (blockAccess.getBlockTileEntity(i, j - 1, k) instanceof IFluidInventory); - boolean flag4 = blockAccess.getBlockId(i, j, k + 1) == block.id || (blockAccess.getBlockTileEntity(i, j, k + 1) instanceof IFluidInventory); - boolean flag5 = blockAccess.getBlockId(i, j, k - 1) == block.id || (blockAccess.getBlockTileEntity(i, j, k - 1) instanceof IFluidInventory); - + HashMap states = new HashMap<>(); + for (Direction direction : Direction.values()) { + boolean show = false; + Vec3i offset = new Vec3i(i,j,k).add(direction.getVec()); + Block neighbouringBlock = blockAccess.getBlock(offset.x, offset.y, offset.z); + if(neighbouringBlock != null) { + if(block.getClass().isAssignableFrom(neighbouringBlock.getClass())){ + show = true; + } else if(!(neighbouringBlock instanceof BlockConduit || neighbouringBlock instanceof BlockFluidConduit)) { + if(neighbouringBlock instanceof BlockTileEntity){ + TileEntity neighbouringTile = blockAccess.getBlockTileEntity(offset.x, offset.y, offset.z); + if(neighbouringTile instanceof IFluidInventory){ + show = true; + } + } else if (neighbouringBlock.hasTag(SignalIndustries.ENERGY_CONDUITS_CONNECT) || neighbouringBlock.hasTag(SignalIndustries.FLUID_CONDUITS_CONNECT)) { + show = true; + } + } + } + states.put(direction, show); + } float amount = (fluidAmount / fluidMaxAmount); float mapped = (float) CatalystFluids.map(amount,0.0d,1.0d,0.0d,0.3d); @@ -63,7 +88,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(0.33F, 0.33f , 0.33f); - if(!(flag2 && flag3)){ + if(!(states.get(Direction.Y_NEG) && states.get(Direction.Y_POS))){ GL11.glScalef(0.3f, mapped,0.3f); } else { GL11.glScalef(mapped,0.3f,mapped); @@ -78,7 +103,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glPopMatrix(); - if(flag){ + if(states.get(Direction.getFromName("EAST"))){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); @@ -90,7 +115,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if(flag1){ + if(states.get(Direction.getFromName("WEST"))){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); @@ -102,7 +127,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if(flag2 && ((TileEntityFluidPipe) tileEntity1).isPressurized || (blockAccess.getBlockTileEntity(i,j+1,k) instanceof TileEntityFluidPipe && ((TileEntityFluidPipe) blockAccess.getBlockTileEntity(i,j+1,k)).getFluidInSlot(0) != null)){ + if(states.get(Direction.getFromName("UP")) && ((TileEntityFluidPipe) tileEntity1).isPressurized || (blockAccess.getBlockTileEntity(i,j+1,k) instanceof TileEntityFluidPipe && ((TileEntityFluidPipe) blockAccess.getBlockTileEntity(i,j+1,k)).getFluidInSlot(0) != null)){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); @@ -114,7 +139,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if(flag3){ + if(states.get(Direction.getFromName("DOWN"))){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); @@ -126,7 +151,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if(flag4){ + if(states.get(Direction.getFromName("SOUTH"))){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); @@ -138,7 +163,7 @@ public void doRender(TileEntity tileEntity1, double d2, double d4, double d6, fl GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } - if(flag5){ + if(states.get(Direction.getFromName("NORTH"))){ GL11.glPushMatrix(); GL11.glTranslatef((float)d2, (float)d4, (float)d6); GL11.glRotatef(0.0f, 0.0F, 1.0F, 0.0F); diff --git a/src/main/resources/assets/signalindustries/blockstates/awakened_conduit.json b/src/main/resources/assets/signalindustries/blockstates/awakened_conduit.json new file mode 100644 index 00000000..30160a8d --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/awakened_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/awakened/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/basic_conduit.json b/src/main/resources/assets/signalindustries/blockstates/basic_conduit.json new file mode 100644 index 00000000..b15020f7 --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/basic_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/basic/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/basic_fluid_conduit.json b/src/main/resources/assets/signalindustries/blockstates/basic_fluid_conduit.json new file mode 100644 index 00000000..685ee162 --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/basic_fluid_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/basic/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/prototype_conduit.json b/src/main/resources/assets/signalindustries/blockstates/prototype_conduit.json new file mode 100644 index 00000000..a9856bfe --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/prototype_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/prototype/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/prototype_fluid_conduit.json b/src/main/resources/assets/signalindustries/blockstates/prototype_fluid_conduit.json new file mode 100644 index 00000000..96d730dd --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/prototype_fluid_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/prototype/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/reinforced_conduit.json b/src/main/resources/assets/signalindustries/blockstates/reinforced_conduit.json new file mode 100644 index 00000000..38eb41d0 --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/reinforced_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/energy/reinforced/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/blockstates/reinforced_fluid_conduit.json b/src/main/resources/assets/signalindustries/blockstates/reinforced_fluid_conduit.json new file mode 100644 index 00000000..069c801b --- /dev/null +++ b/src/main/resources/assets/signalindustries/blockstates/reinforced_fluid_conduit.json @@ -0,0 +1,57 @@ +{ + "multipart": [ + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_base" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_up" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_down" + }, + "when": { + "down": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_north" + }, + "when": { + "north": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_east" + }, + "when": { + "east": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_south" + }, + "when": { + "south": "true" + } + }, + { + "apply": { + "model": "signalindustries:conduit/fluid/reinforced/conduit_west" + }, + "when": { + "west": "true" + } + } + ] +} diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_all.json new file mode 100644 index 00000000..bfe71b91 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_base.json new file mode 100644 index 00000000..6dc594e3 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_down.json new file mode 100644 index 00000000..b40d3b40 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_east.json new file mode 100644 index 00000000..aaf4da0c --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_north.json new file mode 100644 index 00000000..28172e11 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_south.json new file mode 100644 index 00000000..06752e58 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_up.json new file mode 100644 index 00000000..dbfde42f --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_west.json new file mode 100644 index 00000000..751eba96 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/awakened/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/conduit_awakened" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_all.json new file mode 100644 index 00000000..bc84b578 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_base.json new file mode 100644 index 00000000..7ebb89d9 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_down.json new file mode 100644 index 00000000..9854690a --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_east.json new file mode 100644 index 00000000..543f13e1 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_north.json new file mode 100644 index 00000000..9878d912 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_south.json new file mode 100644 index 00000000..c7952e3b --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_up.json new file mode 100644 index 00000000..0a4b6586 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_west.json new file mode 100644 index 00000000..c39df2a9 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/basic/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/conduit_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_all.json new file mode 100644 index 00000000..21e5c8aa --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_base.json new file mode 100644 index 00000000..34dc266b --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_down.json new file mode 100644 index 00000000..f6dc4f17 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_east.json new file mode 100644 index 00000000..5ae9611e --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_north.json new file mode 100644 index 00000000..deef8257 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_south.json new file mode 100644 index 00000000..994390fd --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_up.json new file mode 100644 index 00000000..91ec4520 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_west.json new file mode 100644 index 00000000..032598ae --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/prototype/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/conduit_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_all.json new file mode 100644 index 00000000..f5ac65cd --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_base.json new file mode 100644 index 00000000..cc19366f --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_down.json new file mode 100644 index 00000000..9dcce205 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_east.json new file mode 100644 index 00000000..aefdddca --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_north.json new file mode 100644 index 00000000..554b7101 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_south.json new file mode 100644 index 00000000..d638d7a8 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_up.json new file mode 100644 index 00000000..c1ba7144 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_west.json new file mode 100644 index 00000000..263880f7 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/energy/reinforced/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/conduit_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_all.json new file mode 100644 index 00000000..25bb97a1 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_base.json new file mode 100644 index 00000000..bbd5f800 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_down.json new file mode 100644 index 00000000..90f25247 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_east.json new file mode 100644 index 00000000..06eb9b82 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_north.json new file mode 100644 index 00000000..1578fd2d --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_south.json new file mode 100644 index 00000000..c94b63db --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_up.json new file mode 100644 index 00000000..e6dfc403 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_west.json new file mode 100644 index 00000000..d971875d --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/basic/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_basic" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_all.json new file mode 100644 index 00000000..fab18206 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_base.json new file mode 100644 index 00000000..eb09cdac --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_down.json new file mode 100644 index 00000000..748b8ae5 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_east.json new file mode 100644 index 00000000..c9a36dbc --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_north.json new file mode 100644 index 00000000..d7b1e272 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_south.json new file mode 100644 index 00000000..df362446 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_up.json new file mode 100644 index 00000000..0f6cecf9 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_west.json new file mode 100644 index 00000000..6c3daad5 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/prototype/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_prototype" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_all.json new file mode 100644 index 00000000..8b90ed06 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_all.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_all", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_base.json new file mode 100644 index 00000000..0468ef54 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_base.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_base", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_down.json new file mode 100644 index 00000000..6bf30632 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_down.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_down", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_east.json new file mode 100644 index 00000000..f6ff4cfb --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_east.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_east", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_north.json new file mode 100644 index 00000000..df095301 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_north.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_north", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_south.json new file mode 100644 index 00000000..1dcbf970 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_south.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_south", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_up.json new file mode 100644 index 00000000..ac5c9da8 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_up.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_up", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_west.json new file mode 100644 index 00000000..d3097fb1 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/fluid/reinforced/conduit_west.json @@ -0,0 +1,6 @@ +{ + "parent": "signalindustries:conduit/template_conduit_west", + "textures": { + "conduit": "signalindustries:block/fluid_pipe_reinforced" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_all.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_all.json new file mode 100644 index 00000000..babf04a5 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_all.json @@ -0,0 +1,99 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "base", + "from": [5, 5, 5], + "to": [11, 11, 11], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + }, + { + "name": "up", + "from": [5, 11, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "east": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "south": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "west": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + }, + { + "name": "down", + "from": [5, 0, 5], + "to": [11, 5, 11], + "faces": { + "north": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "east": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "south": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "west": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + }, + { + "name": "north", + "from": [5, 5, 0], + "to": [11, 11, 5], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "up": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "down": {"uv": [5, 0, 11, 5], "texture": "#conduit"} + } + }, + { + "name": "south", + "from": [5, 5, 11], + "to": [11, 11, 16], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "up": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "down": {"uv": [5, 11, 11, 16], "texture": "#conduit"} + } + }, + { + "name": "east", + "from": [11, 5, 5], + "to": [16, 11, 11], + "faces": { + "north": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "down": {"uv": [11, 5, 16, 11], "texture": "#conduit"} + } + }, + { + "name": "west", + "from": [0, 5, 5], + "to": [5, 11, 11], + "faces": { + "north": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "down": {"uv": [0, 5, 5, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_base.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_base.json new file mode 100644 index 00000000..f9f93fa8 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_base.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "base", + "from": [5, 5, 5], + "to": [11, 11, 11], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_down.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_down.json new file mode 100644 index 00000000..36790860 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_down.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "down", + "from": [5, 0, 5], + "to": [11, 5, 11], + "faces": { + "north": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "east": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "south": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "west": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_east.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_east.json new file mode 100644 index 00000000..99c63ad8 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_east.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "east", + "from": [11, 5, 5], + "to": [16, 11, 11], + "faces": { + "north": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "down": {"uv": [11, 5, 16, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_north.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_north.json new file mode 100644 index 00000000..1b8eee17 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_north.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "north", + "from": [5, 5, 0], + "to": [11, 11, 5], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [11, 5, 16, 11], "texture": "#conduit"}, + "up": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "down": {"uv": [5, 0, 11, 5], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_south.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_south.json new file mode 100644 index 00000000..38fe4763 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_south.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "south", + "from": [5, 5, 11], + "to": [11, 11, 16], + "faces": { + "north": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "east": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "south": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "west": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "up": {"uv": [5, 11, 11, 16], "texture": "#conduit"}, + "down": {"uv": [5, 11, 11, 16], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_up.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_up.json new file mode 100644 index 00000000..280d5f11 --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_up.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "up", + "from": [5, 11, 5], + "to": [11, 16, 11], + "faces": { + "north": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "east": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "south": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "west": {"uv": [5, 0, 11, 5], "texture": "#conduit"}, + "up": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "down": {"uv": [5, 5, 11, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/signalindustries/model/conduit/template_conduit_west.json b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_west.json new file mode 100644 index 00000000..abc4e7cd --- /dev/null +++ b/src/main/resources/assets/signalindustries/model/conduit/template_conduit_west.json @@ -0,0 +1,21 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "particle": "#conduit" + }, + "elements": [ + { + "name": "west", + "from": [0, 5, 5], + "to": [5, 11, 11], + "faces": { + "north": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "east": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "south": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "west": {"uv": [5, 5, 11, 11], "texture": "#conduit"}, + "up": {"uv": [0, 5, 5, 11], "texture": "#conduit"}, + "down": {"uv": [0, 5, 5, 11], "texture": "#conduit"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/signalindustries.mixins.json b/src/main/resources/signalindustries.mixins.json index 9f056de6..3bc5c05d 100644 --- a/src/main/resources/signalindustries.mixins.json +++ b/src/main/resources/signalindustries.mixins.json @@ -24,7 +24,6 @@ "MinecraftMixin", "NBTTagCompoundMixin", "NetClientHandlerMixin", - "RenderBlocksMixin", "RenderEngineMixin", "RenderGlobalMixin", "RenderPlayerMixin",