diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index 3cfcd4cd8..cff33da79 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -3,6 +3,7 @@ package techreborn; import java.io.File; import net.minecraftforge.common.MinecraftForge; +import org.apache.commons.lang3.time.StopWatch; import techreborn.achievement.TRAchievements; import techreborn.api.recipe.RecipeHanderer; import techreborn.client.GuiHandler; @@ -62,7 +63,11 @@ public class Core { // Register ModItems ModItems.init(); // Recipes + StopWatch watch = new StopWatch(); + watch.start(); ModRecipes.init(); + LogHelper.all(watch + " : main recipes"); + watch.stop(); //Client only init, needs to be done before parts system proxy.init(); // Compat @@ -86,7 +91,11 @@ public class Core { @Mod.EventHandler public void postinit(FMLPostInitializationEvent event){ // Has to be done here as Buildcraft registers there recipes late + StopWatch watch = new StopWatch(); + watch.start(); RecipeManager.init(); + LogHelper.all(watch + " : main recipes"); + watch.stop(); //Has to be done after the recipes have been added CompatManager.postInit(event); diff --git a/src/main/java/techreborn/api/recipe/RecipeCrafter.java b/src/main/java/techreborn/api/recipe/RecipeCrafter.java index d04f103d7..f9ba961c9 100644 --- a/src/main/java/techreborn/api/recipe/RecipeCrafter.java +++ b/src/main/java/techreborn/api/recipe/RecipeCrafter.java @@ -130,7 +130,8 @@ public class RecipeCrafter { this.currentTickTime = 0; syncIsActive(); } else { - this.currentTickTime = 0; + this.currentTickTime = -1; + syncIsActive(); } } } @@ -273,7 +274,7 @@ public class RecipeCrafter { private boolean isActiveServer() { - return currentRecipe != null; + return currentRecipe != null && energy.getEnergyStored() >= currentRecipe.euPerTick(); } public boolean isActive() { diff --git a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java index fde952a69..e1260cc36 100644 --- a/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java +++ b/src/main/java/techreborn/blocks/generator/BlockHeatGenerator.java @@ -36,10 +36,10 @@ public class BlockHeatGenerator extends BlockMachineBase{ @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/machine_side"); - this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); - this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); + this.blockIcon = icon.registerIcon("techreborn:machine/heat_generator_side"); + this.iconFront = icon.registerIcon("techreborn:machine/heat_generator_side"); + this.iconTop = icon.registerIcon("techreborn:machine/heat_generator_top"); + this.iconBottom = icon.registerIcon("techreborn:machine/heat_generator_bottom"); } @Override diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index 6258dcb79..4ac54fcd3 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -45,7 +45,7 @@ public class BlockAssemblingMachine extends BlockMachineBase { { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); - this.iconFrontOn = icon.registerIcon("techreborn:machine/assembling_machine_front_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/assembling_machine_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/assembling_machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } diff --git a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java index 7cdb12045..8eec64c38 100644 --- a/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/machine/BlockCentrifuge.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; @@ -22,9 +23,15 @@ public class BlockCentrifuge extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconTopOn; @SideOnly(Side.CLIENT) private IIcon iconBottom; @@ -55,20 +62,40 @@ public class BlockCentrifuge extends BlockMachineBase { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { - this.blockIcon = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/industrial_centrifuge_side_on"); this.iconTop = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_off"); + this.iconTopOn = icon.registerIcon("techreborn:machine/industrial_centrifuge_top_on"); this.iconBottom = icon.registerIcon("techreborn:machine/industrial_centrifuge_bottom"); } - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileCentrifuge tileCentrifuge = (TileCentrifuge) blockAccess.getTileEntity(x, y, z); + if(side >= 2 && tileCentrifuge.crafter.isActive()){ + return this.iconFrontOn; + } + + if(side == 1 && tileCentrifuge.crafter.isActive()){ + return this.iconTopOn; + } + return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); + : (side == metadata ? this.iconFront : this.iconFront)); + + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.iconFront)); } diff --git a/src/main/java/techreborn/blocks/machine/BlockGrinder.java b/src/main/java/techreborn/blocks/machine/BlockGrinder.java index efd0cba72..5fbcf5e3e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/machine/BlockGrinder.java @@ -10,10 +10,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.tiles.TileCentrifuge; import techreborn.tiles.TileGrinder; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,9 +24,15 @@ public class BlockGrinder extends BlockMachineBase{ @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; + + @SideOnly(Side.CLIENT) + private IIcon iconTopOn; @SideOnly(Side.CLIENT) private IIcon iconBottom; @@ -57,13 +65,24 @@ public class BlockGrinder extends BlockMachineBase{ { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_grinder_front_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/industrial_grinder_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/industrial_grinder_top_off"); + this.iconTopOn = icon.registerIcon("techreborn:machine/industrial_grinder_top_on"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileGrinder tileGrinder = (TileGrinder) blockAccess.getTileEntity(x, y, z); + if(side == metadata && tileGrinder.crafter.isActive()){ + return this.iconFrontOn; + } + + if(side == 1 && tileGrinder.crafter.isActive()){ + return this.iconTopOn; + } + return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : @@ -72,6 +91,16 @@ public class BlockGrinder extends BlockMachineBase{ } + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.iconFront)); + + } + @Override public Item getItemDropped(int meta, Random random, int fortune) { diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java index 09ca13435..d88e905a5 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialElectrolyzer.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; @@ -22,6 +23,9 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -58,9 +62,25 @@ public class BlockIndustrialElectrolyzer extends BlockMachineBase { { this.blockIcon = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); this.iconFront = icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_off"); + this.iconFrontOn= icon.registerIcon("techreborn:machine/industrial_electrolyzer_front_on"); this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } + + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileIndustrialElectrolyzer tileIndustrialElectrolyzer = (TileIndustrialElectrolyzer) blockAccess.getTileEntity(x, y, z); + if(side == metadata && tileIndustrialElectrolyzer.crafter.isActive()){ + return this.iconFrontOn; + } + + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) diff --git a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java index 846deab24..be2ba1fac 100644 --- a/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java +++ b/src/main/java/techreborn/blocks/machine/BlockIndustrialSawmill.java @@ -10,10 +10,12 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.tiles.TileIndustrialElectrolyzer; import techreborn.tiles.TileIndustrialSawmill; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -22,6 +24,9 @@ public class BlockIndustrialSawmill extends BlockMachineBase { @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -56,10 +61,26 @@ public class BlockIndustrialSawmill extends BlockMachineBase { public void registerBlockIcons(IIconRegister icon) { this.blockIcon = icon.registerIcon("techreborn:machine/machine_side"); - this.iconFront = icon.registerIcon("techreborn:machine/electric_industrial_sawmill"); + this.iconFront = icon.registerIcon("techreborn:machine/industrial_sawmill_off"); + this.iconFront = icon.registerIcon("techreborn:machine/industrial_sawmill_on"); this.iconTop = icon.registerIcon("techreborn:machine/machine_top"); this.iconBottom = icon.registerIcon("techreborn:machine/machine_bottom"); } + + @Override + public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { + int metadata = blockAccess.getBlockMetadata(x, y, z); + TileIndustrialSawmill tileIndustrialSawmill = (TileIndustrialSawmill) blockAccess.getTileEntity(x, y, z); + if(side == metadata && tileIndustrialSawmill.crafter.isActive()){ + return this.iconFrontOn; + } + + return metadata == 0 && side == 3 ? this.iconFront + : side == 1 ? this.iconTop : + side == 0 ? this.iconBottom: (side == 0 ? this.iconTop + : (side == metadata ? this.iconFront : this.blockIcon)); + + } @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) diff --git a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java index a0f5439a9..c082111a9 100644 --- a/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/machine/BlockMatterFabricator.java @@ -22,6 +22,9 @@ public class BlockMatterFabricator extends BlockMachineBase{ @SideOnly(Side.CLIENT) private IIcon iconFront; + + @SideOnly(Side.CLIENT) + private IIcon iconFrontOn; @SideOnly(Side.CLIENT) private IIcon iconTop; @@ -57,6 +60,7 @@ public class BlockMatterFabricator extends BlockMachineBase{ { this.blockIcon = icon.registerIcon("techreborn:machine/matterfab_off"); this.iconFront = icon.registerIcon("techreborn:machine/matterfab_off"); + this.iconFrontOn = icon.registerIcon("techreborn:machine/matterfab_on"); this.iconTop = icon.registerIcon("techreborn:machine/matterfab_off"); this.iconBottom = icon.registerIcon("techreborn:machine/matterfab_off"); } diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index efd31c506..5369dc2fd 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import techreborn.Core; import techreborn.blocks.BlockMachineBase; import techreborn.client.GuiHandler; +import techreborn.packets.PacketHandler; import techreborn.tiles.TileAesu; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -58,14 +59,13 @@ public class BlockAesu extends BlockMachineBase { } @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) - { - + public IIcon getIcon(int side, int metadata) { + if(side == metadata) + return this.iconFront; return metadata == 0 && side == 3 ? this.iconFront : side == 1 ? this.iconTop : side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); - } } diff --git a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java index abfae1b13..a93cf3426 100644 --- a/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java +++ b/src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java @@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot; import techreborn.client.SlotOutput; import techreborn.tiles.TileIndustrialSawmill; -public class ContainerIndustrialSawmill extends TechRebornContainer { +public class ContainerIndustrialSawmill extends ContainerCrafting { EntityPlayer player; @@ -22,6 +22,7 @@ public class ContainerIndustrialSawmill extends TechRebornContainer { public ContainerIndustrialSawmill(TileIndustrialSawmill tileIndustrialSawmill, EntityPlayer player) { + super(tileIndustrialSawmill.crafter); tile = tileIndustrialSawmill; this.player = player; diff --git a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java index a683b1db1..47d41d326 100644 --- a/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java +++ b/src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java @@ -43,15 +43,27 @@ public class GuiIndustrialSawmill extends GuiContainer { 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; + + if(sawmill.crafter.currentTickTime != 0) { + j = this.sawmill.crafter.currentTickTime * 24 / this.sawmill.crafter.currentNeededTicks; + } + this.drawTexturedModalRect(k + 57, l + 36, 176, 11, j - 1, 13); + + j = (int)this.sawmill.energy.getEnergyStored() * 12 / this.sawmill.energy.getCapacity(); + if(j > 0) { + this.drawTexturedModalRect(k + 36, l + 66 + 12 - j, 176, 12 - j, 14, j + 2); + } } protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = StatCollector.translateToLocal("tile.techreborn.tilesawmill.name"); + String name = StatCollector.translateToLocal("tile.techreborn.industrialSawmill.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, + I18n.format("container.inventory", new Object[0]), 58, this.ySize - 96 + 2, 4210752); } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index f8cee69af..890b98cf5 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -175,7 +175,6 @@ public class ModRecipes { RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.netherrack, 4), new ItemStack(Blocks.diamond_block, 1), new ItemStack(ModItems.bucketTritium), null, 120, 5)); - RecipeHanderer.addRecipe(new AlloySmelterRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new LatheRecipe(new ItemStack(Items.coal), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new IndustrialSawmillRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), new ItemStack(Items.diamond), new ItemStack(Items.diamond), 120, 5)); diff --git a/src/main/java/techreborn/pda/GuiPda.java b/src/main/java/techreborn/pda/GuiPda.java index b71ff843c..165238f95 100644 --- a/src/main/java/techreborn/pda/GuiPda.java +++ b/src/main/java/techreborn/pda/GuiPda.java @@ -12,8 +12,6 @@ public class GuiPda extends GuiScreen { private static final ResourceLocation pdaGuipages = new ResourceLocation( "techreborn:" + "textures/gui/pda.png"); - public static final ResourceLocation buttonOre = new ResourceLocation( - "techreborn:" + "textures/blocks/ore/book_of_revealing"); public GuiPda(EntityPlayer player) { @@ -25,21 +23,13 @@ public class GuiPda extends GuiScreen { super.initGui(); this.guiLeft = this.width / 2 - this.guiWidth / 2; this.guiTop = this.height / 2 - this.guiHeight / 2; - GuiButtonCustomTexture oresButton = new GuiButtonCustomTexture(1, - guiLeft + 20, guiTop + 20, 0, 224, 16, 16, buttonOre); - - buttonList.add(oresButton); } @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { - mc.getTextureManager().bindTexture(pdaGuipages); - drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth, - this.guiHeight); - mc.renderEngine.bindTexture(buttonOre); - + drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.guiWidth,this.guiHeight); super.drawScreen(mouseX, mouseY, partialTicks); } diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index 215de5542..bc2aebd97 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -28,19 +28,20 @@ public class TileAesu extends TileEntityElectricBlock implements IWrenchable { @Override public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) { - return false; + return true; } @Override public short getFacing() { - return 0; + return (short) getBlockMetadata(); } @Override public void setFacing(short facing) { - } + worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, facing, 2); + } @Override public boolean wrenchCanRemove(EntityPlayer entityPlayer) diff --git a/src/main/java/techreborn/tiles/TileCentrifuge.java b/src/main/java/techreborn/tiles/TileCentrifuge.java index 78bb1466a..ad8c43018 100644 --- a/src/main/java/techreborn/tiles/TileCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileCentrifuge.java @@ -131,6 +131,7 @@ public class TileCentrifuge extends TileMachineBase implements IWrenchable, IEn if(crafter.currentRecipe !=null){ info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t"); } + info.add("Round and round it goes"); } @Override diff --git a/src/main/java/techreborn/tiles/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/TileImplosionCompressor.java index c817c2ad3..bd3360e15 100644 --- a/src/main/java/techreborn/tiles/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/TileImplosionCompressor.java @@ -73,7 +73,6 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha @Override public void updateEntity() { - System.out.println("hello"); super.updateEntity(); crafter.updateEntity(); energy.updateEntity(); diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index e966fffd1..fa14d36be 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -53,6 +53,7 @@ tile.techreborn.machineFrame.bronze.name=Brone Machine Hull tile.techreborn.machineFrame.brass.name=Brass Machine Hull tile.techreborn.machineFrame.steel.name=Steel Machine Hull tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull +tile.techreborn.industrialSawmill.name=Saw Mill #Ores tile.techreborn.ore.Galena.name=Galena Ore diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png new file mode 100644 index 000000000..b7590890b Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_bottom.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png new file mode 100644 index 000000000..0354b4ae3 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_side.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png new file mode 100644 index 000000000..4f1331b26 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/machine/heat_generator_top.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_side_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta similarity index 100% rename from src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.mcmeta rename to src/main/resources/assets/techreborn/textures/blocks/machine/industrial_centrifuge_top_on.png.mcmeta diff --git a/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png b/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png index f6eeea241..3ec1b05e9 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png and b/src/main/resources/assets/techreborn/textures/items/tool/lapotronicEnergyOrb.png differ