Removed magic energy converter and absorber (Revert to undo)
Associated translations and textures also removed
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -493,8 +493,6 @@ public class TRContent {
|
||||||
FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()),
|
FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()),
|
||||||
GAS_TURBINE(new GenericGeneratorBlock(EGui.GAS_TURBINE, GasTurbineBlockEntity::new)),
|
GAS_TURBINE(new GenericGeneratorBlock(EGui.GAS_TURBINE, GasTurbineBlockEntity::new)),
|
||||||
LIGHTNING_ROD(new GenericGeneratorBlock(null, LightningRodBlockEntity::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)),
|
PLASMA_GENERATOR(new GenericGeneratorBlock(EGui.PLASMA_GENERATOR, PlasmaGeneratorBlockEntity::new)),
|
||||||
SEMI_FLUID_GENERATOR(new GenericGeneratorBlock(EGui.SEMIFLUID_GENERATOR, SemiFluidGeneratorBlockEntity::new)),
|
SEMI_FLUID_GENERATOR(new GenericGeneratorBlock(EGui.SEMIFLUID_GENERATOR, SemiFluidGeneratorBlockEntity::new)),
|
||||||
SOLID_FUEL_GENERATOR(new GenericGeneratorBlock(EGui.GENERATOR, SolidFuelGeneratorBlockEntity::new)),
|
SOLID_FUEL_GENERATOR(new GenericGeneratorBlock(EGui.GENERATOR, SolidFuelGeneratorBlockEntity::new)),
|
||||||
|
|
|
@ -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 }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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 }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -39,10 +39,8 @@
|
||||||
"block.techreborn.implosion_compressor": "Implosion Compressor",
|
"block.techreborn.implosion_compressor": "Implosion Compressor",
|
||||||
"block.techreborn.industrial_grinder": "Industrial Grinder",
|
"block.techreborn.industrial_grinder": "Industrial Grinder",
|
||||||
"block.techreborn.chunk_loader": "Industrial Chunkloader",
|
"block.techreborn.chunk_loader": "Industrial Chunkloader",
|
||||||
"block.techreborn.magic_energy_converter": "Magic Energy Converter",
|
|
||||||
"block.techreborn.diesel_generator": "Diesel Generator",
|
"block.techreborn.diesel_generator": "Diesel Generator",
|
||||||
"block.techreborn.industrial_electrolyzer": "Industrial Electrolyzer",
|
"block.techreborn.industrial_electrolyzer": "Industrial Electrolyzer",
|
||||||
"block.techreborn.magic_energy_absorber": "Magic Energy Absorber",
|
|
||||||
"block.techreborn.assembly_machine": "Assembling Machine",
|
"block.techreborn.assembly_machine": "Assembling Machine",
|
||||||
"block.techreborn.semi_fluid_generator": "Semi Fluid Generator",
|
"block.techreborn.semi_fluid_generator": "Semi Fluid Generator",
|
||||||
"block.techreborn.iron_alloy_furnace": "Iron Alloy Furnace",
|
"block.techreborn.iron_alloy_furnace": "Iron Alloy Furnace",
|
||||||
|
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "techreborn:block/machines/generators/magic_energy_absorber"
|
|
||||||
}
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"parent": "techreborn:block/machines/generators/magic_energy_converter"
|
|
||||||
}
|
|
Before Width: | Height: | Size: 829 B |
Before Width: | Height: | Size: 896 B |
Before Width: | Height: | Size: 408 B |
Before Width: | Height: | Size: 799 B |
Before Width: | Height: | Size: 791 B |
Before Width: | Height: | Size: 329 B |
Before Width: | Height: | Size: 728 B |
Before Width: | Height: | Size: 742 B |
Before Width: | Height: | Size: 335 B |
Before Width: | Height: | Size: 722 B |
Before Width: | Height: | Size: 680 B |
Before Width: | Height: | Size: 294 B |
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"type": "minecraft:block",
|
|
||||||
"pools": [
|
|
||||||
{
|
|
||||||
"rolls": 1,
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"type": "minecraft:item",
|
|
||||||
"name": "techreborn:magic_energy_absorber"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "minecraft:survives_explosion"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
{
|
|
||||||
"type": "minecraft:block",
|
|
||||||
"pools": [
|
|
||||||
{
|
|
||||||
"rolls": 1,
|
|
||||||
"entries": [
|
|
||||||
{
|
|
||||||
"type": "minecraft:item",
|
|
||||||
"name": "techreborn:magic_energy_converter"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"conditions": [
|
|
||||||
{
|
|
||||||
"condition": "minecraft:survives_explosion"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|