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

@ -28,21 +28,21 @@ import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import prospector.shootingstar.ShootingStar;
import prospector.shootingstar.model.ModelCompound;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.blocks.IRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileAlloySmelter;
public class BlockAlloySmelter extends BlockMachineBase implements IRotationTexture {
public class BlockAlloySmelter extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public BlockAlloySmelter(final Material material) {
public BlockAlloySmelter() {
super();
this.setUnlocalizedName("techreborn.alloysmelter");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override
@ -57,29 +57,4 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText
player.openGui(Core.INSTANCE, EGui.ALLOY_SMELTER.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "electric_alloy_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "electric_alloy_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
}

View file

@ -29,13 +29,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.teir1.TileCompressor;
public class BlockCompressor extends BlockMachineBase implements IRotationTexture {
public class BlockCompressor extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@ -58,29 +57,4 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur
}
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "compressor_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "compressor_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
}

View file

@ -29,15 +29,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.teir1.TileElectricFurnace;
public class BlockElectricFurnace extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public class BlockElectricFurnace extends BlockMachineBase {
public BlockElectricFurnace(final Material material) {
super();
@ -58,29 +55,4 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT
}
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "electric_furnace_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "electric_furnace_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
}

View file

@ -29,15 +29,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.teir1.TileExtractor;
public class BlockExtractor extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public class BlockExtractor extends BlockMachineBase {
public BlockExtractor(final Material material) {
super();
@ -58,29 +55,4 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
}
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "extractor_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "extractor_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
}

View file

@ -29,15 +29,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.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileGrinder;
public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public class BlockGrinder extends BlockMachineBase {
public BlockGrinder(final Material material) {
super();
@ -58,25 +55,4 @@ public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationT
}
return true;
}
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "grinder_front_on" : this.prefix + "grinder_front_off";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "grinder_top_on" : this.prefix + "grinder_top_off";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "tier1_machine_bottom";
}
}

View file

@ -29,15 +29,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.teir1.TileRecycler;
public class BlockRecycler extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
public class BlockRecycler extends BlockMachineBase {
public BlockRecycler(final Material material) {
super();
@ -58,29 +55,4 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture
}
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "recycler_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "recycler_front_on";
}
@Override
public String getSide() {
return this.prefix + "tier1_machine_side";
}
@Override
public String getTop() {
return this.prefix + "tier1_machine_top";
}
@Override
public String getBottom() {
return this.prefix + "tier1_machine_bottom";
}
}