diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java deleted file mode 100644 index 54ba08e32..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyAbsorber.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 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 reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.WIP; - -public class BlockMagicEnergyAbsorber extends BlockMachineBase implements WIP { - //TODO remove WIP - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java deleted file mode 100644 index 2debc96ea..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockMagicEnergyConverter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2020 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 reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.utils.WIP; - -public class BlockMagicEnergyConverter extends BlockMachineBase implements WIP { - //TODO: remove WIP - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 27297cdf3..c636a8642 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -493,8 +493,6 @@ public class TRContent { FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()), GAS_TURBINE(new GenericGeneratorBlock(EGui.GAS_TURBINE, GasTurbineBlockEntity::new)), LIGHTNING_ROD(new GenericGeneratorBlock(null, LightningRodBlockEntity::new)), - MAGIC_ENERGY_ABSORBER (new BlockMagicEnergyAbsorber()), - MAGIC_ENERGY_CONVERTER(new BlockMagicEnergyConverter()), PLASMA_GENERATOR(new GenericGeneratorBlock(EGui.PLASMA_GENERATOR, PlasmaGeneratorBlockEntity::new)), SEMI_FLUID_GENERATOR(new GenericGeneratorBlock(EGui.SEMIFLUID_GENERATOR, SemiFluidGeneratorBlockEntity::new)), SOLID_FUEL_GENERATOR(new GenericGeneratorBlock(EGui.GENERATOR, SolidFuelGeneratorBlockEntity::new)), diff --git a/src/main/resources/assets/techreborn/blockstates/magic_energy_absorber.json b/src/main/resources/assets/techreborn/blockstates/magic_energy_absorber.json deleted file mode 100644 index 463982b42..000000000 --- a/src/main/resources/assets/techreborn/blockstates/magic_energy_absorber.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "facing=north,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber" }, - "facing=south,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 180 }, - "facing=west,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 270 }, - "facing=east,active=false": { "model": "techreborn:block/machines/generators/magic_energy_absorber", "y": 90 }, - "facing=north,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on" }, - "facing=south,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 180 }, - "facing=west,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 270 }, - "facing=east,active=true": { "model": "techreborn:block/machines/generators/magic_energy_absorber_on", "y": 90 } - } -} diff --git a/src/main/resources/assets/techreborn/blockstates/magic_energy_converter.json b/src/main/resources/assets/techreborn/blockstates/magic_energy_converter.json deleted file mode 100644 index ac39abc5d..000000000 --- a/src/main/resources/assets/techreborn/blockstates/magic_energy_converter.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "facing=north,active=false": { "model": "techreborn:block/machines/generators/magic_energy_converter" }, - "facing=south,active=false": { "model": "techreborn:block/machines/generators/magic_energy_converter", "y": 180 }, - "facing=west,active=false": { "model": "techreborn:block/machines/generators/magic_energy_converter", "y": 270 }, - "facing=east,active=false": { "model": "techreborn:block/machines/generators/magic_energy_converter", "y": 90 }, - "facing=north,active=true": { "model": "techreborn:block/machines/generators/magic_energy_converter_on" }, - "facing=south,active=true": { "model": "techreborn:block/machines/generators/magic_energy_converter_on", "y": 180 }, - "facing=west,active=true": { "model": "techreborn:block/machines/generators/magic_energy_converter_on", "y": 270 }, - "facing=east,active=true": { "model": "techreborn:block/machines/generators/magic_energy_converter_on", "y": 90 } - } -} diff --git a/src/main/resources/assets/techreborn/lang/en_us.json b/src/main/resources/assets/techreborn/lang/en_us.json index b34f035f3..b6c605847 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.json +++ b/src/main/resources/assets/techreborn/lang/en_us.json @@ -39,10 +39,8 @@ "block.techreborn.implosion_compressor": "Implosion Compressor", "block.techreborn.industrial_grinder": "Industrial Grinder", "block.techreborn.chunk_loader": "Industrial Chunkloader", - "block.techreborn.magic_energy_converter": "Magic Energy Converter", "block.techreborn.diesel_generator": "Diesel Generator", "block.techreborn.industrial_electrolyzer": "Industrial Electrolyzer", - "block.techreborn.magic_energy_absorber": "Magic Energy Absorber", "block.techreborn.assembly_machine": "Assembling Machine", "block.techreborn.semi_fluid_generator": "Semi Fluid Generator", "block.techreborn.iron_alloy_furnace": "Iron Alloy Furnace", diff --git a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber.json b/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber.json deleted file mode 100644 index d4d5c7966..000000000 --- a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "techreborn:block/machines/generators/magic_energy_absorber_top_off", - "bottom": "techreborn:block/machines/generators/generator_bottom", - "side": "techreborn:block/machines/generators/magic_energy_absorber_side_off" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber_on.json b/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber_on.json deleted file mode 100644 index 97cbd1bd1..000000000 --- a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_absorber_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "techreborn:block/machines/generators/magic_energy_absorber_top_on", - "bottom": "techreborn:block/machines/generators/generator_bottom", - "side": "techreborn:block/machines/generators/magic_energy_absorber_side_on" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter.json b/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter.json deleted file mode 100644 index 9a4e391d2..000000000 --- a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "techreborn:block/machines/generators/magic_energy_converter_top_off", - "bottom": "techreborn:block/machines/generators/generator_bottom", - "side": "techreborn:block/machines/generators/magic_energy_converter_side_off" - } -} diff --git a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter_on.json b/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter_on.json deleted file mode 100644 index ea29f385b..000000000 --- a/src/main/resources/assets/techreborn/models/block/machines/generators/magic_energy_converter_on.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/cube_bottom_top", - "textures": { - "top": "techreborn:block/machines/generators/magic_energy_converter_top_on", - "bottom": "techreborn:block/machines/generators/generator_bottom", - "side": "techreborn:block/machines/generators/magic_energy_converter_side_on" - } -} diff --git a/src/main/resources/assets/techreborn/models/item/magic_energy_absorber.json b/src/main/resources/assets/techreborn/models/item/magic_energy_absorber.json deleted file mode 100644 index 2baf73f44..000000000 --- a/src/main/resources/assets/techreborn/models/item/magic_energy_absorber.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "techreborn:block/machines/generators/magic_energy_absorber" -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/magic_energy_converter.json b/src/main/resources/assets/techreborn/models/item/magic_energy_converter.json deleted file mode 100644 index 1d8e5cd21..000000000 --- a/src/main/resources/assets/techreborn/models/item/magic_energy_converter.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "techreborn:block/machines/generators/magic_energy_converter" -} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_off.png deleted file mode 100644 index 6368f76a5..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on.png deleted file mode 100644 index b4bc07782..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on_overlay.png deleted file mode 100644 index 58add96e2..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_side_on_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_off.png deleted file mode 100644 index 7fed91414..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on.png deleted file mode 100644 index 5bf89df10..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on_overlay.png deleted file mode 100644 index ff3f7f89d..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_absorber_top_on_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_off.png deleted file mode 100644 index 64173701c..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on.png deleted file mode 100644 index ff0e33c3f..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on_overlay.png deleted file mode 100644 index 6158fb771..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_side_on_overlay.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_off.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_off.png deleted file mode 100644 index 5cdd77327..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_off.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on.png deleted file mode 100644 index 9ae946944..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on.png and /dev/null differ diff --git a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on_overlay.png b/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on_overlay.png deleted file mode 100644 index f5dfdf44b..000000000 Binary files a/src/main/resources/assets/techreborn/textures/block/machines/generators/magic_energy_converter_top_on_overlay.png and /dev/null differ diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_absorber.json b/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_absorber.json deleted file mode 100644 index 7e3cc11d8..000000000 --- a/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_absorber.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "techreborn:magic_energy_absorber" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_converter.json b/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_converter.json deleted file mode 100644 index e71d8ebc3..000000000 --- a/src/main/resources/data/techreborn/loot_tables/blocks/magic_energy_converter.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "techreborn:magic_energy_converter" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file