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

@ -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.TileAssemblingMachine;
public class BlockAssemblingMachine extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public class BlockAssemblingMachine extends BlockMachineBase {
public BlockAssemblingMachine(final Material material) {
super();
@ -57,29 +54,4 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio
player.openGui(Core.INSTANCE, EGui.ASSEMBLING_MACHINE.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "assembling_machine_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "assembling_machine_front_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "assembling_machine_top";
}
}

View file

@ -24,30 +24,29 @@
package techreborn.blocks.machine;
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.tiles.TileChargeBench;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChargeOMat;
public class BlockChargeBench extends BlockMachineBase implements IRotationTexture {
public class BlockChargeOMat extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChargeBench(final Material material) {
public BlockChargeOMat() {
super();
this.setUnlocalizedName("techreborn.chargebench");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier2_machines"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int p_149915_2_) {
return new TileChargeBench();
return new TileChargeOMat();
}
@Override
@ -57,29 +56,4 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu
player.openGui(Core.INSTANCE, EGui.CHARGEBENCH.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "chargeBench_side";
}
@Override
public String getFrontOn() {
return this.prefix + "chargeBench_side";
}
@Override
public String getSide() {
return this.prefix + "chargeBench_side";
}
@Override
public String getTop() {
return this.prefix + "chargeBench_side";
}
@Override
public String getBottom() {
return this.prefix + "chargeBench_side";
}
}

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.TileChemicalReactor;
public class BlockChemicalReactor extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public class BlockChemicalReactor extends BlockMachineBase {
public BlockChemicalReactor(final Material material) {
super();
@ -57,29 +54,4 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
player.openGui(Core.INSTANCE, EGui.CHEMICAL_REACTOR.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "chemical_reactor_side_off";
}
@Override
public String getFrontOn() {
return this.prefix + "chemical_reactor_side_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "chemical_reactor_bottom";
}
}

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.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileChunkLoader;
public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotationTexture {
public class BlockChunkLoader extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockChunkLoader(final Material material) {
public BlockChunkLoader() {
super();
this.setUnlocalizedName("techreborn.chunkloader");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@Override
@ -57,24 +57,4 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat
player.openGui(Core.INSTANCE, EGui.CHUNK_LOADER.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "industrial_chunk_loader_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}

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.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileMatterFabricator;
public class BlockMatterFabricator extends BlockMachineBase implements IAdvancedRotationTexture {
public class BlockMatterFabricator extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockMatterFabricator(final Material material) {
public BlockMatterFabricator() {
super();
this.setUnlocalizedName("techreborn.matterfabricator");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier3_machines"));
}
@Override
@ -62,24 +62,4 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
public boolean isAdvanced() {
return true;
}
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getSide(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getTop(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
@Override
public String getBottom(final boolean isActive) {
return isActive ? this.prefix + "matter_fabricator_on" : this.prefix + "matter_fabricator_off";
}
}

View file

@ -24,25 +24,24 @@
package techreborn.blocks.machine;
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.IAdvancedRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo;
import techreborn.tiles.TileRollingMachine;
public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRotationTexture {
public class BlockRollingMachine extends BlockMachineBase {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public BlockRollingMachine(final Material material) {
public BlockRollingMachine() {
super();
this.setUnlocalizedName("techreborn.rollingmachine");
this.setCreativeTab(TechRebornCreativeTab.instance);
ShootingStar.registerModel(new ModelCompound(ModInfo.MOD_ID, this, "machines/tier1_machines"));
}
@Override
@ -57,24 +56,4 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo
player.openGui(Core.INSTANCE, EGui.ROLLING_MACHINE.ordinal(), world, x, y, z);
return true;
}
@Override
public String getFront(final boolean isActive) {
return isActive ? this.prefix + "rolling_machine_side_on" : this.prefix + "rolling_machine_side_off";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "machine_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}

View file

@ -32,7 +32,6 @@ 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.IRotationTexture;
import techreborn.Core;
import techreborn.client.EGui;
import techreborn.client.TechRebornCreativeTab;
@ -40,9 +39,7 @@ import techreborn.tiles.TileScrapboxinator;
import java.util.List;
public class BlockScrapboxinator extends BlockMachineBase implements IRotationTexture {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public class BlockScrapboxinator extends BlockMachineBase {
public BlockScrapboxinator(final Material material) {
super();
@ -64,31 +61,6 @@ public class BlockScrapboxinator extends BlockMachineBase implements IRotationTe
return true;
}
@Override
public String getFrontOff() {
return this.prefix + "scrapboxinator_front_off";
}
@Override
public String getFrontOn() {
return this.prefix + "scrapboxinator_front_on";
}
@Override
public String getSide() {
return this.prefix + "machine_side";
}
@Override
public String getTop() {
return this.prefix + "machine_top";
}
@Override
public String getBottom() {
return this.prefix + "machine_bottom";
}
@Override
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
tooltip.add(TextFormatting.RED + "WIP Coming Soon");

View file

@ -33,15 +33,12 @@ import net.minecraft.util.EnumHand;
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.multiblock.TileVacuumFreezer;
public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRotationTexture {
private final String prefix = "techreborn:blocks/machine/greg_machines/";
public class BlockVacuumFreezer extends BlockMachineBase {
public BlockVacuumFreezer(final Material material) {
super();
@ -70,24 +67,4 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot
}
return false;
}
@Override
public String getFront(final boolean isActive) {
return this.prefix + "vacuum_freezer_front";
}
@Override
public String getSide(final boolean isActive) {
return this.prefix + "machine_side";
}
@Override
public String getTop(final boolean isActive) {
return this.prefix + "vacuum_freezer_top";
}
@Override
public String getBottom(final boolean isActive) {
return this.prefix + "machine_bottom";
}
}