mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
update to tcon 1.5.1RC1 commits
This commit is contained in:
1 parent
6a898f97d7
commit
f2da066da2
42 files changed
+1262
-1045
No files matched your search
@@ -337,6 +337,8 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9));
|
||||
TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
|
||||
|
||||
// Tool parts
|
||||
TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2));
|
||||
@@ -368,6 +370,12 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25));
|
||||
TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24));
|
||||
TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23));
|
||||
|
||||
// ToolIcons
|
||||
TConstructClientRegistry.registerManualIcon("pickicon",
|
||||
@@ -412,6 +420,7 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
ItemStack stick = new ItemStack(Item.stick, 1, 0);
|
||||
ItemStack plank = new ItemStack(Block.planks, 1, 0);
|
||||
ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
|
||||
ItemStack workbench = new ItemStack(Block.workbench, 1, 0);
|
||||
ItemStack chest = new ItemStack(Block.chest, 1, 0);
|
||||
ItemStack log = new ItemStack(Block.wood, 1, 0);
|
||||
@@ -451,6 +460,8 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
|
||||
@@ -473,7 +484,10 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null,
|
||||
null);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
searedbrick);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick,
|
||||
@@ -535,6 +549,7 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -1210,7 +1210,8 @@ public class TContent implements IFuelHandler
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 1), new ItemStack(manualBook, 1, 1), Item.book);
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 2), new ItemStack(manualBook, 1, 1));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 2), new ItemStack(manualBook, 1, 2), Item.book);
|
||||
// alternativ Vanilla Book Recipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 1, 3), new ItemStack(manualBook, 1, 2));
|
||||
// alternative Vanilla Book Recipe
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(Item.book), Item.paper, Item.paper, Item.paper, Item.silk, blankPattern, blankPattern);
|
||||
// Paperstack Recipe
|
||||
GameRegistry.addRecipe(new ItemStack(materials, 1, 0), "pp", "pp", 'p', Item.paper);
|
||||
@@ -1233,9 +1234,7 @@ public class TContent implements IFuelHandler
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(materials, 1, 25), patSurround, 'm', "nuggetGold", '#', new ItemStack(Item.silk)));
|
||||
// Silky Jewel Recipes
|
||||
GameRegistry.addRecipe(new ItemStack(materials, 1, 26), " c ", "cec", " c ", 'c', new ItemStack(materials, 1, 25), 'e', new ItemStack(Item.emerald));
|
||||
// Ender Stuff
|
||||
GameRegistry.addRecipe(new ItemStack(Item.enderPearl, 4), "m", 'm', new ItemStack(metalBlock.blockID, 1, 10));
|
||||
// Wooden Armor Recipes
|
||||
// Wooden Armor Recipes
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(helmetWood, new Object[] { "www", "w w", 'w', "logWood" }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(chestplateWood, new Object[] { "w w", "www", "www", 'w', "logWood" }));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(leggingsWood, new Object[] { "www", "w w", "w w", 'w', "logWood" }));
|
||||
@@ -1425,7 +1424,7 @@ public class TContent implements IFuelHandler
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimeExplosive, 1, 0), "slimeball", Block.tnt));
|
||||
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(slimeChannel, 1, 0), new ItemStack(slimeGel, 1, Short.MAX_VALUE), new ItemStack(Item.redstone));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, new ItemStack(slimeGel, 1, Short.MAX_VALUE), "slimeBall"));
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(slimePad, 1, 0), slimeChannel, "slimeBall"));
|
||||
}
|
||||
|
||||
private void addRecipesForFurnace ()
|
||||
|
||||
@@ -75,7 +75,7 @@ public class GoldenHead extends ItemFood
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add(StatCollector.translateToLocal("goldenhead1.tooltip"));
|
||||
list.add(StatCollector.translateToLocal("goldenhead2.tooltip"));
|
||||
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead1.tooltip"));
|
||||
list.add("\u00a75\u00a7o"+StatCollector.translateToLocal("goldenhead2.tooltip"));
|
||||
}
|
||||
}
|
||||
@@ -15,8 +15,8 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class Manual extends CraftingItem
|
||||
{
|
||||
static String[] name = new String[] { "beginner", "toolstation", "smeltery" };
|
||||
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery" };
|
||||
static String[] name = new String[] { "beginner", "toolstation", "smeltery", "diary" };
|
||||
static String[] textureName = new String[] { "tinkerbook_diary", "tinkerbook_toolstation", "tinkerbook_smeltery", "tinkerbook_blue" };
|
||||
|
||||
public Manual(int id)
|
||||
{
|
||||
@@ -41,13 +41,13 @@ public class Manual extends CraftingItem
|
||||
switch (stack.getItemDamage())
|
||||
{
|
||||
case 0:
|
||||
list.add(StatCollector.translateToLocal("manual1.tooltip"));
|
||||
list.add("\u00a7o"+StatCollector.translateToLocal("manual1.tooltip"));
|
||||
break;
|
||||
case 1:
|
||||
list.add(StatCollector.translateToLocal("manual2.tooltip"));
|
||||
list.add("\u00a7o"+StatCollector.translateToLocal("manual2.tooltip"));
|
||||
break;
|
||||
case 2:
|
||||
list.add(StatCollector.translateToLocal("manual3.tooltip"));
|
||||
list.add("\u00a7o"+StatCollector.translateToLocal("manual3.tooltip"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ public class StrangeFood extends SpecialFood
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add(StatCollector.translateToLocal("strangefood1.tooltip"));
|
||||
list.add(StatCollector.translateToLocal("strangefood2.tooltip"));
|
||||
list.add("\u00a7b\u00a7o"+StatCollector.translateToLocal("strangefood1.tooltip"));
|
||||
list.add("\u00a7b\u00a7o"+StatCollector.translateToLocal("strangefood2.tooltip"));
|
||||
}
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public class HamboneItemBlock extends ItemBlock
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
list.add(StatCollector.translateToLocal("hambone1.tooltip"));
|
||||
list.add("\u00A74"+StatCollector.translateToLocal("hambone1.tooltip"));
|
||||
list.add(StatCollector.translateToLocal("hambone2.tooltip"));
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,14 @@
|
||||
package tconstruct.items.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.util.StatCollector;
|
||||
|
||||
public class SmelteryItemBlock extends ItemBlock
|
||||
{
|
||||
@@ -25,4 +31,27 @@ public class SmelteryItemBlock extends ItemBlock
|
||||
int pos = MathHelper.clamp_int(itemstack.getItemDamage(), 0, blockType.length - 1);
|
||||
return (new StringBuilder()).append("Smeltery.").append(blockType[pos]).toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4)
|
||||
{
|
||||
switch (stack.getItemDamage())
|
||||
{
|
||||
case 0:
|
||||
list.add(StatCollector.translateToLocal("smeltery.controller.tooltip"));
|
||||
break;
|
||||
case 1:
|
||||
list.add(StatCollector.translateToLocal("smeltery.drain.tooltip1"));
|
||||
list.add(StatCollector.translateToLocal("smeltery.drain.tooltip2"));
|
||||
break;
|
||||
case 3:
|
||||
list.add(StatCollector.translateToLocal("smeltery.furnace.tooltip"));
|
||||
break;
|
||||
default:
|
||||
list.add(StatCollector.translateToLocal("smeltery.brick.tooltip1"));
|
||||
list.add(StatCollector.translateToLocal("smeltery.brick.tooltip2"));
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package tconstruct.plugins.minefactoryreloaded.drinkable;
|
||||
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import powercrystals.minefactoryreloaded.api.ILiquidDrinkHandler;
|
||||
|
||||
public class Drinkables implements ILiquidDrinkHandler
|
||||
{
|
||||
|
||||
@Override
|
||||
public void onDrink (EntityPlayer player)
|
||||
{
|
||||
//boost health when drink
|
||||
if (player != null)
|
||||
{
|
||||
PotionEffect potion = player.getActivePotionEffect(Potion.field_76434_w);
|
||||
int duration = 0;
|
||||
if (potion != null)
|
||||
duration = potion.duration;
|
||||
player.addPotionEffect(new PotionEffect(Potion.field_76434_w.id, duration + 20 * 30, 0));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package tconstruct.plugins.minefactoryreloaded;
|
||||
|
||||
import powercrystals.minefactoryreloaded.api.FactoryRegistry;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.plugins.minefactoryreloaded.drinkable.Drinkables;
|
||||
import tconstruct.plugins.minefactoryreloaded.harvestables.GrindableHorse;
|
||||
import tconstruct.plugins.minefactoryreloaded.harvestables.HarvestableOreBerry;
|
||||
|
||||
@@ -12,5 +13,6 @@ public class mfrRegistering
|
||||
FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerry.blockID, TContent.oreBerries.itemID, 0));
|
||||
FactoryRegistry.registerHarvestable(new HarvestableOreBerry(TContent.oreBerrySecond.blockID, TContent.oreBerries.itemID, 4));
|
||||
FactoryRegistry.registerGrindable(new GrindableHorse());
|
||||
FactoryRegistry.registerLiquidDrinkHandler(TContent.bloodFluid.getName(), new Drinkables());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user