diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index c7c577350..4c5feff7a 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.machine.tier3.TileChunkLoader; public class BlockChunkLoader extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java index 030f2ea4d..db52bc9d7 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java @@ -35,7 +35,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileCreativeQuantumChest; +import techreborn.tiles.machine.tier3.TileCreativeQuantumChest; public class BlockCreativeQuantumChest extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java index 2d9391615..4260e7bc4 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java @@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileCreativeQuantumTank; +import techreborn.tiles.machine.tier3.TileCreativeQuantumTank; public class BlockCreativeQuantumTank extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index e938865c4..f332d61fa 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.machine.tier3.TileMatterFabricator; public class BlockMatterFabricator extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 2496e83fa..2ea39b877 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.machine.tier3.TileQuantumChest; public class BlockQuantumChest extends BlockMachineBase { diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index 2dd5283d0..b11be8dff 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -32,7 +32,7 @@ import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import techreborn.TechReborn; import techreborn.client.EGui; -import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.machine.tier3.TileQuantumTank; public class BlockQuantumTank extends BlockMachineBase { diff --git a/src/main/java/techreborn/client/EGui.java b/src/main/java/techreborn/client/EGui.java index 41b4ccfa7..57cf05f7b 100644 --- a/src/main/java/techreborn/client/EGui.java +++ b/src/main/java/techreborn/client/EGui.java @@ -57,6 +57,10 @@ import techreborn.tiles.machine.iron.TileIronAlloyFurnace; import techreborn.tiles.machine.iron.TileIronFurnace; import techreborn.tiles.machine.multiblock.*; import techreborn.tiles.machine.tier1.*; +import techreborn.tiles.machine.tier3.TileChunkLoader; +import techreborn.tiles.machine.tier3.TileMatterFabricator; +import techreborn.tiles.machine.tier3.TileQuantumChest; +import techreborn.tiles.machine.tier3.TileQuantumTank; import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index eaf9130e3..8f0b066aa 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -44,6 +44,10 @@ import techreborn.tiles.machine.iron.TileIronAlloyFurnace; import techreborn.tiles.machine.iron.TileIronFurnace; import techreborn.tiles.machine.multiblock.*; import techreborn.tiles.machine.tier1.*; +import techreborn.tiles.machine.tier3.TileChunkLoader; +import techreborn.tiles.machine.tier3.TileMatterFabricator; +import techreborn.tiles.machine.tier3.TileQuantumChest; +import techreborn.tiles.machine.tier3.TileQuantumTank; import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; diff --git a/src/main/java/techreborn/client/gui/GuiChunkLoader.java b/src/main/java/techreborn/client/gui/GuiChunkLoader.java index fa68acbe2..4cdc95b5b 100644 --- a/src/main/java/techreborn/client/gui/GuiChunkLoader.java +++ b/src/main/java/techreborn/client/gui/GuiChunkLoader.java @@ -31,7 +31,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import reborncore.client.gui.builder.widget.GuiButtonSimple; -import techreborn.tiles.TileChunkLoader; +import techreborn.tiles.machine.tier3.TileChunkLoader; public class GuiChunkLoader extends GuiContainer { diff --git a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java index 5444097ef..c0baa8036 100644 --- a/src/main/java/techreborn/client/gui/GuiMatterFabricator.java +++ b/src/main/java/techreborn/client/gui/GuiMatterFabricator.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.guibuilder.GuiBuilder; -import techreborn.tiles.TileMatterFabricator; +import techreborn.tiles.machine.tier3.TileMatterFabricator; public class GuiMatterFabricator extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiQuantumChest.java b/src/main/java/techreborn/client/gui/GuiQuantumChest.java index 4bcbf4387..3249ad1af 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumChest.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumChest.java @@ -26,7 +26,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import reborncore.client.gui.builder.GuiBase; -import techreborn.tiles.TileQuantumChest; +import techreborn.tiles.machine.tier3.TileQuantumChest; public class GuiQuantumChest extends GuiBase { diff --git a/src/main/java/techreborn/client/gui/GuiQuantumTank.java b/src/main/java/techreborn/client/gui/GuiQuantumTank.java index 085a941ba..e112351a2 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumTank.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumTank.java @@ -27,7 +27,7 @@ package techreborn.client.gui; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fluids.FluidStack; import reborncore.client.gui.builder.GuiBase; -import techreborn.tiles.TileQuantumTank; +import techreborn.tiles.machine.tier3.TileQuantumTank; public class GuiQuantumTank extends GuiBase { diff --git a/src/main/java/techreborn/init/TRTileEntities.java b/src/main/java/techreborn/init/TRTileEntities.java index fde714ae2..16a39cfad 100644 --- a/src/main/java/techreborn/init/TRTileEntities.java +++ b/src/main/java/techreborn/init/TRTileEntities.java @@ -44,6 +44,12 @@ import techreborn.tiles.machine.iron.TileIronAlloyFurnace; import techreborn.tiles.machine.iron.TileIronFurnace; import techreborn.tiles.machine.multiblock.*; import techreborn.tiles.machine.tier1.*; +import techreborn.tiles.machine.tier3.TileChunkLoader; +import techreborn.tiles.machine.tier3.TileCreativeQuantumChest; +import techreborn.tiles.machine.tier3.TileCreativeQuantumTank; +import techreborn.tiles.machine.tier3.TileMatterFabricator; +import techreborn.tiles.machine.tier3.TileQuantumChest; +import techreborn.tiles.machine.tier3.TileQuantumTank; import techreborn.tiles.storage.TileAdjustableSU; import techreborn.tiles.storage.TileHighVoltageSU; import techreborn.tiles.storage.TileLowVoltageSU; diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java similarity index 98% rename from src/main/java/techreborn/tiles/TileChunkLoader.java rename to src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java index 7d282d0e0..a8e08ce80 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileChunkLoader.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/tiles/TileCreativeQuantumChest.java b/src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumChest.java similarity index 97% rename from src/main/java/techreborn/tiles/TileCreativeQuantumChest.java rename to src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumChest.java index 4db352d20..c9bdab428 100644 --- a/src/main/java/techreborn/tiles/TileCreativeQuantumChest.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumChest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import net.minecraft.item.ItemStack; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java b/src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumTank.java similarity index 97% rename from src/main/java/techreborn/tiles/TileCreativeQuantumTank.java rename to src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumTank.java index 60b808d45..5fd4f6bc1 100644 --- a/src/main/java/techreborn/tiles/TileCreativeQuantumTank.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileCreativeQuantumTank.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import techreborn.init.TRTileEntities; diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java similarity index 99% rename from src/main/java/techreborn/tiles/TileMatterFabricator.java rename to src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java index 4fce61d64..5b5578f8a 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileMatterFabricator.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumChest.java similarity index 96% rename from src/main/java/techreborn/tiles/TileQuantumChest.java rename to src/main/java/techreborn/tiles/machine/tier3/TileQuantumChest.java index 0626d4bca..88b594fbb 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumChest.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntityType; @@ -33,6 +33,7 @@ import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; import techreborn.init.TRTileEntities; +import techreborn.tiles.TileTechStorageBase; @RebornRegister(TechReborn.MOD_ID) public class TileQuantumChest extends TileTechStorageBase implements IContainerProvider { diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java similarity index 99% rename from src/main/java/techreborn/tiles/TileQuantumTank.java rename to src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java index c353b6389..10e1f8e76 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/machine/tier3/TileQuantumTank.java @@ -22,7 +22,7 @@ * SOFTWARE. */ -package techreborn.tiles; +package techreborn.tiles.machine.tier3; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/resources/assets/techreborn/blockstates/chunk_loader.json b/src/main/resources/assets/techreborn/blockstates/chunk_loader.json new file mode 100644 index 000000000..c9355cc2c --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/chunk_loader.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/chunk_loader" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/creative_quantum_chest.json b/src/main/resources/assets/techreborn/blockstates/creative_quantum_chest.json new file mode 100644 index 000000000..8edaca5b5 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/creative_quantum_chest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_chest" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/creative_quantum_tank.json b/src/main/resources/assets/techreborn/blockstates/creative_quantum_tank.json new file mode 100644 index 000000000..27f3e388b --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/creative_quantum_tank.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_tank" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/fluid_replicator.json b/src/main/resources/assets/techreborn/blockstates/fluid_replicator.json new file mode 100644 index 000000000..34a32c0ca --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/fluid_replicator.json @@ -0,0 +1,12 @@ +{ + "variants": { + "facing=north,active=false": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator" }, + "facing=south,active=false": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator", "y": 180 }, + "facing=west,active=false": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator", "y": 270 }, + "facing=east,active=false": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator", "y": 90 }, + "facing=north,active=true": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator_on" }, + "facing=south,active=true": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator_on", "y": 180 }, + "facing=west,active=true": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator_on", "y": 270 }, + "facing=east,active=true": { "model": "techreborn:block/machines/tier3_machines/fluid_replicator_on", "y": 90 } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json deleted file mode 100644 index 48ca3e818..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/chunk_loader.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/industrial_chunkloader_side", - "top": "techreborn:blocks/machines/tier3_machines/industrial_chunkloader_top", - "side": "techreborn:blocks/machines/tier3_machines/industrial_chunkloader_side", - "bottom": "techreborn:blocks/machines/tier3_machines/machine_bottom", - "front": "techreborn:blocks/machines/tier3_machines/industrial_chunkloader_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_chest.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_chest.json deleted file mode 100644 index 22909d758..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_chest.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side", - "down": "techreborn:blocks/machines/tier3_machines/quantum_chest_bottom", - "top": "techreborn:blocks/machines/tier3_machines/quantum_chest_top", - "side": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side", - "front": "techreborn:blocks/machines/tier3_machines/creative_quantum_chest_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_tank.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_tank.json deleted file mode 100644 index 0d898ad55..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/creative_quantum_tank.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side", - "down": "techreborn:blocks/machines/tier3_machines/quantum_tank_bottom", - "top": "techreborn:blocks/machines/tier3_machines/quantum_tank_top", - "side": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side", - "front": "techreborn:blocks/machines/tier3_machines/creative_quantum_tank_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/fluid_replicator.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/fluid_replicator.json deleted file mode 100644 index fbf9b276d..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/fluid_replicator.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/fluid_replicator_front_off", - "top": "techreborn:blocks/machines/tier3_machines/machine_top", - "down": "techreborn:blocks/machines/tier3_machines/machine_bottom", - "south": "techreborn:blocks/machines/tier3_machines/machine_back", - "west": "techreborn:blocks/machines/tier3_machines/machine_west", - "east": "techreborn:blocks/machines/tier3_machines/machine_east" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "front": "techreborn:blocks/machines/tier3_machines/fluid_replicator_front_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "front": "techreborn:blocks/machines/tier3_machines/fluid_replicator_front_on" - } - }, - "false": { - "textures": { - "front": "techreborn:blocks/machines/tier3_machines/fluid_replicator_front_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json deleted file mode 100644 index 6c13408ee..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/matter_fabricator.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off", - "down": "techreborn:blocks/machines/tier3_machines/mass_fabricator_bottom" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "top": "techreborn:blocks/machines/tier3_machines/mass_fabricator_top_off", - "side": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off", - "front": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off" - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - "top": "techreborn:blocks/machines/tier3_machines/mass_fabricator_top_on", - "side": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_on", - "front": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_on" - } - }, - "false": { - "textures": { - "top": "techreborn:blocks/machines/tier3_machines/mass_fabricator_top_off", - "side": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off", - "front": "techreborn:blocks/machines/tier3_machines/mass_fabricator_side_off" - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json deleted file mode 100644 index 8a555f075..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_chest.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/quantum_chest_side", - "down": "techreborn:blocks/machines/tier3_machines/quantum_chest_bottom", - "top": "techreborn:blocks/machines/tier3_machines/quantum_chest_top", - "side": "techreborn:blocks/machines/tier3_machines/quantum_chest_side", - "front": "techreborn:blocks/machines/tier3_machines/quantum_chest_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json b/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json deleted file mode 100644 index bcb7bee93..000000000 --- a/src/main/resources/assets/techreborn/blockstates/machines/tier3_machines/quantum_tank.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - "particle": "techreborn:blocks/machines/tier3_machines/quantum_tank_side", - "down": "techreborn:blocks/machines/tier3_machines/quantum_tank_bottom", - "top": "techreborn:blocks/machines/tier3_machines/quantum_tank_top", - "side": "techreborn:blocks/machines/tier3_machines/quantum_tank_side", - "front": "techreborn:blocks/machines/tier3_machines/quantum_tank_side" - } - }, - "variants": { - "inventory": { - "transform": "forge:default-block", - "model": "orientable", - "textures": { - } - }, - "facing": { - "north": { - }, - "east": { - "y": 90 - }, - "south": { - "y": 180 - }, - "west": { - "y": 270 - } - }, - "active": { - "true": { - "textures": { - } - }, - "false": { - "textures": { - } - } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/blockstates/matter_fabricator.json b/src/main/resources/assets/techreborn/blockstates/matter_fabricator.json new file mode 100644 index 000000000..cd604f478 --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/matter_fabricator.json @@ -0,0 +1,6 @@ +{ + "variants": { + "active=false": { "model": "techreborn:block/machines/tier3_machines/matter_fabricator" }, + "active=true": { "model": "techreborn:block/machines/tier3_machines/matter_fabricator_on" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/quantum_chest.json b/src/main/resources/assets/techreborn/blockstates/quantum_chest.json new file mode 100644 index 000000000..dc4b1507e --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/quantum_chest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/quantum_chest" } + } +} diff --git a/src/main/resources/assets/techreborn/blockstates/quantum_tank.json b/src/main/resources/assets/techreborn/blockstates/quantum_tank.json new file mode 100644 index 000000000..7cadb758e --- /dev/null +++ b/src/main/resources/assets/techreborn/blockstates/quantum_tank.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/quantum_tank" } + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/chunk_loader.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/chunk_loader.json new file mode 100644 index 000000000..3e2cfcca7 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/chunk_loader.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/chunk_loader_top", + "bottom": "techreborn:block/machines/tier3_machines/machine_bottom", + "side": "techreborn:block/machines/tier3_machines/chunk_loader_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_chest.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_chest.json new file mode 100644 index 000000000..f01c9936e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_chest.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/quantum_chest_top", + "bottom": "techreborn:block/machines/tier3_machines/quantum_chest_bottom", + "side": "techreborn:block/machines/tier3_machines/creative_quantum_chest_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_tank.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_tank.json new file mode 100644 index 000000000..c7d45bb5d --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_tank.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/quantum_tank_top", + "bottom": "techreborn:block/machines/tier3_machines/quantum_tank_bottom", + "side": "techreborn:block/machines/tier3_machines/creative_quantum_tank_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator.json new file mode 100644 index 000000000..b83266879 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier3_machines/machine_top", + "down": "techreborn:block/machines/tier3_machines/machine_bottom", + "west": "techreborn:block/machines/tier3_machines/machine_west", + "east": "techreborn:block/machines/tier3_machines/machine_east", + "south": "techreborn:block/machines/tier3_machines/machine_back", + "front": "techreborn:block/machines/tier3_machines/fluid_replicator_front_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator_on.json new file mode 100644 index 000000000..94782dfa2 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/fluid_replicator_on.json @@ -0,0 +1,11 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "up": "techreborn:block/machines/tier3_machines/machine_top", + "down": "techreborn:block/machines/tier3_machines/machine_bottom", + "west": "techreborn:block/machines/tier3_machines/machine_west", + "east": "techreborn:block/machines/tier3_machines/machine_east", + "south": "techreborn:block/machines/tier3_machines/machine_back", + "front": "techreborn:block/machines/tier3_machines/fluid_replicator_front_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator.json new file mode 100644 index 000000000..35e8789b8 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/matter_fabricator_top_off", + "bottom": "techreborn:block/machines/tier3_machines/matter_fabricator_bottom", + "side": "techreborn:block/machines/tier3_machines/matter_fabricator_side_off" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator_on.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator_on.json new file mode 100644 index 000000000..e885a9cb5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/matter_fabricator_on.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/matter_fabricator_top_on", + "bottom": "techreborn:block/machines/tier3_machines/matter_fabricator_bottom", + "side": "techreborn:block/machines/tier3_machines/matter_fabricator_side_on" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_chest.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_chest.json new file mode 100644 index 000000000..6c7f4bac4 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_chest.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/quantum_chest_top", + "bottom": "techreborn:block/machines/tier3_machines/quantum_chest_bottom", + "side": "techreborn:block/machines/tier3_machines/quantum_chest_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_tank.json b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_tank.json new file mode 100644 index 000000000..17b1de97a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_tank.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "top": "techreborn:block/machines/tier3_machines/quantum_tank_top", + "bottom": "techreborn:block/machines/tier3_machines/quantum_tank_bottom", + "side": "techreborn:block/machines/tier3_machines/quantum_tank_side" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/chunk_loader.json b/src/main/resources/assets/techreborn/models/item/chunk_loader.json new file mode 100644 index 000000000..34c22dd3c --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/chunk_loader.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier3_machines/chunk_loader" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/creative_quantum_chest.json b/src/main/resources/assets/techreborn/models/item/creative_quantum_chest.json new file mode 100644 index 000000000..8edaca5b5 --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/creative_quantum_chest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_chest" } + } +} diff --git a/src/main/resources/assets/techreborn/models/item/creative_quantum_tank.json b/src/main/resources/assets/techreborn/models/item/creative_quantum_tank.json new file mode 100644 index 000000000..27f3e388b --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/creative_quantum_tank.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_tank" } + } +} diff --git a/src/main/resources/assets/techreborn/models/item/fluid_replicator.json b/src/main/resources/assets/techreborn/models/item/fluid_replicator.json new file mode 100644 index 000000000..a2594dbbf --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/fluid_replicator.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier3_machines/fluid_replicator" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/matter_fabricator.json b/src/main/resources/assets/techreborn/models/item/matter_fabricator.json new file mode 100644 index 000000000..583d8e5cd --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/matter_fabricator.json @@ -0,0 +1,3 @@ +{ + "parent": "techreborn:block/machines/tier3_machines/matter_fabricator" +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/quantum_chest.json b/src/main/resources/assets/techreborn/models/item/quantum_chest.json new file mode 100644 index 000000000..dc4b1507e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/quantum_chest.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/quantum_chest" } + } +} diff --git a/src/main/resources/assets/techreborn/models/item/quantum_tank.json b/src/main/resources/assets/techreborn/models/item/quantum_tank.json new file mode 100644 index 000000000..7cadb758e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/quantum_tank.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "techreborn:block/machines/tier3_machines/quantum_tank" } + } +} diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_side.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/chunk_loader_side.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_side.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/chunk_loader_side.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_top.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/chunk_loader_top.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/industrial_chunkloader_top.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/chunk_loader_top.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_bottom.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_bottom.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_bottom.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_bottom.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_off.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_on.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_side_on.png.mcmeta rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_top_off.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_off.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_top_off.png diff --git a/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_top_on.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/mass_fabricator_top_on.png rename to src/main/resources/assets/techreborn/textures/block/machines/tier3_machines/matter_fabricator_top_on.png