Update merged commits to 1.8.8

This commit is contained in:
Modmuss50 2015-12-16 17:13:17 +00:00
parent 0fdba82490
commit f17cd36815
3 changed files with 19 additions and 18 deletions

View file

@ -1,10 +1,10 @@
package techreborn.client.container;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.SlotOutput;
import techreborn.tiles.TileGrinder;
@ -65,8 +65,8 @@ public class ContainerGrinder extends ContainerCrafting {
}
@Override
public void addCraftingToCrafters(ICrafting crafting) {
super.addCraftingToCrafters(crafting);
public void onCraftGuiOpened(ICrafting crafting) {
super.onCraftGuiOpened(crafting);
crafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
}

View file

@ -1,12 +1,12 @@
package techreborn.compat.recipes;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.oredict.OreDictionary;
import reborncore.common.util.CraftingHelper;
import techreborn.api.reactor.FusionReactorRecipe;

View file

@ -1,13 +1,10 @@
package techreborn.items;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import techreborn.api.power.IEnergyItemInfo;
import techreborn.client.TechRebornCreativeTab;
public class ItemLithiumBattery extends ItemTR implements IEnergyItemInfo {
public class ItemLithiumBattery extends ItemTextureBase implements IEnergyItemInfo {
public ItemLithiumBattery() {
super();
@ -17,12 +14,6 @@ public class ItemLithiumBattery extends ItemTR implements IEnergyItemInfo {
setCreativeTab(TechRebornCreativeTab.instance);
}
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister iconRegister) {
this.itemIcon = iconRegister.registerIcon("techreborn:" + "lithiumBattery");
}
@Override
public double getMaxPower(ItemStack stack) {
return 100000;
@ -47,4 +38,14 @@ public class ItemLithiumBattery extends ItemTR implements IEnergyItemInfo {
public int getStackTeir(ItemStack stack) {
return 1;
}
@Override
public String getTextureName(int damage) {
return "techreborn:items/lithiumBattery";
}
@Override
public int getMaxMeta() {
return 1;
}
}