maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Tntrololol 2015-06-07 13:06:08 -05:00
commit d9e219054e
6 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/techreborn/api/recipe/RecipeCrafter.java
View file

@ -130,7 +130,8 @@ public class RecipeCrafter {
this.currentTickTime = 0; this.currentTickTime = 0;
syncIsActive(); syncIsActive();
} else { } else {
this.currentTickTime = 0; this.currentTickTime = -1;
syncIsActive();
} }
} }
} }

3
src/main/java/techreborn/client/container/ContainerIndustrialSawmill.java
View file

@ -5,7 +5,7 @@ import net.minecraft.inventory.Slot;
import techreborn.client.SlotOutput; import techreborn.client.SlotOutput;
import techreborn.tiles.TileIndustrialSawmill; import techreborn.tiles.TileIndustrialSawmill;
public class ContainerIndustrialSawmill extends TechRebornContainer { public class ContainerIndustrialSawmill extends ContainerCrafting {
EntityPlayer player; EntityPlayer player;
@ -22,6 +22,7 @@ public class ContainerIndustrialSawmill extends TechRebornContainer {
public ContainerIndustrialSawmill(TileIndustrialSawmill tileIndustrialSawmill, public ContainerIndustrialSawmill(TileIndustrialSawmill tileIndustrialSawmill,
EntityPlayer player) EntityPlayer player)
{ {
super(tileIndustrialSawmill.crafter);
tile = tileIndustrialSawmill; tile = tileIndustrialSawmill;
this.player = player; this.player = player;

16
src/main/java/techreborn/client/gui/GuiIndustrialSawmill.java
View file

@ -43,15 +43,27 @@ public class GuiIndustrialSawmill extends GuiContainer {
int k = (this.width - this.xSize) / 2; int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2; int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); 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_, protected void drawGuiContainerForegroundLayer(int p_146979_1_,
int p_146979_2_) 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(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
this.fontRendererObj.drawString( this.fontRendererObj.drawString(
I18n.format("container.inventory", new Object[0]), 8, I18n.format("container.inventory", new Object[0]), 58,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
} }

1
src/main/java/techreborn/init/ModRecipes.java
View file

@ -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 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 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 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)); 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));

1
src/main/java/techreborn/tiles/TileImplosionCompressor.java
View file

@ -73,7 +73,6 @@ public class TileImplosionCompressor extends TileMachineBase implements IWrencha
@Override @Override
public void updateEntity() { public void updateEntity() {
System.out.println("hello");
super.updateEntity(); super.updateEntity();
crafter.updateEntity(); crafter.updateEntity();
energy.updateEntity(); energy.updateEntity();

1
src/main/resources/assets/techreborn/lang/en_US.lang
View file

@ -52,6 +52,7 @@ tile.techreborn.machineFrame.bronze.name=Brone Machine Hull
tile.techreborn.machineFrame.brass.name=Brass Machine Hull tile.techreborn.machineFrame.brass.name=Brass Machine Hull
tile.techreborn.machineFrame.steel.name=Steel Machine Hull tile.techreborn.machineFrame.steel.name=Steel Machine Hull
tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull tile.techreborn.machineFrame.titanium.name=Titanium Machine Hull
tile.techreborn.industrialSawmill.name=Saw Mill
#Ores #Ores
tile.techreborn.ore.Galena.name=Galena Ore tile.techreborn.ore.Galena.name=Galena Ore