mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 03:49:29 +00:00
more 1.7 work
This commit is contained in:
1 parent
3bf37fa6a7
commit
3c23d27cf7
48 files changed
+330
-332
No files matched your search
@@ -556,7 +556,7 @@ public class TConstructRegistry
|
||||
drawbridgeState[Blocks.mushroomRed] = 1;
|
||||
drawbridgeState[Blocks.gold_block] = 1;
|
||||
drawbridgeState[Blocks.iron_block] = 1;
|
||||
drawbridgeState[Blocks.brick] = 1;
|
||||
drawbridgeState[Blocks.brick_block] = 1;
|
||||
drawbridgeState[Blocks.tnt] = 1;
|
||||
drawbridgeState[Blocks.bookShelf] = 1;
|
||||
drawbridgeState[Blocks.cobblestoneMossy] = 1;
|
||||
|
||||
@@ -28,9 +28,9 @@ public abstract class ArmorCore extends ItemArmor implements IEnergyContainerIte
|
||||
protected int maxReceive = 75;
|
||||
protected int maxExtract = 75;
|
||||
|
||||
public ArmorCore(int par1, int baseProtection, EnumArmorPart part)
|
||||
public ArmorCore(int baseProtection, EnumArmorPart part)
|
||||
{
|
||||
super(par1, EnumArmorMaterial.CHAIN, 0, part.getPartId());
|
||||
super(ArmorMaterial.CHAIN, 0, part.getPartId());
|
||||
this.maxStackSize = 1;
|
||||
this.setMaxDamage(100);
|
||||
this.setUnlocalizedName(SET_NAME);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tconstruct.library.crafting;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
@@ -11,7 +12,7 @@ public enum FluidType
|
||||
/** Iron Smelting **/
|
||||
Iron(Block.blockIron.blockID, 0, 600, TRepo.moltenIronFluid, true),
|
||||
/** Gold Smelting **/
|
||||
Gold(Block.blockGold.blockID, 0, 400, TRepo.moltenGoldFluid, false),
|
||||
Gold(Blocks.glold_block.blockID, 0, 400, TRepo.moltenGoldFluid, false),
|
||||
/** Tin Smelting **/
|
||||
Tin(TRepo.metalBlock.blockID, 5, 400, TRepo.moltenTinFluid, false),
|
||||
/** Copper Smelting **/
|
||||
|
||||
@@ -5,16 +5,15 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.event.PartBuilderEvent;
|
||||
import tconstruct.library.tools.CustomMaterial;
|
||||
import tconstruct.library.util.IPattern;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.Event.Result;
|
||||
|
||||
public class PatternBuilder
|
||||
{
|
||||
|
||||
@@ -5,11 +5,13 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cpw.mods.fml.common.event.*;
|
||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.armor.ArmorCore;
|
||||
import tconstruct.library.armor.ArmorMod;
|
||||
@@ -118,9 +120,9 @@ public class ToolBuilder
|
||||
if (stack == null)
|
||||
return -1;
|
||||
Item item = stack.getItem();
|
||||
if (item == Item.stick)
|
||||
if (item == Items.stick)
|
||||
return 0;
|
||||
else if (item == Item.bone)
|
||||
else if (item == Items.bone)
|
||||
return 5;
|
||||
else if (item instanceof IToolPart)
|
||||
return ((IToolPart) item).getMaterialID(stack);
|
||||
@@ -266,7 +268,7 @@ public class ToolBuilder
|
||||
ItemStack tool = new ItemStack(item);
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
|
||||
compound.setCompoundTag("InfiTool", new NBTTagCompound());
|
||||
compound.setTag("InfiTool", new NBTTagCompound());
|
||||
compound.getCompoundTag("InfiTool").setInteger("Head", head);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderHead", head);
|
||||
|
||||
@@ -326,7 +328,7 @@ public class ToolBuilder
|
||||
|
||||
if (name != null && !name.equals(""))
|
||||
{
|
||||
compound.setCompoundTag("display", new NBTTagCompound());
|
||||
compound.setTag("display", new NBTTagCompound());
|
||||
compound.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
|
||||
@@ -369,7 +371,7 @@ public class ToolBuilder
|
||||
tags = tool.getTagCompound();
|
||||
if (name != null && !name.equals("") && !tags.hasKey("display"))
|
||||
{
|
||||
tags.setCompoundTag("display", new NBTTagCompound());
|
||||
tags.setTag("display", new NBTTagCompound());
|
||||
tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
|
||||
@@ -399,7 +401,7 @@ public class ToolBuilder
|
||||
tags = armor.getTagCompound();
|
||||
if (name != null && !name.equals("") && !tags.hasKey("display"))
|
||||
{
|
||||
tags.setCompoundTag("display", new NBTTagCompound());
|
||||
tags.setTag("display", new NBTTagCompound());
|
||||
tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
|
||||
@@ -437,7 +439,7 @@ public class ToolBuilder
|
||||
tags = tool.getTagCompound();
|
||||
if (name != null && !name.equals("") && !tags.hasKey("display"))
|
||||
{
|
||||
tags.setCompoundTag("display", new NBTTagCompound());
|
||||
tags.setTag("display", new NBTTagCompound());
|
||||
tags.getCompoundTag("display").setString("Name", "\u00A7f" + name);
|
||||
}
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package tconstruct.library.crafting;
|
||||
|
||||
import java.util.LinkedList;
|
||||
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
@@ -81,7 +82,7 @@ public class ToolRecipe
|
||||
{
|
||||
if (part == input)
|
||||
return true;
|
||||
if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
|
||||
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -99,7 +100,7 @@ public class ToolRecipe
|
||||
{
|
||||
if (part == input)
|
||||
return true;
|
||||
if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
|
||||
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@@ -117,7 +118,7 @@ public class ToolRecipe
|
||||
{
|
||||
if (part == input)
|
||||
return true;
|
||||
if (toolRod != null && part == toolRod && (input == Item.stick || input == Item.bone))
|
||||
if (toolRod != null && part == toolRod && (input == Items.stick || input == Items.bone))
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
||||
@@ -14,9 +14,9 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
public abstract class DualHarvestTool extends HarvestTool
|
||||
{
|
||||
public DualHarvestTool(int itemID, int baseDamage)
|
||||
public DualHarvestTool(int baseDamage)
|
||||
{
|
||||
super(itemID, baseDamage);
|
||||
super(baseDamage);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tconstruct.library.util;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class TabTools extends CreativeTabs
|
||||
@@ -21,4 +22,9 @@ public class TabTools extends CreativeTabs
|
||||
{
|
||||
return display;
|
||||
}
|
||||
|
||||
public Item getTabIconItem ()
|
||||
{
|
||||
return display.getItem();
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user