diff --git a/README.md b/README.md index 4a4f8ad2..05e686a3 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,27 @@ -Tinkers' Construct -http://www.minecraftforum.net/topic/1659892-tinkers-construct/ +#[Tinkers' Construct](http://www.minecraftforum.net/topic/1659892-tinkers-construct/) Modify all the things, then do it again! Melt down any metals you find. Turn everything into golems! -To compile from source: use apache ant(http://ant.apache.org/bindownload.cgi) -run ant in the tinkers construct directory +##Compile from Source +Run [Apache Ant](http://ant.apache.org/bindownload.cgi) in the repository root: `ant package` -For all issue reporting; please include the following: - * Minecraft Version - * TinkersConstruct Version - * Forge Version - * Versions of any mods related to the issue - * If there is a crash involved, describe how you got it to crash and the forge crash log - * Any relevant screenshots are greatly appreciated. +##Issue reporting +Please include the following: +* Minecraft version +* TinkersConstruct version +* Forge version/build +* Versions of any mods potentially related to the issue +* Any relevant screenshots are greatly appreciated. +* For crashes: + * Steps to reproduce + * ForgeModLoader-client-0.log (the FML log) from the root folder of the client -Most code is public domain under Creative Commons 0: http://creativecommons.org/publicdomain/zero/1.0/ -Textures and binaries are licensed under Creative Commons 3: http://creativecommons.org/licenses/by/3.0/ -Any alternate licenses are noted where appropriate +##Licenses +Most code is public domain under [Creative Commons 0](http://creativecommons.org/publicdomain/zero/1.0/). + +Textures and binaries are licensed under [Creative Commons 3](http://creativecommons.org/licenses/by/3.0/). + +Any alternate licenses are noted where appropriate. diff --git a/resources/assets/tinker/textures/skill/Float48x.png b/resources/assets/tinker/textures/skill/Float48x.png deleted file mode 100644 index 37cc41c7..00000000 Binary files a/resources/assets/tinker/textures/skill/Float48x.png and /dev/null differ diff --git a/resources/assets/tinker/textures/skill/Jump48x.png b/resources/assets/tinker/textures/skill/Jump48x.png deleted file mode 100644 index ae2caadc..00000000 Binary files a/resources/assets/tinker/textures/skill/Jump48x.png and /dev/null differ diff --git a/resources/assets/tinker/textures/skill/Wall16x.png b/resources/assets/tinker/textures/skill/Wall16x.png deleted file mode 100644 index 31b39ecf..00000000 Binary files a/resources/assets/tinker/textures/skill/Wall16x.png and /dev/null differ diff --git a/resources/assets/tinker/textures/skill/Wall32x.png b/resources/assets/tinker/textures/skill/Wall32x.png deleted file mode 100644 index 2ea15be2..00000000 Binary files a/resources/assets/tinker/textures/skill/Wall32x.png and /dev/null differ diff --git a/resources/assets/tinker/textures/skill/Wall48x.png b/resources/assets/tinker/textures/skill/Wall48x.png deleted file mode 100644 index ba3ce08c..00000000 Binary files a/resources/assets/tinker/textures/skill/Wall48x.png and /dev/null differ diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index dbc8da7a..36f92f3e 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1144,7 +1144,8 @@ public class TContent implements IFuelHandler TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Item.silk), new ItemStack(bowstring, 1, 0), 1F, 1F, 1f); //String TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Item.feather), new ItemStack(fletching, 1, 0), 100F, 0F, 0.05F); //Feather - TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //Leaves + for (int i = 0; i < 4; i++ ) + TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Block.leaves, 1, i), new ItemStack(fletching, 1, 1), 75F, 0F, 0.2F); //All four vanialla Leaves TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(materials, 1, 1), new ItemStack(fletching, 1, 2), 100F, 0F, 0.12F); //Slime TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(materials, 1, 17), new ItemStack(fletching, 1, 3), 100F, 0F, 0.12F); //BlueSlime @@ -1636,9 +1637,6 @@ public class TContent implements IFuelHandler if (PHConstruct.stencilTableCrafting) GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(toolStationWood, 1, 10), "p", "w", 'p', new ItemStack(blankPattern, 1, 0), 'w', "plankWood")); - GameRegistry.addShapelessRecipe(new ItemStack(Item.book, 1, 0), new ItemStack(blankPattern, 1, 0), new ItemStack(blankPattern, 1, 0), new ItemStack(Item.paper, 1, 0), new ItemStack( - Item.paper, 1, 0), new ItemStack(Item.paper, 1, 0), new ItemStack(Item.silk, 1, 0)); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blankPattern, 1, 0), "ps", "sp", 'p', "plankWood", 's', "stickWood")); GameRegistry.addRecipe(new ItemStack(manualBook), "wp", 'w', new ItemStack(blankPattern, 1, 0), 'p', Item.paper); GameRegistry.addShapelessRecipe(new ItemStack(manualBook, 2, 0), new ItemStack(manualBook, 1, 0), Item.book); @@ -1832,7 +1830,7 @@ public class TContent implements IFuelHandler DryingRackRecipes.addDryingRecipe(Item.fishRaw, 20 * 60 * 5, new ItemStack(jerky, 1, 4)); DryingRackRecipes.addDryingRecipe(Item.rottenFlesh, 20 * 60 * 5, new ItemStack(jerky, 1, 5)); - DryingRackRecipes.addDryingRecipe(new ItemStack(jerky, 1, 5), 20 * 60 * 10, Item.leather); + //DryingRackRecipes.addDryingRecipe(new ItemStack(jerky, 1, 5), 20 * 60 * 10, Item.leather); //Slabs for (int i = 0; i < 7; i++) @@ -2321,4 +2319,4 @@ public class TContent implements IFuelHandler return 26400; return 0; } -} \ No newline at end of file +} diff --git a/src/tconstruct/items/Jerky.java b/src/tconstruct/items/Jerky.java index 95670d9e..adcc4e9f 100644 --- a/src/tconstruct/items/Jerky.java +++ b/src/tconstruct/items/Jerky.java @@ -12,12 +12,13 @@ public class Jerky extends SpecialFood public static String[] textureNames = new String[] { "beef", "chicken", "pork", "mutton", "fish", "monster" }; public static String[] itemNames = new String[] { "jerky.beef", "jerky.chicken", "jerky.pig", "jerky.sheep", "jerky.fish", "jerky.zombie" }; public static int[] hunger = new int[] { 8, 6, 8, 6, 5, 4 }; - public static float[] saturation = new float[] { 0.8f, 0.6f, 0.8f, 0.6f, 0.6f, 0.4f }; + public static float[] saturation = new float[] { 1.0f, 0.8f, 1.0f, 0.8f, 0.8f, 0.4f }; public static int[] overhaulHunger = new int[] { 1, 1, 1, 1, 1, 1 }; public Jerky(int id, boolean hungerOverhaul) { super(id, hungerOverhaul ? overhaulHunger : hunger, saturation, itemNames, textureNames); + this.setHasSubtypes(true); } @SideOnly(Side.CLIENT)