From 40755131a4487958bde025f3d1afe445716f2e68 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 20:30:28 +0300 Subject: [PATCH] Even more blocks removed --- .../generator/BlockDieselGenerator.java | 48 ----------- .../generator/BlockDragonEggSyphon.java | 44 ---------- .../blocks/generator/BlockGasTurbine.java | 45 ----------- .../blocks/generator/BlockLightningRod.java | 44 ---------- .../generator/BlockPlasmaGenerator.java | 48 ----------- .../generator/BlockSemiFluidGenerator.java | 45 ----------- .../generator/BlockSolidFuelGenerator.java | 49 ------------ .../generator/BlockThermalGenerator.java | 45 ----------- .../blocks/generator/BlockWaterMill.java | 47 ----------- .../blocks/generator/BlockWindMill.java | 47 ----------- .../blocks/tier2/BlockChargeOMat.java | 50 ------------ .../blocks/tier2/BlockChemicalReactor.java | 50 ------------ .../blocks/tier2/BlockDigitalChest.java | 50 ------------ .../blocks/tier2/BlockDistillationTower.java | 50 ------------ .../tier2/BlockImplosionCompressor.java | 50 ------------ .../tier2/BlockIndustrialBlastFurnace.java | 50 ------------ .../tier2/BlockIndustrialCentrifuge.java | 50 ------------ .../tier2/BlockIndustrialElectrolyzer.java | 50 ------------ .../blocks/tier2/BlockIndustrialGrinder.java | 50 ------------ .../blocks/tier2/BlockIndustrialSawmill.java | 50 ------------ .../blocks/tier2/BlockVacuumFreezer.java | 50 ------------ .../blocks/tier3/BlockChunkLoader.java | 50 ------------ .../tier3/BlockCreativeQuantumTank.java | 50 ------------ .../blocks/tier3/BlockFluidReplicator.java | 50 ------------ .../blocks/tier3/BlockMatterFabricator.java | 50 ------------ .../blocks/tier3/BlockQuantumChest.java | 50 ------------ .../blocks/tier3/BlockQuantumTank.java | 50 ------------ src/main/java/techreborn/init/TRContent.java | 80 ++++++++++++------- 28 files changed, 52 insertions(+), 1340 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockGasTurbine.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockLightningRod.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockWaterMill.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockWindMill.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java deleted file mode 100644 index 099b769c1..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ /dev/null @@ -1,48 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; - -/** - * Block for Diesel Generator - */ -public class BlockDieselGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DieselGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DIESEL_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java deleted file mode 100644 index 732be488b..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ /dev/null @@ -1,44 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity; - -public class BlockDragonEggSyphon extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DragonEggSyphonBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java deleted file mode 100644 index 2e89aa4b4..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ /dev/null @@ -1,45 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; - -public class BlockGasTurbine extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new GasTurbineBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.GAS_TURBINE; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java deleted file mode 100644 index 43015c405..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ /dev/null @@ -1,44 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.LightningRodBlockEntity; - -public class BlockLightningRod extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new LightningRodBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java deleted file mode 100644 index 2c9d6e7c2..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ /dev/null @@ -1,48 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; - -/** - * Block for Plasma Generator - */ -public class BlockPlasmaGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new PlasmaGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.PLASMA_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java deleted file mode 100644 index c2ea70a8c..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ /dev/null @@ -1,45 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; - -public class BlockSemiFluidGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new SemiFluidGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.SEMIFLUID_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java deleted file mode 100644 index 79e98be07..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ /dev/null @@ -1,49 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; - -public class BlockSolidFuelGenerator extends BlockMachineBase { - - public BlockSolidFuelGenerator() { - super(); - } - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new SolidFuelGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java deleted file mode 100644 index 8c12fa21e..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ /dev/null @@ -1,45 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; - -public class BlockThermalGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ThermalGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.THERMAL_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java deleted file mode 100644 index fef57c207..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ /dev/null @@ -1,47 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.basic.WaterMillBlockEntity; - -/** - * Created by modmuss50 on 25/02/2016. - */ -public class BlockWaterMill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new WaterMillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java deleted file mode 100644 index 6a45d2f31..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ /dev/null @@ -1,47 +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.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.basic.WindMillBlockEntity; - -/** - * Created by modmuss50 on 25/02/2016. - */ -public class BlockWindMill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new WindMillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java deleted file mode 100644 index f39eec2a7..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.ChargeOMatBlockEntity; - -public class BlockChargeOMat extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChargeOMatBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHARGEBENCH; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java deleted file mode 100644 index 3d921dca8..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; - -public class BlockChemicalReactor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChemicalReactorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHEMICAL_REACTOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java deleted file mode 100644 index f99990fd4..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.DigitalChestBlockEntity; - -public class BlockDigitalChest extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DigitalChestBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DIGITAL_CHEST; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java deleted file mode 100644 index 124a386a1..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; - -public class BlockDistillationTower extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DistillationTowerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DISTILLATION_TOWER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java deleted file mode 100644 index a85a0fc7f..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; - -public class BlockImplosionCompressor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ImplosionCompressorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.IMPLOSION_COMPRESSOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java deleted file mode 100644 index e06e42558..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; - -public class BlockIndustrialBlastFurnace extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialBlastFurnaceBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.BLAST_FURNACE; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java deleted file mode 100644 index 38395e08a..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.IndustrialCentrifugeBlockEntity; - -public class BlockIndustrialCentrifuge extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialCentrifugeBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CENTRIFUGE; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java deleted file mode 100644 index eb6c1d1e5..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; - -public class BlockIndustrialElectrolyzer extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialElectrolyzerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.INDUSTRIAL_ELECTROLYZER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java deleted file mode 100644 index 4e3e93a17..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; - -public class BlockIndustrialGrinder extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialGrinderBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.INDUSTRIAL_GRINDER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java deleted file mode 100644 index d13e3989f..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; - -public class BlockIndustrialSawmill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialSawmillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.SAWMILL; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java deleted file mode 100644 index e43c37365..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ /dev/null @@ -1,50 +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.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; - -public class BlockVacuumFreezer extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new VacuumFreezerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.VACUUM_FREEZER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java deleted file mode 100644 index 827a099f0..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; - -public class BlockChunkLoader extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChunkLoaderBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHUNK_LOADER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java deleted file mode 100644 index 13ba70f7f..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity; - -public class BlockCreativeQuantumTank extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new CreativeQuantumTankBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_TANK; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java deleted file mode 100644 index 73eb0b74e..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; - -public class BlockFluidReplicator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new FluidReplicatorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.FLUID_REPLICATOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java deleted file mode 100644 index c2f392ef7..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; - -public class BlockMatterFabricator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new MatterFabricatorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.MATTER_FABRICATOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java deleted file mode 100644 index 89edc9a2e..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity; - -public class BlockQuantumChest extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new QuantumChestBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_CHEST; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java deleted file mode 100644 index 0f48e1efe..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ /dev/null @@ -1,50 +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.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; - -public class BlockQuantumTank extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new QuantumTankBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_TANK; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index b8c4babbd..a990832f7 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -43,7 +43,6 @@ import techreborn.blocks.storage.*; import techreborn.blocks.tier0.BlockIronAlloyFurnace; import techreborn.blocks.tier0.BlockIronFurnace; import techreborn.blocks.tier1.*; -import techreborn.blocks.tier2.*; import techreborn.blocks.tier3.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; @@ -55,7 +54,32 @@ import techreborn.items.ItemDynamicCell; import techreborn.items.ItemUpgrade; import techreborn.utils.InitUtils; import techreborn.blockentity.storage.AdjustableSUBlockEntity; +import techreborn.blockentity.ChargeOMatBlockEntity; +import techreborn.blockentity.DigitalChestBlockEntity; +import techreborn.blockentity.IndustrialCentrifugeBlockEntity; +import techreborn.blockentity.generator.LightningRodBlockEntity; +import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity; +import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; +import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; +import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; +import techreborn.blockentity.generator.basic.WaterMillBlockEntity; +import techreborn.blockentity.generator.basic.WindMillBlockEntity; +import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; +import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; +import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; +import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; import techreborn.blockentity.machine.tier1.*; +import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; +import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity; +import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; +import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity; +import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; import javax.annotation.Nullable; import java.util.Arrays; @@ -368,50 +392,50 @@ public class TRContent { ALLOY_SMELTER(new GenericMachineBlock(EGui.ALLOY_SMELTER, () -> new AlloySmelterBlockEntity())), ASSEMBLY_MACHINE(new GenericMachineBlock(EGui.ASSEMBLING_MACHINE, () -> new AssemblingMachineBlockEntity())), AUTO_CRAFTING_TABLE(new GenericMachineBlock(EGui.AUTO_CRAFTING_TABLE, () -> new AutoCraftingTableBlockEntity())), - CHEMICAL_REACTOR(new BlockChemicalReactor()), + CHEMICAL_REACTOR(new GenericMachineBlock(EGui.CHEMICAL_REACTOR, () -> new ChemicalReactorBlockEntity())), COMPRESSOR(new GenericMachineBlock(EGui.COMPRESSOR, () -> new CompressorBlockEntity())), - DISTILLATION_TOWER(new BlockDistillationTower()), + DISTILLATION_TOWER(new GenericMachineBlock(EGui.DISTILLATION_TOWER, () -> new DistillationTowerBlockEntity())), EXTRACTOR(new GenericMachineBlock(EGui.EXTRACTOR, () -> new ExtractorBlockEntity())), - FLUID_REPLICATOR(new BlockFluidReplicator()), + FLUID_REPLICATOR(new GenericMachineBlock(EGui.FLUID_REPLICATOR, () -> new FluidReplicatorBlockEntity())), GRINDER(new GenericMachineBlock(EGui.GRINDER, () -> new GrinderBlockEntity())), ELECTRIC_FURNACE(new GenericMachineBlock(EGui.ELECTRIC_FURNACE, () -> new ElectricFurnaceBlockEntity())), - IMPLOSION_COMPRESSOR(new BlockImplosionCompressor()), - INDUSTRIAL_BLAST_FURNACE(new BlockIndustrialBlastFurnace()), - INDUSTRIAL_CENTRIFUGE(new BlockIndustrialCentrifuge()), - INDUSTRIAL_ELECTROLYZER(new BlockIndustrialElectrolyzer()), - INDUSTRIAL_GRINDER(new BlockIndustrialGrinder()), - INDUSTRIAL_SAWMILL(new BlockIndustrialSawmill()), + IMPLOSION_COMPRESSOR(new GenericMachineBlock(EGui.IMPLOSION_COMPRESSOR, () -> new ImplosionCompressorBlockEntity())), + INDUSTRIAL_BLAST_FURNACE(new GenericMachineBlock(EGui.BLAST_FURNACE, () -> new IndustrialBlastFurnaceBlockEntity())), + INDUSTRIAL_CENTRIFUGE(new GenericMachineBlock(EGui.CENTRIFUGE, () -> new IndustrialCentrifugeBlockEntity())), + INDUSTRIAL_ELECTROLYZER(new GenericMachineBlock(EGui.INDUSTRIAL_ELECTROLYZER, () -> new IndustrialElectrolyzerBlockEntity())), + INDUSTRIAL_GRINDER(new GenericMachineBlock(EGui.INDUSTRIAL_GRINDER, () -> new IndustrialGrinderBlockEntity())), + INDUSTRIAL_SAWMILL(new GenericMachineBlock(EGui.SAWMILL, () -> new IndustrialSawmillBlockEntity())), IRON_ALLOY_FURNACE(new BlockIronAlloyFurnace()), IRON_FURNACE(new BlockIronFurnace()), - MATTER_FABRICATOR(new BlockMatterFabricator()), + MATTER_FABRICATOR(new GenericMachineBlock(EGui.MATTER_FABRICATOR, () -> new MatterFabricatorBlockEntity())), RECYCLER(new GenericMachineBlock(EGui.RECYCLER, () -> new RecyclerBlockEntity())), ROLLING_MACHINE(new GenericMachineBlock(EGui.ROLLING_MACHINE, () -> new RollingMachineBlockEntity())), SCRAPBOXINATOR(new GenericMachineBlock(EGui.SCRAPBOXINATOR, () -> new ScrapboxinatorBlockEntity())), - VACUUM_FREEZER(new BlockVacuumFreezer()), + VACUUM_FREEZER(new GenericMachineBlock(EGui.VACUUM_FREEZER, () -> new VacuumFreezerBlockEntity())), - DIESEL_GENERATOR(new BlockDieselGenerator()), - DRAGON_EGG_SYPHON(new BlockDragonEggSyphon()), + DIESEL_GENERATOR(new GenericMachineBlock(EGui.DIESEL_GENERATOR, () -> new DieselGeneratorBlockEntity())), + DRAGON_EGG_SYPHON(new GenericMachineBlock(null, () -> new DragonEggSyphonBlockEntity())), FUSION_COIL(new BlockFusionCoil()), FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()), - GAS_TURBINE(new BlockGasTurbine()), - LIGHTNING_ROD(new BlockLightningRod()), + GAS_TURBINE(new GenericMachineBlock(EGui.GAS_TURBINE, () -> new GasTurbineBlockEntity())), + LIGHTNING_ROD(new GenericMachineBlock(null, () -> new LightningRodBlockEntity())), MAGIC_ENERGY_ABSORBER (new BlockMagicEnergyAbsorber()), MAGIC_ENERGY_CONVERTER(new BlockMagicEnergyConverter()), - PLASMA_GENERATOR(new BlockPlasmaGenerator()), - SEMI_FLUID_GENERATOR(new BlockSemiFluidGenerator()), - SOLID_FUEL_GENERATOR(new BlockSolidFuelGenerator()), - THERMAL_GENERATOR(new BlockThermalGenerator()), - WATER_MILL(new BlockWaterMill()), - WIND_MILL(new BlockWindMill()), + PLASMA_GENERATOR(new GenericMachineBlock(EGui.PLASMA_GENERATOR, () -> new PlasmaGeneratorBlockEntity())), + SEMI_FLUID_GENERATOR(new GenericMachineBlock(EGui.SEMIFLUID_GENERATOR, () -> new SemiFluidGeneratorBlockEntity())), + SOLID_FUEL_GENERATOR(new GenericMachineBlock(EGui.GENERATOR, () -> new SolidFuelGeneratorBlockEntity())), + THERMAL_GENERATOR(new GenericMachineBlock(EGui.THERMAL_GENERATOR, () -> new ThermalGeneratorBlockEntity())), + WATER_MILL(new GenericMachineBlock(null, () -> new WaterMillBlockEntity())), + WIND_MILL(new GenericMachineBlock(null, () -> new WindMillBlockEntity())), CREATIVE_QUANTUM_CHEST(new BlockCreativeQuantumChest()), - CREATIVE_QUANTUM_TANK(new BlockCreativeQuantumTank()), - DIGITAL_CHEST(new BlockDigitalChest()), - QUANTUM_CHEST(new BlockQuantumChest()), - QUANTUM_TANK(new BlockQuantumTank()), + CREATIVE_QUANTUM_TANK(new GenericMachineBlock(EGui.QUANTUM_TANK, () -> new CreativeQuantumTankBlockEntity())), + DIGITAL_CHEST(new GenericMachineBlock(EGui.DIGITAL_CHEST, () -> new DigitalChestBlockEntity())), + QUANTUM_CHEST(new GenericMachineBlock(EGui.QUANTUM_CHEST, () -> new QuantumChestBlockEntity())), + QUANTUM_TANK(new GenericMachineBlock(EGui.QUANTUM_TANK, () -> new QuantumTankBlockEntity())), ADJUSTABLE_SU(new BlockAdjustableSU()), - CHARGE_O_MAT(new BlockChargeOMat()), + CHARGE_O_MAT(new GenericMachineBlock(EGui.CHARGEBENCH, () -> new ChargeOMatBlockEntity())), INTERDIMENSIONAL_SU(new BlockInterdimensionalSU()), LAPOTRONIC_SU(new BlockLapotronicSU()), LSU_STORAGE(new BlockLSUStorage()), @@ -423,7 +447,7 @@ public class TRContent { HV_TRANSFORMER(new BlockHVTransformer()), ALARM(new BlockAlarm()), - CHUNK_LOADER(new BlockChunkLoader()), + CHUNK_LOADER(new GenericMachineBlock(EGui.CHUNK_LOADER, () -> new ChunkLoaderBlockEntity())), LAMP_INCANDESCENT(new BlockLamp(14, 4, 10, 8)), LAMP_LED(new BlockLamp(15, 1, 1, 12)), PLAYER_DETECTOR(new BlockPlayerDetector());