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 00a7b04b..e0f1080a 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 f733de07..13852f24 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 b307fe5a..9fc1cc01 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/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 5cd111bd..0be4239c 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 0adc2d86..07b0c3aa 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 32.923 secs +Total time: 10.091 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index c1886763..722a5155 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Thu Jul 02 02:41:31 EDT 2015 +#Thu Jul 02 09:36:46 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/SingleForge.blend b/SingleForge.blend index 36bf0c17..d0101ebe 100644 Binary files a/SingleForge.blend and b/SingleForge.blend differ diff --git a/SingleForge.blend1 b/SingleForge.blend1 new file mode 100644 index 00000000..61302ed9 Binary files /dev/null and b/SingleForge.blend1 differ diff --git a/bin/assets/kitsumedievalcraft/models/SandFilter.mtl b/SingleForge.mtl similarity index 65% rename from bin/assets/kitsumedievalcraft/models/SandFilter.mtl rename to SingleForge.mtl index f26bd2fb..17b3ca66 100644 --- a/bin/assets/kitsumedievalcraft/models/SandFilter.mtl +++ b/SingleForge.mtl @@ -1,4 +1,4 @@ -# Blender MTL File: 'SandFilter.blend' +# Blender MTL File: 'SingleForge.blend' # Material Count: 1 newmtl Material @@ -9,4 +9,4 @@ Ks 0.500000 0.500000 0.500000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/kitsu/Development/Blends/SandFilter.png +map_Kd SingleForge.png diff --git a/SingleForge.obj b/SingleForge.obj new file mode 100644 index 00000000..7c64cd8a --- /dev/null +++ b/SingleForge.obj @@ -0,0 +1,100 @@ +# Blender v2.71 (sub 0) OBJ File: 'SingleForge.blend' +# www.blender.org +mtllib SingleForge.mtl +o Cube +v 1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 -1.000000 +v 1.000000 1.000000 -0.999999 +v 0.999999 1.000000 1.000001 +v -1.000000 1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v 0.999999 0.520000 0.799998 +v 1.000000 -0.519997 0.800000 +v 1.000000 -0.519997 -0.799993 +v 1.000000 0.520000 -0.799994 +v -0.800001 0.520000 0.799998 +v -0.800000 -0.519998 0.799999 +v -0.800000 -0.519997 -0.799994 +v -0.800000 0.520000 -0.799994 +vt 0.981149 0.023858 +vt 0.981149 0.331444 +vt 0.672180 0.331444 +vt 0.310859 0.355729 +vt 0.310859 0.023720 +vt 0.642228 0.023720 +vt 0.310736 0.024172 +vt 0.642745 0.024129 +vt 0.642788 0.355498 +vt 0.642745 0.024153 +vt 0.021985 0.311183 +vt 0.021985 0.037220 +vt 0.251166 0.037220 +vt 0.100605 0.309645 +vt 0.100605 0.036968 +vt 0.249573 0.036968 +vt 0.100064 0.310093 +vt 0.100064 0.036130 +vt 0.249033 0.036130 +vt 0.021084 0.310487 +vt 0.021084 0.036524 +vt 0.250266 0.036524 +vt 0.101536 0.309820 +vt 0.101536 0.037184 +vt 0.248506 0.037184 +vt 0.754766 0.393358 +vt 0.754766 0.648521 +vt 0.683422 0.680417 +vt 0.909344 0.648521 +vt 0.980689 0.680417 +vt 0.984626 0.360150 +vt 0.913282 0.392046 +vt 0.758703 0.392046 +vt 0.909344 0.393358 +vt 0.672180 0.023858 +vt 0.642228 0.355729 +vt 0.310779 0.355541 +vt 0.310809 0.355595 +vt 0.251166 0.311183 +vt 0.292301 0.396658 +vt 0.623671 0.396658 +vt 0.623671 0.728667 +vt 0.249573 0.309645 +vt 0.249033 0.310093 +vt 0.250266 0.310487 +vt 0.248506 0.309820 +vt 0.683422 0.361462 +vt 0.687360 0.360150 +vt 0.980689 0.361463 +vt 0.292301 0.728667 +usemtl Material +s off +f 2/1 3/2 4/3 +f 2/4 6/5 7/6 +f 7/7 8/8 4/9 +f 1/7 4/10 8/9 +f 9/11 13/12 16/13 +f 14/14 15/15 16/16 +f 12/17 16/18 15/19 +f 11/20 15/21 14/22 +f 10/23 14/24 13/25 +f 9/26 12/27 5/28 +f 12/27 11/29 1/30 +f 2/31 10/32 9/33 +f 1/30 11/29 10/34 +f 1/35 2/1 4/3 +f 3/36 2/4 7/6 +f 3/37 7/7 4/9 +f 5/38 1/7 8/9 +f 12/39 9/11 16/13 +f 8/40 7/41 6/42 +f 13/43 14/14 16/16 +f 11/44 12/17 15/19 +f 10/45 11/20 14/22 +f 9/46 10/23 13/25 +f 6/47 9/26 5/28 +f 5/28 12/27 1/30 +f 6/48 2/31 9/33 +f 2/49 1/30 10/34 +f 5/50 8/40 6/42 diff --git a/SingleForge.png b/SingleForge.png new file mode 100644 index 00000000..82baa7c1 Binary files /dev/null and b/SingleForge.png differ diff --git a/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png b/bin/assets/kitsumedievalcraft/models/IronIngotBlock.png index 7ac6c7e2..b19a7f15 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/SingleForge.obj b/bin/assets/kitsumedievalcraft/models/SingleForge.obj new file mode 100644 index 00000000..7c64cd8a --- /dev/null +++ b/bin/assets/kitsumedievalcraft/models/SingleForge.obj @@ -0,0 +1,100 @@ +# Blender v2.71 (sub 0) OBJ File: 'SingleForge.blend' +# www.blender.org +mtllib SingleForge.mtl +o Cube +v 1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 -1.000000 +v 1.000000 1.000000 -0.999999 +v 0.999999 1.000000 1.000001 +v -1.000000 1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v 0.999999 0.520000 0.799998 +v 1.000000 -0.519997 0.800000 +v 1.000000 -0.519997 -0.799993 +v 1.000000 0.520000 -0.799994 +v -0.800001 0.520000 0.799998 +v -0.800000 -0.519998 0.799999 +v -0.800000 -0.519997 -0.799994 +v -0.800000 0.520000 -0.799994 +vt 0.981149 0.023858 +vt 0.981149 0.331444 +vt 0.672180 0.331444 +vt 0.310859 0.355729 +vt 0.310859 0.023720 +vt 0.642228 0.023720 +vt 0.310736 0.024172 +vt 0.642745 0.024129 +vt 0.642788 0.355498 +vt 0.642745 0.024153 +vt 0.021985 0.311183 +vt 0.021985 0.037220 +vt 0.251166 0.037220 +vt 0.100605 0.309645 +vt 0.100605 0.036968 +vt 0.249573 0.036968 +vt 0.100064 0.310093 +vt 0.100064 0.036130 +vt 0.249033 0.036130 +vt 0.021084 0.310487 +vt 0.021084 0.036524 +vt 0.250266 0.036524 +vt 0.101536 0.309820 +vt 0.101536 0.037184 +vt 0.248506 0.037184 +vt 0.754766 0.393358 +vt 0.754766 0.648521 +vt 0.683422 0.680417 +vt 0.909344 0.648521 +vt 0.980689 0.680417 +vt 0.984626 0.360150 +vt 0.913282 0.392046 +vt 0.758703 0.392046 +vt 0.909344 0.393358 +vt 0.672180 0.023858 +vt 0.642228 0.355729 +vt 0.310779 0.355541 +vt 0.310809 0.355595 +vt 0.251166 0.311183 +vt 0.292301 0.396658 +vt 0.623671 0.396658 +vt 0.623671 0.728667 +vt 0.249573 0.309645 +vt 0.249033 0.310093 +vt 0.250266 0.310487 +vt 0.248506 0.309820 +vt 0.683422 0.361462 +vt 0.687360 0.360150 +vt 0.980689 0.361463 +vt 0.292301 0.728667 +usemtl Material +s off +f 2/1 3/2 4/3 +f 2/4 6/5 7/6 +f 7/7 8/8 4/9 +f 1/7 4/10 8/9 +f 9/11 13/12 16/13 +f 14/14 15/15 16/16 +f 12/17 16/18 15/19 +f 11/20 15/21 14/22 +f 10/23 14/24 13/25 +f 9/26 12/27 5/28 +f 12/27 11/29 1/30 +f 2/31 10/32 9/33 +f 1/30 11/29 10/34 +f 1/35 2/1 4/3 +f 3/36 2/4 7/6 +f 3/37 7/7 4/9 +f 5/38 1/7 8/9 +f 12/39 9/11 16/13 +f 8/40 7/41 6/42 +f 13/43 14/14 16/16 +f 11/44 12/17 15/19 +f 10/45 11/20 14/22 +f 9/46 10/23 13/25 +f 6/47 9/26 5/28 +f 5/28 12/27 1/30 +f 6/48 2/31 9/33 +f 2/49 1/30 10/34 +f 5/50 8/40 6/42 diff --git a/bin/assets/kitsumedievalcraft/models/SingleForge.png b/bin/assets/kitsumedievalcraft/models/SingleForge.png new file mode 100644 index 00000000..82baa7c1 Binary files /dev/null and b/bin/assets/kitsumedievalcraft/models/SingleForge.png differ diff --git a/bin/com/kitsu/medievalcraft/block/machines/Firebox.class b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class index d29301a8..ccbead0e 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 6c015509..441ff177 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/contain/ContainerForge.class b/bin/com/kitsu/medievalcraft/contain/ContainerForge.class index 8f46bc1d..f85071b9 100644 Binary files a/bin/com/kitsu/medievalcraft/contain/ContainerForge.class and b/bin/com/kitsu/medievalcraft/contain/ContainerForge.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 7387e0be..b7e4268c 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/tileents/machine/TileForge.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileForge.class index 57b65a05..690b4b2d 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/Firebox.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java index 39d23365..4bbcea91 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,15 @@ import cpw.mods.fml.relauncher.SideOnly; public class Firebox extends BlockContainer{ private final Random random = new Random(); -/* - * - * - * [Chimney] - * [ Forge ] - * [Firebox] - * - * - * */ + /* + * + * + * [Chimney] + * [ Forge ] + * [Firebox] + * + * + * */ public Firebox(String unlocalizedName, Material material) { super(material.rock); this.setBlockName(unlocalizedName); @@ -64,68 +64,67 @@ public class Firebox extends BlockContainer{ //(xmin, ymin, zmin, // xmax, ymax, zmax) this.setBlockBounds(0.0F, 0.00F, 0.0F, - 1.0F, 0.98F, 1.0F); - + 1.0F, 0.98F, 1.0F); + } @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) - { - return true; - } - + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) + { + return true; + } + @Override public boolean isFireSource(World world, int x, int y, int z, ForgeDirection side) { - if (this == ModBlocks.firebox && side == UP) - { - return true; - } - return true; + if (this == ModBlocks.firebox && side == UP) + { + return true; + } + return true; } - + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random rand) { super.randomDisplayTick(world, x, y, z, random); if(world.getBlock(x, y+1, z).equals(Blocks.fire)){ - 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.2F; - 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); - } + 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.2F; + 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); + } } } - +//PACKETHANDLE FOR C public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int q, float a, float b, float c) { TileEntityFirebox tileEnt = (TileEntityFirebox) world.getTileEntity(x, y, z); //System.out.println(""); if(!world.isRemote){ - + if(player.inventory.getCurrentItem()!=null){ if((player.inventory.getCurrentItem().getItem()==Item.getItemFromBlock(Blocks.torch))|| - (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| - (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) + (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| + (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) ){ tileEnt.isOn=true; if(world.getBlock(x, y, z).equals(Blocks.air)){ world.setBlock(x, y+1, z, Blocks.fire, 0, 2); } - + System.out.println(tileEnt.isOn); } } - if(player.inventory.getCurrentItem()!=null){ if (tileEnt.getStackInSlot(0)==null){ tileEnt.setInventorySlotContents(0, player.inventory.getCurrentItem()); @@ -137,11 +136,11 @@ public class Firebox extends BlockContainer{ ItemStack sStack = tileEnt.getStackInSlot(0).copy(); ItemStack sStackTemp = tileEnt.getStackInSlot(0).copy(); if(tileEnt.getStackInSlot(0).stackSize < 64){ - sStackTemp.stackSize++; - if ((sStack.getItem().equals(pStack.getItem())) && (sStack.getItemDamage() == pStack.getItemDamage()) ){ - tileEnt.setInventorySlotContents(0, sStackTemp); - player.inventory.decrStackSize(player.inventory.currentItem, 1); - } + sStackTemp.stackSize++; + if ((sStack.getItem().equals(pStack.getItem())) && (sStack.getItemDamage() == pStack.getItemDamage()) ){ + tileEnt.setInventorySlotContents(0, sStackTemp); + player.inventory.decrStackSize(player.inventory.currentItem, 1); + } } } } @@ -167,7 +166,7 @@ public class Firebox extends BlockContainer{ } //tileEnt.markDirty(); - + } tileEnt.markForUpdate(); @@ -175,21 +174,21 @@ public class Firebox extends BlockContainer{ //System.out.println(player.inventory.getCurrentItem()); return true; } - + /*public void onBlockClicked(World world, int x, int y, int z, EntityPlayer player) { - + if(!world.isRemote){ if(player.inventory.getCurrentItem()!= null){ if(player.inventory.getCurrentItem().equals(ModItems.fireBow)||player.inventory.getCurrentItem().equals(Items.flint_and_steel)){ TileEntityFirebox tileEnt = (TileEntityFirebox) world.getTileEntity(x, y, z); tileEnt.isOn = true; - + } } } - + }*/ - + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { TileEntityFirebox tileEnt = (TileEntityFirebox) world.getTileEntity(x, y, z); @@ -271,6 +270,10 @@ public class Firebox extends BlockContainer{ if (item == Items.blaze_rod) return 2400; return GameRegistry.getFuelValue(p_145952_0_); } + public static boolean isItemFuel(ItemStack stack) + { + return getItemBurnTime(stack) > 0; + } @Override public int getRenderType() { return RenderId.fireboxID; @@ -283,8 +286,5 @@ public class Firebox extends BlockContainer{ public boolean isOpaqueCube() { return false; } - public static boolean isItemFuel(ItemStack stack) - { - return getItemBurnTime(stack) > 0; - } + } 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 5bb53dc3..a27f2031 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -5,32 +5,44 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemSword; +import net.minecraft.item.ItemTool; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.kitsu.medievalcraft.Main; import com.kitsu.medievalcraft.block.ModBlocks; +import com.kitsu.medievalcraft.item.ModItems; import com.kitsu.medievalcraft.renderer.RenderId; import com.kitsu.medievalcraft.tileents.machine.TileForge; import com.kitsu.medievalcraft.util.CustomTab; import com.kitsu.medievalcraft.util.TileForgePlaceables; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class Forge extends BlockContainer implements TileForgePlaceables{ private final Random random = new Random(); - - + private float mopX, mopY, mopZ, mopBlockX, mopBlockY, mopBlockZ; + private int sideMeta, c; + public Forge(String unlocalizedName, Material material) { super(material.rock); this.setBlockName(unlocalizedName); @@ -44,25 +56,22 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ //(xmin, ymin, zmin, // xmax, ymax, zmax) this.setBlockBounds(0.0F, 0.00F, 0.0F, - 1.0F, 0.5F, 1.0F); + 1.0F, 1.0F, 1.0F); - } @Override - public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) - { - return true; - } - + public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face) + { + return true; + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World world, int x, int y, int z, Random rand) { super.randomDisplayTick(world, x, y, z, random); - - } - + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack p_149689_6_) { if(!world.isRemote){ @@ -70,7 +79,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ } world.markBlockForUpdate(x, y, z); } - + private boolean shouldPlace(ItemStack stack, EntityPlayer player){ for(int i=0; i 0; + } + @Override public int getRenderType() { return RenderId.forgeID; diff --git a/src/main/java/com/kitsu/medievalcraft/block/wood/ShelfFour.java b/src/main/java/com/kitsu/medievalcraft/block/wood/ShelfFour.java index 8cf6234f..9542c7c5 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/wood/ShelfFour.java +++ b/src/main/java/com/kitsu/medievalcraft/block/wood/ShelfFour.java @@ -1106,7 +1106,7 @@ public class ShelfFour extends BlockContainer{ if(!world.isRemote){ world.setBlockMetadataWithNotify(x, y, z, (MathHelper.floor_double((player.rotationYaw * 4F) / 360F + 0.5D) & 3), 2); - + } world.markBlockForUpdate(x, y, z); diff --git a/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java b/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java index 0f03a524..673f6d2f 100644 --- a/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java +++ b/src/main/java/com/kitsu/medievalcraft/contain/ContainerForge.java @@ -29,7 +29,7 @@ public class ContainerForge extends Container { } }*/ addSlotToContainer(new Slot(tileEnt, 0, 80, 34)); - + addSlotToContainer(new Slot(tileEnt, 1, 81, 34)); //commonly used vanilla code that adds the player's inventory bindPlayerInventory(inventoryPlayer); } 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 8b36ccbc..1942e1d5 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 @@ -32,8 +32,8 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { EntityItem entItem = null; EntityItem entCoal = null; //boolean slotStatus; - public static final ResourceLocation MODEL = new ResourceLocation("kitsumedievalcraft:models/Forge.obj"); - public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/Forge.png"); + public static final ResourceLocation MODEL = new ResourceLocation("kitsumedievalcraft:models/SingleForge.obj"); + public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/SingleForge.png"); IModelCustom model = AdvancedModelLoader.loadModel(MODEL); @@ -45,36 +45,7 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glTranslatef((float) x, (float) y, (float) z); renderBlock(tileEntity, tile.getWorldObj(), tile.xCoord,tile.yCoord, tile.zCoord, ModBlocks.forge); - //System.out.println(tileEntity.isCoal); - //if(tileEntity.isCoal==true){ - //System.out.println("Renderer me plz"); - ItemStack c = new ItemStack(Items.coal, 1 , 1); - entCoal = new EntityItem(tileEntity.getWorldObj(), x, y, z, c); - GL11.glPushMatrix(); - this.entCoal.hoverStart = 0.0F; - RenderItem.renderInFrame = true; - GL11.glScalef(0.5f, 0.5f, 0.5f); - - 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); - - RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.35D, 1.0D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.95D, 1.0D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.55D, 1.0D, -0.79D, 0.0F, 0.0F); - - RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.55D, 0.7D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.15D, 0.7D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.75D, 0.7D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.35D, 0.7D, -0.79D, 0.0F, 0.0F); - - RenderManager.instance.renderEntityWithPosYaw(entCoal, 1.35D, 0.4D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.95D, 0.4D, -0.79D, 0.0F, 0.0F); - RenderManager.instance.renderEntityWithPosYaw(entCoal, 0.55D, 0.4D, -0.79D, 0.0F, 0.0F); - - RenderItem.renderInFrame = false; - GL11.glPopMatrix(); + //} @@ -84,8 +55,8 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { this.entItem.hoverStart = 0.0F; RenderItem.renderInFrame = true; GL11.glScalef(1.0f, 1.0f, 1.0f); - GL11.glRotatef(10, 0, 1, 0); - RenderManager.instance.renderEntityWithPosYaw(entItem, 0.4D, 0.3D, 0.6D, 0.0F, 0.0F); + //GL11.glRotatef(10, 0, 1, 0); + RenderManager.instance.renderEntityWithPosYaw(entItem, 0.55D, 0.25D, 0.5D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); } @@ -101,20 +72,24 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glPushMatrix(); //GL11.glRotatef(15F, 0F, 1F, 0F); float scale = 0.50f; - GL11.glScalef(scale, 1f, scale); - GL11.glTranslatef(1.0F, 0.2F, 1.0F); + GL11.glScalef(scale, scale, scale); + GL11.glTranslatef(1.0F, 1.0F, 1.0F); int dir = world.getBlockMetadata(i, j, k); + if(dir == 0){ + //GL11.glTranslatef(-1F, 0F, 1F); + GL11.glRotated(90F, 0.0, 1.0F, 0.0F); + } if(dir == 1){ //GL11.glTranslatef(-1F, 0F, 1F); - GL11.glRotated(-90F, 0.0, 1.0F, 0.0F); + //GL11.glRotated(90F, 0.0, 1.0F, 0.0F); } if(dir == 2){ //GL11.glTranslatef(-2F, 0F, 0F); - GL11.glRotated(-180F, 0.0, 1.0F, 0.0F); + GL11.glRotated(-90F, 0.0, 1.0F, 0.0F); } if(dir == 3){ //GL11.glTranslatef(-1F, 0F, -1F); - GL11.glRotated(90F, 0.0, 1.0F, 0.0F); + GL11.glRotated(180F, 0.0, 1.0F, 0.0F); } // FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE); 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 304c131a..5bf9fd94 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -19,10 +19,10 @@ public class TileForge extends TileEntity implements IInventory{ private ItemStack[] inv; private NBTTagCompound tag = new NBTTagCompound(); public int heat; - public boolean isCoal; + public boolean isOn; public TileForge(){ - this.inv = new ItemStack[1]; + this.inv = new ItemStack[2]; } @Override @@ -108,7 +108,7 @@ public class TileForge extends TileEntity implements IInventory{ @Override public int getInventoryStackLimit() { - return 1; + return 64; } @Override @@ -147,7 +147,7 @@ public class TileForge extends TileEntity implements IInventory{ } //this.stack0 = tagCompound.getString("stack0"); this.heat = tag.getInteger("HEAT"); - this.isCoal = tag.getBoolean("ISCOAL"); + this.isOn = tag.getBoolean("ISCOAL"); } @@ -167,7 +167,7 @@ public class TileForge extends TileEntity implements IInventory{ } tagCompound.setTag("Inventory", itemList); tag.setInteger("HEAT", this.heat); - tag.setBoolean("ISCOAL", this.isCoal); + tag.setBoolean("ISCOAL", this.isOn); } @Override public Packet getDescriptionPacket() { diff --git a/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png b/src/main/resources/assets/kitsumedievalcraft/models/IronIngotBlock.png index 7ac6c7e2..b19a7f15 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/SandFilter.mtl b/src/main/resources/assets/kitsumedievalcraft/models/SandFilter.mtl deleted file mode 100644 index f26bd2fb..00000000 --- a/src/main/resources/assets/kitsumedievalcraft/models/SandFilter.mtl +++ /dev/null @@ -1,12 +0,0 @@ -# Blender MTL File: 'SandFilter.blend' -# Material Count: 1 - -newmtl Material -Ns 96.078431 -Ka 0.000000 0.000000 0.000000 -Kd 0.640000 0.640000 0.640000 -Ks 0.500000 0.500000 0.500000 -Ni 1.000000 -d 1.000000 -illum 2 -map_Kd /home/kitsu/Development/Blends/SandFilter.png diff --git a/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.obj b/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.obj new file mode 100644 index 00000000..7c64cd8a --- /dev/null +++ b/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.obj @@ -0,0 +1,100 @@ +# Blender v2.71 (sub 0) OBJ File: 'SingleForge.blend' +# www.blender.org +mtllib SingleForge.mtl +o Cube +v 1.000000 -1.000000 -1.000000 +v 1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 1.000000 +v -1.000000 -1.000000 -1.000000 +v 1.000000 1.000000 -0.999999 +v 0.999999 1.000000 1.000001 +v -1.000000 1.000000 1.000000 +v -1.000000 1.000000 -1.000000 +v 0.999999 0.520000 0.799998 +v 1.000000 -0.519997 0.800000 +v 1.000000 -0.519997 -0.799993 +v 1.000000 0.520000 -0.799994 +v -0.800001 0.520000 0.799998 +v -0.800000 -0.519998 0.799999 +v -0.800000 -0.519997 -0.799994 +v -0.800000 0.520000 -0.799994 +vt 0.981149 0.023858 +vt 0.981149 0.331444 +vt 0.672180 0.331444 +vt 0.310859 0.355729 +vt 0.310859 0.023720 +vt 0.642228 0.023720 +vt 0.310736 0.024172 +vt 0.642745 0.024129 +vt 0.642788 0.355498 +vt 0.642745 0.024153 +vt 0.021985 0.311183 +vt 0.021985 0.037220 +vt 0.251166 0.037220 +vt 0.100605 0.309645 +vt 0.100605 0.036968 +vt 0.249573 0.036968 +vt 0.100064 0.310093 +vt 0.100064 0.036130 +vt 0.249033 0.036130 +vt 0.021084 0.310487 +vt 0.021084 0.036524 +vt 0.250266 0.036524 +vt 0.101536 0.309820 +vt 0.101536 0.037184 +vt 0.248506 0.037184 +vt 0.754766 0.393358 +vt 0.754766 0.648521 +vt 0.683422 0.680417 +vt 0.909344 0.648521 +vt 0.980689 0.680417 +vt 0.984626 0.360150 +vt 0.913282 0.392046 +vt 0.758703 0.392046 +vt 0.909344 0.393358 +vt 0.672180 0.023858 +vt 0.642228 0.355729 +vt 0.310779 0.355541 +vt 0.310809 0.355595 +vt 0.251166 0.311183 +vt 0.292301 0.396658 +vt 0.623671 0.396658 +vt 0.623671 0.728667 +vt 0.249573 0.309645 +vt 0.249033 0.310093 +vt 0.250266 0.310487 +vt 0.248506 0.309820 +vt 0.683422 0.361462 +vt 0.687360 0.360150 +vt 0.980689 0.361463 +vt 0.292301 0.728667 +usemtl Material +s off +f 2/1 3/2 4/3 +f 2/4 6/5 7/6 +f 7/7 8/8 4/9 +f 1/7 4/10 8/9 +f 9/11 13/12 16/13 +f 14/14 15/15 16/16 +f 12/17 16/18 15/19 +f 11/20 15/21 14/22 +f 10/23 14/24 13/25 +f 9/26 12/27 5/28 +f 12/27 11/29 1/30 +f 2/31 10/32 9/33 +f 1/30 11/29 10/34 +f 1/35 2/1 4/3 +f 3/36 2/4 7/6 +f 3/37 7/7 4/9 +f 5/38 1/7 8/9 +f 12/39 9/11 16/13 +f 8/40 7/41 6/42 +f 13/43 14/14 16/16 +f 11/44 12/17 15/19 +f 10/45 11/20 14/22 +f 9/46 10/23 13/25 +f 6/47 9/26 5/28 +f 5/28 12/27 1/30 +f 6/48 2/31 9/33 +f 2/49 1/30 10/34 +f 5/50 8/40 6/42 diff --git a/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.png b/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.png new file mode 100644 index 00000000..82baa7c1 Binary files /dev/null and b/src/main/resources/assets/kitsumedievalcraft/models/SingleForge.png differ