diff --git a/.classpath b/.classpath index 770a4f99..c3151cc0 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index fbe8c07b..f8fb0c42 100644 Binary files a/.gradle/2.0/taskArtifacts/cache.properties.lock and b/.gradle/2.0/taskArtifacts/cache.properties.lock differ diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin index 74b82227..779d2016 100644 Binary files a/.gradle/2.0/taskArtifacts/fileHashes.bin and b/.gradle/2.0/taskArtifacts/fileHashes.bin differ diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index f8b7ff89..26818e44 100644 Binary files a/.gradle/2.0/taskArtifacts/fileSnapshots.bin and b/.gradle/2.0/taskArtifacts/fileSnapshots.bin differ diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin index fce22159..6f67b993 100644 Binary files a/.gradle/2.0/taskArtifacts/outputFileStates.bin and b/.gradle/2.0/taskArtifacts/outputFileStates.bin differ diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 42184ee1..3879d84e 100644 Binary files a/.gradle/2.0/taskArtifacts/taskArtifacts.bin and b/.gradle/2.0/taskArtifacts/taskArtifacts.bin differ diff --git a/.gradle/gradle.log b/.gradle/gradle.log index 616cba47..72d74314 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -5,11 +5,33 @@ R4wk, ZeuX, IngisKahn, bspkrs MCP Data version : unknown **************************** -:eclipseClasspath -:eclipseJdt -:eclipseProject -:eclipse +:compileApiJava UP-TO-DATE +:processApiResources UP-TO-DATE +:apiClasses UP-TO-DATE +:sourceMainJava +:compileJavawarning: [options] bootstrap class path not set in conjunction with -source 1.6 +Note: Some input files use or override a deprecated API. +Note: Recompile with -Xlint:deprecation for details. +Note: Some input files use unchecked or unsafe operations. +Note: Recompile with -Xlint:unchecked for details. +1 warning + +:processResources +:classes +:jar +:compileTestJava UP-TO-DATE +:processTestResources UP-TO-DATE +:testClasses UP-TO-DATE +:test UP-TO-DATE +:extractMcpData UP-TO-DATE +:getVersionJson +:extractUserDev UP-TO-DATE +:genSrgs SKIPPED +:reobf +:assemble +:check UP-TO-DATE +:build BUILD SUCCESSFUL -Total time: 18.656 secs +Total time: 9.173 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 1a8985cf..c7d4e8b0 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Sun Jul 05 01:42:35 EDT 2015 +#Sun Jul 05 08:31:31 EDT 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/bin/assets/kitsumedievalcraft/lang/en_US.lang b/bin/assets/kitsumedievalcraft/lang/en_US.lang index 7a7bfa90..6da58a4d 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -74,7 +74,7 @@ item.ironsawBlade.name=Iron Saw Blade item.ironweaponHandle.name=Iron Handle item.woodentoolHandle.name=Wooden Handle item.ironPickaxeForm.name=Iron Pickaxe Form -item.ironSpadForm.name=Iron Shovel Form +item.ironSpadeForm.name=Iron Shovel Form item.ironHoeForm.name=Iron Hoe Form item.ironAxeForm.name=Iron Lumber Axe Form item.ironLongswordForm.name=Iron Long Sword Form @@ -169,54 +169,25 @@ item.itemSmallBarrelLid.name item.halfSplitBoard.name=Half Split Board item.woodPulp.name=Wood Pulp item.charcoalFilter.name=Charcoal Filter -item.stoneTongsCoolLapisIngot.name=StoneTongs -item.stoneTongsCoolRedstoneIngot.name=Stone Tongs -item.stoneTongsMyDamascusIngot.name=Stone Tongs -item.stoneTongsMyIronIngot.name=Stone Tongs -item.stoneTongs.name=Stone Tongs -item.stoneTongsIngot.name=Stone Tongs -item.stoneTongsDamascus.name=Stone Tongs -item.stoneTongsPlate.name=Stone Tongs -item.stoneTongsICrucible.name=Stone Tongs -item.stoneTongsDCrucible.name=Stone Tongs -item.stoneTongsCoolPlate.name=Stone Tongs -item.stoneTongsLapisCrucible.name=Stone Tongs -item.stoneTongsLapisIngot.name=Stone Tongs -item.stoneTongsRedstoneCrucible.name=Stone Tongs -item.stoneTongsRedstoneIngot.name=Stone Tongs + tile.shitBlock.name=Shit Block tile.formTable.name=Form Table -tile.myIronIngot.name=Refined Iron Ingot -tile.hotIronBlock.name=Hot Refined Iron Ingot -tile.TestForge.name=Forge -tile.hotCrucibleIron.name=Hot Iron Crucible -tile.filledCrucibleIron.name=Filled Iron Ore Crucible -tile.coolCrucibleIron.name=Cooled Iron Crucible -tile.emptySoftCrucible.name=Soft Clay Crucible -tile.emptyCookedCrucible.name=Empty Crucible +tile.refinedIron.name=Refined Iron Ingot +tile.crucibleIronOre.name=Iron Ore Crucible +tile.crucibleIronIngot.name=Iron Ore Crucible +tile.crucibleWootz.name=Wootz Ore Crucible +tile.crucibleLapis.name=Lapis Crucible +tile.crucibleRedstone.name=Redstone Crucible +tile.forge.name=Forge tile.ironPlate.name=Iron Plate -tile.hotIronPlate.name=Hot Iron Plate -tile.filledCrucibleIronIngot.name=Filled Iron Ingot Crucible -tile.filledCrucibleDamascus.name=Filled Charcoal Leaf Crucible -tile.damascusIngot.name=Damascus Steel Ingot -tile.hotCrucibleDamascus.name=Hot Damascus Steel Crucible -tile.coolCrucibleDamascus.name=Cooled Damascus Steel Crucible -tile.hotDamascusIngot.name=Hot Damascus Steel Ingot +tile.damascus.name=Damascus Steel Ingot tile.eggWashedWall.name=Egg Washed Wall tile.eggWashedBrick.name=Egg Washed Brick tile.wootzOre.name=Wootz Ore tile.limestoneRaw.name=Raw Limestone tile.forgeAnvil.name=Forge Anvil -tile.filledLapisCrucible.name=Filled Lapis Crucible -tile.hotLapisCrucible.name=Hot Lapis Crucible -tile.coolLapisCrucible.name=Cool Lapis Crucible tile.lapisIngot.name=Lapis Ingot -tile.hotLapisIngot.name=Hot Lapis Ingot tile.redstoneIngot.name=Redstone Ingot -tile.hotRedstoneIngot.name=Hot Redstone Ingot -tile.filledRedstoneCrucible.name=Filled Redstone Crucible -tile.hotRedstoneCrucible.name=Hot Redstone Crucible -tile.coolRedstoneCrucible.name=Cool Redstone Crucible tile.sandFilterEmpty.name=Filter Stand tile.sandFilter.name=Filter Stand tile.waterFilter.name=WaterFilter @@ -247,6 +218,8 @@ tile.smallBarrel.name=Small Barrel tile.smallBarrelLid.name=Small Barrel Lid tile.shelfFour.name=Shelf tile.firebox.name=Clay Firebox +tile.emptySoftCrucible.name=Empty Soft Crucible +tile.emptyCookedCrucible=Empty Crucible itemGroup.MedievalCraftTab=ForgeCraft diff --git a/bin/assets/kitsumedievalcraft/textures/items/ironSpadForm.png b/bin/assets/kitsumedievalcraft/textures/items/ironSpadeForm.png similarity index 100% rename from bin/assets/kitsumedievalcraft/textures/items/ironSpadForm.png rename to bin/assets/kitsumedievalcraft/textures/items/ironSpadeForm.png diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index 161f04d8..15ed1dc9 100644 Binary files a/bin/com/kitsu/medievalcraft/Main.class and b/bin/com/kitsu/medievalcraft/Main.class differ diff --git a/bin/com/kitsu/medievalcraft/block/ModBlocks.class b/bin/com/kitsu/medievalcraft/block/ModBlocks.class index 2bd0b395..04229117 100644 Binary files a/bin/com/kitsu/medievalcraft/block/ModBlocks.class and b/bin/com/kitsu/medievalcraft/block/ModBlocks.class differ diff --git a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class index f8a56b23..96e29cc7 100644 Binary files a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class and b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/Firebox.class b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class index ccbead0e..1929438c 100644 Binary files a/bin/com/kitsu/medievalcraft/block/machines/Firebox.class and b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index 3fea732d..d90ea3fc 100644 Binary files a/bin/com/kitsu/medievalcraft/block/machines/Forge.class and b/bin/com/kitsu/medievalcraft/block/machines/Forge.class differ diff --git a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.class b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.class index bdefc4c8..24331277 100644 Binary files a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.class and b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.class differ diff --git a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.class b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.class index 097c9c31..e3e9a382 100644 Binary files a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.class and b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.class differ diff --git a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.class b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.class index 638cbec7..606bb1d2 100644 Binary files a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.class and b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.class differ diff --git a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.class b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.class index e4cd72e6..2a4d77e6 100644 Binary files a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.class and b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.class differ diff --git a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.class b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.class index 6df73ba6..8ac775ab 100644 Binary files a/bin/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.class and b/bin/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class index 42dd47dc..12baa308 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class and b/bin/com/kitsu/medievalcraft/crafting/ModCrafting.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$2.class b/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$2.class index 3ecdf9ac..87dd9ad0 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$2.class and b/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$2.class differ diff --git a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$3.class b/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$3.class deleted file mode 100644 index f8af8bf5..00000000 Binary files a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting$3.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting.class b/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting.class index a9a62e9b..f7919c74 100644 Binary files a/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting.class and b/bin/com/kitsu/medievalcraft/crafting/TestForgeCrafting.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index cd9afc36..8841fc6e 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class differ diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.class b/bin/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.class index ca53b5c0..df2b68ef 100644 Binary files a/bin/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.class and b/bin/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class new file mode 100644 index 00000000..babefe72 Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.class new file mode 100644 index 00000000..2d99d97c Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class new file mode 100644 index 00000000..b456f0eb Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.class differ diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.class new file mode 100644 index 00000000..b2eb6a3d Binary files /dev/null and b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class b/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class index 0dc7f0e0..74ad0b08 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class and b/bin/com/kitsu/medievalcraft/renderer/RendererRegistry.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.class deleted file mode 100644 index 17555c8e..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.class deleted file mode 100644 index 14efaa23..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.class deleted file mode 100644 index 9e8325a3..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.class deleted file mode 100644 index 8a4b139d..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.class deleted file mode 100644 index 4a4f5f3a..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.class deleted file mode 100644 index 1aa75d1f..00000000 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.class and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.class new file mode 100644 index 00000000..4df8714a Binary files /dev/null and b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.class index ebc35047..c93876a2 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 19c27609..7f8213c7 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class and b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class differ diff --git a/bin/mcmod.info b/bin/mcmod.info index 435802c6..f9df848b 100644 --- a/bin/mcmod.info +++ b/bin/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.0}", + "version": "{2.2.2}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads", diff --git a/build.gradle b/build.gradle index 2af0653b..a74b8208 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,9 @@ buildscript { apply plugin: 'forge' -version = "1.0" -group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "modid" +version = "2.2.1" +group= "com.kitsu.medievalcraft" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "ForgeCraft" minecraft { version = "1.7.10-10.13.4.1448-1.7.10" diff --git a/src/main/java/com/kitsu/medievalcraft/Main.java b/src/main/java/com/kitsu/medievalcraft/Main.java index ccd4b5a0..57f1c030 100644 --- a/src/main/java/com/kitsu/medievalcraft/Main.java +++ b/src/main/java/com/kitsu/medievalcraft/Main.java @@ -20,7 +20,9 @@ import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherX; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherY; import com.kitsu.medievalcraft.packethandle.curedLeather.MsgPacketCuredLeatherZ; import com.kitsu.medievalcraft.packethandle.forge.MsgHandleForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgHandleOn; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandle; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocY; import com.kitsu.medievalcraft.packethandle.forgeHammerParticles.MsgHandleLocZ; @@ -55,7 +57,7 @@ public class Main { public static final String MODID = "kitsumedievalcraft"; public static final String MODNAME = "ForgeCraft"; - public static final String VERSION = "2.2.0"; + public static final String VERSION = "2.2.2"; public static SimpleNetworkWrapper sNet; @@ -85,6 +87,7 @@ public class Main { sNet.registerMessage(MsgHandleCuredLeatherZ.class, MsgPacketCuredLeatherZ.class, 8, Side.SERVER); sNet.registerMessage(MsgHandleShelfCase.class, MsgPacketShelfCase.class, 9, Side.SERVER); sNet.registerMessage(MsgHandleForge.class, MsgPacketForge.class, 10, Side.SERVER); + sNet.registerMessage(MsgHandleOn.class, MsgPacketOn.class, 11, Side.CLIENT); CustomTab.MedievalTab(); ModBlocks.init(); ModItems.init(); diff --git a/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java index 47e4e615..98dc86ce 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java @@ -109,7 +109,7 @@ public class ModBlocks { //MACHINES public static Block formtable; - public static Block newForge; + //public static Block newForge; public static Block testForge; public static Block forgeAnvil; public static Block waterFilter; diff --git a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java index 338900d7..89e04081 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java @@ -12,6 +12,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import com.kitsu.medievalcraft.Main; +import com.kitsu.medievalcraft.item.ModItems; import com.kitsu.medievalcraft.util.CustomTab; import cpw.mods.fml.relauncher.Side; @@ -22,7 +23,7 @@ public abstract class IngotBase extends BlockContainer { private final Random random = new Random(); public static boolean makeParts; public static int locX, locY, locZ; - + public IngotBase(String unlocalizedName, Material material) { super(material); this.setBlockName(unlocalizedName); @@ -35,9 +36,9 @@ public abstract class IngotBase extends BlockContainer { //xmin, ymin, zmin, //xmax, ymax, zmax this.setBlockBounds(0.25F, 0.0F, 0.35F, - 0.75F , 0.15F, 0.7F); + 0.75F , 0.15F, 0.7F); } - + @Override public Item getItemDropped(int metadata, Random random, int fortune) { return Item.getItemFromBlock(this); @@ -46,13 +47,13 @@ public abstract class IngotBase extends BlockContainer { public TileEntity createNewTileEntity(World world, int i) { return null; } - + @Override - public int quantityDropped(Random p_149745_1_) - { - return 1; - } - + public int quantityDropped(Random p_149745_1_) + { + return 1; + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random rand) @@ -63,27 +64,31 @@ public abstract class IngotBase extends BlockContainer { makeParts = false; } } - + @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_){ - int a = player.inventory.currentItem; - if(player.inventory.getStackInSlot(a)!=null){ - if(player.inventory.getStackInSlot(a).getItem()==Item.getItemFromBlock(this)){ + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int aa, float bb, float cc, float ff){ + if(player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){ + int a = player.inventory.currentItem; + if(player.inventory.getStackInSlot(a)!=null){ + if(player.inventory.getStackInSlot(a).getItem()==Item.getItemFromBlock(this)){ + ItemStack jar = new ItemStack(this); + player.inventory.addItemStackToInventory(jar); + if(!world.isRemote){ + world.setBlock(x, y, z, Blocks.air, 0, 2); + } + } + return true; + } + if(player.inventory.getStackInSlot(a)==null){ ItemStack jar = new ItemStack(this); - player.inventory.addItemStackToInventory(jar); + player.inventory.setInventorySlotContents(a, jar); if(!world.isRemote){ world.setBlock(x, y, z, Blocks.air, 0, 2); } + return true; } } - if(player.inventory.getStackInSlot(a)==null){ - ItemStack jar = new ItemStack(this); - player.inventory.setInventorySlotContents(a, jar); - if(!world.isRemote){ - world.setBlock(x, y, z, Blocks.air, 0, 2); - } - } - return true; + return false; } private void parts(World world, int x, int y, int z){ @@ -97,7 +102,7 @@ public abstract class IngotBase extends BlockContainer { world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); world.spawnParticle("lava", x+0.5D, y+0.5D, z+0.5D, 0, 0, 0); } - + @Override public int getRenderType() { return 0; diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java index 4bbcea91..5c7fe7b2 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java @@ -42,15 +42,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class Firebox extends BlockContainer{ private final Random random = new Random(); - /* - * - * - * [Chimney] - * [ Forge ] - * [Firebox] - * - * - * */ + public Firebox(String unlocalizedName, Material material) { super(material.rock); this.setBlockName(unlocalizedName); diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java index acb82c77..196a6657 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -29,6 +29,7 @@ import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.item.ModItems; import com.kitsu.medievalcraft.packethandle.forge.MsgPacketForge; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; import com.kitsu.medievalcraft.packethandle.shelf.MsgPacketShelfCase; import com.kitsu.medievalcraft.renderer.RenderId; import com.kitsu.medievalcraft.tileents.machine.TileForge; @@ -43,6 +44,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ private final Random random = new Random(); public static int sideMeta; + public static boolean furnaceParts; private int c; public Forge(String unlocalizedName, Material material) { @@ -72,6 +74,21 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ public void randomDisplayTick(World world, int x, int y, int z, Random rand) { super.randomDisplayTick(world, x, y, z, random); + if(furnaceParts == true){ + int l; + float f; + float f1; + float f2; + for (l = 0; l < 3; ++l) + { + f = (float)(x+0.25) + (rand.nextFloat()/2); + f1 = (float)y + rand.nextFloat() * 0.4F + 0.3F; + f2 = (float)(z+0.25) + (rand.nextFloat()/2); + world.spawnParticle("fire", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + world.spawnParticle("flame", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + //world.spawnParticle("smoke", (double)f, (double)f1, (double)f2, 0.0D, 0.0D, 0.0D); + } + } } public static int determineOrientation(World p_150071_0_, int p_150071_1_, int p_150071_2_, int p_150071_3_, EntityLivingBase p_150071_4_) @@ -118,6 +135,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) ){ tileEnt.isBurning=true; + Main.sNet.sendToAll(new MsgPacketOn(tileEnt.isBurning)); if(tileEnt.getStackInSlot(1)!=null){ tileEnt.isOn=true; } diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.java b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.java index 65ecd0a3..bba3f5b6 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/BirchSplitLog.java @@ -43,7 +43,7 @@ public class BirchSplitLog extends BlockRotatedPillar { this.setHardness(3.0F); this.setResistance(3.0F); this.setStepSound(Block.soundTypeWood); - this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); + this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.java b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.java index 83fae7ea..b547a8cd 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/DarkSplitLog.java @@ -40,6 +40,7 @@ public class DarkSplitLog extends BlockRotatedPillar { this.setHardness(3.0F); this.setResistance(3.0F); this.setStepSound(Block.soundTypeWood); + this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.java b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.java index e415906c..ab67e300 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/JungleSplitLog.java @@ -40,6 +40,7 @@ public class JungleSplitLog extends BlockRotatedPillar { this.setHardness(3.0F); this.setResistance(3.0F); this.setStepSound(Block.soundTypeWood); + this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.java b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.java index bea87991..69a88447 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/OakSplitLog.java @@ -40,6 +40,7 @@ public class OakSplitLog extends BlockRotatedPillar { this.setHardness(3.0F); this.setResistance(3.0F); this.setStepSound(Block.soundTypeWood); + this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.java b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.java index 0e1c408f..b8322c19 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/quartersplit/SpruceSplitLog.java @@ -40,6 +40,7 @@ public class SpruceSplitLog extends BlockRotatedPillar { this.setHardness(3.0F); this.setResistance(3.0F); this.setStepSound(Block.soundTypeWood); + this.setBlockBounds(0.25F, 0.0F, 0.25F, 0.75F, 1.0F, 0.75F); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java index 2cbff530..57ff883d 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/ModCrafting.java @@ -174,9 +174,9 @@ public final class ModCrafting { {"ccc", "bbb", "bbb", 'c', Blocks.crafting_table, 'b', Blocks.brick_block}); - GameRegistry.addRecipe(new ItemStack(ModBlocks.testForge), new Object [] - {"xxx", "x x", "xxx", - 'x', Blocks.stonebrick}); + GameRegistry.addRecipe(new ItemStack(ModBlocks.forge), new Object [] + {"xax", "xsx", "xxx", + 'x', Blocks.stonebrick, 'a', Blocks.stone_slab, 's', ModBlocks.firebox}); GameRegistry.addRecipe(new ItemStack(ModBlocks.solidFilter), new Object[] {"xyx", "y y", "xyx", 'x', ModItems.splitBoard, diff --git a/src/main/java/com/kitsu/medievalcraft/crafting/TestForgeCrafting.java b/src/main/java/com/kitsu/medievalcraft/crafting/TestForgeCrafting.java index e150d92b..bbe946ac 100644 --- a/src/main/java/com/kitsu/medievalcraft/crafting/TestForgeCrafting.java +++ b/src/main/java/com/kitsu/medievalcraft/crafting/TestForgeCrafting.java @@ -24,9 +24,9 @@ public class TestForgeCrafting { }}; - public static final Hashtable cookTable= new Hashtable (){{ + /*public static final Hashtable cookTable= new Hashtable (){{ - /*put(0, 300); + put(0, 300); put(1, 1000); put(2, 200); put(3, 250); @@ -36,22 +36,22 @@ public class TestForgeCrafting { put(7, 900); put(8, 400); put(9, 400); - put(10, 900);*/ - }}; + put(10, 900); + }};*/ public static final Hashtable blockToCook = new Hashtable (){{ - /*put(0, ModBlocks.hotIronBlock); - put(1, ModBlocks.hotCrucibleIron); - put(2, ModBlocks.emptyCookedCrucible); - put(3, ModBlocks.hotIronPlate); - put(4, ModBlocks.hotCrucibleIron); - put(5, ModBlocks.hotCrucibleDamascus); - put(6, ModBlocks.hotDamascusIngot); - put(7, ModBlocks.hotLapisCrucible); - put(8, ModBlocks.hotLapisIngot); - put(9, ModBlocks.hotRedstoneIngot); - put(10, ModBlocks.hotRedstoneCrucible);*/ + put(0, ModBlocks.refinedIron); + //put(1, ModBlocks.crucibleIronOre); + //put(2, ModBlocks.emptyCookedCrucible); + put(3, ModBlocks.ironPlate); + //put(4, ModBlocks.hotCrucibleIron); + //put(5, ModBlocks.hotCrucibleDamascus); + put(6, ModBlocks.damascus); + //put(7, ModBlocks.hotLapisCrucible); + //put(8, ModBlocks.hotLapisIngot); + //put(9, ModBlocks.hotRedstoneIngot); + //put(10, ModBlocks.hotRedstoneCrucible); }}; diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java index 13185817..56e2c298 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.java @@ -77,7 +77,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ } private void onClick(Block block, Block blockSub, World world, int x, int y, int z, EntityPlayer p, ItemStack stack, Random rand){ - + System.out.println("Layer 1"); if(block == ModBlocks.refinedIron){ tileRefIngot = (TileMyIronIngot) world.getTileEntity(x, y, z); } @@ -85,6 +85,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ tilePlate = (TileIronPlate) world.getTileEntity(x, y, z); } if((blockSub == ModBlocks.forgeAnvil)&&(p.isSwingInProgress == false)){ + TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z); if((block instanceof IngotBase)&&(block==ModBlocks.refinedIron)){ TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z); @@ -123,6 +124,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ //IRON FORMS if(tileEnt.getStackInSlot(0)!=null){ if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){ + System.out.println("working"); p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); Main.sNet.sendToAll(new MsgPacket(true)); Main.sNet.sendToAll(new MsgPacketLocX(x)); @@ -269,6 +271,7 @@ public class ForgeHammer extends Item implements AnvilUtil{ Block block = world.getBlock(x, y, z); Block anvil = world.getBlock(x, y-1, z); if(!world.isRemote){ + System.out.println("Item Use"); onClick(block, anvil, world, x, y, z, player, stack, world.rand); } return true; diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.java index ae4fb147..f10b6ac4 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/WorkBlade.java @@ -41,15 +41,6 @@ public class WorkBlade extends Item { GameRegistry.registerItem(this, name); } - @Override - public void onCreated(ItemStack stack, World world, EntityPlayer player) { - stack.stackTagCompound = new NBTTagCompound(); - stack.stackTagCompound.setInteger("X", 1); - stack.stackTagCompound.setInteger("Y", 1); - stack.stackTagCompound.setInteger("Z", 1); - stack.stackTagCompound.setInteger("BARKHITS", 0); - } - public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_){ if(!world.isRemote){ @@ -60,110 +51,79 @@ public class WorkBlade extends Item { } private void getBark(World world, int x, int y, int z, EntityPlayer player, ItemStack stack){ - //if(player.isSwingInProgress == false){ - if(world.getBlock(x, y, z).getUnlocalizedName().equals("tile.log")){ - //System.out.println(stack.stackTagCompound.getInteger("BARKHITS")); - //System.out.println(stack.stackTagCompound.getInteger("X")); - //System.out.println(stack.stackTagCompound.getInteger("Y")); - //System.out.println(stack.stackTagCompound.getInteger("Z")); - //System.out.println(world.getBlockMetadata(x, y, z)); - - if((stack.stackTagCompound.getInteger("BARKHITS") == 0) || (stack.stackTagCompound.getInteger("X") != x) || (stack.stackTagCompound.getInteger("Y") != y) || (stack.stackTagCompound.getInteger("Z") != z)){ - stack.stackTagCompound.setInteger("X", x); - stack.stackTagCompound.setInteger("Y", y); - stack.stackTagCompound.setInteger("Z", z); - stack.stackTagCompound.setInteger("BARKHITS", 1); - player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.33F, 1.0F); - //System.out.println("lvl2"); - } - if(stack.stackTagCompound.getInteger("BARKHITS") > 0){ - if((stack.stackTagCompound.getInteger("X") == x) && (stack.stackTagCompound.getInteger("Y") == y) && (stack.stackTagCompound.getInteger("Z") == z)){ - player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.33F, 1.0F); - if (world.rand.nextInt(2) == 0 ) { - stack.stackTagCompound.setInteger("BARKHITS", stack.stackTagCompound.getInteger("BARKHITS") + 1); - stack.stackTagCompound.setInteger("X", x); - stack.stackTagCompound.setInteger("Y", y); - stack.stackTagCompound.setInteger("Z", z); - stack.damageItem(1, player); - //System.out.println("lvl3"); + if(player.isSwingInProgress == false){ + if(world.getBlock(x, y, z).getUnlocalizedName().equals("tile.log")){ + player.worldObj.playSoundAtEntity(player, Main.MODID + ":scrapes1", 0.25F, 1.8F); + if(world.rand.nextInt(8)==1){ + if(world.getBlock(x, y, z).equals(Blocks.log)){ + //System.out.println("lvl5"); + int woodMeta = world.getBlockMetadata(x, y, z); + if(woodMeta == 0){ + world.setBlock(x, y, z, ModBlocks.cleanOak, 0, 2); + } + if(woodMeta == 4){ + world.setBlock(x, y, z, ModBlocks.cleanOak, 4, 2); + } + if(woodMeta == 8){ + world.setBlock(x, y, z, ModBlocks.cleanOak, 8, 2); + } + if(woodMeta == 1){ + world.setBlock(x, y, z, ModBlocks.cleanSpruce, 0, 2); + } + if(woodMeta == 5){ + world.setBlock(x, y, z, ModBlocks.cleanSpruce, 4, 2); + } + if(woodMeta == 9){ + world.setBlock(x, y, z, ModBlocks.cleanSpruce, 8, 2); + } + if(woodMeta == 2){ + world.setBlock(x, y, z, ModBlocks.cleanBirch, 0, 2); + } + if(woodMeta == 6){ + world.setBlock(x, y, z, ModBlocks.cleanBirch, 4, 2); + } + if(woodMeta == 10){ + world.setBlock(x, y, z, ModBlocks.cleanBirch, 8, 2); + } + if(woodMeta == 3){ + world.setBlock(x, y, z, ModBlocks.cleanJungle, 0, 2); + } + if(woodMeta == 7){ + world.setBlock(x, y, z, ModBlocks.cleanJungle, 4, 2); + } + if(woodMeta == 11){ + world.setBlock(x, y, z, ModBlocks.cleanJungle, 8, 2); + } } - } - } - if(stack.stackTagCompound.getInteger("BARKHITS") >= 6 + world.rand.nextInt(4)){ - stack.stackTagCompound.setInteger("BARKHITS", 0); - stack.stackTagCompound.setInteger("X", 0); - stack.stackTagCompound.setInteger("Y", 0); - stack.stackTagCompound.setInteger("Z", 0); - //System.out.println("lvl4"); - - if(world.getBlock(x, y, z).equals(Blocks.log)){ - //System.out.println("lvl5"); - int woodMeta = world.getBlockMetadata(x, y, z); - if(woodMeta == 0){ - world.setBlock(x, y, z, ModBlocks.cleanOak, 0, 2); + if(world.getBlock(x, y, z).equals(Blocks.log2)){ + //System.out.println("lvl6"); + int woodMeta = world.getBlockMetadata(x, y, z); + if(woodMeta == 0){ + world.setBlock(x, y, z, ModBlocks.cleanAcacia, 0, 2); + } + if(woodMeta == 4){ + world.setBlock(x, y, z, ModBlocks.cleanAcacia, 4, 2); + } + if(woodMeta == 8){ + world.setBlock(x, y, z, ModBlocks.cleanAcacia, 8, 2); + } + if(woodMeta == 1){ + world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 0, 2); + } + if(woodMeta == 5){ + world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 4, 2); + } + if(woodMeta == 9){ + world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 8, 2); + } } - if(woodMeta == 4){ - world.setBlock(x, y, z, ModBlocks.cleanOak, 4, 2); - } - if(woodMeta == 8){ - world.setBlock(x, y, z, ModBlocks.cleanOak, 8, 2); - } - if(woodMeta == 1){ - world.setBlock(x, y, z, ModBlocks.cleanSpruce, 0, 2); - } - if(woodMeta == 5){ - world.setBlock(x, y, z, ModBlocks.cleanSpruce, 4, 2); - } - if(woodMeta == 9){ - world.setBlock(x, y, z, ModBlocks.cleanSpruce, 8, 2); - } - if(woodMeta == 2){ - world.setBlock(x, y, z, ModBlocks.cleanBirch, 0, 2); - } - if(woodMeta == 6){ - world.setBlock(x, y, z, ModBlocks.cleanBirch, 4, 2); - } - if(woodMeta == 10){ - world.setBlock(x, y, z, ModBlocks.cleanBirch, 8, 2); - } - if(woodMeta == 3){ - world.setBlock(x, y, z, ModBlocks.cleanJungle, 0, 2); - } - if(woodMeta == 7){ - world.setBlock(x, y, z, ModBlocks.cleanJungle, 4, 2); - } - if(woodMeta == 11){ - world.setBlock(x, y, z, ModBlocks.cleanJungle, 8, 2); - } - } - if(world.getBlock(x, y, z).equals(Blocks.log2)){ - //System.out.println("lvl6"); - int woodMeta = world.getBlockMetadata(x, y, z); - if(woodMeta == 0){ - world.setBlock(x, y, z, ModBlocks.cleanAcacia, 0, 2); - } - if(woodMeta == 4){ - world.setBlock(x, y, z, ModBlocks.cleanAcacia, 4, 2); - } - if(woodMeta == 8){ - world.setBlock(x, y, z, ModBlocks.cleanAcacia, 8, 2); - } - if(woodMeta == 1){ - world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 0, 2); - } - if(woodMeta == 5){ - world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 4, 2); - } - if(woodMeta == 9){ - world.setBlock(x, y, z, ModBlocks.cleanDarkOak, 8, 2); - } - } - world.spawnEntityInWorld(new EntityItem(world, x, y, z, new ItemStack(ModItems.itemBark, 5 + world.rand.nextInt(4), 0))); + world.spawnEntityInWorld(new EntityItem(world, x, y, z, new ItemStack(ModItems.itemBark, 5 + world.rand.nextInt(4), 0))); + } } } } - + private void makeLonbow(World world, int x, int y, int z, EntityPlayer player, ItemStack stack){ if(!world.isRemote){ if((world.getBlock(x, y, z).equals(ModBlocks.jungleSplitLog))&&world.getBlock(x, y-1, z).equals(ModBlocks.jungleSplitLog)){ diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java new file mode 100644 index 00000000..a374415a --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleBurning.java @@ -0,0 +1,5 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +public class MsgHandleBurning { + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.java new file mode 100644 index 00000000..fddf6709 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleOn.java @@ -0,0 +1,16 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import com.kitsu.medievalcraft.block.machines.Forge; + +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; + +public class MsgHandleOn implements IMessageHandler{ + + @Override + public IMessage onMessage(MsgPacketOn message, MessageContext ctx) { + Forge.furnaceParts = message.packetOn; + return null; + } +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java new file mode 100644 index 00000000..797ddf06 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketBurning.java @@ -0,0 +1,5 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +public class MsgPacketBurning { + +} diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.java new file mode 100644 index 00000000..ab97efa2 --- /dev/null +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgPacketOn.java @@ -0,0 +1,26 @@ +package com.kitsu.medievalcraft.packethandle.forge; + +import io.netty.buffer.ByteBuf; +import cpw.mods.fml.common.network.simpleimpl.IMessage; + +public class MsgPacketOn implements IMessage { + + public boolean packetOn; + + public MsgPacketOn() {} + + public MsgPacketOn(boolean x){ + this.packetOn = x; + } + + @Override + public void fromBytes(ByteBuf buf) { + this.packetOn = buf.readBoolean(); + } + + @Override + public void toBytes(ByteBuf buf) { + buf.writeBoolean(this.packetOn); + } + +} diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java index 79cc87cd..3d3a0608 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/RendererRegistry.java @@ -45,6 +45,7 @@ import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.IronIngotIR; import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.IronPlateIR; import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.LapisIngotIR; import com.kitsu.medievalcraft.renderer.itemrenderer.ingotsplates.RedstoneIngotIR; +import com.kitsu.medievalcraft.renderer.itemrenderer.machines.ForgeIR; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRBarrelLid; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRFirebox; import com.kitsu.medievalcraft.renderer.itemrenderer.machines.IRForgeAnvil; @@ -129,6 +130,7 @@ public class RendererRegistry { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.smallBarrelLid), new IRBarrelLid()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.shelfFour), new IRShelfFour()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.firebox), new IRFirebox()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.forge), new ForgeIR()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.crucibleIronOre), new IRCrucible()); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.crucibleIronIngot), new IRCrucible()); @@ -168,7 +170,6 @@ public class RendererRegistry { ClientRegistry.bindTileEntitySpecialRenderer(TileCrucibleWootz.class, new WootzCrucibleRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileCrucibleRedstone.class, new RedstoneCrucibleRenderer()); - ClientRegistry.bindTileEntitySpecialRenderer(TileMyIronIngot.class, new IronIngotRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileDamascus.class, new DamascusIngotRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileIronPlate.class, new IronPlateRenderer()); diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.java deleted file mode 100644 index 86306cc7..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCDCrucible.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererCDCrucible implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/CoolCrucible.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.45F; - GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; - GL11.glPushMatrix(); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float scale = 0.5F; - GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - - - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.java deleted file mode 100644 index e50213ae..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererCICrucible.java +++ /dev/null @@ -1,150 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererCICrucible implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/CoolCrucible.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.45F; - GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; - GL11.glPushMatrix(); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float scale = 0.5F; - GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - - - - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.java deleted file mode 100644 index df9a139f..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFICrucible.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererFICrucible implements IItemRenderer { - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/Crucible.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.45F; - GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; - GL11.glPushMatrix(); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float scale = 0.5F; - GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.java deleted file mode 100644 index 8724144f..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHDCrucible.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererHDCrucible implements IItemRenderer{ - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/HotDamascusCrucible.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.45F; - GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; - GL11.glPushMatrix(); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float scale = 0.5F; - GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.java deleted file mode 100644 index 34286402..00000000 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererHICrucible.java +++ /dev/null @@ -1,146 +0,0 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.client.model.AdvancedModelLoader; -import net.minecraftforge.client.model.IModelCustom; - -import org.lwjgl.opengl.GL11; - -public class ItemRendererHICrucible implements IItemRenderer{ - - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/HotCrucible.png"); - - public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); - - @Override - public boolean handleRenderType(ItemStack item, ItemRenderType type) { - - switch(type) { - case EQUIPPED: { - return true; - } - case EQUIPPED_FIRST_PERSON: { - return true; - } - case INVENTORY: { - return true; - } - case ENTITY: { - return true; - } - - default: return false; - } - } - - @Override - public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, - ItemRendererHelper helper) { - - switch(type) { - case EQUIPPED: { - return helper == ItemRendererHelper.BLOCK_3D; - } - case EQUIPPED_FIRST_PERSON: { - return helper == ItemRendererHelper.EQUIPPED_BLOCK; - } - case INVENTORY: { - return helper == ItemRendererHelper.INVENTORY_BLOCK; - } - case ENTITY: { - return (helper == ItemRendererHelper.ENTITY_BOBBING || - helper == ItemRendererHelper.ENTITY_ROTATION || - helper == ItemRendererHelper.BLOCK_3D); - } - - default: return false; - } - } - - @Override - public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - - switch(type) { - - case EQUIPPED: { - - GL11.glPushMatrix(); - float scale = 0.45F; - GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - } break; - - case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; - GL11.glPushMatrix(); - GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case INVENTORY: { - GL11.glPushMatrix(); - - GL11.glEnable(GL11.GL_TEXTURE_2D); - float scale = 0.5F; - GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - case ENTITY: { - GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); - model.renderAll(); - - GL11.glPopMatrix(); - - } break; - - default: - break; - } - } - -} - diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.java similarity index 77% rename from src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.java rename to src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.java index d8c9c2db..6b931ebe 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/crucibles/ItemRendererFDCrucible.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/ForgeIR.java @@ -1,18 +1,20 @@ -package com.kitsu.medievalcraft.renderer.itemrenderer.crucibles; +package com.kitsu.medievalcraft.renderer.itemrenderer.machines; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; +import net.minecraftforge.client.IItemRenderer.ItemRenderType; +import net.minecraftforge.client.IItemRenderer.ItemRendererHelper; import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; -public class ItemRendererFDCrucible implements IItemRenderer { +public class ForgeIR implements IItemRenderer { - public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/CrucibleModel.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/Crucible.png"); + public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/SingleForge.obj"); + public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/SingleForge.png"); public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); @@ -69,14 +71,11 @@ public class ItemRendererFDCrucible implements IItemRenderer { case EQUIPPED: { GL11.glPushMatrix(); - float scale = 0.45F; + float scale = 0.5F; + GL11.glRotatef(22F, 0.0F, 0.0F, 1.0F); + //GL11.glRotatef(0F, 0.0F, 1.0F, 0.0F); GL11.glScalef(scale, scale, scale); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(25F, 0.0F, 0.0F, 1.0F); - GL11.glRotatef(60F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(0.2F, -2.9F, 2.1F); + GL11.glTranslatef(2.25F, -0.75F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); model.renderAll(); @@ -85,15 +84,12 @@ public class ItemRendererFDCrucible implements IItemRenderer { } break; case EQUIPPED_FIRST_PERSON: { - float f = 0.4F; + float f = 0.8F; GL11.glPushMatrix(); GL11.glScalef(f, f, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - - GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.5F, 0.0F, 0.0F); + GL11.glRotatef(-135F, 0.0F, 1.0F, 0.0F); + //GL11.glRotatef(-45F, 0.0F, 1.0F, 0.0F); + GL11.glTranslatef(1.0F, 0.5F, -0.4F); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); model.renderAll(); @@ -108,11 +104,7 @@ public class ItemRendererFDCrucible implements IItemRenderer { GL11.glEnable(GL11.GL_TEXTURE_2D); float scale = 0.5F; GL11.glScalef(scale, scale, scale); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - GL11.glTranslatef(0.0F, -1.1F, 0.0F); - + GL11.glTranslatef(0.0F, 0.0F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); model.renderAll(); @@ -124,11 +116,7 @@ public class ItemRendererFDCrucible implements IItemRenderer { case ENTITY: { GL11.glPushMatrix(); //GL11.glScalef(1.75F, 1.75F, 1.75F); - - - - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); + GL11.glTranslatef(0.0F, 0.5F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); model.renderAll(); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java index d23f7218..3fedb734 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java @@ -136,14 +136,14 @@ public class TileEntityTestForge extends TileEntity implements IInventory { } return TestForgeCrafting.blockToCheck.get(type); } - private int getCookTime(int a){ + /*private int getCookTime(int a){ for(int i = 0; i < TestForgeCrafting.cookTable.size(); i++){ if(a == TestForgeCrafting.cookTable.get(i)){ cookKey = i; } } return TestForgeCrafting.cookTable.get(cookKey); - } + }*/ private void cook(World world, int x, int y, int z){ Block isAir = world.getBlock(x, y+2, z); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java index 32f93e6e..c0a9b47b 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -20,7 +20,9 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.block.ingots.IngotBase; +import com.kitsu.medievalcraft.packethandle.forge.MsgPacketOn; import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; import cpw.mods.fml.common.registry.GameRegistry; @@ -223,8 +225,6 @@ public class TileForge extends TileEntity implements IInventory{ if(this.isOn==true){ if(tile.hot==false){ tile.heatTicks--; - //System.out.println(tile.hot); - //System.out.println(tile.heatTicks); } } } @@ -332,6 +332,7 @@ public class TileForge extends TileEntity implements IInventory{ if(this.getStackInSlot(0)==null){ this.isOn = false; this.isBurning = false; + Main.sNet.sendToAll(new MsgPacketOn(this.isBurning)); } if(this.getStackInSlot(1)==null){ this.isOn = false; diff --git a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang index 7a7bfa90..6da58a4d 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -74,7 +74,7 @@ item.ironsawBlade.name=Iron Saw Blade item.ironweaponHandle.name=Iron Handle item.woodentoolHandle.name=Wooden Handle item.ironPickaxeForm.name=Iron Pickaxe Form -item.ironSpadForm.name=Iron Shovel Form +item.ironSpadeForm.name=Iron Shovel Form item.ironHoeForm.name=Iron Hoe Form item.ironAxeForm.name=Iron Lumber Axe Form item.ironLongswordForm.name=Iron Long Sword Form @@ -169,54 +169,25 @@ item.itemSmallBarrelLid.name item.halfSplitBoard.name=Half Split Board item.woodPulp.name=Wood Pulp item.charcoalFilter.name=Charcoal Filter -item.stoneTongsCoolLapisIngot.name=StoneTongs -item.stoneTongsCoolRedstoneIngot.name=Stone Tongs -item.stoneTongsMyDamascusIngot.name=Stone Tongs -item.stoneTongsMyIronIngot.name=Stone Tongs -item.stoneTongs.name=Stone Tongs -item.stoneTongsIngot.name=Stone Tongs -item.stoneTongsDamascus.name=Stone Tongs -item.stoneTongsPlate.name=Stone Tongs -item.stoneTongsICrucible.name=Stone Tongs -item.stoneTongsDCrucible.name=Stone Tongs -item.stoneTongsCoolPlate.name=Stone Tongs -item.stoneTongsLapisCrucible.name=Stone Tongs -item.stoneTongsLapisIngot.name=Stone Tongs -item.stoneTongsRedstoneCrucible.name=Stone Tongs -item.stoneTongsRedstoneIngot.name=Stone Tongs + tile.shitBlock.name=Shit Block tile.formTable.name=Form Table -tile.myIronIngot.name=Refined Iron Ingot -tile.hotIronBlock.name=Hot Refined Iron Ingot -tile.TestForge.name=Forge -tile.hotCrucibleIron.name=Hot Iron Crucible -tile.filledCrucibleIron.name=Filled Iron Ore Crucible -tile.coolCrucibleIron.name=Cooled Iron Crucible -tile.emptySoftCrucible.name=Soft Clay Crucible -tile.emptyCookedCrucible.name=Empty Crucible +tile.refinedIron.name=Refined Iron Ingot +tile.crucibleIronOre.name=Iron Ore Crucible +tile.crucibleIronIngot.name=Iron Ore Crucible +tile.crucibleWootz.name=Wootz Ore Crucible +tile.crucibleLapis.name=Lapis Crucible +tile.crucibleRedstone.name=Redstone Crucible +tile.forge.name=Forge tile.ironPlate.name=Iron Plate -tile.hotIronPlate.name=Hot Iron Plate -tile.filledCrucibleIronIngot.name=Filled Iron Ingot Crucible -tile.filledCrucibleDamascus.name=Filled Charcoal Leaf Crucible -tile.damascusIngot.name=Damascus Steel Ingot -tile.hotCrucibleDamascus.name=Hot Damascus Steel Crucible -tile.coolCrucibleDamascus.name=Cooled Damascus Steel Crucible -tile.hotDamascusIngot.name=Hot Damascus Steel Ingot +tile.damascus.name=Damascus Steel Ingot tile.eggWashedWall.name=Egg Washed Wall tile.eggWashedBrick.name=Egg Washed Brick tile.wootzOre.name=Wootz Ore tile.limestoneRaw.name=Raw Limestone tile.forgeAnvil.name=Forge Anvil -tile.filledLapisCrucible.name=Filled Lapis Crucible -tile.hotLapisCrucible.name=Hot Lapis Crucible -tile.coolLapisCrucible.name=Cool Lapis Crucible tile.lapisIngot.name=Lapis Ingot -tile.hotLapisIngot.name=Hot Lapis Ingot tile.redstoneIngot.name=Redstone Ingot -tile.hotRedstoneIngot.name=Hot Redstone Ingot -tile.filledRedstoneCrucible.name=Filled Redstone Crucible -tile.hotRedstoneCrucible.name=Hot Redstone Crucible -tile.coolRedstoneCrucible.name=Cool Redstone Crucible tile.sandFilterEmpty.name=Filter Stand tile.sandFilter.name=Filter Stand tile.waterFilter.name=WaterFilter @@ -247,6 +218,8 @@ tile.smallBarrel.name=Small Barrel tile.smallBarrelLid.name=Small Barrel Lid tile.shelfFour.name=Shelf tile.firebox.name=Clay Firebox +tile.emptySoftCrucible.name=Empty Soft Crucible +tile.emptyCookedCrucible=Empty Crucible itemGroup.MedievalCraftTab=ForgeCraft diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/items/ironSpadForm.png b/src/main/resources/assets/kitsumedievalcraft/textures/items/ironSpadeForm.png similarity index 100% rename from src/main/resources/assets/kitsumedievalcraft/textures/items/ironSpadForm.png rename to src/main/resources/assets/kitsumedievalcraft/textures/items/ironSpadeForm.png diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 435802c6..f9df848b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.2.0}", + "version": "{2.2.2}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",