diff --git a/.classpath b/.classpath index c3151cc0..770a4f99 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 65739765..00a7b04b 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 09b96878..f733de07 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 adf0da86..b307fe5a 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 adddb845..fce22159 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 90181da2..5cd111bd 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 6349f673..0adc2d86 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 7.125 secs +Total time: 32.923 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 4d5832a7..c1886763 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Wed Jul 01 17:46:05 EDT 2015 +#Thu Jul 02 02:41: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/models/HotIronIngotBlock.png b/bin/assets/kitsumedievalcraft/models/HotIronIngotBlock.png index 7fd98e50..14fa8e0a 100644 Binary files a/bin/assets/kitsumedievalcraft/models/HotIronIngotBlock.png and b/bin/assets/kitsumedievalcraft/models/HotIronIngotBlock.png differ diff --git a/bin/assets/kitsumedievalcraft/models/HotIronPlate.png b/bin/assets/kitsumedievalcraft/models/HotIronPlate.png index 6f50ad9a..da7050e5 100644 Binary files a/bin/assets/kitsumedievalcraft/models/HotIronPlate.png and b/bin/assets/kitsumedievalcraft/models/HotIronPlate.png differ diff --git a/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png b/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png index 0201a9ca..7ac6c7e2 100644 Binary files a/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png and b/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png differ diff --git a/bin/assets/kitsumedievalcraft/models/IronPlate.png b/bin/assets/kitsumedievalcraft/models/IronPlate.png index 7085af91..60c8601c 100644 Binary files a/bin/assets/kitsumedievalcraft/models/IronPlate.png and b/bin/assets/kitsumedievalcraft/models/IronPlate.png differ diff --git a/bin/assets/kitsumedievalcraft/models/StoneTongs.png b/bin/assets/kitsumedievalcraft/models/StoneTongs.png index adfefbba..d5af2925 100644 Binary files a/bin/assets/kitsumedievalcraft/models/StoneTongs.png and b/bin/assets/kitsumedievalcraft/models/StoneTongs.png differ diff --git a/bin/assets/kitsumedievalcraft/models/hotIronPlate.png b/bin/assets/kitsumedievalcraft/models/hotIronPlate.png deleted file mode 100644 index 6f50ad9a..00000000 Binary files a/bin/assets/kitsumedievalcraft/models/hotIronPlate.png and /dev/null differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index 67e617b2..6c015509 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/renderer/blocks/machine/ForgeRenderer.class b/bin/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.class index 7539864f..7387e0be 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/ingotsplates/IronPlateIR.class b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.class index fc465203..a4dff4eb 100644 Binary files a/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.class and b/bin/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.class differ diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class index 26f5886e..8e4d2cba 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/machine/TileEntityTestForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.class index 0148e516..ebc35047 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 75858129..57b65a05 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/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java index e978e558..5bb53dc3 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -35,7 +35,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ super(material.rock); this.setBlockName(unlocalizedName); this.setBlockTextureName(Main.MODID + ":" + unlocalizedName); - this.setCreativeTab(CustomTab.MedievalCraftTab); + //this.setCreativeTab(CustomTab.MedievalCraftTab); this.setHardness(3.0F); this.setResistance(5.0F); this.setHarvestLevel("pickaxe", 1, 0); @@ -92,8 +92,8 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ player.inventory.getCurrentItem().getItem()==placeMe.get(2).getItem()|| player.inventory.getCurrentItem().getItem()==placeMe.get(3).getItem()|| player.inventory.getCurrentItem().getItem()==placeMe.get(4).getItem()){ - - tileEnt.setInventorySlotContents(0, player.inventory.getCurrentItem()); + ItemStack tempStack = new ItemStack(player.inventory.getCurrentItem().getItem(), 1); + tileEnt.setInventorySlotContents(0, tempStack); player.inventory.decrStackSize(player.inventory.currentItem, 1); } } 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 870391f9..8b36ccbc 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 @@ -54,8 +54,8 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { this.entCoal.hoverStart = 0.0F; RenderItem.renderInFrame = true; GL11.glScalef(0.5f, 0.5f, 0.5f); - GL11.glRotatef(90, 1, 0, 0); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.55D, 1.3D, -0.79D, 0.0F, 0.0F); + + RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.0D, 1.0D, -0.5D, 0.0F, 0.0F); RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.15D, 1.3D, -0.79D, 0.0F, 0.0F); RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.75D, 1.3D, -0.79D, 0.0F, 0.0F); RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.35D, 1.3D, -0.79D, 0.0F, 0.0F); @@ -85,7 +85,7 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { RenderItem.renderInFrame = true; GL11.glScalef(1.0f, 1.0f, 1.0f); GL11.glRotatef(10, 0, 1, 0); - RenderManager.instance.renderEntityWithPosYaw(entItem, 0.4D, 0.325D, 0.6D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem, 0.4D, 0.3D, 0.6D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); } @@ -101,7 +101,7 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glPushMatrix(); //GL11.glRotatef(15F, 0F, 1F, 0F); float scale = 0.50f; - GL11.glScalef(scale, scale, scale); + GL11.glScalef(scale, 1f, scale); GL11.glTranslatef(1.0F, 0.2F, 1.0F); int dir = world.getBlockMetadata(i, j, k); if(dir == 1){ diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.java b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.java index e781455c..78007c95 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/itemrenderer/ingotsplates/IronPlateIR.java @@ -15,6 +15,8 @@ public class IronPlateIR implements IItemRenderer { public static final ResourceLocation MODEL_CRUCIBLE = new ResourceLocation("kitsumedievalcraft:models/IronPlate.obj"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/IronPlate.png"); + public static final ResourceLocation TEXTURE1 = new ResourceLocation("kitsumedievalcraft:models/HotIronPlate.png"); + private ResourceLocation loc; public IModelCustom model = AdvancedModelLoader.loadModel(MODEL_CRUCIBLE); @@ -73,14 +75,15 @@ public class IronPlateIR implements IItemRenderer { GL11.glPushMatrix(); float scale = 0.75F; GL11.glScalef(scale, 3.5F, scale); - - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - //GL11.glRotatef(90F, 0.0F, 0.0F, 1.0F); - //GL11.glRotatef(10F, 1.0F, 0.0F, 0.0F); - //GL11.glRotated(90, 1.0, 0.0, 0.0); GL11.glTranslatef(1.0F, 0.0F, 0.0F); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); model.renderAll(); @@ -92,15 +95,15 @@ public class IronPlateIR implements IItemRenderer { float f = 2.0F; GL11.glPushMatrix(); GL11.glScalef(f, 8.0F, f); - - //ANGLE, X ROTATE, Y ROTATE, Z ROTATE - GL11.glRotatef(45F, 0.0F, 1.0F, 0.0F); - - GL11.glTranslatef(1.3F, -0.2F, 1.7F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); GL11.glPopMatrix(); @@ -113,13 +116,13 @@ public class IronPlateIR implements IItemRenderer { GL11.glEnable(GL11.GL_TEXTURE_2D); float f = 0.66F; GL11.glScalef(f, 4.0F, f); - - //GL11.glRotatef(90, 1.0F, 0.0F, 0.0F); - - //GL11.glTranslatef(1.0F, 0.0F, -1.0F); - - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); GL11.glPopMatrix(); @@ -128,12 +131,14 @@ public class IronPlateIR implements IItemRenderer { case ENTITY: { GL11.glPushMatrix(); - //float f = 0.8F; GL11.glScalef(1.0F, 3.0F, 1.0F); - - //GL11.glTranslatef(0.0F, 0.0F, 0.0F); - - Minecraft.getMinecraft().renderEngine.bindTexture(TEXTURE); + if(item.getItemDamage()==0){ + loc=TEXTURE; + } + if(item.getItemDamage()==1){ + loc=TEXTURE1; + } + Minecraft.getMinecraft().renderEngine.bindTexture(loc); model.renderAll(); GL11.glPopMatrix(); 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 4d9b7e3e..cc640398 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java @@ -35,12 +35,14 @@ public class TileIngotBase extends TileEntity { if(!world.isRemote){ if(this.heatTicks<=0){ world.setBlockMetadataWithNotify(x, y, z, 1, 2); + this.hot=true; + this.heatTicks=100; } if(this.coolTicks<=0){ world.setBlockMetadataWithNotify(x, y, z, 0, 2); } coolDown(world, x, y, z); - //System.out.println(this.hot); + //System.out.println(this.heatTicks); } } 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 b942e66f..d23f7218 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityTestForge.java @@ -1,7 +1,5 @@ package com.kitsu.medievalcraft.tileents.machine; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +21,9 @@ 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.crafting.TestForgeCrafting; +import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; import cpw.mods.fml.common.registry.GameRegistry; @@ -151,31 +151,16 @@ public class TileEntityTestForge extends TileEntity implements IInventory { Block fire = world.getBlock(x, y-1, z); TileEntityTestForge tileEnt = (TileEntityTestForge) world.getTileEntity(x, y, z); if(!world.isRemote){ - - if(fire.equals(Blocks.fire)){ - if(checkBlock.equals(Blocks.snow) || checkBlock.equals(Blocks.snow_layer)){ - world.setBlock(x, y+1, z, Blocks.air, 0, 2); - this.worldObj.playSoundEffect(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D, "random.fizz", 0.2F, 0.4F); - } - if(checkBlock.equals(Blocks.ice) || checkBlock.equals(Blocks.packed_ice)){ - world.setBlock(x, y+1, z, Blocks.water, 0, 2); - this.worldObj.playSoundEffect(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D, "random.fizz", 0.2F, 0.4F); - } - - if((checkBlock.equals(getBlock(checkBlock))) && (isItemFuel(tileEnt.getStackInSlot(0))) && (isAir.equals(Blocks.air)) && (fire.equals(Blocks.fire))){ - Random rand = new Random(); - if ((rand.nextInt(20) == 0)){ - world.setBlock(x, y+3, z, ModBlocks.blockSmoke, 0, 2); + if(fire==ModBlocks.firebox){ + TileEntityFirebox box = (TileEntityFirebox) world.getTileEntity(x, y-1, z); + if(checkBlock instanceof IngotBase && box.isOn==true && isItemFuel(this.getStackInSlot(0))==true){ + TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y+1, z); + System.out.println(tile.hot); + System.out.println(tile.heatTicks); + if(tile.hot==false){ + tile.heatTicks--; } - ticks++; - - //System.out.println(tag.getInteger("TICKS") + ":" + tag.getInteger("FUELTICKS")); - if(ticks == getCookTime(ticks)){ - world.setBlock(x, y+1, z, TestForgeCrafting.blockToCook.get(type), 0, 2); - ticks=0; - } - - } + } } } } @@ -189,7 +174,7 @@ public class TileEntityTestForge extends TileEntity implements IInventory { fuelTicks++; //System.out.println(fuelTicks + " " + getItemBurnTime(tileEnt.getStackInSlot(0))); - if(fuelTicks >= getItemBurnTime(tileEnt.getStackInSlot(0))){ + if(fuelTicks >= 2*getItemBurnTime(tileEnt.getStackInSlot(0))){ fuelTicks = 0; if (tileEnt.getStackInSlot(0).stackSize == 1){ 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 a67a815c..304c131a 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -191,11 +191,7 @@ public class TileForge extends TileEntity implements IInventory{ int z = this.zCoord; if(!world.isRemote){ if(!world.isRemote){ - if(this.getStackInSlot(0)!=null){ - System.out.println(this.getStackInSlot(0).getItemDamage()); - ItemStack c = new ItemStack(this.getStackInSlot(0).getItem(),1,1); - this.setInventorySlotContents(0, c); - } + } /*if(world.getBlock(x, y+1, z).equals(Blocks.air)||this.getStackInSlot(0)==null){ this.isOn = false; diff --git a/src/main/resources/assets/kitsumedievalcraft/models/HotIronIngotBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/HotIronIngotBlock.png index 7fd98e50..14fa8e0a 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/HotIronIngotBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/HotIronIngotBlock.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png b/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png index 6f50ad9a..da7050e5 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png and b/src/main/resources/assets/kitsumedievalcraft/models/HotIronPlate.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png index 0201a9ca..7ac6c7e2 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png and b/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png b/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png index 7085af91..60c8601c 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png and b/src/main/resources/assets/kitsumedievalcraft/models/IronPlate.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png b/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png index adfefbba..d5af2925 100644 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png and b/src/main/resources/assets/kitsumedievalcraft/models/StoneTongs.png differ diff --git a/src/main/resources/assets/kitsumedievalcraft/models/hotIronPlate.png b/src/main/resources/assets/kitsumedievalcraft/models/hotIronPlate.png deleted file mode 100644 index 6f50ad9a..00000000 Binary files a/src/main/resources/assets/kitsumedievalcraft/models/hotIronPlate.png and /dev/null differ