Begin the Great Refactor of Mid-2017

This commit is contained in:
Prospector 2017-06-13 16:49:52 -07:00
parent a4a4042eb1
commit 1fa9f1cf52
97 changed files with 328 additions and 1713 deletions

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDieselGenerator;
public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockDieselGenerator extends BlockMachineBase {
public BlockDieselGenerator(final Material material) {
super();
@ -61,25 +58,4 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
player.openGui(Core.INSTANCE, EGui.DIESEL_GENERATOR.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "diesel_generator_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
}

View file

@ -31,15 +31,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileDragonEggSiphoner;
import java.util.List;
public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockDragonEggSiphoner extends BlockMachineBase {
public BlockDragonEggSiphoner(Material material) {
super();
@ -52,26 +49,6 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
return new TileDragonEggSiphoner();
}
@Override
public String getFront(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_side_off";
}
@Override
public String getTop(boolean isActive) {
return prefix + "dragon_egg_energy_siphon_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "generator_machine_bottom";
}
@Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon");

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGasTurbine;
public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockGasTurbine extends BlockMachineBase {
public BlockGasTurbine(final Material material) {
super();
@ -62,24 +59,4 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati
return true;
}
@Override
public String getFront(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "gas_generator_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "gas_generator_bottom";
}
}

View file

@ -28,15 +28,12 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileGenerator;
public class BlockGenerator extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockGenerator extends BlockMachineBase {
public BlockGenerator() {
super();
@ -57,29 +54,4 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
}
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "generator_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "generator_front_on";
}
@Override
public String getSide() {
return this.prefix + "generator_machine_side";
}
@Override
public String getTop() {
return this.prefix + "generator_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "generator_machine_bottom";
}
}

View file

@ -31,15 +31,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileHeatGenerator;
import java.util.List;
public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockHeatGenerator extends BlockMachineBase {
public BlockHeatGenerator(Material material) {
super();
@ -52,30 +49,4 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot
return new TileHeatGenerator();
}
@Override
public String getFront(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getSide(boolean isActive) {
return prefix + "heat_generator_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "heat_generator_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "heat_generator_bottom";
}
@Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
//TODO Finish Heat Generator and add recipe + texture
//Remember to remove WIP override and imports once complete
}
}

View file

@ -26,12 +26,9 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockMagicEnergyAbsorber extends BlockMachineBase {
public BlockMagicEnergyAbsorber(Material material) {
super();
@ -39,24 +36,4 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvan
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getSide(boolean isActive) {
return prefix + "magic_energy_absorber_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "magic_energy_absorber_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "magic_energy_absorber_bottom";
}
}

View file

@ -26,37 +26,13 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockMagicEnergyConverter extends BlockMachineBase {
public BlockMagicEnergyConverter(Material material) {
super();
setUnlocalizedName("techreborn.magicenergyconverter");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive) {
return prefix + "magic_energy_converter_front_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "magic_energy_converter_side";
}
@Override
public String getTop(boolean isActive) {
return prefix + "magic_energy_converter_top";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "magic_energy_converter_bottom";
}
}

View file

@ -26,36 +26,13 @@ package techreborn.blocks.generator;
import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab;
public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockPlasmaGenerator extends BlockMachineBase {
public BlockPlasmaGenerator(Material material) {
super();
setUnlocalizedName("techreborn.plasmagenerator");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public String getFront(boolean isActive) {
return prefix + "plasma_generator_front";
}
@Override
public String getSide(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off";
}
}

View file

@ -30,15 +30,12 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.generator.TileSemifluidGenerator;
public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockSemiFluidGenerator extends BlockMachineBase {
public BlockSemiFluidGenerator(final Material material) {
super();
@ -61,25 +58,4 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
player.openGui(Core.INSTANCE, EGui.SEMIFLUID_GENERATOR.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(final boolean isActive) {
return this.prefix + "semifluid_generator_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "semifluid_generator_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "generator_machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
}

View file

@ -28,21 +28,21 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.generator.TileThermalGenerator;
public class BlockThermalGenerator extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/generators/";
public class BlockThermalGenerator extends BlockMachineBase {
public BlockThermalGenerator() {
super();
this.setUnlocalizedName("techreborn.thermalGenerator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/generators"));
}
@Override
@ -60,24 +60,4 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
player.openGui(Core.INSTANCE, EGui.THERMAL_GENERATOR.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_side_on" : this.prefix + "thermal_generator_side_off";
}
@Override
public String getSide(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_side_on" : this.prefix + "thermal_generator_side_off";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "thermal_generator_top_on" : this.prefix + "thermal_generator_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "generator_machine_bottom";
}
}

View file

@ -44,7 +44,6 @@ public class BlockWaterMill extends BaseTileBlock {
setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F);
RebornCore.jsonDestroyer.registerObject(this);
}
@Override