Merge remote-tracking branch 'remotes/origin/1.8.9' into 1.9

This commit is contained in:
modmuss50 2016-03-15 08:07:06 +00:00
commit e0547cecff
311 changed files with 1025 additions and 361 deletions

View file

@ -27,7 +27,7 @@ public class BlockComputerCube extends BlockMachineBase implements IAdvancedRota
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -32,7 +32,7 @@ public class BlockDigitalChest extends BlockMachineBase implements IAdvancedRota
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -15,7 +15,7 @@ public class BlockElectricCraftingTable extends BlockMachineBase implements IAdv
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -16,7 +16,7 @@ public class BlockFusionCoil extends BlockMachineBase {
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) {

View file

@ -48,7 +48,7 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
return new TileEntityFusionController(); return new TileEntityFusionController();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -57,16 +57,16 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "plasma_generator_side_off" ; return prefix + "fusion_control_computer_side" ;
} }
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "fusion_control_computer_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "fusion_control_computer_bottom";
} }
} }

View file

@ -14,7 +14,7 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase {
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/machine_blocks/";
@Override @Override

View file

@ -100,8 +100,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured
} }
@Override @Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/casing" + types[getMetaFromState(BlockStateContainer)] + "_full"; return "techreborn:blocks/machine/machine_blocks/casing" + types[getMetaFromState(blockState)] + "_full";
} }
@Override @Override

View file

@ -57,8 +57,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock {
} }
@Override @Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/" + types[getMetaFromState(BlockStateContainer)] + "_machine_block"; return "techreborn:blocks/machine/machine_blocks/" + types[getMetaFromState(blockState)] + "_machine_block";
} }
@Override @Override

View file

@ -53,8 +53,8 @@ public class BlockNuke extends BlockTNT implements ITexturedBlock {
} }
@Override @Override
public String getTextureNameFromState(IBlockState IBlockState, EnumFacing enumFacing) { public String getTextureNameFromState(IBlockState iBlockState, EnumFacing enumFacing) {
return "techreborn:blocks/machine/machine_bottom"; return "techreborn:blocks/machine/greg_machine/nuke";
} }
@Override @Override

View file

@ -62,8 +62,8 @@ public class BlockOre2 extends BaseBlock implements ITexturedBlock, IOreNameProv
setUnlocalizedName("techreborn.ore2"); setUnlocalizedName("techreborn.ore2");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0f); setHardness(2.0f);
setHarvestLevel("pickaxe", 2); setHarvestLevel("pickaxe", 1);
this.setDefaultState(this.getDefaultState().withProperty(METADATA, 0)); this.setDefaultState(this.blockState.getBaseState().withProperty(METADATA, 0));
} }
@Override @Override

View file

@ -124,8 +124,8 @@ public class BlockPlayerDetector extends BaseTileBlock implements ITexturedBlock
} }
@Override @Override
public String getTextureNameFromState(IBlockState BlockStateContainer, EnumFacing facing) { public String getTextureNameFromState(IBlockState blockState, EnumFacing facing) {
return "techreborn:blocks/machine/player_detector_" + types[getMetaFromState(BlockStateContainer)]; return "techreborn:blocks/machine/greg_machines/player_detector_" + types[getMetaFromState(blockState)];
} }
@Override @Override

View file

@ -37,7 +37,8 @@ public class BlockQuantumChest extends BlockMachineBase implements IAdvancedRota
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/";
private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -36,7 +36,7 @@ public class BlockQuantumTank extends BlockMachineBase implements IAdvancedRotat
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -14,7 +14,7 @@ public class BlockSupercondensator extends BlockMachineBase implements IAdvanced
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -36,7 +36,7 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -55,11 +55,11 @@ public class BlockBlastFurnace extends BlockMachineBase implements IRotationText
@Override @Override
public String getTop() { public String getTop() {
return prefix + "advanced_machine_side"; return prefix + "advanced_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "assembling_machine_top"; return prefix + "advanced_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -31,7 +31,7 @@ public class BlockCentrifuge extends BlockMachineBase implements IRotationTextur
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
@ -13,7 +13,7 @@ public class BlockDistillationTower extends BlockMachineBase implements IRotatio
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -31,7 +31,7 @@ public class BlockImplosionCompressor extends BlockMachineBase implements IRotat
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -31,7 +31,7 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase implements IRo
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -35,7 +35,7 @@ public class BlockIndustrialGrinder extends BlockMachineBase implements IRotatio
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.advanced_machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -35,7 +35,7 @@ public class BlockIndustrialSawmill extends BlockMachineBase implements IRotatio
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/advanced_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -39,16 +39,16 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "machine_side"; return prefix + "generator_machine_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override
@ -58,7 +58,7 @@ public class BlockDieselGenerator extends BlockMachineBase implements IAdvancedR
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }

View file

@ -24,7 +24,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
return new TileDragonEggSiphoner(); return new TileDragonEggSiphoner();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -43,7 +43,7 @@ public class BlockDragonEggSiphoner extends BlockMachineBase implements IAdvance
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -38,16 +38,16 @@ public class BlockGasTurbine extends BlockMachineBase implements IAdvancedRotati
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "machine_side"; return prefix + "generator_machine_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override

View file

@ -31,7 +31,7 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -45,16 +45,16 @@ public class BlockGenerator extends BlockMachineBase implements IRotationTexture
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side" ; return prefix + "generator_machine_side" ;
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "generator_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -24,7 +24,7 @@ public class BlockHeatGenerator extends BlockMachineBase implements IAdvancedRot
return new TileHeatGenerator(); return new TileHeatGenerator();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -14,16 +14,16 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
return prefix + "idsu_front"; return prefix + "lightning_rod_side";
} }
@Override @Override
public String getSide(boolean isActive) { public String getSide(boolean isActive) {
return prefix + "idsu_front" ; return prefix + "lightning_rod_side" ;
} }
@Override @Override
@ -33,7 +33,7 @@ public class BlockLightningRod extends BlockMachineBase implements IAdvancedRota
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "extreme_voltage_machine_side"; return prefix + "lightning_rod_bottom";
} }
} }

View file

@ -14,7 +14,7 @@ public class BlockMagicEnergyAbsorber extends BlockMachineBase implements IAdvan
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -14,7 +14,7 @@ public class BlockMagicEnergyConverter extends BlockMachineBase implements IAdva
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -15,7 +15,7 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -29,12 +29,12 @@ public class BlockPlasmaGenerator extends BlockMachineBase implements IAdvancedR
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "plasma_generator_bottom";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "plasma_generator_side_off"; return prefix + "plasma_generator_bottom";
} }
} }

View file

@ -39,7 +39,7 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {
@ -53,12 +53,12 @@ public class BlockSemiFluidGenerator extends BlockMachineBase implements IAdvanc
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "machine_top"; return prefix + "generator_machine_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -46,7 +46,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
return new TileSolarPanel(); return new TileSolarPanel();
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
public String getTextureNameFromState(IBlockState state, EnumFacing side) { public String getTextureNameFromState(IBlockState state, EnumFacing side) {
@ -54,7 +54,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
if(side == EnumFacing.UP){ if(side == EnumFacing.UP){
return prefix + "solar_panel_top_" + (isActive ? "on" : "off"); return prefix + "solar_panel_top_" + (isActive ? "on" : "off");
} else if(side==EnumFacing.DOWN){ } else if(side==EnumFacing.DOWN){
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
return prefix + "solar_panel_side_" + (isActive ? "on" : "off"); return prefix + "solar_panel_side_" + (isActive ? "on" : "off");
} }

View file

@ -38,7 +38,7 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/generators/";
@Override @Override
@ -58,6 +58,6 @@ public class BlockThermalGenerator extends BlockMachineBase implements IAdvanced
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "machine_bottom"; return prefix + "generator_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.iron_machines;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@ -45,7 +45,7 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText
return items; return items;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/iron_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -59,16 +59,16 @@ public class BlockAlloyFurnace extends BlockMachineBase implements IRotationText
@Override @Override
public String getSide() { public String getSide() {
return prefix + "alloy_furnace_side"; return prefix + "iron_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "alloy_furnace_top"; return prefix + "iron_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "iron_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks; package techreborn.blocks.iron_machines;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -83,7 +83,7 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu
} }
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/iron_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -97,16 +97,16 @@ public class BlockIronFurnace extends BlockMachineBase implements IRotationTextu
@Override @Override
public String getSide() { public String getSide() {
return prefix + "iron_furnace_side"; return prefix + "iron_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "iron_furnace_top"; return prefix + "iron_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "iron_furnace_bottom"; return prefix + "iron_machine_bottom";
} }
} }

View file

@ -32,7 +32,7 @@ public class BlockAssemblingMachine extends BlockMachineBase implements IRotatio
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -31,7 +31,7 @@ public class BlockChargeBench extends BlockMachineBase implements IRotationTextu
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {

View file

@ -32,7 +32,7 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -51,11 +51,11 @@ public class BlockChemicalReactor extends BlockMachineBase implements IRotationT
@Override @Override
public String getTop() { public String getTop() {
return prefix + "industrial_centrifuge_top_off"; return prefix + "chemical_reactor_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "industrial_centrifuge_bottom"; return prefix + "chemical_reactor_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks; package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -34,7 +34,7 @@ public class BlockChunkLoader extends BlockMachineBase implements IAdvancedRotat
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -31,7 +31,7 @@ public class BlockMatterFabricator extends BlockMachineBase implements IAdvanced
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public boolean isAdvanced() { public boolean isAdvanced() {

View file

@ -31,7 +31,7 @@ public class BlockRollingMachine extends BlockMachineBase implements IAdvancedRo
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -1,4 +1,4 @@
package techreborn.blocks.teir1; package techreborn.blocks.machine;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -9,39 +9,40 @@ import reborncore.common.blocks.IRotationTexture;
import techreborn.Core; import techreborn.Core;
import techreborn.client.GuiHandler; import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileGrinder; import techreborn.tiles.TileScrapboxinator;
import techreborn.tiles.teir1.TileRecycler;
public class BlockGrinder extends BlockMachineBase implements IRotationTexture{ public class BlockScrapboxinator extends BlockMachineBase implements IRotationTexture{
public BlockGrinder(Material material) { public BlockScrapboxinator(Material material) {
super(); super();
setUnlocalizedName("techreborn.grinder"); setUnlocalizedName("techreborn.scrapboxinator");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
} }
@Override @Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileGrinder(); return new TileScrapboxinator();
} }
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if (!player.isSneaking()){ if (!player.isSneaking()){
player.openGui(Core.INSTANCE, GuiHandler.grinderID, world, x, y, z); player.openGui(Core.INSTANCE, GuiHandler.scrapboxinatorID, world, x, y, z);
} }
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
return prefix + "industrial_grinder_front_off"; return prefix + "scrapboxinator_front_off";
} }
@Override @Override
public String getFrontOn() { public String getFrontOn() {
return prefix + "industrial_grinder_front_on"; return prefix + "scrapboxinator_front_on";
} }
@Override @Override
@ -51,11 +52,11 @@ public class BlockGrinder extends BlockMachineBase implements IRotationTexture{
@Override @Override
public String getTop() { public String getTop() {
return prefix + "industrial_grinder_top_off"; return prefix + "machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "industrial_centrifuge_bottom"; return prefix + "machine_bottom";
} }
} }

View file

@ -34,7 +34,7 @@ public class BlockVacuumFreezer extends BlockMachineBase implements IAdvancedRot
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/greg_machines/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -11,11 +11,9 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.TileAesu; import techreborn.tiles.TileAesu;
public class BlockAesu extends BlockMachineBase implements IRotationTexture { public class BlockAESU extends BlockMachineBase implements IRotationTexture {
public BlockAESU(Material material) {
public BlockAesu(Material material) {
super(); super();
setUnlocalizedName("techreborn.aesu"); setUnlocalizedName("techreborn.aesu");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -35,7 +33,7 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture {
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -54,12 +52,12 @@ public class BlockAesu extends BlockMachineBase implements IRotationTexture {
@Override @Override
public String getTop() { public String getTop() {
return prefix + "aesu_side"; return prefix + "aesu_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "aesu_side"; return prefix + "aesu_bottom";
} }
} }

View file

@ -0,0 +1,55 @@
package techreborn.blocks.storage;
import net.minecraft.block.material.Material;
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.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileBatBox;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockBatBox extends BlockMachineBase implements IRotationTexture {
public BlockBatBox() {
super();
setUnlocalizedName("techreborn.batBox");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileBatBox();
}
protected final String prefix = "techreborn:blocks/machine/storage/";
@Override
public String getFrontOff() {
return prefix + "batbox_front";
}
@Override
public String getFrontOn() {
return prefix + "batbox_front";
}
@Override
public String getSide() {
return prefix + "batbox_side";
}
@Override
public String getTop() {
return prefix + "batbox_top";
}
@Override
public String getBottom() {
return prefix + "batbox_bottom";
}
}

View file

@ -48,7 +48,7 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
@ -63,12 +63,12 @@ public class BlockIDSU extends BlockMachineBase implements IAdvancedRotationText
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "idsu_side"; return prefix + "idsu_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "idsu_side"; return prefix + "idsu_bottom";
} }
} }

View file

@ -11,10 +11,10 @@ import techreborn.client.GuiHandler;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesu;
public class BlockLesu extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLesu(Material material) { public BlockLESU(Material material) {
super(); super();
setUnlocalizedName("techreborn.lesu"); setUnlocalizedName("techreborn.lesu");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -35,7 +35,7 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
@ -50,12 +50,12 @@ public class BlockLesu extends BlockMachineBase implements IAdvancedRotationText
@Override @Override
public String getTop(boolean isActive) { public String getTop(boolean isActive) {
return prefix + "lesu_side"; return prefix + "lesu_top";
} }
@Override @Override
public String getBottom(boolean isActive) { public String getBottom(boolean isActive) {
return prefix + "lesu_side"; return prefix + "lesu_bottom";
} }
} }

View file

@ -13,9 +13,9 @@ import reborncore.common.blocks.IAdvancedRotationTexture;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.lesu.TileLesuStorage; import techreborn.tiles.lesu.TileLesuStorage;
public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotationTexture { public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotationTexture {
public BlockLesuStorage(Material material) { public BlockLESUStorage(Material material) {
super(); super();
setUnlocalizedName("techreborn.lesustorage"); setUnlocalizedName("techreborn.lesustorage");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
@ -48,7 +48,7 @@ public class BlockLesuStorage extends BlockMachineBase implements IAdvancedRotat
return block == (Block) this; return block == (Block) this;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/storage/";
@Override @Override
public String getFront(boolean isActive) { public String getFront(boolean isActive) {

View file

@ -0,0 +1,48 @@
package techreborn.blocks.storage;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileMFE;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockMFE extends BlockBatBox {
public BlockMFE() {
super();
setUnlocalizedName("techreborn.mfe");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileMFE();
}
@Override
public String getFrontOff() {
return prefix + "mfe_front";
}
@Override
public String getFrontOn() {
return prefix + "mfe_front";
}
@Override
public String getSide() {
return prefix + "mfe_side";
}
@Override
public String getTop() {
return prefix + "mfe_top";
}
@Override
public String getBottom() {
return prefix + "mfe_bottom";
}
}

View file

@ -0,0 +1,48 @@
package techreborn.blocks.storage;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.storage.TileMFSU;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class BlockMFSU extends BlockBatBox {
public BlockMFSU() {
super();
setUnlocalizedName("techreborn.mfsu");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World world, int p_149915_2_) {
return new TileMFSU();
}
@Override
public String getFrontOff() {
return prefix + "mfsu_front";
}
@Override
public String getFrontOn() {
return prefix + "mfsu_front";
}
@Override
public String getSide() {
return prefix + "mfsu_side";
}
@Override
public String getTop() {
return prefix + "mfsu_top";
}
@Override
public String getBottom() {
return prefix + "mfsu_bottom";
}
}

View file

@ -1,4 +1,4 @@
package techreborn.blocks.machine; package techreborn.blocks.tier1;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -31,7 +31,7 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -45,16 +45,16 @@ public class BlockAlloySmelter extends BlockMachineBase implements IRotationText
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side"; return prefix + "tier1_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "tier1_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "tier1_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks.teir1; package techreborn.blocks.tier1;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -32,7 +32,7 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -46,16 +46,16 @@ public class BlockCompressor extends BlockMachineBase implements IRotationTextur
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side"; return prefix + "tier1_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "tier1_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "tier1_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks.teir1; package techreborn.blocks.tier1;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -32,7 +32,7 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -46,16 +46,16 @@ public class BlockElectricFurnace extends BlockMachineBase implements IRotationT
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side" ; return prefix + "tier1_machine_side" ;
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "tier1_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "tier1_machine_bottom";
} }
} }

View file

@ -1,4 +1,4 @@
package techreborn.blocks.teir1; package techreborn.blocks.tier1;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -32,7 +32,7 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -46,16 +46,16 @@ public class BlockExtractor extends BlockMachineBase implements IRotationTexture
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side"; return prefix + "tier1_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "tier1_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "tier1_machine_bottom";
} }
} }

View file

@ -0,0 +1,56 @@
package techreborn.blocks.tier1;
import net.minecraft.block.material.Material;
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.GuiHandler;
import techreborn.client.TechRebornCreativeTab;
import techreborn.tiles.teir1.TileGrinder;
public class BlockGrinder extends BlockMachineBase implements IAdvancedRotationTexture{
public BlockGrinder(Material material) {
super();
setUnlocalizedName("techreborn.grinder");
setCreativeTab(TechRebornCreativeTab.instance);
}
@Override
public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
return new TileGrinder();
}
@Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
if (!player.isSneaking()){
player.openGui(Core.INSTANCE, GuiHandler.grinderID, world, x, y, z);
}
return true;
}
private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override
public String getFront(boolean isActive) {
return isActive ? prefix + "grinder_front_on" : prefix + "grinder_front_off";
}
@Override
public String getSide(boolean isActive) {
return prefix + "tier1_machine_side";
}
@Override
public String getTop(boolean isActive) {
return isActive ? prefix + "grinder_top_on" : prefix + "grinder_top_off";
}
@Override
public String getBottom(boolean isActive) {
return prefix + "tier1_machine_bottom";
}
}

View file

@ -1,4 +1,4 @@
package techreborn.blocks.teir1; package techreborn.blocks.tier1;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -32,7 +32,7 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture{
return true; return true;
} }
private final String prefix = "techreborn:blocks/machine/"; private final String prefix = "techreborn:blocks/machine/tier1_machines/";
@Override @Override
public String getFrontOff() { public String getFrontOff() {
@ -46,16 +46,16 @@ public class BlockRecycler extends BlockMachineBase implements IRotationTexture{
@Override @Override
public String getSide() { public String getSide() {
return prefix + "machine_side"; return prefix + "tier1_machine_side";
} }
@Override @Override
public String getTop() { public String getTop() {
return prefix + "machine_top"; return prefix + "tier1_machine_top";
} }
@Override @Override
public String getBottom() { public String getBottom() {
return prefix + "machine_bottom"; return prefix + "tier1_machine_bottom";
} }
} }

View file

@ -4,108 +4,15 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fml.common.network.IGuiHandler; import net.minecraftforge.fml.common.network.IGuiHandler;
import techreborn.client.container.ContainerAesu; import techreborn.client.container.*;
import techreborn.client.container.ContainerAlloyFurnace; import techreborn.client.gui.*;
import techreborn.client.container.ContainerAlloySmelter;
import techreborn.client.container.ContainerAssemblingMachine;
import techreborn.client.container.ContainerBlastFurnace;
import techreborn.client.container.ContainerCentrifuge;
import techreborn.client.container.ContainerChargeBench;
import techreborn.client.container.ContainerChemicalReactor;
import techreborn.client.container.ContainerChunkloader;
import techreborn.client.container.ContainerCompressor;
import techreborn.client.container.ContainerDestructoPack;
import techreborn.client.container.ContainerDieselGenerator;
import techreborn.client.container.ContainerDigitalChest;
import techreborn.client.container.ContainerElectricFurnace;
import techreborn.client.container.ContainerExtractor;
import techreborn.client.container.ContainerFusionReactor;
import techreborn.client.container.ContainerGasTurbine;
import techreborn.client.container.ContainerGenerator;
import techreborn.client.container.ContainerGrinder;
import techreborn.client.container.ContainerIDSU;
import techreborn.client.container.ContainerImplosionCompressor;
import techreborn.client.container.ContainerIndustrialElectrolyzer;
import techreborn.client.container.ContainerIndustrialGrinder;
import techreborn.client.container.ContainerIndustrialSawmill;
import techreborn.client.container.ContainerIronFurnace;
import techreborn.client.container.ContainerLesu;
import techreborn.client.container.ContainerMatterFabricator;
import techreborn.client.container.ContainerQuantumChest;
import techreborn.client.container.ContainerQuantumTank;
import techreborn.client.container.ContainerRecycler;
import techreborn.client.container.ContainerRollingMachine;
import techreborn.client.container.ContainerSemifluidGenerator;
import techreborn.client.container.ContainerThermalGenerator;
import techreborn.client.container.ContainerVacuumFreezer;
import techreborn.client.gui.GuiAesu;
import techreborn.client.gui.GuiAlloyFurnace;
import techreborn.client.gui.GuiAlloySmelter;
import techreborn.client.gui.GuiAssemblingMachine;
import techreborn.client.gui.GuiBlastFurnace;
import techreborn.client.gui.GuiCentrifuge;
import techreborn.client.gui.GuiChargeBench;
import techreborn.client.gui.GuiChemicalReactor;
import techreborn.client.gui.GuiChunkLoader;
import techreborn.client.gui.GuiCompressor;
import techreborn.client.gui.GuiDestructoPack;
import techreborn.client.gui.GuiDieselGenerator;
import techreborn.client.gui.GuiDigitalChest;
import techreborn.client.gui.GuiElectricFurnace;
import techreborn.client.gui.GuiExtractor;
import techreborn.client.gui.GuiFusionReactor;
import techreborn.client.gui.GuiGasTurbine;
import techreborn.client.gui.GuiGenerator;
import techreborn.client.gui.GuiGrinder;
import techreborn.client.gui.GuiIDSU;
import techreborn.client.gui.GuiImplosionCompressor;
import techreborn.client.gui.GuiIndustrialElectrolyzer;
import techreborn.client.gui.GuiIndustrialGrinder;
import techreborn.client.gui.GuiIndustrialSawmill;
import techreborn.client.gui.GuiIronFurnace;
import techreborn.client.gui.GuiLesu;
import techreborn.client.gui.GuiMatterFabricator;
import techreborn.client.gui.GuiQuantumChest;
import techreborn.client.gui.GuiQuantumTank;
import techreborn.client.gui.GuiRecycler;
import techreborn.client.gui.GuiRollingMachine;
import techreborn.client.gui.GuiSemifluidGenerator;
import techreborn.client.gui.GuiThermalGenerator;
import techreborn.client.gui.GuiVacuumFreezer;
import techreborn.manual.GuiManual; import techreborn.manual.GuiManual;
import techreborn.tiles.TileAesu; import techreborn.tiles.*;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileAssemblingMachine;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileCentrifuge;
import techreborn.tiles.TileChargeBench;
import techreborn.tiles.TileChemicalReactor;
import techreborn.tiles.TileChunkLoader;
import techreborn.tiles.TileDigitalChest;
import techreborn.tiles.TileImplosionCompressor;
import techreborn.tiles.TileIndustrialElectrolyzer;
import techreborn.tiles.TileIndustrialGrinder;
import techreborn.tiles.TileIndustrialSawmill;
import techreborn.tiles.TileIronFurnace;
import techreborn.tiles.TileMatterFabricator;
import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileQuantumTank;
import techreborn.tiles.TileRollingMachine;
import techreborn.tiles.TileVacuumFreezer;
import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.generator.TileDieselGenerator; import techreborn.tiles.generator.*;
import techreborn.tiles.generator.TileGasTurbine;
import techreborn.tiles.generator.TileGenerator;
import techreborn.tiles.generator.TileSemifluidGenerator;
import techreborn.tiles.generator.TileThermalGenerator;
import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.teir1.TileCompressor; import techreborn.tiles.teir1.*;
import techreborn.tiles.teir1.TileElectricFurnace;
import techreborn.tiles.teir1.TileExtractor;
import techreborn.tiles.teir1.TileGrinder;
import techreborn.tiles.teir1.TileRecycler;
public class GuiHandler implements IGuiHandler { public class GuiHandler implements IGuiHandler {
@ -144,6 +51,7 @@ public class GuiHandler implements IGuiHandler {
public static final int electricFurnaceID = 35; public static final int electricFurnaceID = 35;
public static final int ironFurnace = 36; public static final int ironFurnace = 36;
public static final int recyclerID = 37; public static final int recyclerID = 37;
public static final int scrapboxinatorID = 38;
@Override @Override
public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
@ -238,6 +146,8 @@ public class GuiHandler implements IGuiHandler {
return new ContainerIronFurnace((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerIronFurnace((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)), player);
}else if (ID == recyclerID) { }else if (ID == recyclerID) {
return new ContainerRecycler((TileRecycler) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerRecycler((TileRecycler) world.getTileEntity(new BlockPos(x, y, z)), player);
}else if (ID == scrapboxinatorID) {
return new ContainerScrapboxinator((TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)), player);
} }
return null; return null;
} }
@ -336,6 +246,8 @@ public class GuiHandler implements IGuiHandler {
return new GuiIronFurnace(player, (TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z))); return new GuiIronFurnace(player, (TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)));
}else if (ID == recyclerID) { }else if (ID == recyclerID) {
return new GuiRecycler(player, (TileRecycler) world.getTileEntity(new BlockPos(x, y, z))); return new GuiRecycler(player, (TileRecycler) world.getTileEntity(new BlockPos(x, y, z)));
} else if (ID == scrapboxinatorID) {
return new GuiScrapboxinator(player, (TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)));
} }
return null; return null;
} }

View file

@ -0,0 +1,63 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Slot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.api.SlotUpgrade;
import techreborn.tiles.TileScrapboxinator;
public class ContainerScrapboxinator extends RebornContainer {
EntityPlayer player;
TileScrapboxinator tile;
public int connectionStatus;
public ContainerScrapboxinator(TileScrapboxinator tileScrapboxinator, EntityPlayer player) {
super();
tile = tileScrapboxinator;
this.player = player;
// input
this.addSlotToContainer(new SlotScrapbox(tileScrapboxinator.inventory, 0, 56, 34));
this.addSlotToContainer(new SlotOutput(tileScrapboxinator.inventory, 1, 116, 34));
// upgrades
this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 2, 152, 8));
this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 3, 152, 26));
this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 4, 152, 44));
this.addSlotToContainer(new SlotUpgrade(tileScrapboxinator.inventory, 5, 152, 62));
int i;
for (i = 0; i < 3; ++i) {
for (int j = 0; j < 9; ++j) {
this.addSlotToContainer(new Slot(player.inventory, j + i * 9
+ 9, 8 + j * 18, 84 + i * 18));
}
}
for (i = 0; i < 9; ++i) {
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18,
142));
}
}
@Override
public boolean canInteractWith(EntityPlayer p_75145_1_) {
return true;
}
@SideOnly(Side.CLIENT)
@Override
public void updateProgressBar(int id, int value) {
if (id == 10) {
this.connectionStatus = value;
}
}
}

View file

@ -0,0 +1,24 @@
package techreborn.client.container;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import techreborn.init.ModItems;
public class SlotScrapbox extends Slot {
public SlotScrapbox(IInventory par1iInventory, int par2, int par3, int par4) {
super(par1iInventory, par2, par3, par4);
}
public boolean isItemValid(ItemStack par1ItemStack) {
if(par1ItemStack.getItem()==ModItems.scrapBox){
return true;
}
return false;
}
public int getSlotStackLimit() {
return 64;
}
}

View file

@ -0,0 +1,53 @@
package techreborn.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import techreborn.client.container.ContainerScrapboxinator;
import techreborn.tiles.TileScrapboxinator;
public class GuiScrapboxinator extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/scrapboxinator.png");
TileScrapboxinator tile;
ContainerScrapboxinator containerScrapboxinator;
public GuiScrapboxinator(EntityPlayer player, TileScrapboxinator tileScrapboxinator) {
super(new ContainerScrapboxinator(tileScrapboxinator, player));
this.xSize = 176;
this.ySize = 167;
tile = tileScrapboxinator;
containerScrapboxinator = (ContainerScrapboxinator) this.inventorySlots;
}
@Override
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(texture);
int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = 0;
j = tile.gaugeProgressScaled(24);
// System.out.println(compressor.gaugeProgressScaled(10));
if (j > 0) {
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
}
j = tile.getEnergyScaled(12);
if (j > 0) {
this.drawTexturedModalRect(k + 24, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
}
}
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
String name = net.minecraft.util.text.translation.I18n.translateToLocal("tile.techreborn.scrapboxinator.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752);
}
}

View file

@ -8,122 +8,25 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.tile.TileMachineBase; import reborncore.common.tile.TileMachineBase;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockChunkLoader; import techreborn.blocks.*;
import techreborn.blocks.BlockComputerCube; import techreborn.blocks.advanced_machine.*;
import techreborn.blocks.BlockDigitalChest; import techreborn.blocks.generator.*;
import techreborn.blocks.BlockElectricCraftingTable; import techreborn.blocks.iron_machines.BlockAlloyFurnace;
import techreborn.blocks.BlockFusionCoil; import techreborn.blocks.iron_machines.BlockIronFurnace;
import techreborn.blocks.BlockFusionControlComputer; import techreborn.blocks.machine.*;
import techreborn.blocks.BlockHighlyAdvancedMachine; import techreborn.blocks.storage.*;
import techreborn.blocks.BlockIronFence; import techreborn.blocks.tier1.*;
import techreborn.blocks.BlockIronFurnace; import techreborn.itemblocks.*;
import techreborn.blocks.BlockMachineCasing; import techreborn.tiles.*;
import techreborn.blocks.BlockMachineFrame;
import techreborn.blocks.BlockNuke;
import techreborn.blocks.BlockOre;
import techreborn.blocks.BlockOre2;
import techreborn.blocks.BlockPlayerDetector;
import techreborn.blocks.BlockQuantumChest;
import techreborn.blocks.BlockQuantumTank;
import techreborn.blocks.BlockReinforcedGlass;
import techreborn.blocks.BlockRubberLeaves;
import techreborn.blocks.BlockRubberLog;
import techreborn.blocks.BlockRubberPlank;
import techreborn.blocks.BlockRubberSapling;
import techreborn.blocks.BlockStorage;
import techreborn.blocks.BlockStorage2;
import techreborn.blocks.BlockSupercondensator;
import techreborn.blocks.generator.BlockDieselGenerator;
import techreborn.blocks.generator.BlockDragonEggSiphoner;
import techreborn.blocks.generator.BlockGasTurbine;
import techreborn.blocks.generator.BlockGenerator;
import techreborn.blocks.generator.BlockHeatGenerator;
import techreborn.blocks.generator.BlockLightningRod;
import techreborn.blocks.generator.BlockMagicEnergyAbsorber;
import techreborn.blocks.generator.BlockMagicEnergyConverter;
import techreborn.blocks.generator.BlockPlasmaGenerator;
import techreborn.blocks.generator.BlockSemiFluidGenerator;
import techreborn.blocks.generator.BlockSolarPanel;
import techreborn.blocks.generator.BlockThermalGenerator;
import techreborn.blocks.generator.BlockWaterMill;
import techreborn.blocks.generator.BlockWindMill;
import techreborn.blocks.machine.BlockAlloyFurnace;
import techreborn.blocks.machine.BlockAlloySmelter;
import techreborn.blocks.machine.BlockAssemblingMachine;
import techreborn.blocks.machine.BlockBlastFurnace;
import techreborn.blocks.machine.BlockCentrifuge;
import techreborn.blocks.machine.BlockChargeBench;
import techreborn.blocks.machine.BlockChemicalReactor;
import techreborn.blocks.machine.BlockDistillationTower;
import techreborn.blocks.machine.BlockImplosionCompressor;
import techreborn.blocks.machine.BlockIndustrialElectrolyzer;
import techreborn.blocks.machine.BlockIndustrialGrinder;
import techreborn.blocks.machine.BlockIndustrialSawmill;
import techreborn.blocks.machine.BlockMatterFabricator;
import techreborn.blocks.machine.BlockRollingMachine;
import techreborn.blocks.machine.BlockVacuumFreezer;
import techreborn.blocks.storage.BlockAesu;
import techreborn.blocks.storage.BlockIDSU;
import techreborn.blocks.storage.BlockLesu;
import techreborn.blocks.storage.BlockLesuStorage;
import techreborn.blocks.teir1.BlockCompressor;
import techreborn.blocks.teir1.BlockElectricFurnace;
import techreborn.blocks.teir1.BlockExtractor;
import techreborn.blocks.teir1.BlockGrinder;
import techreborn.blocks.teir1.BlockRecycler;
import techreborn.itemblocks.ItemBlockAesu;
import techreborn.itemblocks.ItemBlockDigitalChest;
import techreborn.itemblocks.ItemBlockMachineCasing;
import techreborn.itemblocks.ItemBlockMachineFrame;
import techreborn.itemblocks.ItemBlockOre;
import techreborn.itemblocks.ItemBlockOre2;
import techreborn.itemblocks.ItemBlockPlayerDetector;
import techreborn.itemblocks.ItemBlockQuantumChest;
import techreborn.itemblocks.ItemBlockQuantumTank;
import techreborn.itemblocks.ItemBlockRubberSapling;
import techreborn.itemblocks.ItemBlockStorage;
import techreborn.itemblocks.ItemBlockStorage2;
import techreborn.tiles.TileAesu;
import techreborn.tiles.TileAlloyFurnace;
import techreborn.tiles.TileAlloySmelter;
import techreborn.tiles.TileAssemblingMachine;
import techreborn.tiles.TileBlastFurnace;
import techreborn.tiles.TileCentrifuge;
import techreborn.tiles.TileChargeBench;
import techreborn.tiles.TileChemicalReactor;
import techreborn.tiles.TileChunkLoader;
import techreborn.tiles.TileDigitalChest;
import techreborn.tiles.TileImplosionCompressor;
import techreborn.tiles.TileIndustrialElectrolyzer;
import techreborn.tiles.TileIndustrialGrinder;
import techreborn.tiles.TileIndustrialSawmill;
import techreborn.tiles.TileIronFurnace;
import techreborn.tiles.TileMachineCasing;
import techreborn.tiles.TileMatterFabricator;
import techreborn.tiles.TilePlayerDectector;
import techreborn.tiles.TileQuantumChest;
import techreborn.tiles.TileQuantumTank;
import techreborn.tiles.TileRollingMachine;
import techreborn.tiles.TileVacuumFreezer;
import techreborn.tiles.fusionReactor.TileEntityFusionController; import techreborn.tiles.fusionReactor.TileEntityFusionController;
import techreborn.tiles.generator.TileDieselGenerator; import techreborn.tiles.generator.*;
import techreborn.tiles.generator.TileDragonEggSiphoner;
import techreborn.tiles.generator.TileGasTurbine;
import techreborn.tiles.generator.TileGenerator;
import techreborn.tiles.generator.TileHeatGenerator;
import techreborn.tiles.generator.TileSemifluidGenerator;
import techreborn.tiles.generator.TileSolarPanel;
import techreborn.tiles.generator.TileThermalGenerator;
import techreborn.tiles.generator.TileWaterMill;
import techreborn.tiles.generator.TileWindMill;
import techreborn.tiles.idsu.TileIDSU; import techreborn.tiles.idsu.TileIDSU;
import techreborn.tiles.lesu.TileLesu; import techreborn.tiles.lesu.TileLesu;
import techreborn.tiles.lesu.TileLesuStorage; import techreborn.tiles.lesu.TileLesuStorage;
import techreborn.tiles.teir1.TileCompressor; import techreborn.tiles.storage.TileBatBox;
import techreborn.tiles.teir1.TileElectricFurnace; import techreborn.tiles.storage.TileMFE;
import techreborn.tiles.teir1.TileExtractor; import techreborn.tiles.storage.TileMFSU;
import techreborn.tiles.teir1.TileGrinder; import techreborn.tiles.teir1.*;
import techreborn.tiles.teir1.TileRecycler;
public class ModBlocks { public class ModBlocks {
@ -177,6 +80,10 @@ public class ModBlocks {
public static Block waterMill; public static Block waterMill;
public static Block windMill; public static Block windMill;
public static Block recycler; public static Block recycler;
public static Block batBox;
public static Block mfe;
public static Block mfsu;
public static Block scrapboxinator;
public static BlockOre ore; public static BlockOre ore;
public static BlockOre2 ore2; public static BlockOre2 ore2;
@ -312,18 +219,18 @@ public class ModBlocks {
GameRegistry.registerBlock(Idsu, "idsu"); GameRegistry.registerBlock(Idsu, "idsu");
GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR"); GameRegistry.registerTileEntity(TileIDSU.class, "TileIDSUTR");
Aesu = new BlockAesu(Material.rock); Aesu = new BlockAESU(Material.rock);
GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu"); GameRegistry.registerBlock(Aesu, ItemBlockAesu.class, "aesu");
GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR"); GameRegistry.registerTileEntity(TileAesu.class, "TileAesuTR");
Lesu = new BlockLesu(Material.rock); Lesu = new BlockLESU(Material.rock);
GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.rock); Supercondensator = new BlockSupercondensator(Material.rock);
GameRegistry.registerBlock(Supercondensator, "supercondensator"); GameRegistry.registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLesuStorage(Material.rock); LesuStorage = new BlockLESUStorage(Material.rock);
GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
@ -419,6 +326,18 @@ public class ModBlocks {
recycler = new BlockRecycler(Material.iron); recycler = new BlockRecycler(Material.iron);
GameRegistry.registerBlock(recycler, "recycler"); GameRegistry.registerBlock(recycler, "recycler");
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR"); GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
batBox = new BlockBatBox();
GameRegistry.registerBlock(batBox, "batBox");
GameRegistry.registerTileEntity(TileBatBox.class, "TileBatBox");
mfe = new BlockMFE();
GameRegistry.registerBlock(mfe, "mfe");
GameRegistry.registerTileEntity(TileMFE.class, "TileMFE");
mfsu = new BlockMFSU();
GameRegistry.registerBlock(mfsu, "mfsu");
GameRegistry.registerTileEntity(TileMFSU.class, "TileMFSU");
ironFurnace = new BlockIronFurnace(); ironFurnace = new BlockIronFurnace();
GameRegistry.registerBlock(ironFurnace, "ironfurnace"); GameRegistry.registerBlock(ironFurnace, "ironfurnace");
@ -426,6 +345,10 @@ public class ModBlocks {
nuke = new BlockNuke(); nuke = new BlockNuke();
GameRegistry.registerBlock(nuke, "nuke"); GameRegistry.registerBlock(nuke, "nuke");
scrapboxinator = new BlockScrapboxinator(Material.iron);
GameRegistry.registerBlock(scrapboxinator, "scrapboxinator");
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
registerOreDict(); registerOreDict();
Core.logHelper.info("TechReborns Blocks Loaded"); Core.logHelper.info("TechReborns Blocks Loaded");

View file

@ -694,6 +694,8 @@ public class ModRecipes {
GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.gold_ingot), 1F); GameRegistry.addSmelting(ItemDusts.getDustByName("gold", 1), new ItemStack(Items.gold_ingot), 1F);
GameRegistry.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F); GameRegistry.addSmelting(ItemParts.getPartByName("rubberSap"), ItemParts.getPartByName("rubber"), 1F);
GameRegistry.addSmelting(new ItemStack(Items.iron_ingot), ItemIngots.getIngotByName("refinediron"), 1F); GameRegistry.addSmelting(new ItemStack(Items.iron_ingot), ItemIngots.getIngotByName("refinediron"), 1F);
GameRegistry.addSmelting(BlockOre2.getOreByName("copper"), ItemIngots.getIngotByName("copper"), 1F);
GameRegistry.addSmelting(BlockOre2.getOreByName("tin"), ItemIngots.getIngotByName("tin"), 1F);
Core.logHelper.info("Smelting Recipes Added"); Core.logHelper.info("Smelting Recipes Added");
} }

View file

@ -0,0 +1,294 @@
package techreborn.tiles;
import java.util.Random;
import ic2.api.tile.IWrenchable;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.text.ITextComponent;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
import techreborn.api.ScrapboxList;
import techreborn.init.ModBlocks;
import techreborn.init.ModItems;
import techreborn.items.ItemParts;
public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory {
public Inventory inventory = new Inventory(6, "TileScrapboxinator", 64, this);
public int capacity = 1000;
public int cost = 20;
public int progress;
public int time = 200;
public int chance = 4;
public int random;
public int input1 = 0;
public int output = 1;
public TileScrapboxinator() {
super(1);
}
public int gaugeProgressScaled(int scale) {
return (progress * scale) / time;
}
@Override
public void updateEntity() {
boolean burning = isBurning();
boolean updateInventory = false;
if (getEnergy() <= cost && canOpen()) {
if (getEnergy() > cost) {
updateInventory = true;
}
}
if (isBurning() && canOpen()) {
updateState();
progress++;
if (progress >= time) {
progress = 0;
recycleItems();
updateInventory = true;
}
} else {
progress = 0;
updateState();
}
if (burning != isBurning()) {
updateInventory = true;
}
if (updateInventory) {
markDirty();
}
}
public void recycleItems() {
if (this.canOpen() && !worldObj.isRemote) {
int random = new Random().nextInt(ScrapboxList.stacks.size());
ItemStack out = ScrapboxList.stacks.get(random).copy();
if (getStackInSlot(output) == null) {
useEnergy(cost);
setInventorySlotContents(output, out);
}
if (getStackInSlot(input1).stackSize > 1) {
useEnergy(cost);
this.decrStackSize(input1, 1);
} else {
useEnergy(cost);
setInventorySlotContents(input1, null);
}
}
}
public boolean canOpen() {
if (getStackInSlot(input1) != null && getStackInSlot(output) == null) {
return true;
}
return false;
}
public boolean isBurning() {
return getEnergy() > cost;
}
public void updateState() {
IBlockState blockState = worldObj.getBlockState(pos);
if (blockState.getBlock() instanceof BlockMachineBase) {
BlockMachineBase blockMachineBase = (BlockMachineBase) blockState.getBlock();
if (blockState.getValue(BlockMachineBase.ACTIVE) != progress > 0)
blockMachineBase.setActive(progress > 0, worldObj, pos);
}
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
if (entityPlayer.isSneaking()) {
return true;
}
return false;
}
@Override
public float getWrenchDropRate() {
return 1.0F;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.scrapboxinator, 1);
}
public boolean isComplete() {
return false;
}
@Override
public void readFromNBT(NBTTagCompound tagCompound) {
super.readFromNBT(tagCompound);
inventory.readFromNBT(tagCompound);
}
@Override
public void writeToNBT(NBTTagCompound tagCompound) {
super.writeToNBT(tagCompound);
inventory.writeToNBT(tagCompound);
}
@Override
public int getSizeInventory() {
return inventory.getSizeInventory();
}
@Override
public ItemStack getStackInSlot(int slot) {
return inventory.getStackInSlot(slot);
}
@Override
public ItemStack decrStackSize(int slot, int amount) {
return inventory.decrStackSize(slot, amount);
}
@Override
public ItemStack removeStackFromSlot(int slot) {
return inventory.removeStackFromSlot(slot);
}
@Override
public void setInventorySlotContents(int slot, ItemStack stack) {
inventory.setInventorySlotContents(slot, stack);
}
@Override
public int getInventoryStackLimit() {
return inventory.getInventoryStackLimit();
}
@Override
public boolean isUseableByPlayer(EntityPlayer player) {
return inventory.isUseableByPlayer(player);
}
@Override
public boolean isItemValidForSlot(int slot, ItemStack stack) {
return inventory.isItemValidForSlot(slot, stack);
}
// ISidedInventory
@Override
public int[] getSlotsForFace(EnumFacing side) {
return side == EnumFacing.DOWN ? new int[] { 0, 1, 2 } : new int[] { 0, 1, 2 };
}
@Override
public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
if (slotIndex == 2)
return false;
if (slotIndex == 1) {
if (itemStack.getItem() == ModItems.scrapBox) {
return true;
}
}
return isItemValidForSlot(slotIndex, itemStack);
}
@Override
public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) {
return slotIndex == 2;
}
@Override
public double getMaxPower() {
return capacity;
}
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
return true;
}
@Override
public boolean canProvideEnergy(EnumFacing direction) {
return false;
}
@Override
public double getMaxOutput() {
return 0;
}
@Override
public double getMaxInput() {
return 32;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.MEDIUM;
}
@Override
public void openInventory(EntityPlayer player) {
inventory.openInventory(player);
}
@Override
public void closeInventory(EntityPlayer player) {
inventory.closeInventory(player);
}
@Override
public int getField(int id) {
return inventory.getField(id);
}
@Override
public void setField(int id, int value) {
inventory.setField(id, value);
}
@Override
public int getFieldCount() {
return inventory.getFieldCount();
}
@Override
public void clear() {
inventory.clear();
}
@Override
public String getName() {
return inventory.getName();
}
@Override
public boolean hasCustomName() {
return inventory.hasCustomName();
}
@Override
public ITextComponent getDisplayName() {
return inventory.getDisplayName();
}
}

View file

@ -0,0 +1,81 @@
package techreborn.tiles.storage;
import ic2.api.tile.IWrenchable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import reborncore.api.power.EnumPowerTier;
import reborncore.common.powerSystem.TilePowerAcceptor;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileBatBox extends TilePowerAcceptor implements IWrenchable {
public TileBatBox() {
super(1);
}
@Override
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) {
return false;
}
@Override
public EnumFacing getFacing() {
return getFacingEnum();
}
@Override
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
if (entityPlayer.isSneaking()) {
return true;
}
return false;
}
@Override
public float getWrenchDropRate() {
return 1.0F;
}
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.batBox);
}
public boolean isComplete() {
return false;
}
@Override
public double getMaxPower() {
return 40000;
}
@Override
public boolean canAcceptEnergy(EnumFacing direction) {
return getFacingEnum() != direction;
}
@Override
public boolean canProvideEnergy(EnumFacing direction) {
return getFacingEnum() == direction;
}
@Override
public double getMaxOutput() {
return 32;
}
@Override
public double getMaxInput() {
return 32;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.LOW;
}
}

View file

@ -0,0 +1,37 @@
package techreborn.tiles.storage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileMFE extends TileBatBox {
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.mfe);
}
@Override
public double getMaxPower() {
return 4000000;
}
@Override
public double getMaxOutput() {
return 512;
}
@Override
public double getMaxInput() {
return 512;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.MEDIUM;
}
}

View file

@ -0,0 +1,37 @@
package techreborn.tiles.storage;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.api.power.EnumPowerTier;
import techreborn.init.ModBlocks;
/**
* Created by modmuss50 on 14/03/2016.
*/
public class TileMFSU extends TileBatBox {
@Override
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
return new ItemStack(ModBlocks.mfsu);
}
@Override
public double getMaxPower() {
return 40000000;
}
@Override
public double getMaxOutput() {
return 2048;
}
@Override
public double getMaxInput() {
return 2048;
}
@Override
public EnumPowerTier getTier() {
return EnumPowerTier.HIGH;
}
}

View file

@ -1,3 +1,9 @@
item.missingRecipe.name=Missing Recipe Placeholder
itemGroup.techreborn=Tech Reborn itemGroup.techreborn=Tech Reborn
#machines #machines
@ -69,6 +75,12 @@ tile.techreborn.watermill.name=Water Mill
tile.techreborn.windmill.name=Wind Mill tile.techreborn.windmill.name=Wind Mill
tile.techreborn.ironfurnace.name=Iron Furnace tile.techreborn.ironfurnace.name=Iron Furnace
tile.techreborn.recycler.name=Recycler tile.techreborn.recycler.name=Recycler
tile.techreborn.scrapboxinator.name=Scrapbox-inator
tile.techreborn.batBox.name=Battery Box
tile.techreborn.mfe.name=MFE
tile.techreborn.mfsu.name=MFSU
tile.techreborn.reinforcedglass.name=Reinforced Glass
tile.techreborn.nuke.name=Nuke
#Blocks #Blocks
tile.techreborn.rubberlog.name=Rubber Wood tile.techreborn.rubberlog.name=Rubber Wood
@ -270,6 +282,7 @@ item.techreborn.dust.zinc.name=Zinc Dust
item.techreborn.dust.galena.name=Galena Dust item.techreborn.dust.galena.name=Galena Dust
item.techreborn.dust.greenSapphire.name=Green Sapphire Dust item.techreborn.dust.greenSapphire.name=Green Sapphire Dust
item.techreborn.dust.sawDust.name=Saw Dust item.techreborn.dust.sawDust.name=Saw Dust
item.techreborn.dust.olivine.name=Olivine Dust
item.techreborn.lapotroncrystal.name=Lapotron Crystal item.techreborn.lapotroncrystal.name=Lapotron Crystal
item.techreborn.energycrystal.name=Energy Crystal item.techreborn.energycrystal.name=Energy Crystal
item.techreborn.ingot.refinediron.name=Refined Iron Ingot item.techreborn.ingot.refinediron.name=Refined Iron Ingot
@ -375,6 +388,7 @@ item.techreborn.dustsmall.Voidstone.name=Small Pile of Voidstone Dust
item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust item.techreborn.dustsmall.YellowGarnet.name=Small Pile of Yellow Garnet Dust
item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust item.techreborn.dustsmall.Zinc.name=Small Pile of Zinc Dust
item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust item.techreborn.dustsmall.Galena.name=Small Pile of Galena Dust
item.techreborn.dustsmall.Olivine.name=Small Pile of Olivine Dust
#Cells #Cells
item.techreborn.cell.Berylium.name=Berylium Cell item.techreborn.cell.Berylium.name=Berylium Cell
@ -415,7 +429,9 @@ item.techreborn.cell.empty.name=Empty Cell
item.techreborn.cell.water.name=Water Cell item.techreborn.cell.water.name=Water Cell
item.techreborn.cell.lava.name=Lava Cell item.techreborn.cell.lava.name=Lava Cell
item.techreborn.rebattery.name=Battery item.techreborn.rebattery.name=Battery
item.techreborn.treetap.name=Tree Tap item.techreborn.lithiumBattery.name=Lithium Battery
item.techreborn.treetap.name=Treetap
item.techreborn.nanosaber.name=Nanosaber
#Gems #Gems
item.techreborn.gem.ruby.name=Ruby item.techreborn.gem.ruby.name=Ruby
@ -607,9 +623,6 @@ item.techreborn.part.advancedCircuit.name=Advanced Electronic Circuit
item.techreborn.part.pump.name=Pump item.techreborn.part.pump.name=Pump
item.techreborn.part.teleporter.name=Teleporter item.techreborn.part.teleporter.name=Teleporter
item.techreborn.part.advancedAlloy.name=Advanced Alloy item.techreborn.part.advancedAlloy.name=Advanced Alloy
item.techreborn.part.lvTransformer.name=LV Transformer
item.techreborn.part.mvTransformer.name=MV Transformer
item.techreborn.part.hvTransformer.name=HV Transformer
#Tools #Tools
item.techreborn.rockcutter.name=Rockcutter item.techreborn.rockcutter.name=Rockcutter

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

Some files were not shown because too many files have changed in this diff Show more