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 ed8e0970..2b0ce434 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 59b30c8e..429abcd8 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 91769b8d..300b8cec 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 6f67b993..1a30c429 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 1d325e34..6bbd882e 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 ad385c35..ecaa4dea 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: 17.823 secs +Total time: 9.424 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 37a0d482..b9d6a2fe 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Tue Jul 07 00:22:43 EDT 2015 +#Tue Jul 07 08:24:12 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 6da58a4d..d111ae6d 100644 --- a/bin/assets/kitsumedievalcraft/lang/en_US.lang +++ b/bin/assets/kitsumedievalcraft/lang/en_US.lang @@ -169,6 +169,7 @@ item.itemSmallBarrelLid.name item.halfSplitBoard.name=Half Split Board item.woodPulp.name=Wood Pulp item.charcoalFilter.name=Charcoal Filter +item.slottedTongs.name=Stone Tongs tile.shitBlock.name=Shit Block tile.formTable.name=Form Table diff --git a/bin/assets/kitsumedievalcraft/models/FireboxUV.png b/bin/assets/kitsumedievalcraft/models/FireboxUV.png index e0101f37..1a5bea28 100644 Binary files a/bin/assets/kitsumedievalcraft/models/FireboxUV.png and b/bin/assets/kitsumedievalcraft/models/FireboxUV.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/coolCrucibleDamascus.png b/bin/assets/kitsumedievalcraft/textures/blocks/crucibleIronIngot.png similarity index 100% rename from bin/assets/kitsumedievalcraft/textures/blocks/coolCrucibleDamascus.png rename to bin/assets/kitsumedievalcraft/textures/blocks/crucibleIronIngot.png diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/coolCrucibleIron.png b/bin/assets/kitsumedievalcraft/textures/blocks/crucibleIronOre.png similarity index 100% rename from bin/assets/kitsumedievalcraft/textures/blocks/coolCrucibleIron.png rename to bin/assets/kitsumedievalcraft/textures/blocks/crucibleIronOre.png diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/coolLapisCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/crucibleLapis.png similarity index 100% rename from bin/assets/kitsumedievalcraft/textures/blocks/coolLapisCrucible.png rename to bin/assets/kitsumedievalcraft/textures/blocks/crucibleLapis.png diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/coolRedstoneCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/crucibleRedstone.png similarity index 100% rename from bin/assets/kitsumedievalcraft/textures/blocks/coolRedstoneCrucible.png rename to bin/assets/kitsumedievalcraft/textures/blocks/crucibleRedstone.png diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolRedstoneCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/crucibleWootz.png similarity index 100% rename from src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolRedstoneCrucible.png rename to bin/assets/kitsumedievalcraft/textures/blocks/crucibleWootz.png diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/damascus.png b/bin/assets/kitsumedievalcraft/textures/blocks/damascus.png new file mode 100644 index 00000000..b406e941 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/damascus.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png b/bin/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png deleted file mode 100644 index 9bf77866..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png b/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png b/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png b/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png deleted file mode 100644 index 8e742d34..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png deleted file mode 100644 index de4dede7..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/firebox.png b/bin/assets/kitsumedievalcraft/textures/blocks/firebox.png new file mode 100644 index 00000000..1a5bea28 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/firebox.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/forge.png b/bin/assets/kitsumedievalcraft/textures/blocks/forge.png new file mode 100644 index 00000000..9a87332c Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/forge.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png b/bin/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png new file mode 100644 index 00000000..db912da3 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/forgebot.png b/bin/assets/kitsumedievalcraft/textures/blocks/forgebot.png deleted file mode 100644 index 2cab87b4..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/forgebot.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/forgeside.png b/bin/assets/kitsumedievalcraft/textures/blocks/forgeside.png deleted file mode 100644 index a4e772c7..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/forgeside.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/forgetop.png b/bin/assets/kitsumedievalcraft/textures/blocks/forgetop.png deleted file mode 100644 index c31fcfb3..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/forgetop.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png deleted file mode 100644 index 70535af0..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png deleted file mode 100644 index 70535af0..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png deleted file mode 100644 index 70535af0..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png b/bin/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png b/bin/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png deleted file mode 100644 index 9bf77866..00000000 Binary files a/bin/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png and /dev/null differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/refinedIron.png b/bin/assets/kitsumedievalcraft/textures/blocks/refinedIron.png new file mode 100644 index 00000000..f7a3e19d Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/refinedIron.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/shelfFour.png b/bin/assets/kitsumedievalcraft/textures/blocks/shelfFour.png new file mode 100644 index 00000000..5396b132 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/shelfFour.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/solidFilter.png b/bin/assets/kitsumedievalcraft/textures/blocks/solidFilter.png new file mode 100644 index 00000000..dea287ec Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/solidFilter.png differ diff --git a/bin/assets/kitsumedievalcraft/textures/blocks/waterFilter.png b/bin/assets/kitsumedievalcraft/textures/blocks/waterFilter.png new file mode 100644 index 00000000..254c2ad2 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/textures/blocks/waterFilter.png differ diff --git a/bin/com/kitsu/medievalcraft/block/ModBlocks.class b/bin/com/kitsu/medievalcraft/block/ModBlocks.class index 04229117..dc01689e 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/fluid/BlockSmoke.class b/bin/com/kitsu/medievalcraft/block/fluid/BlockSmoke.class index ef1f5652..21e33e43 100644 Binary files a/bin/com/kitsu/medievalcraft/block/fluid/BlockSmoke.class and b/bin/com/kitsu/medievalcraft/block/fluid/BlockSmoke.class differ diff --git a/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class b/bin/com/kitsu/medievalcraft/block/ingots/IngotBase.class index 96e29cc7..d59bd486 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/ForgeAnvil.class b/bin/com/kitsu/medievalcraft/block/machines/ForgeAnvil.class index 9e3dc010..d0b71499 100644 Binary files a/bin/com/kitsu/medievalcraft/block/machines/ForgeAnvil.class and b/bin/com/kitsu/medievalcraft/block/machines/ForgeAnvil.class differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/TestForge.class b/bin/com/kitsu/medievalcraft/block/machines/TestForge.class index 75ac3fdc..3efd5a94 100644 Binary files a/bin/com/kitsu/medievalcraft/block/machines/TestForge.class and b/bin/com/kitsu/medievalcraft/block/machines/TestForge.class differ diff --git a/bin/com/kitsu/medievalcraft/compat/FuelHandler.class b/bin/com/kitsu/medievalcraft/compat/FuelHandler.class index 28486f68..76035225 100644 Binary files a/bin/com/kitsu/medievalcraft/compat/FuelHandler.class and b/bin/com/kitsu/medievalcraft/compat/FuelHandler.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class index a73113d4..a149b2c1 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class and b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class differ diff --git a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.class index 2168d282..56856e6c 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.class and b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.class index 616e83be..6a62411d 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class index b3857f56..17e7d692 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.class index aa4a829b..2f4d8133 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.class index 8050d740..d3274729 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class index 1de8189c..7c726729 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.class index 9a399654..ee32e917 100644 Binary files a/bin/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.class and b/bin/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 2b47c12b..3079569f 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/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java index 98dc86ce..6855fa45 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ModBlocks.java @@ -110,7 +110,7 @@ public class ModBlocks { //MACHINES public static Block formtable; //public static Block newForge; - public static Block testForge; + //public static Block testForge; public static Block forgeAnvil; public static Block waterFilter; public static Block shelfFour; @@ -139,11 +139,11 @@ public class ModBlocks { public static Block tanWaterCrucible; public static Block slackWaterCrucible; - public static final void init() { GameRegistry.registerBlock(testBlock = new TestBlock("testBlock", Material.rock), "testBlock"); - Fluid fluidSmoke = new Fluid("blocksmoke").setDensity(-1000).setTemperature(310).setGaseous(true).setBlock(blockSmoke).setViscosity(1200); + + Fluid fluidSmoke = new Fluid("blocksmoke").setDensity(-1000).setTemperature(310).setGaseous(true).setBlock(blockSmoke).setViscosity(0); FluidRegistry.registerFluid(fluidSmoke); blockSmoke = new BlockSmoke(fluidSmoke, Material.water).setBlockName("blockSmoke"); GameRegistry.registerBlock(blockSmoke, Main.MODID + "_" + blockSmoke.getUnlocalizedName().substring(5)); @@ -174,7 +174,7 @@ public class ModBlocks { GameRegistry.registerBlock(wootzOre = new WootzOre("wootzOre", Material.rock), "wootzOre"); GameRegistry.registerBlock(formtable = new formTable("formTable", Material.wood), "formTable"); - GameRegistry.registerBlock(testForge = new TestForge("TestForge", Material.iron), "TestForge"); + //GameRegistry.registerBlock(testForge = new TestForge("TestForge", Material.iron), "TestForge"); GameRegistry.registerBlock(forgeAnvil = new ForgeAnvil("forgeAnvil", Material.iron), "forgeAnvil"); GameRegistry.registerBlock(waterFilter = new WaterFilter("waterFilter", Material.iron), "waterFilter"); //GameRegistry.registerBlock(sandFilter = new SandFilter("sandFilter", Material.wood), "sandFilter"); diff --git a/src/main/java/com/kitsu/medievalcraft/block/fluid/BlockSmoke.java b/src/main/java/com/kitsu/medievalcraft/block/fluid/BlockSmoke.java index bfb800e4..12959c67 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/fluid/BlockSmoke.java +++ b/src/main/java/com/kitsu/medievalcraft/block/fluid/BlockSmoke.java @@ -60,28 +60,28 @@ public class BlockSmoke extends BlockFluidFinite{ super.randomDisplayTick(world, x, y, z, random); if (random.nextInt(6) == 0) { - world.spawnParticle("cloud", x + 0.5D, y + 0.2D, z + 0.5D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.5D, y + 0.2D, z + 0.5D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); } if (random.nextInt(6) == 1) { - world.spawnParticle("cloud", x + 0.5D, y + 0.8D, z + 0.5D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.5D, y + 0.8D, z + 0.5D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); } if (random.nextInt(6) == 2) { - world.spawnParticle("cloud", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.2D, y + 0.5D, z + 0.5D, 0.0D, 0.2D, 0.0D); } if (random.nextInt(6) == 3) { - world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.5D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.2D, 0.0D); } if (random.nextInt(6) == 4) { - world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D); } if (random.nextInt(6) == 5) { - world.spawnParticle("cloud", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.0D, 0.0D); - world.spawnParticle("largesmoke", x + 0.5D, y + 0.5D, z + 0.8D, 0.0D, 0.0D, 0.0D); + world.spawnParticle("cloud", x + 0.8D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D); + world.spawnParticle("largesmoke", x + 0.8D, y + 0.5D, z + 0.2D, 0.0D, 0.2D, 0.0D); } } 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 89e04081..519cd315 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/block/ingots/IngotBase.java @@ -67,6 +67,7 @@ public abstract class IngotBase extends BlockContainer { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int aa, float bb, float cc, float ff){ + //System.out.println(this.getUnlocalizedName()); if(player.inventory.getCurrentItem().getItem()!=ModItems.forgeHammer){ int a = player.inventory.currentItem; if(player.inventory.getStackInSlot(a)!=null){ diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/ForgeAnvil.java b/src/main/java/com/kitsu/medievalcraft/block/machines/ForgeAnvil.java index ad59b076..4cc7ae95 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/ForgeAnvil.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/ForgeAnvil.java @@ -30,13 +30,6 @@ public class ForgeAnvil extends BlockContainer{ private final Random random = new Random(); - @SideOnly(Side.CLIENT) - private IIcon iconSide; - @SideOnly(Side.CLIENT) - private IIcon iconTop; - @SideOnly(Side.CLIENT) - private IIcon iconBot; - public ForgeAnvil(String unlocalizedName, Material mat) { super(mat); this.setBlockName(unlocalizedName); @@ -48,19 +41,6 @@ public class ForgeAnvil extends BlockContainer{ } - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iconRegister) { - } - - - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int metadata) { - - return side == 1 ? this.iconTop : (side == 0 ? this.iconBot : (side != metadata ? this.blockIcon : this.iconSide)); - } - @Override public TileEntity createNewTileEntity(World world, int i) { return new TileEntityAnvilForge(); diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java index 77798e66..a58cdb37 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/TestForge.java @@ -80,11 +80,12 @@ public class TestForge extends BlockContainer { } public Item getItemDropped(int par1, Random random, int par3) { - return Item.getItemFromBlock(ModBlocks.testForge); + return null; } public Item getItem(World world, int par2, int par3, int par4) { - return Item.getItemFromBlock(ModBlocks.testForge); + //return Item.getItemFromBlock(ModBlocks.testForge); + return null; } @Override diff --git a/src/main/java/com/kitsu/medievalcraft/compat/FuelHandler.java b/src/main/java/com/kitsu/medievalcraft/compat/FuelHandler.java index 874e518b..e5a91678 100644 --- a/src/main/java/com/kitsu/medievalcraft/compat/FuelHandler.java +++ b/src/main/java/com/kitsu/medievalcraft/compat/FuelHandler.java @@ -16,8 +16,8 @@ public class FuelHandler implements IFuelHandler //MagnumOpus.logger.info("fuel handler: " + fuel); /** Mod Real Fuel Items **/ - if ( stack.isItemEqual(new ItemStack(ModItems.itemShit)) ) { return 600; } - else if ( stack.isItemEqual(new ItemStack(ModBlocks.shitblock)) ) { return 3200; } + if ( stack.isItemEqual(new ItemStack(ModItems.itemShit)) ) { return 150; } + else if ( stack.isItemEqual(new ItemStack(ModBlocks.shitblock)) ) { return 1500; } /** that is all **/ diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java index b2f619f7..4f2fc794 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java @@ -42,8 +42,6 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glPushMatrix(); GL11.glTranslatef((float) x, (float) y, (float) z); - - if(tileEntity.getStackInSlot(1) != null){ entItem1 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(1)); GL11.glPushMatrix(); @@ -95,7 +93,6 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { loc = TEXTURE; } - FMLClientHandler.instance().getClient().renderEngine.bindTexture(loc); renderBlock(tileEntity, tile.getWorldObj(), tile.xCoord,tile.yCoord, tile.zCoord, ModBlocks.forge); GL11.glPopMatrix(); diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.java index beccb1a4..d75bb9cf 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/machines/IRFirebox.java @@ -124,7 +124,7 @@ public class IRFirebox implements IItemRenderer { case ENTITY: { GL11.glPushMatrix(); - //GL11.glScalef(1.75F, 1.75F, 1.75F); + GL11.glScalef(0.5F, 1.0F, 0.5F); GL11.glTranslatef(0.0F, 0.5F, 0.0F); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.java index a17282ba..74be8912 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileDamascus.java @@ -10,6 +10,7 @@ public class TileDamascus extends TileIngotBase{ this.hot = false; this.heatTicks = 500; + this.heatBase = 500; } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java index 7a16c9c6..6266ff33 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java @@ -36,7 +36,7 @@ public class TileIngotBase extends TileEntity implements AnvilUtil{ int y = this.yCoord; int z = this.zCoord; if(!world.isRemote){ - System.out.println(this.heatTicks); + //System.out.println(this.heatTicks); if(this.heatTicks<=0){ world.setBlockMetadataWithNotify(x, y, z, 1, 2); this.hot=true; diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.java index 698a5d51..b532043a 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIronPlate.java @@ -9,6 +9,7 @@ public class TileIronPlate extends TileIngotBase{ this.hits = 0; this.hot = false; this.heatTicks = 450; + this.heatBase = 450; } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.java index 580e2dc0..114ab23c 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileLapisIngot.java @@ -9,7 +9,9 @@ public class TileLapisIngot extends TileIngotBase{ this.hits = 0; this.hot = false; this.coolTicks = 300; + this.coolBase = 300; this.heatTicks = 600; + this.heatBase = 600; } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java index 1466aa85..6274b6b5 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileMyIronIngot.java @@ -8,9 +8,6 @@ public class TileMyIronIngot extends TileIngotBase{ super(nameCustom); this.hits = 0; this.hot = false; - this.heatBase = 50; - this.heatTicks = 50; - this.coolBase = 50; } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.java index b38fbb65..30aca1a7 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileRedstoneIngot.java @@ -9,7 +9,9 @@ public class TileRedstoneIngot extends TileIngotBase{ this.hits = 0; this.hot = false; this.coolTicks = 300; + this.coolBase = 300; this.heatTicks = 600; + this.heatBase = 600; } } 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 a89fd2d6..d4646424 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -22,6 +22,7 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.block.ingots.IngotBase; import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; @@ -331,28 +332,32 @@ public class TileForge extends TileEntity implements IInventory{ return getItemBurnTime(stack) > 0; } - //Main.sNet.sendToAll(new MsgPacketOn(tileEnt.isBurning)); - //Main.sNet.sendToAll(new MsgPacketForgeX(tileEnt.xCoord)); - //Main.sNet.sendToAll(new MsgPacketForgeY(tileEnt.yCoord)); - //Main.sNet.sendToAll(new MsgPacketForgeZ(tileEnt.zCoord)); - //Main.sNet.sendToAll(new MsgPacketBurning(tileEnt.isOn)); - private void forgeMaint(World world, int x, int y, int z){ if(this.getStackInSlot(0)==null){ if(world.getBlockMetadata(x, y, z)>=4&&world.getBlockMetadata(x, y, z)<=7){ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2); } } + if(this.getStackInSlot(0)==null){ + if(world.getBlockMetadata(x, y, z)>7){ + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 2); + } + } if(this.getStackInSlot(1)==null){ if(world.getBlockMetadata(x, y, z)>=8){ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2); } } if(world.getBlockMetadata(x, y, z)>3&&world.getBlockMetadata(x, y, z)<8){ - if(this.getStackInSlot(1)!=null){ + if(this.getStackInSlot(1)!=null && (world.canBlockSeeTheSky(x, y+1, z)==true)){ world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 2); } } + if(world.getBlockMetadata(x, y, z)>7){ + if(world.rand.nextInt(5)==1){ + world.setBlock(x, y+2, z, ModBlocks.blockSmoke, 0, 2); + } + } } } diff --git a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang index 6da58a4d..d111ae6d 100644 --- a/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang +++ b/src/main/resources/assets/kitsumedievalcraft/lang/en_US.lang @@ -169,6 +169,7 @@ item.itemSmallBarrelLid.name item.halfSplitBoard.name=Half Split Board item.woodPulp.name=Wood Pulp item.charcoalFilter.name=Charcoal Filter +item.slottedTongs.name=Stone Tongs tile.shitBlock.name=Shit Block tile.formTable.name=Form Table diff --git a/src/main/resources/assets/kitsumedievalcraft/models/FireboxUV.png b/src/main/resources/assets/kitsumedievalcraft/models/FireboxUV.png index e0101f37..1a5bea28 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/FireboxUV.png and b/src/main/resources/assets/kitsumedievalcraft/models/FireboxUV.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolCrucibleDamascus.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleIronIngot.png similarity index 100% rename from src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolCrucibleDamascus.png rename to src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleIronIngot.png diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolCrucibleIron.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleIronOre.png similarity index 100% rename from src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolCrucibleIron.png rename to src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleIronOre.png diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolLapisCrucible.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleLapis.png similarity index 100% rename from src/main/resources/assets/kitsumedievalcraft/textures/blocks/coolLapisCrucible.png rename to src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleLapis.png diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleRedstone.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleRedstone.png new file mode 100644 index 00000000..479a8ad4 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleRedstone.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleWootz.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleWootz.png new file mode 100644 index 00000000..479a8ad4 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/crucibleWootz.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascus.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascus.png new file mode 100644 index 00000000..b406e941 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascus.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png deleted file mode 100644 index 9bf77866..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/damascusIngot.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleDamascus.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIron.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png deleted file mode 100644 index 5adfcaa5..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledCrucibleIronIngot.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png deleted file mode 100644 index 8e742d34..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledLapisCrucible.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png deleted file mode 100644 index de4dede7..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/filledRedstoneCrucible.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/firebox.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/firebox.png new file mode 100644 index 00000000..1a5bea28 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/firebox.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forge.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forge.png new file mode 100644 index 00000000..9a87332c Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forge.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png new file mode 100644 index 00000000..db912da3 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeAnvil.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgebot.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgebot.png deleted file mode 100644 index 2cab87b4..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgebot.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeside.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeside.png deleted file mode 100644 index a4e772c7..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgeside.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgetop.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgetop.png deleted file mode 100644 index c31fcfb3..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/forgetop.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleDamascus.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotCrucibleIron.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png deleted file mode 100644 index 70535af0..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotDamascusIngot.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png deleted file mode 100644 index 70535af0..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronBlock.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png deleted file mode 100644 index 70535af0..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotIronPlate.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png deleted file mode 100644 index 6dc42553..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/hotLapisCrucible.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png deleted file mode 100644 index 9bf77866..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/myIronIngot.png and /dev/null differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/refinedIron.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/refinedIron.png new file mode 100644 index 00000000..f7a3e19d Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/refinedIron.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/shelfFour.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/shelfFour.png new file mode 100644 index 00000000..5396b132 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/shelfFour.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/solidFilter.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/solidFilter.png new file mode 100644 index 00000000..dea287ec Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/solidFilter.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/textures/blocks/waterFilter.png b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/waterFilter.png new file mode 100644 index 00000000..254c2ad2 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/textures/blocks/waterFilter.png differ