From d0dedc689347288613c8b57b29aaa2041209a03a Mon Sep 17 00:00:00 2001 From: drcrazy Date: Mon, 22 Jul 2019 02:43:22 +0300 Subject: [PATCH] Cleanup --- src/main/java/techreborn/TechReborn.java | 5 +- .../java/techreborn/blocks/BlockAlarm.java | 4 - .../generator/BlockDieselGenerator.java | 8 - .../generator/BlockDragonEggSyphon.java | 8 - .../blocks/generator/BlockFusionCoil.java | 4 - .../generator/BlockFusionControlComputer.java | 8 - .../blocks/generator/BlockGasTurbine.java | 8 - .../blocks/generator/BlockLightningRod.java | 8 - .../generator/BlockMagicEnergyAbsorber.java | 9 - .../generator/BlockMagicEnergyConverter.java | 9 - .../generator/BlockPlasmaGenerator.java | 8 - .../generator/BlockSemiFluidGenerator.java | 8 - .../blocks/generator/BlockSolarPanel.java | 4 - .../generator/BlockSolidFuelGenerator.java | 4 - .../generator/BlockThermalGenerator.java | 8 - .../blocks/generator/BlockWaterMill.java | 8 - .../blocks/generator/BlockWindMill.java | 8 - .../techreborn/blocks/lighting/BlockLamp.java | 4 - .../blocks/misc/BlockComputerCube.java | 8 - .../techreborn/blocks/misc/BlockNuke.java | 4 - .../blocks/misc/BlockReinforcedGlass.java | 4 - .../blocks/misc/BlockRubberLeaves.java | 4 - .../blocks/misc/BlockRubberLog.java | 4 - .../blocks/misc/BlockRubberPlank.java | 4 - .../blocks/misc/BlockRubberPlankSlab.java | 4 - .../blocks/misc/BlockRubberPlankStair.java | 4 - .../blocks/storage/BlockEnergyStorage.java | 4 - .../blocks/storage/BlockLSUStorage.java | 4 - .../blocks/tier0/BlockIronAlloyFurnace.java | 8 - .../blocks/tier0/BlockIronFurnace.java | 8 - .../blocks/tier1/BlockAlloySmelter.java | 4 - .../blocks/tier1/BlockAssemblingMachine.java | 4 - .../blocks/tier1/BlockAutoCraftingTable.java | 8 - .../blocks/tier1/BlockCompressor.java | 8 - .../blocks/tier1/BlockElectricFurnace.java | 8 - .../blocks/tier1/BlockExtractor.java | 8 - .../techreborn/blocks/tier1/BlockGrinder.java | 8 - .../blocks/tier1/BlockPlayerDetector.java | 59 ++-- .../blocks/tier1/BlockRecycler.java | 8 - .../blocks/tier1/BlockRollingMachine.java | 8 - .../blocks/tier1/BlockScrapboxinator.java | 8 - .../blocks/tier2/BlockChargeOMat.java | 8 - .../blocks/tier2/BlockChemicalReactor.java | 8 - .../blocks/tier2/BlockDigitalChest.java | 8 - .../blocks/tier2/BlockDistillationTower.java | 8 - .../tier2/BlockImplosionCompressor.java | 8 - .../tier2/BlockIndustrialBlastFurnace.java | 8 - .../tier2/BlockIndustrialCentrifuge.java | 8 - .../tier2/BlockIndustrialElectrolyzer.java | 8 - .../blocks/tier2/BlockIndustrialGrinder.java | 8 - .../blocks/tier2/BlockIndustrialSawmill.java | 8 - .../blocks/tier2/BlockVacuumFreezer.java | 8 - .../blocks/tier3/BlockChunkLoader.java | 8 - .../tier3/BlockCreativeQuantumChest.java | 8 - .../tier3/BlockCreativeQuantumTank.java | 8 - .../blocks/tier3/BlockFluidReplicator.java | 8 - .../blocks/tier3/BlockMatterFabricator.java | 8 - .../blocks/tier3/BlockQuantumChest.java | 8 - .../blocks/tier3/BlockQuantumTank.java | 8 - .../blocks/transformers/BlockTransformer.java | 4 - .../java/techreborn/client/gui/GuiAESU.java | 1 - .../client/gui/GuiAutoCrafting.java | 4 - .../events/ModelRegistryEventHandler.java | 270 ------------------ .../techreborn/events/TRRecipeHandler.java | 1 - .../java/techreborn/events/TRTickHandler.java | 4 - src/main/java/techreborn/init/ModLoot.java | 2 - .../java/techreborn/items/DynamicCell.java | 1 - .../items/armor/ItemLithiumIonBatpack.java | 1 - .../techreborn/items/tool/ItemJackhammer.java | 1 - .../tool/industrial/ItemIndustrialDrill.java | 5 - .../items/tool/industrial/ItemNanosaber.java | 5 - .../tiles/generator/TileSolarPanel.java | 5 - .../machine/tier1/TilePlayerDectector.java | 7 +- .../tiles/storage/TileAdjustableSU.java | 7 +- .../tiles/storage/TileEnergyStorage.java | 5 - .../tiles/transformers/TileTransformer.java | 6 +- 76 files changed, 44 insertions(+), 743 deletions(-) delete mode 100644 src/main/java/techreborn/events/ModelRegistryEventHandler.java diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index a8dab58cf..40bed57ad 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -32,6 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + +import reborncore.common.registration.RegistrationManager; import reborncore.common.util.Torus; import techreborn.client.GuiHandler; import techreborn.events.ModRegistry; @@ -59,7 +61,8 @@ public class TechReborn implements ModInitializer { @Override public void onInitialize() { INSTANCE = this; -// RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass()); + @SuppressWarnings("unused") + RegistrationManager registrationManager = new RegistrationManager("techreborn", getClass()); // TechRebornAPI.subItemRetriever = new SubItemRetriever(); // Done like this to load them here ModFluids.values(); diff --git a/src/main/java/techreborn/blocks/BlockAlarm.java b/src/main/java/techreborn/blocks/BlockAlarm.java index 7f5e35335..d131ddf03 100644 --- a/src/main/java/techreborn/blocks/BlockAlarm.java +++ b/src/main/java/techreborn/blocks/BlockAlarm.java @@ -48,12 +48,9 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.ToolManager; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; -import techreborn.TechReborn; import techreborn.tiles.TileAlarm; import javax.annotation.Nullable; @@ -68,7 +65,6 @@ public class BlockAlarm extends BaseTileBlock { super(Block.Settings.of(Material.STONE)); this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH).with(ACTIVE, false)); this.shape = GenCuboidShapes(3, 10); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java index 65215cb6f..3a5d7c1b9 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.advanced.TileDieselGenerator; @@ -39,11 +36,6 @@ import techreborn.tiles.generator.advanced.TileDieselGenerator; */ public class BlockDieselGenerator extends BlockMachineBase { - public BlockDieselGenerator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileDieselGenerator(); diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java index 9e7cbea7d..557aed0b4 100644 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java @@ -27,19 +27,11 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.tiles.generator.advanced.TileDragonEggSyphon; public class BlockDragonEggSyphon extends BlockMachineBase { - public BlockDragonEggSyphon() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileDragonEggSyphon(); diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java index 1b8e8413c..079f997f7 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionCoil.java @@ -44,9 +44,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.ToolManager; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; import techreborn.init.ModSounds; import javax.annotation.Nullable; @@ -56,7 +53,6 @@ public class BlockFusionCoil extends Block { public BlockFusionCoil() { super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).sounds(BlockSoundGroup.METAL).build()); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java index 774b3c863..3d1d6f806 100644 --- a/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/generator/BlockFusionControlComputer.java @@ -34,11 +34,8 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.util.Torus; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.init.TRContent; import techreborn.tiles.fusionReactor.TileFusionControlComputer; @@ -48,11 +45,6 @@ import java.util.List; public class BlockFusionControlComputer extends BlockMachineBase { - public BlockFusionControlComputer() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public boolean activate(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockHitResult hitResult) { diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java index c6b7b86b3..e89a2d5ff 100644 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java @@ -27,20 +27,12 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.advanced.TileGasTurbine; public class BlockGasTurbine extends BlockMachineBase { - public BlockGasTurbine() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileGasTurbine(); diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java index c3a3d9851..cb5686231 100644 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java @@ -27,19 +27,11 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.tiles.generator.TileLightningRod; public class BlockLightningRod extends BlockMachineBase { - public BlockLightningRod() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileLightningRod(); diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java index a1eeaaabc..0d39ced64 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java @@ -31,21 +31,12 @@ import net.minecraft.client.item.TooltipContext; import net.minecraft.item.ItemStack; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; - import javax.annotation.Nullable; import java.util.List; public class BlockMagicEnergyAbsorber extends BlockMachineBase { - public BlockMagicEnergyAbsorber() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List tooltip, TooltipContext flagIn) { tooltip.add(new LiteralText("WIP Coming Soon").formatted(Formatting.RED)); diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java index 5c09c8d23..124a49527 100644 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java @@ -31,20 +31,11 @@ import net.minecraft.text.Text; import net.minecraft.text.LiteralText; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; - import javax.annotation.Nullable; import java.util.List; public class BlockMagicEnergyConverter extends BlockMachineBase { - - public BlockMagicEnergyConverter() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } @Override public void buildTooltip(ItemStack stack, @Nullable BlockView worldIn, List tooltip, TooltipContext flagIn) { diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java index 08df05125..105196a0e 100644 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.TilePlasmaGenerator; @@ -38,11 +35,6 @@ import techreborn.tiles.generator.TilePlasmaGenerator; * Block for Plasma Generator */ public class BlockPlasmaGenerator extends BlockMachineBase { - - public BlockPlasmaGenerator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } @Override public BlockEntity createBlockEntity(BlockView worldIn) { diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java index 05c735bce..f67988ce8 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java @@ -27,20 +27,12 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.advanced.TileSemiFluidGenerator; public class BlockSemiFluidGenerator extends BlockMachineBase { - public BlockSemiFluidGenerator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileSemiFluidGenerator(); diff --git a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java index be93d1801..fc0d94e12 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolarPanel.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.init.TRContent.SolarPanels; import techreborn.tiles.generator.TileSolarPanel; @@ -44,7 +41,6 @@ public class BlockSolarPanel extends BlockMachineBase { public BlockSolarPanel(SolarPanels panel) { super(); this.panelType = panel; - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java index f553f7d1c..b416697de 100644 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.basic.TileSolidFuelGenerator; @@ -38,7 +35,6 @@ public class BlockSolidFuelGenerator extends BlockMachineBase { public BlockSolidFuelGenerator() { super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); } @Override diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java index 85b7ad93a..4e68dd2c7 100644 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java @@ -27,20 +27,12 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.generator.advanced.TileThermalGenerator; public class BlockThermalGenerator extends BlockMachineBase { - public BlockThermalGenerator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileThermalGenerator(); diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java index f76f20c91..7bf7d9c5a 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.tiles.generator.basic.TileWaterMill; /** @@ -38,11 +35,6 @@ import techreborn.tiles.generator.basic.TileWaterMill; */ public class BlockWaterMill extends BlockMachineBase { - public BlockWaterMill() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileWaterMill(); diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java index c6a77b1c1..88ca984e5 100644 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ b/src/main/java/techreborn/blocks/generator/BlockWindMill.java @@ -27,10 +27,7 @@ package techreborn.blocks.generator; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.tiles.generator.basic.TileWindMill; /** @@ -38,11 +35,6 @@ import techreborn.tiles.generator.basic.TileWindMill; */ public class BlockWindMill extends BlockMachineBase { - public BlockWindMill() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileWindMill(); diff --git a/src/main/java/techreborn/blocks/lighting/BlockLamp.java b/src/main/java/techreborn/blocks/lighting/BlockLamp.java index b2c51f4d8..53a71242e 100644 --- a/src/main/java/techreborn/blocks/lighting/BlockLamp.java +++ b/src/main/java/techreborn/blocks/lighting/BlockLamp.java @@ -44,12 +44,9 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.ToolManager; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; -import techreborn.TechReborn; import techreborn.tiles.lighting.TileLamp; import javax.annotation.Nullable; @@ -69,7 +66,6 @@ public class BlockLamp extends BaseTileBlock { this.shape = GenCuboidShapes(depth, width); this.cost = cost; this.brightness = brightness; - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/lighting")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/misc/BlockComputerCube.java b/src/main/java/techreborn/blocks/misc/BlockComputerCube.java index 6f7b4ec32..8603553ba 100644 --- a/src/main/java/techreborn/blocks/misc/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/misc/BlockComputerCube.java @@ -36,20 +36,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import reborncore.api.ToolManager; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.init.ModSounds; import techreborn.init.TRContent; public class BlockComputerCube extends BlockMachineBase { - public BlockComputerCube() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public IMachineGuiHandler getGui() { return null; diff --git a/src/main/java/techreborn/blocks/misc/BlockNuke.java b/src/main/java/techreborn/blocks/misc/BlockNuke.java index a84e15f9a..4d3c4e1d3 100644 --- a/src/main/java/techreborn/blocks/misc/BlockNuke.java +++ b/src/main/java/techreborn/blocks/misc/BlockNuke.java @@ -39,10 +39,7 @@ import net.minecraft.state.property.BooleanProperty; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.explosion.Explosion; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseBlock; -import techreborn.TechReborn; import techreborn.entities.EntityNukePrimed; /** @@ -54,7 +51,6 @@ public class BlockNuke extends BaseBlock { public BlockNuke() { super(Block.Settings.of(Material.TNT)); this.setDefaultState(this.stateFactory.getDefaultState().with(OVERLAY, false)); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } public void ignite(World worldIn, BlockPos pos, BlockState state, LivingEntity igniter) { diff --git a/src/main/java/techreborn/blocks/misc/BlockReinforcedGlass.java b/src/main/java/techreborn/blocks/misc/BlockReinforcedGlass.java index 8e33b082d..872a3e6ad 100644 --- a/src/main/java/techreborn/blocks/misc/BlockReinforcedGlass.java +++ b/src/main/java/techreborn/blocks/misc/BlockReinforcedGlass.java @@ -28,15 +28,11 @@ import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.GlassBlock; import net.minecraft.block.Material; import net.minecraft.sound.BlockSoundGroup; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; public class BlockReinforcedGlass extends GlassBlock { public BlockReinforcedGlass() { super(FabricBlockSettings.of(Material.GLASS).strength(4f, 60f).sounds(BlockSoundGroup.STONE).build()); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java index b2c97724e..d7c552ab3 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLeaves.java @@ -30,16 +30,12 @@ import net.minecraft.block.FireBlock; import net.minecraft.block.LeavesBlock; import net.minecraft.block.Material; import net.minecraft.sound.BlockSoundGroup; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; public class BlockRubberLeaves extends LeavesBlock { public BlockRubberLeaves() { super(FabricBlockSettings.of(Material.LEAVES).hardness(0.2F).ticksRandomly().sounds(BlockSoundGroup.GRASS).build()); ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 30, 60); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, DISTANCE, PERSISTENT)); } } diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java index d3ec329fd..a24dbb124 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberLog.java @@ -42,12 +42,9 @@ import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.ItemPowerManager; import reborncore.common.util.WorldUtils; -import techreborn.TechReborn; import techreborn.events.TRRecipeHandler; import techreborn.init.ModSounds; import techreborn.init.TRContent; @@ -68,7 +65,6 @@ public class BlockRubberLog extends LogBlock { super(MaterialColor.SPRUCE, FabricBlockSettings.of(Material.WOOD, MaterialColor.BROWN).strength(2.0F, 2f).sounds(BlockSoundGroup.WOOD).ticksRandomly().build()); this.setDefaultState(this.getDefaultState().with(SAP_SIDE, Direction.NORTH).with(HAS_SAP, false).with(AXIS, Direction.Axis.Y)); ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 5); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } @Override diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java b/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java index 1252d30ad..1c898c79d 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberPlank.java @@ -30,9 +30,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.FireBlock; import net.minecraft.block.Material; import net.minecraft.sound.BlockSoundGroup; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; /** * Created by modmuss50 on 20/02/2016. @@ -42,6 +39,5 @@ public class BlockRubberPlank extends Block { public BlockRubberPlank() { super(FabricBlockSettings.of(Material.WOOD).strength(2f, 2f).sounds(BlockSoundGroup.WOOD).build()); ((FireBlock) Blocks.FIRE).registerFlammableBlock(this, 5, 20); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java index 2c50b5cbc..7ceab34b5 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberPlankSlab.java @@ -29,14 +29,10 @@ import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; import net.minecraft.block.SlabBlock; import net.minecraft.sound.BlockSoundGroup; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; public class BlockRubberPlankSlab extends SlabBlock { public BlockRubberPlankSlab() { super(FabricBlockSettings.of(Material.WOOD, MaterialColor.SPRUCE).strength(2.0F, 15.0F).sounds(BlockSoundGroup.WOOD).build()); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } diff --git a/src/main/java/techreborn/blocks/misc/BlockRubberPlankStair.java b/src/main/java/techreborn/blocks/misc/BlockRubberPlankStair.java index 61e1cdc2a..c0c396929 100644 --- a/src/main/java/techreborn/blocks/misc/BlockRubberPlankStair.java +++ b/src/main/java/techreborn/blocks/misc/BlockRubberPlankStair.java @@ -26,15 +26,11 @@ package techreborn.blocks.misc; import net.minecraft.block.Block; import net.minecraft.block.StairsBlock; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; import techreborn.init.TRContent; public class BlockRubberPlankStair extends StairsBlock { public BlockRubberPlankStair() { super(TRContent.RUBBER_PLANKS.getDefaultState(), Block.Settings.copy(TRContent.RUBBER_PLANKS)); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java index d0aa1c84b..47c011a9b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockEnergyStorage.java @@ -42,12 +42,9 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.World; import reborncore.api.ToolManager; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; -import techreborn.TechReborn; /** * Created by Rushmead @@ -62,7 +59,6 @@ public abstract class BlockEnergyStorage extends BaseTileBlock { this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH)); this.name = name; this.gui = gui; - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java index 81e599d30..f9c269701 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLSUStorage.java @@ -38,13 +38,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.ToolManager; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.RebornCoreConfig; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; -import techreborn.TechReborn; import techreborn.init.TRContent; import techreborn.tiles.storage.lesu.TileLSUStorage; @@ -55,7 +52,6 @@ public class BlockLSUStorage extends BaseTileBlock { public BlockLSUStorage() { super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).build()); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java index ed901ddad..681e4c614 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronAlloyFurnace.java @@ -32,20 +32,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.iron.TileIronAlloyFurnace; public class BlockIronAlloyFurnace extends BlockMachineBase { - public BlockIronAlloyFurnace() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIronAlloyFurnace(); diff --git a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java index 88b432a9e..fb2d7481f 100644 --- a/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java +++ b/src/main/java/techreborn/blocks/tier0/BlockIronFurnace.java @@ -38,10 +38,7 @@ import net.minecraft.util.math.Direction; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.iron.TileIronFurnace; @@ -49,11 +46,6 @@ import java.util.Random; public class BlockIronFurnace extends BlockMachineBase { - public BlockIronFurnace() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier0_machines")); - } - @SuppressWarnings("incomplete-switch") @Environment(EnvType.CLIENT) public void randomDisplayTick(BlockState stateIn, World worldIn, BlockPos pos, Random rand) { diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java index 2c8981548..9d659f0f7 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java @@ -27,10 +27,7 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileAlloySmelter; @@ -38,7 +35,6 @@ public class BlockAlloySmelter extends BlockMachineBase { public BlockAlloySmelter() { super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java index 4af543dc4..2e07542a1 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java @@ -27,10 +27,7 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileAssemblingMachine; @@ -38,7 +35,6 @@ public class BlockAssemblingMachine extends BlockMachineBase { public BlockAssemblingMachine() { super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java index 772e5f893..66e462b86 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java +++ b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileAutoCraftingTable; public class BlockAutoCraftingTable extends BlockMachineBase { - public BlockAutoCraftingTable() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileAutoCraftingTable(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java index 66e6a6214..81521ea0b 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileCompressor; public class BlockCompressor extends BlockMachineBase { - public BlockCompressor() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileCompressor(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java index c72be48de..3e1c35128 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileElectricFurnace; public class BlockElectricFurnace extends BlockMachineBase { - public BlockElectricFurnace() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileElectricFurnace(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java index 5c7db65ca..cd4d099dd 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileExtractor; public class BlockExtractor extends BlockMachineBase { - public BlockExtractor() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileExtractor(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java index d1bb71a40..c3a3b9a72 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileGrinder; public class BlockGrinder extends BlockMachineBase { - public BlockGrinder() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileGrinder(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java index 3f3ca82d0..0fe8e95fc 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java +++ b/src/main/java/techreborn/blocks/tier1/BlockPlayerDetector.java @@ -24,7 +24,6 @@ package techreborn.blocks.tier1; -import com.google.common.collect.Lists; import net.minecraft.text.LiteralText; import net.minecraft.util.Formatting; import net.minecraft.block.Block; @@ -37,7 +36,9 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.state.StateFactory; +import net.minecraft.state.property.EnumProperty; import net.minecraft.util.Hand; +import net.minecraft.util.StringIdentifiable; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -46,31 +47,19 @@ import net.minecraft.world.World; import reborncore.api.IToolDrop; import reborncore.api.ToolManager; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import reborncore.common.blocks.PropertyString; -import reborncore.common.util.ArrayUtils; import reborncore.common.util.ChatUtils; import reborncore.common.util.StringUtils; -import techreborn.TechReborn; import techreborn.tiles.machine.tier1.TilePlayerDectector; import techreborn.utils.MessageIDs; -import java.util.List; - public class BlockPlayerDetector extends BlockMachineBase { - public static final String[] types = new String[] { "all", "others", "you" }; - static List typeNamesList = Lists.newArrayList(ArrayUtils.arrayToLowercase(types)); - public static PropertyString TYPE; + public static EnumProperty TYPE; public BlockPlayerDetector() { super(Block.Settings.of(Material.METAL), true); - this.setDefaultState(this.stateFactory.getDefaultState().with(TYPE, types[0])); - for (int i = 0; i < types.length; i++) { - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, i, "machines/tier1_machines").setInvVariant("type=" + types[i])); - } + this.setDefaultState(this.stateFactory.getDefaultState().with(TYPE, PlayerDetectorType.ALL)); } // BlockMachineBase @@ -98,8 +87,8 @@ public class BlockPlayerDetector extends BlockMachineBase { return super.activate(state, worldIn, pos, playerIn, hand, hitResult); } - String type = state.get(TYPE); - String newType = type; + PlayerDetectorType type = state.get(TYPE); + PlayerDetectorType newType = type; Formatting color = Formatting.GREEN; if (!stack.isEmpty() && ToolManager.INSTANCE.canHandleTool(stack)) { @@ -119,14 +108,14 @@ public class BlockPlayerDetector extends BlockMachineBase { return true; } } else { - if (type.equals("all")) { - newType = "others"; + if (type == PlayerDetectorType.ALL) { + newType = PlayerDetectorType.OTHERS; color = Formatting.RED; - } else if (type.equals("others")) { - newType = "you"; + } else if (type == PlayerDetectorType.OTHERS) { + newType = PlayerDetectorType.YOU; color = Formatting.BLUE; - } else if (type.equals("you")) { - newType = "all"; + } else if (type == PlayerDetectorType.YOU) { + newType = PlayerDetectorType.ALL; } worldIn.setBlockState(pos, state.with(TYPE, newType)); } @@ -136,7 +125,7 @@ public class BlockPlayerDetector extends BlockMachineBase { if (worldIn.isClient) { ChatUtils.sendNoSpamMessages(MessageIDs.playerDetectorID, new LiteralText( Formatting.GRAY + I18n.translate("techreborn.message.detects") + " " + color - + StringUtils.toFirstCapital(newType))); + + StringUtils.toFirstCapital(newType.asString()))); } return true; } @@ -149,7 +138,7 @@ public class BlockPlayerDetector extends BlockMachineBase { // Block @Override protected void appendProperties(StateFactory.Builder builder) { - TYPE = new PropertyString("type", types); + TYPE = EnumProperty.of("type", PlayerDetectorType.class); builder.add(TYPE); } @@ -175,4 +164,24 @@ public class BlockPlayerDetector extends BlockMachineBase { } return 0; } + + public enum PlayerDetectorType implements StringIdentifiable { + ALL("all"), OTHERS("others"), YOU("you"); + + private final String name; + + private PlayerDetectorType(String name) { + this.name = name; + } + + @Override + public String toString() { + return this.name; + } + + @Override + public String asString() { + return this.name; + } + } } diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java index 3e4ee9012..82a4e8230 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileRecycler; public class BlockRecycler extends BlockMachineBase { - public BlockRecycler() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileRecycler(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java index 5c08dc9ee..74e8a554e 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileRollingMachine; public class BlockRollingMachine extends BlockMachineBase { - public BlockRollingMachine() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileRollingMachine(); diff --git a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java index 4d975320c..6c1b9c7da 100644 --- a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java +++ b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier1; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileScrapboxinator; public class BlockScrapboxinator extends BlockMachineBase { - public BlockScrapboxinator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier1_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileScrapboxinator(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java index aaeab18c6..e34332714 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.TileChargeOMat; public class BlockChargeOMat extends BlockMachineBase { - public BlockChargeOMat() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileChargeOMat(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java index e7fae51d5..c96512011 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileChemicalReactor; public class BlockChemicalReactor extends BlockMachineBase { - public BlockChemicalReactor() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileChemicalReactor(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java index b44c71865..76cf0e869 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.TileDigitalChest; public class BlockDigitalChest extends BlockMachineBase { - public BlockDigitalChest() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileDigitalChest(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java index cc19d4a19..fd5ab510d 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java @@ -27,19 +27,11 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileDistillationTower; public class BlockDistillationTower extends BlockMachineBase { - - public BlockDistillationTower() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } @Override public BlockEntity createBlockEntity(BlockView worldIn) { diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java index dec0f361c..8465a2193 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileImplosionCompressor; public class BlockImplosionCompressor extends BlockMachineBase { - public BlockImplosionCompressor() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileImplosionCompressor(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java index b22f1529c..7c1cee7b8 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileIndustrialBlastFurnace; public class BlockIndustrialBlastFurnace extends BlockMachineBase { - public BlockIndustrialBlastFurnace() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIndustrialBlastFurnace(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java index 5fb6a657a..944005c6f 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.TileIndustrialCentrifuge; public class BlockIndustrialCentrifuge extends BlockMachineBase { - public BlockIndustrialCentrifuge() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIndustrialCentrifuge(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java index db2e9710a..ed92a72c3 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier1.TileIndustrialElectrolyzer; public class BlockIndustrialElectrolyzer extends BlockMachineBase { - public BlockIndustrialElectrolyzer() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIndustrialElectrolyzer(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java index 71b5f4e31..6d066bb22 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileIndustrialGrinder; public class BlockIndustrialGrinder extends BlockMachineBase { - public BlockIndustrialGrinder() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIndustrialGrinder(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java index 1ccabd8c4..c162f03dc 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileIndustrialSawmill; public class BlockIndustrialSawmill extends BlockMachineBase { - public BlockIndustrialSawmill() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileIndustrialSawmill(); diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java index 1807f7566..ea16900e9 100644 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier2; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileVacuumFreezer; public class BlockVacuumFreezer extends BlockMachineBase { - public BlockVacuumFreezer() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier2_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileVacuumFreezer(); diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java index 79082bac1..883e1ff1f 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileChunkLoader; public class BlockChunkLoader extends BlockMachineBase { - public BlockChunkLoader() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileChunkLoader(); diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java index 9b900789f..4e2acc6dc 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumChest.java @@ -30,20 +30,12 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.BlockView; import net.minecraft.world.World; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileCreativeQuantumChest; public class BlockCreativeQuantumChest extends BlockMachineBase { - public BlockCreativeQuantumChest() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileCreativeQuantumChest(); diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java index bd1ef1d69..16fb908ea 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileCreativeQuantumTank; public class BlockCreativeQuantumTank extends BlockMachineBase { - public BlockCreativeQuantumTank() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileCreativeQuantumTank(); diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java index e07b2b917..a5f29f996 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java @@ -27,19 +27,11 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.multiblock.TileFluidReplicator; public class BlockFluidReplicator extends BlockMachineBase { - - public BlockFluidReplicator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } @Override public BlockEntity createBlockEntity(BlockView worldIn) { diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java index 1b2b396c3..0e8158b3e 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileMatterFabricator; public class BlockMatterFabricator extends BlockMachineBase { - public BlockMatterFabricator() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileMatterFabricator(); diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java index 2313792af..5d7d84a02 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java @@ -27,19 +27,11 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileQuantumChest; public class BlockQuantumChest extends BlockMachineBase { - - public BlockQuantumChest() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } @Override public BlockEntity createBlockEntity(BlockView worldIn) { diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java index 8a90c68aa..a1167228e 100644 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java @@ -27,20 +27,12 @@ package techreborn.blocks.tier3; import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.tile.IMachineGuiHandler; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.blocks.BlockMachineBase; -import techreborn.TechReborn; import techreborn.client.EGui; import techreborn.tiles.machine.tier3.TileQuantumTank; public class BlockQuantumTank extends BlockMachineBase { - public BlockQuantumTank() { - super(); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/tier3_machines")); - } - @Override public BlockEntity createBlockEntity(BlockView worldIn) { return new TileQuantumTank(); diff --git a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java index 349753047..400760f11 100644 --- a/src/main/java/techreborn/blocks/transformers/BlockTransformer.java +++ b/src/main/java/techreborn/blocks/transformers/BlockTransformer.java @@ -41,12 +41,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import reborncore.api.ToolManager; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; import reborncore.common.BaseTileBlock; import reborncore.common.blocks.BlockWrenchEventHandler; import reborncore.common.util.WrenchUtils; -import techreborn.TechReborn; /** * Created by Rushmead @@ -60,7 +57,6 @@ public abstract class BlockTransformer extends BaseTileBlock { super(FabricBlockSettings.of(Material.METAL).strength(2f, 2f).build()); this.setDefaultState(this.stateFactory.getDefaultState().with(FACING, Direction.NORTH)); this.name = name; - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/energy")); BlockWrenchEventHandler.wrenableBlocks.add(this); } diff --git a/src/main/java/techreborn/client/gui/GuiAESU.java b/src/main/java/techreborn/client/gui/GuiAESU.java index 6b10701cc..c1205321d 100644 --- a/src/main/java/techreborn/client/gui/GuiAESU.java +++ b/src/main/java/techreborn/client/gui/GuiAESU.java @@ -28,7 +28,6 @@ import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.entity.player.PlayerEntity; import reborncore.client.gui.builder.GuiBase; -import reborncore.client.gui.builder.widget.GuiButtonExtended; import reborncore.client.gui.builder.widget.GuiButtonUpDown; import reborncore.common.network.NetworkManager; import reborncore.common.powerSystem.PowerSystem; diff --git a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java index f2858c960..1c8f87543 100644 --- a/src/main/java/techreborn/client/gui/GuiAutoCrafting.java +++ b/src/main/java/techreborn/client/gui/GuiAutoCrafting.java @@ -24,9 +24,7 @@ package techreborn.client.gui; -import com.mojang.blaze3d.platform.GlStateManager; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.GuiLighting; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Recipe; @@ -37,8 +35,6 @@ import reborncore.common.network.NetworkManager; import techreborn.packets.ServerboundPackets; import techreborn.tiles.machine.tier1.TileAutoCraftingTable; -import static net.minecraft.item.ItemStack.EMPTY; - /** * Created by modmuss50 on 20/06/2017. */ diff --git a/src/main/java/techreborn/events/ModelRegistryEventHandler.java b/src/main/java/techreborn/events/ModelRegistryEventHandler.java deleted file mode 100644 index 515e2d624..000000000 --- a/src/main/java/techreborn/events/ModelRegistryEventHandler.java +++ /dev/null @@ -1,270 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.events; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.item.Item; -import net.minecraft.util.Identifier; -import reborncore.client.models.ModelCompound; -import reborncore.client.models.RebornModelRegistry; -import techreborn.TechReborn; -import techreborn.config.ConfigTechReborn; -import techreborn.init.TRContent; -import techreborn.init.TRContent.*; - -import java.util.Arrays; - -/** - * @author drcrazy - * - */ -@Environment(EnvType.CLIENT) -public class ModelRegistryEventHandler { - - public static void registerModels() { - registerBlocks(); - registerFluidBlocks(); - registerItems(); - //RebornModelRegistry.registerModels(TechReborn.MOD_ID); - } - - private static void registerBlocks() { - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, TRContent.REFINED_IRON_FENCE)); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, TRContent.RUBBER_SAPLING)); - - for (Ores value : Ores.values()) { - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.block).setFileName("ore").setInvVariant("type=" + value.name)); - } - - for (StorageBlocks value : StorageBlocks.values()) { - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.block).setFileName("storage_block").setInvVariant("type=" + value.name)); - } - - for (MachineBlocks value : MachineBlocks.values()) { - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.frame).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_frame")); - RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, value.casing).setFileName("machine_block").setInvVariant("type=" + value.name + "_machine_casing")); - } - - /* - - ResourceLocation cableRL = new ResourceLocation(TechReborn.MOD_ID, "cable_inv"); - for (Cables value : Cables.values()) { - registerBlockstateMultiItem(cableRL, Item.getItemFromBlock(value.block), value.name); - ModelLoader.setCustomStateMapper(value.block, new DefaultStateMapper() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - Map, Comparable> map = Maps.newLinkedHashMap(state.getProperties()); - String property = this.getPropertyString(map) + ",ztype=" + value.name; - - return new ModelResourceLocation(new ResourceLocation(TechReborn.MOD_ID, - "cable_" + (value.cableThickness == 5 ? "thick" : "thin")), property); - } - }); - } - - */ - } - - - private static void registerFluidBlocks() { - /* - registerFluidBlockModel(ModFluids.BLOCK_BERYLLIUM); - registerFluidBlockModel(ModFluids.BLOCK_CALCIUM); - registerFluidBlockModel(ModFluids.BLOCK_CALCIUM_CARBONATE); - registerFluidBlockModel(ModFluids.BLOCK_CHLORITE); - registerFluidBlockModel(ModFluids.BLOCK_DEUTERIUM); - registerFluidBlockModel(ModFluids.BLOCK_GLYCERYL); - registerFluidBlockModel(ModFluids.BLOCK_HELIUM); - registerFluidBlockModel(ModFluids.BLOCK_HELIUM_3); - registerFluidBlockModel(ModFluids.BLOCK_HELIUMPLASMA); - registerFluidBlockModel(ModFluids.BLOCK_HYDROGEN); - registerFluidBlockModel(ModFluids.BLOCK_LITHIUM); - registerFluidBlockModel(ModFluids.BLOCK_MERCURY); - registerFluidBlockModel(ModFluids.BLOCK_METHANE); - registerFluidBlockModel(ModFluids.BLOCK_NITROCOAL_FUEL); - registerFluidBlockModel(ModFluids.BLOCK_NITROFUEL); - registerFluidBlockModel(ModFluids.BLOCK_NITROGEN); - registerFluidBlockModel(ModFluids.BLOCK_NITROGENDIOXIDE); - registerFluidBlockModel(ModFluids.BLOCK_POTASSIUM); - registerFluidBlockModel(ModFluids.BLOCK_SILICON); - registerFluidBlockModel(ModFluids.BLOCK_SODIUM); - registerFluidBlockModel(ModFluids.BLOCK_SODIUMPERSULFATE); - registerFluidBlockModel(ModFluids.BLOCK_TRITIUM); - registerFluidBlockModel(ModFluids.BLOCK_WOLFRAMIUM); - registerFluidBlockModel(ModFluids.BLOCK_CARBON); - registerFluidBlockModel(ModFluids.BLOCK_CARBON_FIBER); - registerFluidBlockModel(ModFluids.BLOCK_NITRO_CARBON); - registerFluidBlockModel(ModFluids.BLOCK_SULFUR); - registerFluidBlockModel(ModFluids.BLOCK_SODIUM_SULFIDE); - registerFluidBlockModel(ModFluids.BLOCK_DIESEL); - registerFluidBlockModel(ModFluids.BLOCK_NITRO_DIESEL); - registerFluidBlockModel(ModFluids.BLOCK_OIL); - registerFluidBlockModel(ModFluids.BLOCK_SULFURIC_ACID); - registerFluidBlockModel(ModFluids.BLOCK_COMPRESSED_AIR); - registerFluidBlockModel(ModFluids.BLOCK_ELECTROLYZED_WATER); - */ - } - - - private static void registerItems() { - // Armor - register(TRContent.CLOAKING_DEVICE, "armor/cloaking_device"); - register(TRContent.LAPOTRONIC_ORBPACK, "armor/lapotronic_orbpack"); - register(TRContent.LITHIUM_ION_BATPACK, "armor/lithium_batpack"); - - // Battery - register(TRContent.RED_CELL_BATTERY, "battery/re_battery"); - register(TRContent.LITHIUM_ION_BATTERY, "battery/lithium_battery"); - register(TRContent.ENERGY_CRYSTAL, "battery/energy_crystal"); - register(TRContent.LAPOTRON_CRYSTAL, "battery/lapotron_crystal"); - register(TRContent.LAPOTRONIC_ORB, "battery/lapotronic_orb"); - - // Tools - register(TRContent.INDUSTRIAL_CHAINSAW, "tool/industrial_chainsaw"); - register(TRContent.INDUSTRIAL_DRILL, "tool/industrial_drill"); - register(TRContent.INDUSTRIAL_JACKHAMMER, "tool/industrial_jackhammer"); - register(TRContent.DEBUG_TOOL, "tool/debug"); - register(TRContent.ADVANCED_CHAINSAW, "tool/advanced_chainsaw"); - register(TRContent.ADVANCED_DRILL, "tool/advanced_drill"); - register(TRContent.ADVANCED_JACKHAMMER, "tool/advanced_jackhammer"); - register(TRContent.ELECTRIC_TREE_TAP, "tool/electric_treetap"); - register(TRContent.NANOSABER, "tool/nanosaber"); - register(TRContent.OMNI_TOOL, "tool/omni_tool"); - register(TRContent.ROCK_CUTTER, "tool/rock_cutter"); - register(TRContent.BASIC_CHAINSAW, "tool/basic_chainsaw"); - register(TRContent.BASIC_DRILL, "tool/basic_drill"); - register(TRContent.BASIC_JACKHAMMER, "tool/basic_jackhammer"); - register(TRContent.TREE_TAP, "tool/treetap"); - register(TRContent.WRENCH, "tool/wrench"); - - // Other - register(TRContent.FREQUENCY_TRANSMITTER, "misc/frequency_transmitter"); - register(TRContent.SCRAP_BOX, "misc/scrapbox"); - register(TRContent.MANUAL, "misc/manual"); - - // Gem armor & tools - if (ConfigTechReborn.enableGemArmorAndTools) { - Identifier armourRL = new Identifier(TechReborn.MOD_ID, "items/armour"); - registerBlockstateMultiItem(armourRL, TRContent.RUBY_HELMET, "ruby_helmet"); - registerBlockstateMultiItem(armourRL, TRContent.RUBY_CHESTPLATE, "ruby_chestplate"); - registerBlockstateMultiItem(armourRL, TRContent.RUBY_LEGGINGS, "ruby_leggings"); - registerBlockstateMultiItem(armourRL, TRContent.RUBY_BOOTS, "ruby_boots"); - registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_HELMET, "sapphire_helmet"); - registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_CHESTPLATE, "sapphire_chestplate"); - registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_LEGGINGS, "sapphire_leggings"); - registerBlockstateMultiItem(armourRL, TRContent.SAPPHIRE_BOOTS, "sapphire_boots"); - registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_HELMET, "peridot_helmet"); - registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_CHESTPLATE, "peridot_chestplate"); - registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_LEGGINGS, "peridot_leggings"); - registerBlockstateMultiItem(armourRL, TRContent.PERIDOT_BOOTS, "peridot_boots"); - registerBlockstateMultiItem(armourRL, TRContent.BRONZE_HELMET, "bronze_helmet"); - registerBlockstateMultiItem(armourRL, TRContent.BRONZE_CHESTPLATE, "bronze_chestplate"); - registerBlockstateMultiItem(armourRL, TRContent.BRONZE_LEGGINGS, "bronze_leggings"); - registerBlockstateMultiItem(armourRL, TRContent.BRONZE_BOOTS, "bronze_boots"); - - Identifier toolRL = new Identifier(TechReborn.MOD_ID, "items/tool"); - registerBlockstateMultiItem(toolRL, TRContent.RUBY_PICKAXE, "ruby_pickaxe"); - registerBlockstateMultiItem(toolRL, TRContent.RUBY_SWORD, "ruby_sword"); - registerBlockstateMultiItem(toolRL, TRContent.RUBY_AXE, "ruby_axe"); - registerBlockstateMultiItem(toolRL, TRContent.RUBY_SPADE, "ruby_spade"); - registerBlockstateMultiItem(toolRL, TRContent.RUBY_HOE, "ruby_hoe"); - registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_PICKAXE, "sapphire_pickaxe"); - registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_SWORD, "sapphire_sword"); - registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_AXE, "sapphire_axe"); - registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_SPADE, "sapphire_spade"); - registerBlockstateMultiItem(toolRL, TRContent.SAPPHIRE_HOE, "sapphire_hoe"); - registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_PICKAXE, "peridot_pickaxe"); - registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_SWORD, "peridot_sword"); - registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_AXE, "peridot_axe"); - registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_SPADE, "peridot_spade"); - registerBlockstateMultiItem(toolRL, TRContent.PERIDOT_HOE, "peridot_hoe"); - registerBlockstateMultiItem(toolRL, TRContent.BRONZE_PICKAXE, "bronze_pickaxe"); - registerBlockstateMultiItem(toolRL, TRContent.BRONZE_SWORD, "bronze_sword"); - registerBlockstateMultiItem(toolRL, TRContent.BRONZE_AXE, "bronze_axe"); - registerBlockstateMultiItem(toolRL, TRContent.BRONZE_SPADE, "bronze_spade"); - registerBlockstateMultiItem(toolRL, TRContent.BRONZE_HOE, "bronze_hoe"); - } - - Identifier dustsRL = new Identifier(TechReborn.MOD_ID, "items/material/dust"); - Arrays.stream(Dusts.values()).forEach(value -> registerBlockstateMultiItem(dustsRL, value.item, value.name)); - - Identifier dustsSmallRL = new Identifier(TechReborn.MOD_ID, "items/material/small_dust"); - Arrays.stream(SmallDusts.values()).forEach(value -> registerBlockstateMultiItem(dustsSmallRL, value.item, value.name)); - - Identifier gemsRL = new Identifier(TechReborn.MOD_ID, "items/material/gem"); - Arrays.stream(Gems.values()).forEach(value -> registerBlockstateMultiItem(gemsRL, value.item, value.name)); - - Identifier ingotsRL = new Identifier(TechReborn.MOD_ID, "items/material/ingot"); - Arrays.stream(Ingots.values()).forEach(value -> registerBlockstateMultiItem(ingotsRL, value.item, value.name)); - - Identifier nuggetsRL = new Identifier(TechReborn.MOD_ID, "items/material/nugget"); - Arrays.stream(Nuggets.values()).forEach(value -> registerBlockstateMultiItem(nuggetsRL, value.item, value.name)); - - Identifier partsRL = new Identifier(TechReborn.MOD_ID, "items/material/part"); - Arrays.stream(Parts.values()).forEach(value -> registerBlockstateMultiItem(partsRL, value.item, value.name)); - - Identifier platesRL = new Identifier(TechReborn.MOD_ID, "items/material/plate"); - Arrays.stream(Plates.values()).forEach(value -> registerBlockstateMultiItem(platesRL, value.item, value.name)); - - Identifier upgradeRL = new Identifier(TechReborn.MOD_ID, "items/misc/upgrades"); - Arrays.stream(Upgrades.values()).forEach(value -> registerBlockstateMultiItem(upgradeRL, value.item, value.name)); - - } - - /* - - private static void registerFluidBlockModel(BlockFluidTechReborn block) { - String name = block.getTranslationKey().substring(5).toLowerCase(); - Item item = Item.getItemFromBlock(block); - ModelResourceLocation location = new ModelResourceLocation( - new ResourceLocation(TechReborn.MOD_ID, "fluids"), name); - - ModelLoader.registerItemVariants(item); - ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) { - return location; - } - }); - ModelLoader.setCustomStateMapper(block, new StateMapperBase() { - @Override - protected ModelResourceLocation getModelResourceLocation(IBlockState state) { - return location; - } - }); - } - - */ - - private static void register(Item item, String modelPath) { - //RebornModelRegistry.registerItemModel(item, modelPath); - } - - private static void registerBlockstateMultiItem(Identifier RL, Item item, String variantName) { - //ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(RL, "type=" + variantName)); - } - -} diff --git a/src/main/java/techreborn/events/TRRecipeHandler.java b/src/main/java/techreborn/events/TRRecipeHandler.java index 2fab27587..57856de79 100644 --- a/src/main/java/techreborn/events/TRRecipeHandler.java +++ b/src/main/java/techreborn/events/TRRecipeHandler.java @@ -35,7 +35,6 @@ import techreborn.init.TRContent; import java.util.ArrayList; import java.util.List; -import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; diff --git a/src/main/java/techreborn/events/TRTickHandler.java b/src/main/java/techreborn/events/TRTickHandler.java index 6f2234bd6..b1119fc67 100644 --- a/src/main/java/techreborn/events/TRTickHandler.java +++ b/src/main/java/techreborn/events/TRTickHandler.java @@ -24,11 +24,7 @@ package techreborn.events; -import net.minecraft.entity.EquipmentSlot; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; -import techreborn.init.TRContent; public class TRTickHandler { diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index 60ed5fa08..26cc869c4 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -25,8 +25,6 @@ package techreborn.init; import net.minecraft.util.Identifier; -import net.minecraft.world.loot.LootPool; -import net.minecraft.world.loot.LootTables; import techreborn.TechReborn; import techreborn.config.ConfigTechReborn; diff --git a/src/main/java/techreborn/items/DynamicCell.java b/src/main/java/techreborn/items/DynamicCell.java index 7fa3d2124..1aaa39265 100644 --- a/src/main/java/techreborn/items/DynamicCell.java +++ b/src/main/java/techreborn/items/DynamicCell.java @@ -34,7 +34,6 @@ import net.minecraft.util.DefaultedList; import net.minecraft.world.World; import org.apache.commons.lang3.Validate; import reborncore.fluid.Fluid; -import reborncore.fluid.FluidStack; import techreborn.TechReborn; import techreborn.init.TRContent; import techreborn.utils.FluidUtils; diff --git a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java index d7119261b..6292d8ae0 100644 --- a/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java +++ b/src/main/java/techreborn/items/armor/ItemLithiumIonBatpack.java @@ -33,7 +33,6 @@ import net.minecraft.item.*; import net.minecraft.util.DefaultedList; import net.minecraft.world.World; import reborncore.api.power.IEnergyItemInfo; -import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.ItemPowerManager; import reborncore.common.powerSystem.PowerSystem; import reborncore.common.util.ItemDurabilityExtensions; diff --git a/src/main/java/techreborn/items/tool/ItemJackhammer.java b/src/main/java/techreborn/items/tool/ItemJackhammer.java index 13ac758e5..33d07225c 100644 --- a/src/main/java/techreborn/items/tool/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tool/ItemJackhammer.java @@ -26,7 +26,6 @@ package techreborn.items.tool; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.enchantment.Enchantments; import net.minecraft.entity.LivingEntity; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java index 9c977f3b8..bfd3d386e 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemIndustrialDrill.java @@ -31,7 +31,6 @@ import net.minecraft.block.Blocks; import net.minecraft.block.Material; import net.minecraft.client.item.TooltipContext; import net.minecraft.client.resource.language.I18n; -import net.minecraft.entity.ItemEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemGroup; @@ -42,11 +41,8 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.*; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; import reborncore.common.powerSystem.ExternalPowerSystems; import reborncore.common.powerSystem.ItemPowerManager; @@ -58,7 +54,6 @@ import techreborn.items.tool.ItemDrill; import techreborn.utils.MessageIDs; import javax.annotation.Nullable; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java index ac9b9650e..c11049deb 100644 --- a/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java +++ b/src/main/java/techreborn/items/tool/industrial/ItemNanosaber.java @@ -24,17 +24,12 @@ package techreborn.items.tool.industrial; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.item.TooltipContext; import net.minecraft.client.resource.language.I18n; import net.minecraft.entity.Entity; -import net.minecraft.entity.EquipmentSlot; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.attribute.EntityAttributeModifier; -import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.*; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java index e936b8373..add5a4b98 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolarPanel.java +++ b/src/main/java/techreborn/tiles/generator/TileSolarPanel.java @@ -119,11 +119,6 @@ public class TileSolarPanel extends TilePowerAcceptor implements IToolDrop { return panel.powerTier; } - @Override - public EnumPowerTier getBaseTier() { - return getTier(); - } - @Override public void checkTier() { // Nope diff --git a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java index 0aa30aed5..b2612169c 100644 --- a/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java +++ b/src/main/java/techreborn/tiles/machine/tier1/TilePlayerDectector.java @@ -35,6 +35,7 @@ import reborncore.common.registration.config.ConfigRegistry; import reborncore.common.util.WorldUtils; import techreborn.TechReborn; import techreborn.blocks.tier1.BlockPlayerDetector; +import techreborn.blocks.tier1.BlockPlayerDetector.PlayerDetectorType; import techreborn.init.TRContent; import techreborn.init.TRTileEntities; @@ -69,10 +70,10 @@ public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop if (canUseEnergy(euPerTick)) { for(PlayerEntity player : world.getPlayers()){ if (player.distanceTo(player) <= 256.0D) { - String type = world.getBlockState(pos).get(BlockPlayerDetector.TYPE); - if (type.equals("all")) {// ALL + PlayerDetectorType type = world.getBlockState(pos).get(BlockPlayerDetector.TYPE); + if (type == PlayerDetectorType.ALL) {// ALL redstone = true; - } else if (type.equals("others")) {// Others + } else if (type == PlayerDetectorType.OTHERS) {// Others if (!owenerUdid.isEmpty() && !owenerUdid.equals(player.getUuid().toString())) { redstone = true; } diff --git a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java index 9be50e1cb..d9250d2a8 100644 --- a/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java +++ b/src/main/java/techreborn/tiles/storage/TileAdjustableSU.java @@ -110,7 +110,7 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro public ItemStack getDropWithNBT() { CompoundTag tileEntity = new CompoundTag(); ItemStack dropStack = TRContent.Machine.ADJUSTABLE_SU.getStack(); - writeWithoutCoords(tileEntity); + toTag(tileEntity); dropStack.setTag(new CompoundTag()); dropStack.getTag().put("tileEntity", tileEntity); return dropStack; @@ -149,11 +149,6 @@ public class TileAdjustableSU extends TileEnergyStorage implements IContainerPro return maxInput; } - @Override - public EnumPowerTier getBaseTier() { - return null; - } - // TilePowerAcceptor @Override public CompoundTag toTag(CompoundTag tagCompound) { diff --git a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java index b41e8c0d9..2a283662f 100644 --- a/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java +++ b/src/main/java/techreborn/tiles/storage/TileEnergyStorage.java @@ -103,11 +103,6 @@ public class TileEnergyStorage extends TilePowerAcceptor return maxInput; } - @Override - public EnumPowerTier getBaseTier() { - return tier; - } - // TileMachineBase @Override public void setFacing(Direction enumFacing) { diff --git a/src/main/java/techreborn/tiles/transformers/TileTransformer.java b/src/main/java/techreborn/tiles/transformers/TileTransformer.java index a9a5c5e48..d884688d9 100644 --- a/src/main/java/techreborn/tiles/transformers/TileTransformer.java +++ b/src/main/java/techreborn/tiles/transformers/TileTransformer.java @@ -113,11 +113,6 @@ public class TileTransformer extends TilePowerAcceptor return inputTier.getMaxInput(); } - @Override - public EnumPowerTier getBaseTier() { - return inputTier; - } - @Override public EnumPowerTier getPushingTier() { return ouputTier; @@ -126,6 +121,7 @@ public class TileTransformer extends TilePowerAcceptor @Override public void checkTier() { //Nope + //TODO: really nope? needs review } // TileMachineBase