diff --git a/1.11/To-Dos b/1.11/To-Dos index be66650f..36dfd346 100644 --- a/1.11/To-Dos +++ b/1.11/To-Dos @@ -2,12 +2,11 @@ To-Dos *** Priority *** - [ ] Block Drop for failed crucible -- [ ] Fix Bloomery Lit Texture -- [ ] Tile Firebox Heat Manager - [ ] oreDictionary ingotBall to ingotIron -- [ ] Crafting Recipes +- [x] Tile Firebox Heat Manager +- [x] Fix Bloomery Lit Texture - [x] Bellows break texture - [x] Bellows Pump Speed - [x] Break IronCrucible gives back Ore @@ -17,6 +16,7 @@ To-Dos - [x] Tongs Model for hotIronBurnt - [x] Tongs Extract from bloomery for Hot Iron - [x] Tongs Extract from bloomery for Hot Iron Finished +- [x] Crafting Recipes - [ ] Anvil - [ ] Anvil Recipe Handler diff --git a/1.11/gradle.properties b/1.11/gradle.properties index 9927bad0..8ed92717 100644 --- a/1.11/gradle.properties +++ b/1.11/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx3G mod_group=nmd.primal.forgecraft mod_name=ForgeCraft -mod_version=1.1.1 +mod_version=1.1.11 forge_version=13.20.0.2226 mcp_mappings=snapshot_20161220 mc_version=1.11.2 diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java index 1a228397..65d0b1a2 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ForgeCraft.java @@ -9,6 +9,7 @@ import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import nmd.primal.forgecraft.compat.ModDictionary; import nmd.primal.forgecraft.gui.GuiHandler; import nmd.primal.forgecraft.init.ModBlocks; import nmd.primal.forgecraft.init.ModCrafting; @@ -55,7 +56,9 @@ public class ForgeCraft { //this.proxy.init(event); proxy.init(); + ModDictionary.registerDictionaryNames(); ModCrafting.register(); + //proxy.registerModelBakeryVariants(); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java index ae5e46ed..0487ba30 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/ModInfo.java @@ -17,7 +17,7 @@ public class ModInfo { public static final String MOD_NAME = "Kitsu's ForgeCraft"; //public static final String MOD_PREFIX = MOD_ID + ":"; public static final String MOD_CHANNEL = MOD_ID; - public static final String MOD_VERSION = "1.1.1"; + public static final String MOD_VERSION = "1.1.11"; public static final String MC_VERSIONS = "[1.11.0, 1.12.0)"; /** Mod Structures **/ diff --git a/1.11/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java b/1.11/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java new file mode 100644 index 00000000..bef75a77 --- /dev/null +++ b/1.11/src/main/java/nmd/primal/forgecraft/compat/ModDictionary.java @@ -0,0 +1,31 @@ +package nmd.primal.forgecraft.compat; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import nmd.primal.forgecraft.init.ModBlocks; + +/** + * Created by mminaie on 2/7/17. + */ +public class ModDictionary {/******************************************************************************* + * Register Only Vanilla OreDictionary Entries Here + * Mod Items/Blocks have their names added through the respective + * registration methods as a list of comma delineated strings. + * + * EXAMPLE: + * LEATHER_CORDAGE = registerItem(new PrimalItem("leather_cordage"), "cordageGeneral, cordageLeather"); + * + */ +public static void registerDictionaryNames() +{ + //if (ModConfig.COMPATIBILITY_DICTIONARY_MAGMACREAM_AS_SLIME) + //OreDictionary.registerOre("clayball", Items.CLAY_BALL); + OreDictionary.registerOre("ingotIron", ModBlocks.ironball); + + + + +} +} \ No newline at end of file diff --git a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java index 791b7766..53642f45 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/init/ModCrafting.java @@ -34,8 +34,12 @@ public class ModCrafting { /***Bellows Handle***/ GameRegistry.addShapedRecipe(new ItemStack(ModItems.pistonbellows), "X X", "X X", " X ", 'X', Items.STICK); + /***Tongs***/ GameRegistry.addShapedRecipe(new ItemStack(ModItems.stonetongs, 1), "X X", "YSY", 'X', Blocks.STONE, 'S', Items.STRING, 'Y', Items.STICK); + /***Iron Crucible***/ + GameRegistry.addShapedRecipe(new ItemStack(ModBlocks.rawironcrucible, 1), " X ", " Y ", 'X', Blocks.IRON_ORE, 'Y', ModBlocks.emptycrucible); + /***Bloomery Crafting***/ //Makes the Empty Crucible diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java index 4574b905..b290aa8b 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileBloomery.java @@ -62,9 +62,9 @@ public class TileBloomery extends TileBaseSlot implements ITickable { private void slotOneManager(){ BloomeryCrafting recipe = BloomeryCrafting.getRecipe(this.getSlotStack(1)); if(recipe != null){ - System.out.println(recipe.getIdealTime() + " : " + recipe.getHeatThreshold()); - System.out.println(this.cookCounter + " : " + this.getHeat()); - System.out.println("===================="); + //System.out.println(recipe.getIdealTime() + " : " + recipe.getHeatThreshold()); + //System.out.println(this.cookCounter + " : " + this.getHeat()); + //System.out.println("===================="); if(this.getHeat() >= recipe.getHeatThreshold()){ cookCounter++; } @@ -72,7 +72,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutput()); this.cookCounter = 0; - System.out.print(" :Success: " + this.getSlotStack(1)); + //System.out.print(" :Success: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -81,7 +81,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - System.out.print(" :Failure Time: " + this.getSlotStack(1)); + //System.out.print(" :Failure Time: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } @@ -90,7 +90,7 @@ public class TileBloomery extends TileBaseSlot implements ITickable { if(this.getSlotStack(1).getItem() == recipe.getInput().getItem()) { this.setSlotStack(1, recipe.getOutputFailed()); this.cookCounter = 0; - System.out.print(" :Failure Heat: " + this.getSlotStack(1)); + //System.out.print(" :Failure Heat: " + this.getSlotStack(1)); this.updateBlock(); this.markDirty(); } diff --git a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java index ab208d2d..42d18262 100644 --- a/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java +++ b/1.11/src/main/java/nmd/primal/forgecraft/tiles/TileFirebox.java @@ -68,7 +68,7 @@ public class TileFirebox extends TileBaseSlot implements ITickable { } } } - this.heatManager(this.getHeat(), state, this.getSlotStack(0)); + this.heatManager(this.getHeat(), state, this.getSlotStack(0), world, pos); } } } @@ -85,31 +85,26 @@ public class TileFirebox extends TileBaseSlot implements ITickable { return 1; } - private void heatManager(Integer h, IBlockState state, ItemStack stack){ + private void heatManager(Integer h, IBlockState state, ItemStack stack, World world, BlockPos pos){ if(state.getValue(Firebox.ACTIVE) == true){ if(!stack.isEmpty()) { - if(h > 400) { + if(h > 0) { this.setHeat(h - 25); } - if(h < 400){ - this.setHeat(400); + if(h < 10 ){ + world.setBlockState(pos, state.withProperty(Firebox.ACTIVE, false), 2); } } if(stack.isEmpty()){ - if(h > 50){ - this.setHeat(h - 25); - if(this.getHeat() < 50){ - this.setHeat(50); - } - } + world.setBlockState(pos, state.withProperty(Firebox.ACTIVE, false), 2); } } if(state.getValue(Firebox.ACTIVE) == false){ if(h > 50){ this.setHeat(h - 50); - if(this.getHeat() < 50){ - this.setHeat(50); - } + } + if(h < 0){ + this.setHeat(0); } } this.updateBlock(); diff --git a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit.json b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit.json index 9919e3ec..a97ba5f5 100644 --- a/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit.json +++ b/1.11/src/main/resources/assets/forgecraft/models/block/bloomery_lit.json @@ -145,7 +145,7 @@ "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } } }, @@ -158,7 +158,7 @@ "up": { "uv": [ 2, 14, 3, 15 ], "texture": "#texture" }, "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture" }, "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture1" }, - "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture1" }, + "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } } }, @@ -211,7 +211,7 @@ "north": { "uv": [ 13, 2, 14, 16 ], "texture": "#texture1" }, "south": { "uv": [ 2, 2, 3, 16 ], "texture": "#texture" }, "west": { "uv": [ 14, 2, 15, 16 ], "texture": "#texture" }, - "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture1" } + "east": { "uv": [ 1, 2, 2, 16 ], "texture": "#texture" } } } ] diff --git a/1.11/src/main/resources/mcmod.info b/1.11/src/main/resources/mcmod.info index f0c5d6eb..c3105129 100644 --- a/1.11/src/main/resources/mcmod.info +++ b/1.11/src/main/resources/mcmod.info @@ -2,7 +2,7 @@ "modid": "forgecraft", "name": "Kitsu's Forgecraft", "description": "Forged with sweat and blood", - "version": "1.1.1", + "version": "1.1.11", "mcversion": "1.11.2", "url": "", "updateUrl": "",