From 345075cf0126dac33fec3c485d46b3a00189491a Mon Sep 17 00:00:00 2001 From: Cricket Date: Fri, 3 Jul 2015 12:53:30 -0400 Subject: [PATCH 01/57] I blame @Drullkus --- .../java/com/cricketcraft/chisel/Features.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index f8ac0c624..9120c55f7 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2414,23 +2414,23 @@ void addBlocks() { technical.carverHelper.addVariation("tile.technical.13.desc", 13, "technical/grate"); technical.carverHelper.addVariation("tile.technical.14.desc", 14, "technical/malfunctionFan"); technical.carverHelper.addVariation("tile.technical.15.desc", 15, "technical/grateRusty"); - technical.carverHelper.registerAll(technical, "technical"); + technical.carverHelper.registerAll(technical, "technical"); BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent", 20); technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent", 21); technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent", 22); technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent", 23); - technical2.carverHelper.registerBlock(technical2, "technical2"); - technical2.carverHelper.registerVariations("technical"); + technical2.carverHelper.registerBlock(technical2, "technical2"); + technical2.carverHelper.registerVariations("technical"); - BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); - technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); - technical2.carverHelper.registerBlock(technical3, "technical3"); - technical2.carverHelper.registerVariations("technical"); + BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); + technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); + technical3.carverHelper.registerBlock(technical3, "technical3"); + technical3.carverHelper.registerVariations("technical"); - Carving.chisel.registerOre("technical", "technical"); + Carving.chisel.registerOre("technical", "technical"); } @Override From e4e5e0da08e49da79d8c15598ae92e1ac934e3c1 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 3 Jul 2015 17:14:58 -0400 Subject: [PATCH 02/57] Some more voidstone fixes --- .../com/cricketcraft/chisel/Features.java | 4 ++-- .../client/render/SubmapManagerVoidstone.java | 12 ++++++------ .../blocks/voidstone/animated/bevel-ctm.png | Bin 7444 -> 7444 bytes 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index f8ac0c624..75770a38f 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1074,14 +1074,14 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(9001.0F); + BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); for (int i = 0; i < 16; i++) { hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); } hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); Carving.chisel.registerOre("hexPlating", "hexPlating"); - BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(9001.0F); + BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); for (int i = 0; i < 16; i++) { hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew", (i+20)); } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java index b03c495db..139827f78 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java @@ -26,7 +26,7 @@ private class RenderBlocksVoidstone extends RenderBlocksCTM { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceXNeg(block, x, y, z, icon); - setRenderBounds(0.001, 0, 0, 1, 1, 1); + renderMinX += 0.001; setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.WEST.ordinal())); super.renderFaceXNeg(block, x, y, z, null); clearOverrideBlockTexture(); @@ -36,7 +36,7 @@ public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceXPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.EAST.ordinal())); - setRenderBounds(0, 0, 0, 0.999, 1, 1); + renderMaxX -= 0.001; super.renderFaceXPos(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -45,7 +45,7 @@ public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceYNeg(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.DOWN.ordinal())); - setRenderBounds(0, 0.001, 0, 1, 1, 1); + renderMinY += 0.001; super.renderFaceYNeg(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -54,7 +54,7 @@ public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceYPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.UP.ordinal())); - setRenderBounds(0, 0, 0, 1, 0.999, 1); + renderMaxY -= 0.001; super.renderFaceYPos(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -63,7 +63,7 @@ public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceZNeg(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.NORTH.ordinal())); - setRenderBounds(0, 0, 0.001, 1, 1, 1); + renderMinZ += 0.001; super.renderFaceZNeg(block, x, y, z, null); clearOverrideBlockTexture(); } @@ -72,7 +72,7 @@ public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { super.renderFaceZPos(block, x, y, z, icon); setOverrideBlockTexture(getBase(x, y, z, ForgeDirection.SOUTH.ordinal())); - setRenderBounds(0, 0, 0, 1, 1, 0.999); + renderMaxZ -= 0.001; super.renderFaceZPos(block, x, y, z, null); clearOverrideBlockTexture(); } diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png index a1cdc54002453dbee3d9d33c130ce98f13747271..2ea57fcff0f620b2346449a60c98aead1237f023 100644 GIT binary patch delta 236 zcmW-Zy-LGi7=@qrOKeO`nkXIWU^|G5=-8!h{tPbSQk;Z>w;>4LLV6d92!i+ED2~~J zIu&f`U{jm#HR*xFIUF9&s6XmIzlG}#$$sbZaW{PrZ$#2w)D=w!(Xi^TQTI-b#%!3F zndZ1-$#Cr!f8vvv7J)YSaX*Q)T>)dfWdlzXQ3sUR#_8Z{c;VQX?31nH?tjl4rrPl9vxh1lgJ+1dbomL2Ju7G`o6u& RZTN9gPv>VBr%%Vj`+sbVN)G@4 delta 236 zcmW-Zy-EW?7)8%F?z)b%o0S;<3QZL;pk?uALvQ|>}>?B>!`=ow~aw$fo zjNB_zp@|4=!mn6TsZt~6BY0z0Es;~8OU*QqmjXm!$N;SjW1C~F0rP$~`ufCIKHF5C zV2hF>9FpfhI2mKD_3mT=R+k~DZ-1U0RbEy_vndtTl87}4WLf5 Date: Tue, 7 Jul 2015 09:39:27 -0700 Subject: [PATCH 03/57] Removed Other mod support (moved to ChiselCompat) --- .../java/com/cricketcraft/chisel/Chisel.java | 1 - .../com/cricketcraft/chisel/Features.java | 323 +----------------- .../cricketcraft/chisel/init/ChiselTabs.java | 18 - 3 files changed, 12 insertions(+), 330 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 80589626e..612b7424d 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -133,7 +133,6 @@ public void preInit(FMLPreInitializationEvent event) { Configurations.config.load(); Configurations.refreshConfig(); - ChiselTabs.preInit(); Features.preInit(); Statistics.init(); PacketHandler.init(); diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 6d5b6e5bf..0036ca11d 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -58,34 +58,13 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; public enum Features { - - AE_CERTUS_QUARTZ("appliedenergistics2") { - - @Override - void addBlocks() { - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0, 0); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), 0, 1); - Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), 0, 2); - Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); - } - }, - - AE_SKY_STONE("appliedenergistics2") { - - @Override - void addBlocks() { - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 1, 0); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 2, 1); - Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 3, 2); - Carving.chisel.registerOre("AESkyStone", "AESkyStone"); - } - }, + ALUMINUM { @Override void addBlocks() { - BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); aluminum.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution", 20); aluminum.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate", 21); @@ -109,17 +88,6 @@ void addBlocks() { } }, - AMBER("Thaumcraft") { - - @Override - void addBlocks() { - BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 0, 0); - Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 1, 1); - amber.carverHelper.registerAll(amber, "amber"); - Carving.chisel.registerOre("amber", "amber"); - } - }, ANDESITE { @@ -177,29 +145,6 @@ boolean needsMetaRecipes() { } }, - ARCANE("Thaumcraft") { - - @Override - void addBlocks() { - BlockCarvable arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, -5); - Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, -4); - arcane.carverHelper.addVariation("tile.arcane.0.desc", 0, "arcane/moonEngrave"); - arcane.carverHelper.addVariation("tile.arcane.1.desc", 1, "arcane/moonGlowAnim"); - arcane.carverHelper.addVariation("tile.arcane.2.desc", 2, "arcane/arcaneTile"); - arcane.carverHelper.addVariation("tile.arcane.3.desc", 3, "arcane/runes"); - arcane.carverHelper.addVariation("tile.arcane.4.desc", 4, "arcane/runesGlow"); - arcane.carverHelper.addVariation("tile.arcane.5.desc", 5, "arcane/bigBrick"); - arcane.carverHelper.addVariation("tile.arcane.6.desc", 6, "arcane/conduitGlowAnim"); - arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); - arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); - arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); - arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); - arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/arcaneCrackAnim"); - arcane.carverHelper.registerAll(arcane, "arcane"); - Carving.chisel.registerOre("arcane", "arcane"); - } - }, AUTO_CHISEL { @@ -262,35 +207,7 @@ void addBlocks(){ Carving.chisel.registerOre("beacon", "beacon"); } }, - - BLOOD_RUNE("AWWayofTime") { - - @Override - void addBlocks() { - BlockCarvable bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayofTime", "AlchemicalWizardrybloodRune"), 0, 0); - bloodRune.carverHelper.addVariation("tile.bloodRune.0.desc", 0, "bloodMagic/bloodRuneArranged"); - bloodRune.carverHelper.addVariation("tile.bloodRune.1.desc", 1, "bloodMagic/bloodRuneBricks"); - bloodRune.carverHelper.addVariation("tile.bloodRune.2.desc", 2, "bloodMagic/bloodRuneCarved"); - bloodRune.carverHelper.addVariation("tile.bloodRune.3.desc", 3, "bloodMagic/bloodRuneCarvedRadial"); - bloodRune.carverHelper.addVariation("tile.bloodRune.4.desc", 4, "bloodMagic/bloodRuneClassicPanel"); - bloodRune.carverHelper.addVariation("tile.bloodRune.5.desc", 5, "bloodMagic/bloodRuneTiles"); - bloodRune.carverHelper.registerAll(bloodRune, "bloodRune"); - Carving.chisel.registerOre("bloodRune", "bloodRune"); - } - }, - - BLOOD_BLOCK("AWWayofTime") { - - @Override - void addBlocks() { - BlockCarvable bloodBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); - Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "largeBloodStoneBrick"), 0, 0); - Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "bloodStoneBrick"), 0, 1); - bloodBrick.carverHelper.registerAll(bloodBrick, "bloodBrick"); - Carving.chisel.registerOre("bloodBrick", "bloodBrick"); - } - }, + BOOKSHELF { @@ -334,7 +251,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); bronze.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/bronze/caution", 20); bronze.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/bronze/crate", 21); @@ -585,7 +502,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); copper.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/copper/caution", 20); copper.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/copper/crate", 21); @@ -1000,7 +917,7 @@ void addBlocks() { gold_block.carverHelper.addVariation("tile.gold.13.desc", 13, "gold/terrain-gold-spaceblack"); gold_block.carverHelper.addVariation("tile.gold.14.desc", 14, "gold/terrain-gold-simple"); - BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution", 20); gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate", 21); @@ -1259,7 +1176,7 @@ void addBlocks() { iron_block.carverHelper.addVariation("tile.iron.14.desc", 14, "iron/terrain-iron-vents"); iron_block.carverHelper.addVariation("tile.iron.15.desc", 15, "iron/terrain-iron-simple"); - BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution", 20); iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate", 21); @@ -1373,7 +1290,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); lead.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/lead/caution"); lead.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/lead/crate"); @@ -1988,142 +1905,6 @@ void addBlocks() { } }, - /** - * Dummy feature for all RC subsets - */ - RAILCRAFT("Railcraft"), - - RC_ABYSSAL_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block abyssal = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"); - if (abyssal == null) { - abyssal = GameRegistry.findBlock("Railcraft", "brick.abyssal"); - } - - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 0, 0); - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 1, 1); - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 2, 2); - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 3, 3); - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 4, 4); - Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 5, 5); - Carving.chisel.registerOre("RCAbyssalBlock", "RCAbyssalBlock"); - } - - ; - }, - RC_BLEACHED_BONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block bleachedBone = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"); - if (bleachedBone == null) { - bleachedBone = GameRegistry.findBlock("Railcraft", "brick.bleachedbone"); - } - - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 0, 0); - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 1, 1); - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 2, 2); - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 3, 3); - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 4, 4); - Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 5, 5); - Carving.chisel.registerOre("RCBleachedBone", "RCBleachedBone"); - } - }, - - RC_BLOOD_STAINED(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block bloodStained = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"); - if (bloodStained == null) { - bloodStained = GameRegistry.findBlock("Railcraft", "brick.bloodstained"); - } - - Carving.chisel.addVariation("RCBloodStained", bloodStained, 0, 0); - Carving.chisel.addVariation("RCBloodStained", bloodStained, 1, 1); - Carving.chisel.addVariation("RCBloodStained", bloodStained, 2, 2); - Carving.chisel.addVariation("RCBloodStained", bloodStained, 3, 3); - Carving.chisel.addVariation("RCBloodStained", bloodStained, 4, 4); - Carving.chisel.addVariation("RCBloodStained", bloodStained, 5, 5); - Carving.chisel.registerOre("RCBloodStained", "RCBloodStained"); - } - }, - - RC_FROST_BOUND_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block frostBound = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"); - if (frostBound == null) { - frostBound = GameRegistry.findBlock("Railcraft", "brick.frostbound"); - } - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 0, 0); - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 1, 1); - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 2, 2); - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 3, 3); - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 4, 4); - Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 5, 5); - Carving.chisel.registerOre("RCFrostBoundBlock", "RCFrostBoundBlock"); - } - }, - - RC_INFERNAL_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block infernal = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"); - if (infernal == null) { - infernal = GameRegistry.findBlock("Railcraft", "brick.infernal"); - } - Carving.chisel.addVariation("RCInfernalStone", infernal, 0, 0); - Carving.chisel.addVariation("RCInfernalStone", infernal, 1, 1); - Carving.chisel.addVariation("RCInfernalStone", infernal, 2, 2); - Carving.chisel.addVariation("RCInfernalStone", infernal, 3, 3); - Carving.chisel.addVariation("RCInfernalStone", infernal, 4, 4); - Carving.chisel.addVariation("RCInfernalStone", infernal, 5, 5); - Carving.chisel.registerOre("RCInfernalStone", "RCInfernalStone"); - } - }, - - RC_QUARRIED_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block quarried = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"); - if (quarried == null) { - quarried = GameRegistry.findBlock("Railcraft", "brick.quarried"); - } - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 0, 0); - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 1, 1); - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 2, 2); - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 3, 3); - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 4, 4); - Carving.chisel.addVariation("RCQuarriedBlock", quarried, 5, 5); - Carving.chisel.registerOre("RCQuarriedBlock", "RCQuarriedBlock"); - } - - ; - }, - - RC_SANDY_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { - - @Override - void addBlocks() { - Block sandy = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"); - if (sandy == null) { - sandy = GameRegistry.findBlock("Railcraft", "brick.sandy"); - } - Carving.chisel.addVariation("RCSandyStone", sandy, 0, 0); - Carving.chisel.addVariation("RCSandyStone", sandy, 1, 1); - Carving.chisel.addVariation("RCSandyStone", sandy, 2, 2); - Carving.chisel.addVariation("RCSandyStone", sandy, 3, 3); - Carving.chisel.addVariation("RCSandyStone", sandy, 4, 4); - Carving.chisel.addVariation("RCSandyStone", sandy, 5, 5); - Carving.chisel.registerOre("RCSandyStone", "RCSandyStone"); - } - }, REDSTONE_BLOCK { @@ -2245,7 +2026,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); silver.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/silver/caution", 20); silver.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/silver/crate", 21); @@ -2326,7 +2107,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); steel.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/steel/caution", 20); steel.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/steel/crate", 21); @@ -2380,18 +2161,6 @@ void addBlocks() { } }, - TALLOW("Thaumcraft") { - - @Override - void addBlocks() { - BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); - Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 5, 0); - tallow.carverHelper.addVariation("tile.tallow.0.desc", 0, "tallow/smooth"); - tallow.carverHelper.addVariation("tile.tallow.0.desc", 1, "tallow/faces"); - tallow.carverHelper.registerAll(tallow, "tallow"); - Carving.chisel.registerOre("tallow", "tallow"); - } - }, TECHNICAL { @@ -2509,7 +2278,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); tin.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/tin/caution", 20); tin.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/tin/crate", 21); @@ -2522,66 +2291,6 @@ void addBlocks() { } }, - /** - * Dummy feature for all TF subsets - */ - TWILGHT_FOREST("TwilightForest"), - - TF_MAZESTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); - Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); - Carving.chisel.registerOre("TFMazestone", "TFMazestone"); - } - }, - - TF_TOWERSTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); - Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 3, 3); - Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); - } - }, - - TF_UNDER_BRICK(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { - - @Override - void addBlocks() { - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); - Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); - Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); - } - }, - - THAUMIUM("Thaumcraft") { - - @Override - void addBlocks() { - BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); - Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0); - thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate", 20); - thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem", 21); - thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks", 22); - thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small", 23); - thaumium.carverHelper.addVariation("tile.thaumium.4.desc", 4, "thaumium/lattice", 24); - thaumium.carverHelper.addVariation("tile.thaumium.5.desc", 5, "thaumium/planks", 25); - thaumium.carverHelper.registerAll(thaumium, "thaumium"); - Carving.chisel.registerOre("thaumium", "thaumium"); - } - }, TORCH { @@ -2644,7 +2353,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) .setResistance(10F); uranium.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/uranium/caution", 20); uranium.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/uranium/crate", 21); @@ -2948,14 +2657,6 @@ private static void logDisabled(Features f) { } } - public static boolean oneModdedFeatureLoaded() { - for (Features f : values()) { - if (f.hasRequiredMod()) { - return true; - } - } - return false; - } static void preInit() { Chisel.logger.info("Starting pre-init..."); diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index 24064a51d..4dfb31aa0 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -58,20 +58,14 @@ public boolean hasSearchBar() { } } - private static boolean atLeastOneModIsLoaded = false; public static final CustomCreativeTab tabChisel = new CustomCreativeTab("tabChisel", false); public static final CustomCreativeTab tabStoneChiselBlocks = new CustomCreativeTab("tabStoneChiselBlocks", true); public static final CustomCreativeTab tabWoodChiselBlocks = new CustomCreativeTab("tabWoodChiselBlocks", true); public static final CustomCreativeTab tabMetalChiselBlocks = new CustomCreativeTab("tabMetalChiselBlocks", true); public static final CustomCreativeTab tabOtherChiselBlocks = new CustomCreativeTab("tabOtherChiselBlocks", true); - public static final CustomCreativeTab tabModdedChiselBlocks = new CustomCreativeTab("tabModdedChiselBlocks", true); public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true); - // this serves mostly just to load the static initializers - public static void preInit() { - atLeastOneModIsLoaded = Features.oneModdedFeatureLoaded(); - } public static void postInit() { @@ -100,17 +94,5 @@ public static void postInit() { else tabStairChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.nether_brick_stairs)); - if (atLeastOneModIsLoaded) { - if (Features.ARCANE.enabled()) { - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane)); - } else if (Features.BLOOD_RUNE.enabled()) { - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune)); - } else { - if (ChiselBlocks.voidstone != null) - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone)); - else - tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.obsidian)); - } - } } } From a5e59c9f5968ca26d112c55ba77fbe60fa00b17d Mon Sep 17 00:00:00 2001 From: minecreatr Date: Tue, 7 Jul 2015 10:02:44 -0700 Subject: [PATCH 04/57] Readded preinit --- src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index 4dfb31aa0..b4a74f3ad 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -67,6 +67,11 @@ public boolean hasSearchBar() { public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true); + // this serves mostly just to load the static initializers + public static void preInit() { + + } + public static void postInit() { if (Features.CHISEL.enabled()) From ec8d8c3edfc8cb8cfcd5b38f89d84cfdcae08361 Mon Sep 17 00:00:00 2001 From: minecreatr Date: Tue, 7 Jul 2015 10:03:56 -0700 Subject: [PATCH 05/57] Readded preinit call --- src/main/java/com/cricketcraft/chisel/Chisel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 612b7424d..80589626e 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -133,6 +133,7 @@ public void preInit(FMLPreInitializationEvent event) { Configurations.config.load(); Configurations.refreshConfig(); + ChiselTabs.preInit(); Features.preInit(); Statistics.init(); PacketHandler.init(); From 5a21c6bc81f3c492df9d6a73a59ccc04ee25c53a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 10 Jul 2015 18:19:32 -0400 Subject: [PATCH 06/57] Add back in RendererCTM --- .../chisel/api/rendering/ClientUtils.java | 8 ++ .../chisel/block/BlockCarvable.java | 2 +- .../chisel/block/BlockCarvableCarpet.java | 2 +- .../chisel/block/BlockCarvableGlass.java | 2 +- .../chisel/block/BlockCarvableIce.java | 2 +- .../chisel/block/BlockCarvablePackedIce.java | 2 +- .../chisel/block/BlockCarvableSand.java | 2 +- .../chisel/client/render/RendererCTM.java | 78 +++++++++++++++++++ .../chisel/proxy/ClientProxy.java | 25 ++++-- 9 files changed, 110 insertions(+), 13 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java create mode 100644 src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java new file mode 100644 index 000000000..fc3f3ded5 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java @@ -0,0 +1,8 @@ +package com.cricketcraft.chisel.api.rendering; + + +public class ClientUtils { + + public static int renderCTMId; + +} diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index eb892c6e1..faef75d41 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -16,8 +16,8 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.ctmlib.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java index 9383506e0..465429a6b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java @@ -14,7 +14,7 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.ctmlib.ClientUtils; +import com.cricketcraft.chisel.api.rendering.ClientUtils; public class BlockCarvableCarpet extends BlockCarpet implements ICarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index ec9a96b6f..d001868cc 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -14,8 +14,8 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.ctmlib.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java index 49e601cd0..aa5301795 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java @@ -17,7 +17,7 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.ctmlib.ClientUtils; +import com.cricketcraft.chisel.api.rendering.ClientUtils; public class BlockCarvableIce extends BlockIce implements ICarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java index e3d2eba2a..052da89b1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java @@ -19,7 +19,7 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.ctmlib.ClientUtils; +import com.cricketcraft.chisel.api.rendering.ClientUtils; public class BlockCarvablePackedIce extends Block implements ICarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java index b18e2ebf1..7ddfc154a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java @@ -15,8 +15,8 @@ import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.ctmlib.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java new file mode 100644 index 000000000..658e5b3bd --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java @@ -0,0 +1,78 @@ +package com.cricketcraft.chisel.client.render; + +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; +import com.cricketcraft.ctmlib.Drawing; +import com.cricketcraft.ctmlib.RenderBlocksCTM; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + +public class RendererCTM implements ISimpleBlockRenderingHandler { + + public RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); + + public RendererCTM() { + if (ClientUtils.renderCTMId == 0) { + ClientUtils.renderCTMId = RenderingRegistry.getNextAvailableRenderId(); + } + } + + @Override + public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { + GL11.glTranslatef(-0.5F, -0.5F, -0.5F); + IVariationInfo var = ((ICarvable) block).getVariation(new ItemStack(block, 1, metadata)); + RenderBlocks rb = getContext(renderer, block, Minecraft.getMinecraft().theWorld, var, metadata); + Drawing.drawBlock(block, metadata, rb); + GL11.glTranslatef(0.5F, 0.5F, 0.5F); + rb.unlockBlockBounds(); + } + + @Override + public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) { + int meta = world.getBlockMetadata(x, y, z); + IVariationInfo var = ((ICarvable) block).getVariation(world, x, y, z, meta); + RenderBlocks rb = getContext(rendererOld, block, world, var, meta); + boolean ret = rb.renderStandardBlock(block, x, y, z); + rb.unlockBlockBounds(); + return ret; + } + + private RenderBlocks getContext(RenderBlocks rendererOld, Block block, IBlockAccess world, IVariationInfo var, int meta) { + if (!rendererOld.hasOverrideBlockTexture() && var != null) { + RenderBlocks rb = var.getSubmapManager().createRenderContext(rendererOld, block, world); + if (rb != null && rb != rendererOld) { + rb.blockAccess = world; + if (rendererOld.lockBlockBounds) { + rb.overrideBlockBounds(rendererOld.renderMinX, rendererOld.renderMinY, rendererOld.renderMinZ, rendererOld.renderMaxX, rendererOld.renderMaxY, rendererOld.renderMaxZ); + } + if (rb instanceof RenderBlocksCTM) { + RenderBlocksCTM rbctm = (RenderBlocksCTM) rb; + rbctm.manager = rbctm.manager == null ? var.getSubmapManager() : rbctm.manager; + rbctm.rendererOld = rbctm.rendererOld == null ? rendererOld : rbctm.rendererOld; + } + return rb; + } + } + return rendererOld; + } + + @Override + public boolean shouldRender3DInInventory(int renderId) { + return true; + } + + @Override + public int getRenderId() { + return ClientUtils.renderCTMId; + } +} diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 27d21f62c..915eb09a4 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -1,11 +1,27 @@ package com.cricketcraft.chisel.proxy; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; + import com.cricketcraft.chisel.block.BlockCarvableBeacon; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; import com.cricketcraft.chisel.client.player.PlayerSpecials; -import com.cricketcraft.chisel.client.render.*; +import com.cricketcraft.chisel.client.render.RenderChiselSnowman; +import com.cricketcraft.chisel.client.render.RendererCTM; +import com.cricketcraft.chisel.client.render.RendererCTMPane; +import com.cricketcraft.chisel.client.render.RendererEldritch; +import com.cricketcraft.chisel.client.render.RendererLayeredGlow; +import com.cricketcraft.chisel.client.render.RendererMultiLayer; +import com.cricketcraft.chisel.client.render.RendererRoadLine; +import com.cricketcraft.chisel.client.render.RendererSimpleLayered; +import com.cricketcraft.chisel.client.render.RendererSnakeStone; +import com.cricketcraft.chisel.client.render.RendererStairs; import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel; import com.cricketcraft.chisel.client.render.tile.RenderCarvableBeacon; @@ -19,12 +35,6 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxy extends CommonProxy { @@ -36,6 +46,7 @@ public void preInit() { @Override public void init() { + RenderingRegistry.registerBlockHandler(new RendererCTM()); RenderingRegistry.registerBlockHandler(new RendererStairs()); RenderingRegistry.registerBlockHandler(new RendererCTMPane()); RenderingRegistry.registerBlockHandler(new RendererRoadLine()); From 9eab9b6e153bf2a5c4c14c585338dab2fdd64ad8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 15 Jul 2015 00:35:00 -0400 Subject: [PATCH 07/57] Update to conform to new CTMLib layout. Bit hacky, unsure if final --- gradle.properties | 2 +- .../cricketcraft/chisel/api/ICarvable.java | 10 ++- .../chisel/api/carving/CarvableHelper.java | 6 +- .../chisel/api/carving/IVariationInfo.java | 4 +- .../chisel/api/carving/VariationInfoBase.java | 41 +++++++++-- .../chisel/block/BlockCarvable.java | 9 +-- .../chisel/block/BlockCarvableBeacon.java | 6 +- .../chisel/block/BlockCarvableCarpet.java | 7 +- .../chisel/block/BlockCarvableGlass.java | 7 +- .../chisel/block/BlockCarvableIce.java | 7 +- .../chisel/block/BlockCarvablePackedIce.java | 7 +- .../chisel/block/BlockCarvablePane.java | 7 +- .../chisel/block/BlockCarvablePumpkin.java | 6 +- .../chisel/block/BlockCarvableSand.java | 7 +- .../chisel/block/BlockCarvableStairs.java | 6 +- .../chisel/block/BlockCarvableTorch.java | 7 +- .../chisel/block/BlockMultiLayer.java | 7 +- .../chisel/block/BlockPresent.java | 6 +- .../chisel/client/render/RendererCTM.java | 72 ++----------------- .../render/SubmapManagerFakeController.java | 7 +- .../chisel/compat/WailaCompat.java | 2 +- .../chisel/item/ItemCarvable.java | 2 +- .../chisel/item/ItemCarvablePumpkin.java | 2 +- 23 files changed, 96 insertions(+), 141 deletions(-) diff --git a/gradle.properties b/gradle.properties index aea219463..8298adefa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mod_version=2.4.1 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 -ctmlib_version=1.0.0.4 +ctmlib_version=1.1.1-7 ccl_version=1.1.3.136 ccc_version=1.0.6.43 nei_version=1.0.4.107 diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java index 463363b60..a2d815492 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java +++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java @@ -5,12 +5,13 @@ import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.ctmlib.ICTMBlock; import com.cricketcraft.ctmlib.ISubmapManager; /** * To be implemented on blocks that can be chiseled and need advanced metadata to variation mapping. Currently not very usable without internal classes. */ -public interface ICarvable { +public interface ICarvable extends ICTMBlock { /** * Gets a {@link ISubmapManager} from this block, based on metadata. @@ -31,15 +32,12 @@ public interface ICarvable { * The metadata of the block * @return The {@link ISubmapManager} that represents this block in the world. */ - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata); + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata); /** * Gets the {@link ISubmapManager} for this block when it is in item form. * - * @param stack - * The {@link ItemStack} representing this block; * @return A {@link ISubmapManager} */ - public IVariationInfo getVariation(ItemStack stack); + public IVariationInfo getManager(int meta); } - \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java index 85986dca6..5f9ba175e 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java @@ -142,7 +142,7 @@ public IIcon getIcon(int side, int metadata) { if (info == null) return getMissingIcon(); - return info.getSubmapManager().getIcon(side, metadata); + return info.getIcon(side, metadata); } public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { @@ -155,7 +155,7 @@ public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { if (info == null) return getMissingIcon(); - return info.getSubmapManager().getIcon(world, x, y, z, side); + return info.getIcon(world, x, y, z, side); } public void registerAll(Block block, String name) { @@ -199,7 +199,7 @@ public void registerVariation(String name, IVariationInfo info) { @SideOnly(Side.CLIENT) public void registerBlockIcons(String modName, Block block, IIconRegister register) { for (IVariationInfo info : infoList) { - info.getSubmapManager().registerIcons(modName, block, register); + info.registerIcons(modName, block, register); } } diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java index 41d7bf613..1592977e2 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java @@ -3,9 +3,7 @@ import com.cricketcraft.chisel.api.rendering.TextureType; import com.cricketcraft.ctmlib.ISubmapManager; -public interface IVariationInfo { - - ISubmapManager getSubmapManager(); +public interface IVariationInfo extends ISubmapManager { ICarvingVariation getVariation(); diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java b/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java index ecdc1ba64..0ab6621fa 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java @@ -1,6 +1,12 @@ package com.cricketcraft.chisel.api.carving; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; import com.cricketcraft.chisel.api.rendering.TextureType; import com.cricketcraft.ctmlib.ISubmapManager; @@ -34,12 +40,39 @@ public String getDescription() { } @Override - public ISubmapManager getSubmapManager() { - return manager; + public TextureType getType() { + return type; } + // ISubmapManager delegation + @Override - public TextureType getType() { - return type; + public IIcon getIcon(int side, int meta) { + return manager.getIcon(side, meta); + } + + @Override + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { + return manager.getIcon(world, x, y, z, side); + } + + @Override + public void registerIcons(String modName, Block block, IIconRegister register) { + manager.registerIcons(modName, block, register); + } + + @Override + public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { + return manager.createRenderContext(rendererOld, block, world); + } + + @Override + public void preRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) { + manager.preRenderSide(renderer, world, x, y, z, side); + } + + @Override + public void postRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) { + manager.postRenderSide(renderer, world, x, y, z, side); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index faef75d41..08fe7058f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -7,12 +7,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; @@ -84,13 +82,13 @@ public int getRenderType() { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } public static class SoundType extends Block.SoundType { @@ -180,5 +178,4 @@ public String func_150496_b() { return this.soundNamePlace; } } - } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java index 101655c2b..3d6abd10d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java @@ -63,12 +63,12 @@ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase p } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java index 465429a6b..e55f9a072 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java @@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -55,12 +54,12 @@ public int getRenderType() { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index d001868cc..ae2b852a6 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -73,13 +72,13 @@ public void getSubBlocks(Item item, CreativeTabs tabs, List list) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java index aa5301795..f354aae82 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java @@ -8,7 +8,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -64,12 +63,12 @@ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java index 052da89b1..0de0ab89c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java @@ -10,7 +10,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -72,12 +71,12 @@ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java index 576852471..b8dff33ce 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java @@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -70,12 +69,12 @@ public void getSubBlocks(Item item, CreativeTabs tabs, List list) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java index 14d21ff15..143d6f438 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java @@ -111,13 +111,13 @@ public void registerBlockIcons(IIconRegister icon) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } public void setInformation(String textureLocation) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java index 7ddfc154a..eca4ccea4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java @@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -74,13 +73,13 @@ public int getRenderType() { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } public static class SoundType extends Block.SoundType { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java index 891ce02ce..f4dcc75f9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java @@ -82,12 +82,12 @@ public int onBlockPlaced(World world, int x, int y, int z, int side, float hx, f } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(blockMeta + (metadata / 8)); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(blockMeta + (stack.getItemDamage() / 8)); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(blockMeta + (meta / 8)); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java index 29a3e3d5d..ab496c526 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -4,7 +4,6 @@ import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -35,13 +34,13 @@ public BlockCarvableTorch(int idx, String tex) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java index 1e60e6be4..54badd10e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java @@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; @@ -54,12 +53,12 @@ public void getSubBlocks(Item block, CreativeTabs tabs, List list) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java index cb6a3ec0e..cb726b13e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java @@ -215,12 +215,12 @@ public void registerBlockIcons(IIconRegister register) { } @Override - public IVariationInfo getVariation(IBlockAccess world, int x, int y, int z, int metadata) { + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { return carverHelper.getVariation(metadata); } @Override - public IVariationInfo getVariation(ItemStack stack) { - return carverHelper.getVariation(stack.getItemDamage()); + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); } } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java index 658e5b3bd..db0f9095c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java @@ -1,78 +1,14 @@ package com.cricketcraft.chisel.client.render; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.IVariationInfo; import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.ctmlib.Drawing; -import com.cricketcraft.ctmlib.RenderBlocksCTM; +import com.cricketcraft.ctmlib.CTMRenderer; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; -public class RendererCTM implements ISimpleBlockRenderingHandler { - - public RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); +public class RendererCTM extends CTMRenderer { public RendererCTM() { - if (ClientUtils.renderCTMId == 0) { - ClientUtils.renderCTMId = RenderingRegistry.getNextAvailableRenderId(); - } - } - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) { - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - IVariationInfo var = ((ICarvable) block).getVariation(new ItemStack(block, 1, metadata)); - RenderBlocks rb = getContext(renderer, block, Minecraft.getMinecraft().theWorld, var, metadata); - Drawing.drawBlock(block, metadata, rb); - GL11.glTranslatef(0.5F, 0.5F, 0.5F); - rb.unlockBlockBounds(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) { - int meta = world.getBlockMetadata(x, y, z); - IVariationInfo var = ((ICarvable) block).getVariation(world, x, y, z, meta); - RenderBlocks rb = getContext(rendererOld, block, world, var, meta); - boolean ret = rb.renderStandardBlock(block, x, y, z); - rb.unlockBlockBounds(); - return ret; - } - - private RenderBlocks getContext(RenderBlocks rendererOld, Block block, IBlockAccess world, IVariationInfo var, int meta) { - if (!rendererOld.hasOverrideBlockTexture() && var != null) { - RenderBlocks rb = var.getSubmapManager().createRenderContext(rendererOld, block, world); - if (rb != null && rb != rendererOld) { - rb.blockAccess = world; - if (rendererOld.lockBlockBounds) { - rb.overrideBlockBounds(rendererOld.renderMinX, rendererOld.renderMinY, rendererOld.renderMinZ, rendererOld.renderMaxX, rendererOld.renderMaxY, rendererOld.renderMaxZ); - } - if (rb instanceof RenderBlocksCTM) { - RenderBlocksCTM rbctm = (RenderBlocksCTM) rb; - rbctm.manager = rbctm.manager == null ? var.getSubmapManager() : rbctm.manager; - rbctm.rendererOld = rbctm.rendererOld == null ? rendererOld : rbctm.rendererOld; - } - return rb; - } - } - return rendererOld; - } - - @Override - public boolean shouldRender3DInInventory(int renderId) { - return true; - } - - @Override - public int getRenderId() { - return ClientUtils.renderCTMId; + super(RenderingRegistry.getNextAvailableRenderId()); + ClientUtils.renderCTMId = getRenderId(); } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index b84382691..9e2d04bc4 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.client.render; import com.cricketcraft.chisel.Chisel; + import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; @@ -9,9 +10,9 @@ import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.ctmlib.CTM; import com.cricketcraft.ctmlib.TextureSubmap; +import com.google.common.base.Optional; import static com.cricketcraft.ctmlib.Dir.*; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,13 +24,13 @@ public class SubmapManagerFakeController extends SubmapManagerBase { private String texturePath; public SubmapManagerFakeController(int meta, String texture) { - ctm.disableObscuredFaceCheck = true; + ctm.disableObscuredFaceCheck = Optional.of(true); this.meta = meta; texturePath = texture; } public SubmapManagerFakeController(int meta) { - ctm.disableObscuredFaceCheck = true; + ctm.disableObscuredFaceCheck = Optional.of(true); this.meta = meta; } diff --git a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java index de7c923d4..f33c2b03a 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java +++ b/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java @@ -35,7 +35,7 @@ public List getWailaBody(ItemStack stack, List strings, IWailaDa if (accessor.getBlock() instanceof ICarvable) { ICarvable block = (ICarvable) accessor.getBlock(); MovingObjectPosition pos = accessor.getPosition(); - strings.add(block.getVariation(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getMetadata()).getDescription()); + strings.add(block.getManager(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getMetadata()).getDescription()); } return strings; } diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java index e63d8a324..51ae041db 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java @@ -47,7 +47,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List lines, boo return; ICarvable carvable = (ICarvable) block; - IVariationInfo var = carvable.getVariation(stack); + IVariationInfo var = carvable.getManager(stack.getItemDamage()); if (var == null) return; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java index 753e2724c..065624654 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java @@ -53,7 +53,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List lines, boo return; ICarvable carvable = (ICarvable) block; - IVariationInfo var = carvable.getVariation(stack); + IVariationInfo var = carvable.getManager(stack.getItemDamage()); if (var == null) return; From 4e27c8e93a66bed90bb6d37cc832edb34ecbe0e3 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 15 Jul 2015 00:37:16 -0400 Subject: [PATCH 08/57] Remove copied code from ItemCarvablePumpkin --- .../chisel/item/ItemCarvablePumpkin.java | 47 +------------------ 1 file changed, 1 insertion(+), 46 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java index 065624654..f8df77e5e 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java @@ -1,62 +1,17 @@ package com.cricketcraft.chisel.item; -import java.util.List; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.General; -public class ItemCarvablePumpkin extends ItemBlock { +public class ItemCarvablePumpkin extends ItemCarvable { public ItemCarvablePumpkin(Block block) { super(block); - setMaxDamage(0); - setHasSubtypes(true); } @Override public boolean isValidArmor(ItemStack itemStack, int armorType, Entity entity){ return true; } - - @Override - public int getMetadata(int i) { - return i; - } - - @Override - public IIcon getIconFromDamage(int damage) { - return Block.getBlockFromItem(this).getIcon(2, damage); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List lines, boolean advancedTooltips) { - if (!Configurations.blockDescriptions) - return; - - Item item = General.getItem(stack); - if (item == null) - return; - - Block block = Block.getBlockFromItem(this); - if (!(block instanceof ICarvable)) - return; - - ICarvable carvable = (ICarvable) block; - IVariationInfo var = carvable.getManager(stack.getItemDamage()); - if (var == null) - return; - - lines.add(var.getDescription()); - } } From 7ca7c882fae9d196af21c1e6c7e2cad5ea8e3ba2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 15 Jul 2015 00:46:29 -0400 Subject: [PATCH 09/57] Add IConnectable for determining if other blocks can connect. Version 2.5 --- gradle.properties | 2 +- .../cricketcraft/chisel/api/IConnectable.java | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/cricketcraft/chisel/api/IConnectable.java diff --git a/gradle.properties b/gradle.properties index 8298adefa..2d90964b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=2.4.1 +mod_version=2.5.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 diff --git a/src/main/java/com/cricketcraft/chisel/api/IConnectable.java b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java new file mode 100644 index 000000000..f00e02e43 --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java @@ -0,0 +1,24 @@ +package com.cricketcraft.chisel.api; + +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + +/** + * This extension of {@link IFacade} allows the block to say whether or not OTHER CTM blocks can connect to IT. + */ +public interface IConnectable extends IFacade { + + /** + * Determines whether other CTM blocks can connect to this one. + * + * @param world + * @param x + * @param y + * @param z + * @param from + * The direction that the block is connecting from. This differes from the {@link IFacade} methods in that it is NOT the side which is being rendered. + * @return True if a block can connect to this one from the given direction. False otherwise. + */ + boolean canConnectCTM(IBlockAccess world, int x, int y, int z, ForgeDirection from); + +} From 1f475b93a12462a078e4eada0beb31078461706f Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 15 Jul 2015 00:47:29 -0400 Subject: [PATCH 10/57] Bump CTMLib version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2d90964b4..a63d06a63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mod_version=2.5.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 -ctmlib_version=1.1.1-7 +ctmlib_version=1.2.0-7 ccl_version=1.1.3.136 ccc_version=1.0.6.43 nei_version=1.0.4.107 From 512bf7bff113d3aa8eb531d83446a118f71048e0 Mon Sep 17 00:00:00 2001 From: Cricket Date: Fri, 17 Jul 2015 10:44:44 -0400 Subject: [PATCH 11/57] y u hate me so much --- src/main/java/com/cricketcraft/chisel/Chisel.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 80589626e..44e9b7671 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -199,16 +199,4 @@ public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) { Configurations.refreshConfig(); } } - - @SubscribeEvent - public void thankYou(EntityJoinWorldEvent event){ - if(!event.world.isRemote && event.entity instanceof EntityPlayerMP){ - EntityPlayerMP player = (EntityPlayerMP) event.entity; - if(!player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG).getBoolean("thanked")){ - NBTTagCompound tag = player.getEntityData().getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); - tag.setBoolean("thanked", true); - player.addChatMessage(new ChatComponentText("Thank you for half a million downloads! - The Chisel Team")); - } - } - } } From 31aeb6d85cabebc5a49e91c6fd0a6457dd69178d Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 25 Jul 2015 22:31:55 -0400 Subject: [PATCH 12/57] Fix botania compat #379 --- .../com/cricketcraft/chisel/api/IConnectable.java | 12 +++++++----- .../cricketcraft/chisel/compat/Compatibility.java | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/IConnectable.java b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java index f00e02e43..583ada355 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IConnectable.java +++ b/src/main/java/com/cricketcraft/chisel/api/IConnectable.java @@ -1,24 +1,26 @@ package com.cricketcraft.chisel.api; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; /** * This extension of {@link IFacade} allows the block to say whether or not OTHER CTM blocks can connect to IT. */ -public interface IConnectable extends IFacade { +public interface IConnectable { /** * Determines whether other CTM blocks can connect to this one. * * @param world * @param x + * The X position of the block that is connecting to this one. NOT the position of your block. * @param y + * The Y position of the block that is connecting to this one. NOT the position of your block. * @param z - * @param from - * The direction that the block is connecting from. This differes from the {@link IFacade} methods in that it is NOT the side which is being rendered. + * The Z position of the block that is connecting to this one. NOT the position of your block. + * @param side + * The side being drawn. * @return True if a block can connect to this one from the given direction. False otherwise. */ - boolean canConnectCTM(IBlockAccess world, int x, int y, int z, ForgeDirection from); + boolean canConnectCTM(IBlockAccess world, int x, int y, int z, int side); } diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index 218607413..78a447064 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -82,7 +82,8 @@ public static void init(FMLPostInitializationEvent event) { addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); - addSupport("Botania", "endStoneBrick", "end_stone", 12, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 0, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 1, 0); if(Loader.isModLoaded("EE3")){ loadEE3Values(); From 4c73140224a6032fbdd099df5d0d9f573101ed43 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Tue, 28 Jul 2015 16:00:50 -0700 Subject: [PATCH 13/57] Commit a pile of textures --- .../blocks/technical/new/ExhaustPlating-ctm.png | Bin 0 -> 4610 bytes .../blocks/technical/new/ExhaustPlating.png | Bin 0 -> 3519 bytes .../blocks/technical/new/MakeshiftPanels-v9.png | Bin 0 -> 7553 bytes .../blocks/technical/new/MegaCell-bottom.png | Bin 0 -> 3371 bytes .../blocks/technical/new/MegaCell-side.png | Bin 0 -> 3462 bytes .../blocks/technical/new/MegaCell-top.png | Bin 0 -> 3435 bytes .../blocks/technical/new/OldeTimeyServerAnim.png | Bin 0 -> 6288 bytes .../textures/blocks/technical/new/Sturdy-ctm.png | Bin 0 -> 4718 bytes .../textures/blocks/technical/new/Sturdy.png | Bin 0 -> 3423 bytes .../technical/new/weatheredGreenPanels-r4.png | Bin 0 -> 5372 bytes .../technical/new/weatheredOrangePanels-r4.png | Bin 0 -> 5447 bytes 11 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/ExhaustPlating-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/ExhaustPlating.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/MakeshiftPanels-v9.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/weatheredGreenPanels-r4.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/weatheredOrangePanels-r4.png diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/ExhaustPlating-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/ExhaustPlating-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..dc5978413457001fa0b5d54f3d44a29d053af918 GIT binary patch literal 4610 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..46773a4eaadb860598a528d916d589f7fda1aa31 GIT binary patch literal 3371 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 BPrCpB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-side.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-side.png new file mode 100644 index 0000000000000000000000000000000000000000..64c7abfc19e02891457c26a2382028aff5ae7a62 GIT binary patch literal 3462 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 N002ovPDHLkV1j}qU0VPE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png new file mode 100644 index 0000000000000000000000000000000000000000..c263042c7a3ecff6734cdd2af4290edcf6c94b66 GIT binary patch literal 6288 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 PK0rm`nS6z;`K$i{bdEG9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..90b5ffab472019a5101d5be76f6d0ff3b219aa88 GIT binary patch literal 4718 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/Sturdy.png new file mode 100644 index 0000000000000000000000000000000000000000..40893771437b9d1b17bbec2dc59f6c990e813d82 GIT binary patch literal 3423 zcmV-l4WROgP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0007tNkl_+$c!$nbCw1~90sEP$qTFSGaecRoKqxxc^1TFYv+Vm_Z!*EK06WKk4kS;pSp9^c>Jv~7!0 ziobvU^6~M3a}KRFySux5eSOjI_fblr8~ww$*X!~2_C}uPgb;`^l2Srzy}lQV#X8!Q z62G$ZJV*BXeE^(ugb)xyV6CO=IslYXWLd^wFd)W=_nx9C)_sxQdq$%XZQGJkBBeyr zG=vZskH>Uf$K~ZEQc6-vc<)Im;hbYKnUK|WP17`7U0qQW1tA0`lL^+^|7c%dUjrbe zGHWebYtGNlF~$&M@8_kBKp2jN$O`khcB7$t=t0_xotA z$@841Y4F}7M23`-7$eR(@;t{FgAfAmJ>TC;VvNYm%}rLT70=JlY;A3kQsU+1g{rF7 z+i2UC>2%8e{ystoX0sV(S(0TL@^@ubRk2(y*Sd{1Ysam%Y;SL`%T<;o!3T!JAyP`o zS4DjCbZvguM#TeKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000UnNklm>{zj6%Z5d7`I!hLRtO1+ zp{r}4RW6syWxwgZJLJ8Y8JRH$3;%{s`p!Ax+yDDEANPCerY5II2$8(ra6BA1oX@;? zdBZOsK61HPBS{Rip&)TS9vR8}#oFcKQafbu#ddczK zTdJm|dwAd+EGopncKZRAE9Pd6By)NHk=r-lap+F?FJAHWoAv&7xd@cPJ&vDKeZ-+`j(^MZwBBa*oU)P*fG#T8wk(b596?cGje#LhB>eIfibJ z2m)&zNWn5iytjXVH4XI|l+%j&$26 z($xjarpD|J}_B^J`qD?2ClWH4FQ+I8jCyioXQNJ&(>KX3M&5nLgg*HZ3kD zW@FLD(l!l9h(4g28Xp5%&xFkirJZ4@8?JNY*ma1yruoa?(EacO^K5y&T+oV)_MZ0U zhUwH1gJ*u+Vne{#$fPZzZV}dU640hhzgS{~;Q8mTdDhl=Yf+*=6oTGmQr!?jK!)HM z_6Lg91wu+xAqn$D7LuYYF+PxDq$(uB%=k&;j~!+*n0~}MNB{VMIiJY_rlDsZCyX(K zX=Xf~8FEJEj5iilD9W-xRwdDSWR8(a3cA}n9zWi5H_qguKox?zR1CW(Vo0>hmc^oB zQ#It2kcA|APY8}8dh~A3Fk4d2$nMM)k-DnLQX&o=q=Y0>3Yhu>qdFJx))A?G7eQ8Ng06veYAOipLJ#IEsP0JV) zF$9`fqrFG>19}+ILys;LX10`7g+g$>SyL(r0_J%pgv4&QrwASuf@dER*Ul4NAeS|= zR2b`-#~#%#FvgI5pe;+RwWO2~0t!`f8hUtmBwk$-t%agMl?r1mCMPmrRKYY(!Xe^~F2;L(@pvbUn7o6sq;2evpgrcB* z{*2Q+v#DyF4`k;ls)~BO#1#cT1lqQt1iUeb7*UI+W+5a^RpP3WQfta|iS(X%7+KX< zL?4hb5>h6_ND7|yddYM+&{P!{ZHp}xDMkwG@F60BXe>Dfx`&=>xuBL39|D<7AtWg} z)c47f*6oRf%hKi16ofMN+G`f<`20KiFUO_@ApiTrY$71bM%Kt zmRHZYf4Jpxb;*`XzSOEZa5b`(MyG5y(_!#rF1=8!2d%GR+#9Gf7F#{YbjKrSDFJ6gfWai7|5j;g&Cc{pa+@GZY17Eg>bw!w&H* zlSSf6LO0Fm!+{rtU>qi<6uDe)NH1>iLg2pMA*ByoFIuXiV%e_v^;drel_JK76oNu3 zR+|m0&4x@S#)NgA=hxR%NrJ zx!qFqCzLlDYi9I#;QI20dh?P+y`!pI)-P^Yv@K8j1KBmmvLc6o$cgu3&u~2A>;%D) zLPgy!C=ygfg)x@*F%yiXPc19w7<*0E_2l5Fnu=3*Mh&B;)<<%RG&$qOGmEPm_TE!n zY#6M=)eUPUDa(?!xxzIKk53)e2PW&eBr_i$p{&vKL`;c#u_OtBn`TrY=!9hI&x911 z&I46k;9^3#5cseE{vR-wi@*6T4|iLvHSEWU`m{4bOe{`z;n{dBWAA%JPpSm%*ak+*kD^Ncl~^QdVBSZh(Unb~f4*(_pNnEDGYq#V50BYKq|a zdAp@(YHAr+Gz|!W5Cw9W2As9b^Nevb<9T5B@WkLXe_oAtmGE7TtAtJyH~cWmz#CI)?q8<9^SoY`DC-pluh-;|xNuSglB8v>wst zfsiv&2t-O;u9rkrf{?_rM5gC2_&8{q#R6+B#u$ciM$eZ0H{Z~WBirK{Unr{83L`$5 za7-YPAWJsSpOF!G>#(y$PX=oP^K5ZsKHNVthlq=T{qc;OCL)4rxk6e$!{(B)ZrEI1 zpvsD(EKo`@%7V76sHLDxi8vVq87T{*03#sBz@cp!fp~Gr0O(RNO%rj^@bdG|xw=@> z6q5FGNzR{|U^sQe5Ku7$qO&xMhM}pDIkRY6cB>WH802bAvFMq`nVce1Kag|&1RCc# zri2|dSqN06C~^ftaM1G~gpyYjO$@BH4SA_xN!n10^7>!5t5T zX+~9gKKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000VdNkl4~ zdg18jaCrWdqv8SQ=WDWP(a{=ibdSh&Mi3D>QVni1JJLjc#uEv1BLp=&(r zrK8$-UXMP+`hh+sN)mc2{G6}d_uy)vFdKYh=sQb5(02}R!Sn-RVYyg2?u-><5~7W$ z1VThczjuJhB!yIL?M#^#r?gAU@7!B#hRFV+U^d&(y2y>~21BCn2bR{M-DZV~C7p4| z(Ln4XLvPWg=H|gRLTUbd?}{M_mQ`RX1j}~7+DPalvF+GiJi=CvohT@4$&=krnH4Aa zFktM!dJ~y917`3fDakWM+d7PMXxn@0>k98YqLhSH$9mPVTR-OyOT{g%xVU~3Y`e&b zvuuV)7Gc!|l9@vwZ{hdw`R&svmh9c?*mdvWE;6xJtlcg z5duC1rf)0ed+*=}kCc*33f`(OsPXh3WQ>8j3aCj5LZFo(4Us~CPy#hXyiaH?xc0Cb zBEK*@RK4T43wY~UT?dB7gM_+?^nD`rkkRRq~DG-HZw)DsZyQO4^&`vd}PiQG<0yr123EGuMC_zZ@EWC@}jvS;T ziUePVcL`}tNHAnM7i~ZSS_ri7ET-}J%=3XeAx42)JJu_Y*MYklHrI~D4UI{HJ1+7= zmV6e*tQoPMtucLItYEYB)U{{cZFmsQ>3~8c9?!2ZA<*=e*RwUNu!EF|FwBt`@gbMx z9e%(uInW1i0%Q(FCb=9Eq7+=Z#2}y@BKLC1PPfK|$SnNp zml&zozfmGHNfd&WaoCVJUN)SFG15oD?dlXlBDjQ>FxG-(66>X991?>`T-AYj7r8Wv z#zk@=$h4$tJ^$11V{D?ao=n2F7Gy3m@{vhQeA1s%wU&?)osG1{5n`gZ5p4&{css*s zffy^40H-8c2{H*mz{(|ZEifTsMM4P4;aD=Qd%SgT@U0{VV@+rSMX9hZF$5?xxLqhj zr${j|Efq-$wDpJ(k;Q04DkO5G(3zz6iBbS5ab^-If%S>ChsHz(pI8rp2UATeC*)<$ z)_8;}Brd=vB-TSD$v4HXT;lVKfj?C%w#ytJKmk!mLIC~Z@l)1MYHTK0HIdsB$^3fY zzb_r%*)gB@C1P14lpqNhY(h$?Y@%Vr`LpkM@?yq~sloU}CIpR(2oEbCIgg1|8yO-f zb%ync>olV39a>4mi?4o>#_c~b-r8lgyu#Eg?Bwt8eML1pXZ!Fji{qDU?cU@@_XYK3 z&19=Ugus*8E`RoqKY_(h$;&;W56Ix@jHO>K(MnO~1%6SH7a5oNUtznNs;ap>Tadan zI{0(y$KPPK6xB)3%ss@V{~+4H{A|VEy_Z~kH)k>(v$3A#!g2rp9^2a`2S>lA?EjhB z=if5AmE%lgypyp!?@2Bplb|iZ9rw(3{uq&c#hvAE*p)EMEvyFg0sqOWl$dpZLeQ@* zQ6{2@T(tw{wBoED*iC}-MU4*;dA8)f+GkYwEmkcQ_l!Gle1ng12X1@S+L~gCV2@9`cb!AkY~M4t6fS#?*#ML zhL0ZNt!KabhEagN4di`btJHip+{Kud-gwsaK#Y;z2DEKk=2shBjL4%)u4feoZ|`y( z@9~a1$7|?GbVI;+m`Z3};zlNTR_^o3x~1<2){SGFX@R#QsQf{~+gJOOqd8Au`xjf}cf&R7J-A!4^>pOz*J( z61h~ylR1;D4uQtUu^=fSC*p8+20;9EepEV(czI?`XRA72XZya6gXpG}uPHs|Hf%UcLFeL7ml6@PQ$V3?< zT0~S)u)RA1Au%>E43424u*T7M1LF``pBlD?z{Dl$rDHP$_EY3T#X8rkK6BPdc&xY^le~AD!yJd#BNhvYbATvQO;r9BRAu1LjQ6@oUBUK?Ogusi44~aH{ZdL<6m!KsV zHt}J+;(n@m>IJ=s?2j~Bf=!9tOt81BdD;Xj>q(hl=n|9LIpa2B*80rhcX@Wt`eM^NZkjnBb3*UM@x@OiIZ%XHVo*i@1Ajbu|Q;! zw(a@AdR`nyPHM;NIxufNRU3I=0#`O+ePZS#FHK@w3I1j==hd@@Sr@5YV(ud|y=Hgt xe0d(2`^cdb9QBd54?Nj;)^d!oHBu}7e*mgu`%U*da`*rM002ovPDHLkV1mB=Iivsp literal 0 HcmV?d00001 From b7d4abcca72583f4e307aaef84f5b6e0318572b6 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Tue, 28 Jul 2015 21:45:21 -0700 Subject: [PATCH 14/57] More Stuff --- .../com/cricketcraft/chisel/Features.java | 33 +++-- .../resources/assets/chisel/lang/en_US.lang | 8 ++ .../{MegaCell-bottom.png => MegaCell-bot.png} | Bin .../new/OldeTimeyServerAnim.png.mcmeta | 15 +++ .../blocks/technical/new/TapeDrive.png | Bin 0 -> 23202 bytes .../blocks/technical/new/TapeDrive.png.mcmeta | 117 ++++++++++++++++++ 6 files changed, 162 insertions(+), 11 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/technical/new/{MegaCell-bottom.png => MegaCell-bot.png} (100%) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 0036ca11d..2dc3b748d 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2183,23 +2183,34 @@ void addBlocks() { technical.carverHelper.addVariation("tile.technical.13.desc", 13, "technical/grate"); technical.carverHelper.addVariation("tile.technical.14.desc", 14, "technical/malfunctionFan"); technical.carverHelper.addVariation("tile.technical.15.desc", 15, "technical/grateRusty"); - technical.carverHelper.registerAll(technical, "technical"); + technical.carverHelper.registerAll(technical, "technical"); BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F).setResistance(10F); technical2.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffoldTransparent", 20); technical2.carverHelper.addVariation("tile.technical.4.desc", 1, "technical/fanFastTransparent", 21); technical2.carverHelper.addVariation("tile.technical.6.desc", 2, "technical/fanStillTransparent", 22); technical2.carverHelper.addVariation("tile.technical.14.desc", 3, "technical/fanStillTransparent", 23); - technical2.carverHelper.registerBlock(technical2, "technical2"); - technical2.carverHelper.registerVariations("technical"); - - BlockCarvable technical3 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - technical3.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); - technical3.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); - technical3.carverHelper.registerBlock(technical3, "technical3"); - technical3.carverHelper.registerVariations("technical"); - - Carving.chisel.registerOre("technical", "technical"); + technical2.carverHelper.registerBlock(technical2, "technical2"); + technical2.carverHelper.registerVariations("technical"); + + BlockCarvable technicalLarge = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + technicalLarge.carverHelper.addVariation("tile.technical3.0.desc", 0, "technical/massiveFan", 40); + technicalLarge.carverHelper.addVariation("tile.technical3.1.desc", 1, "technical/massiveHexPlating", 41); + technicalLarge.carverHelper.registerBlock(technicalLarge, "technical3"); + technicalLarge.carverHelper.registerVariations("technical"); + + BlockCarvable technical4 = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + technical4.carverHelper.addVariation("tile.technical4.0.desc", 0, "technical/new/weatheredGreenPanels"); + technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); + technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); + technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"); + technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); + technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); + technical4.carverHelper.registerBlock(technical4, "technical4"); + technical4.carverHelper.registerVariations("technical"); + + Carving.chisel.registerOre("technical", "technical"); } @Override diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index f7300f95b..6991f882c 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -329,6 +329,7 @@ tile.grimstone.14.desc=Flaky Grimstone tile.chisel.technical.name=Technical Block tile.chisel.technical2.name=Transparent Technical Block tile.chisel.technical3.name=Industrial Technical Block +tile.chisel.technical4.name=Technical Block tile.technical.0.desc=Scaffold tile.technical.1.desc=Panels with Caution Tape tile.technical.2.desc=An Old Relic from the land of Oneteufyv @@ -347,6 +348,13 @@ tile.technical.14.desc=Fan (Malfunctioning) tile.technical.15.desc=Rusty Grate tile.technical3.0.desc=I'm a big fan of this massive fan! tile.technical3.1.desc=Industrial Armor Plating +tile.technical4.0.desc=Corroded Metal Chunks +tile.technical4.1.desc=Rusted Metal Chunks +tile.technical4.2.desc=Sturdy +tile.technical4.3.desc=MegaCell© +tile.technical4.4.desc=Thermal Exhaust Plating +tile.technical4.5.desc=Makeshift Plating +tile.technical4.6.desc=Tape Drive? (I'm too young for this.) #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png rename to src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta new file mode 100644 index 000000000..4bfd91017 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/new/OldeTimeyServerAnim.png.mcmeta @@ -0,0 +1,15 @@ +{ + "animation": { + "frames": [ + 0, + 4, + 5, + 6, + 7, + 4, + 5, + 6, + 7, + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png new file mode 100644 index 0000000000000000000000000000000000000000..0c72813f105711bb7650b2d702ccd0f2cf409c50 GIT binary patch literal 23202 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta new file mode 100644 index 000000000..143d4db36 --- /dev/null +++ b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta @@ -0,0 +1,117 @@ +{ + "animation": { + "frametime": 1, + "frames": [ + 0, + 0, + 0, + 4, + 5, + 6, + 7, + 4, + 5, + 6, + 7, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 12, + 14, + 4, + 5, + 2, + 2, + 2, + 11, + 8, + 9, + 10, + 11, + 8, + 9, + 10, + 19, + 17, + 19, + 17, + 19, + 17, + 19, + 17, + 19, + 17, + 11, + 8, + 1, + 1, + 1, + 6, + 7, + 4, + 5, + 6, + 7, + 4, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 13, + 15, + 5, + 6, + 7, + 4, + 5, + 6, + 3, + 3, + 3, + 8, + 9, + 10 + 11, + 8, + 9, + 10, + 11, + 8, + 9, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 16, + 18, + 8, + 9, + 10, + 11, + 8, + 9, + 10, + 11, + ] + } +} \ No newline at end of file From 3161317962892d4225b230ba698c013b05460e60 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 29 Jul 2015 10:31:34 -0700 Subject: [PATCH 15/57] wait drull wat r u doin drull pls --- .../blocks/end_purpur/purpur_block.png | Bin 0 -> 657 bytes .../blocks/end_purpur/purpur_pillar-side.png | Bin 0 -> 743 bytes .../blocks/end_purpur/purpur_pillar-top.png | Bin 0 -> 768 bytes .../textures/blocks/endstone/end_bricks.png | Bin 0 -> 773 bytes .../blocks/technical/new/TapeDrive.png.mcmeta | 107 +----------------- 5 files changed, 1 insertion(+), 106 deletions(-) create mode 100755 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_block.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_pillar-side.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_pillar-top.png create mode 100755 src/main/resources/assets/chisel/textures/blocks/endstone/end_bricks.png diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_block.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_block.png new file mode 100755 index 0000000000000000000000000000000000000000..9c657760b43a4c99d84872dfe7b3fcd2733fb9f4 GIT binary patch literal 657 zcmV;C0&e|@P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z4h1P7PjDju00I$7L_t(I%Tb8cfI4qs~4P(C%if< zSus8x+5g-_!tQ2Ai5fiqdgS+y-z3Ss+#@QGFxQ!StlaKy0YG599f=44!UL^d@o=md zNn*vAV@6VzPn*q#?REze1e3-!+}~WhvNZFMO26g%nSr{ zb+MvG{p(OrRn(Mm96@0FY|AhXl(C?yG;f%7w?NN;*3~l;TN%@7TFz0U7ts|(g%*uy zL1t3I0|Z)YhzL;wQ(Ib6>#8-o%c7;L3y28i^M}u5%f-@J`JDRI$E&5ib5UmYGf-Z? zecibN?#||NL!Bxa$<@azUcPzBbexzU=bn1$j>3cMFV~d)-JZK|cZ>3aJrEIGj28f$ z9!}hUzsJm&>x`;)2O_8_s;aDqHLAL_V8xhyM(BZ=8P)6Z9xZ6CK|-lh?P*%+1=$dU z>Xm4Lhm)C|(3ySHB_ka#M?9PwwHN=Lvh{k6i16h36UtB)ha$o-43tu6+4>w5E4VwY zwa&f;D!td!{?x5np?XD9@a7$Lf_gX}PRoWj?+UA7VLjD}X`Yztyx0R r?41Jt_?|z0{qz-)|L;Tuq0hq~-?P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z3l*KR)7|yDRatb>#&=nqI(5%iM}7F?L)lzzD7kQRd&9fm-{A*OPMOO; zFM0Fp8{FVXG12_p@Z#bHt4}MkWH$F3tnWQ3CSr{E=-J+G8Mh-jWfp3|ZnNX=`VN48 z>UzVA_bBD-F#`G1}sKgD3sOa{uRi9vH{kSrugoWK3X;Pc1Nyng>0 z-}{-#;)exQT_G~*t?L{`3L1^U&@3Ac_XlA5(stF-x6_uv1%eBBKQSYNb>5L=Duy5& zRY#;c5mG=K&Hk|eb^)L;SHE7=Se-OlX^b({Rn7H3*K_w3igwkal$x20<48&gYb_Fm Ze*u$vsQKb8`)B|F002ovPDHLkV1n_BOE3Tc literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_pillar-top.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpur_pillar-top.png new file mode 100755 index 0000000000000000000000000000000000000000..3269d450833081c7b4ea9f4ba259b6862aec3f1c GIT binary patch literal 768 zcmV+b1ONPqP)Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2j2q; z4kR8FZNSd}00MwXL_t(I%SDn)YaCY)g};0IcK1wc#!V!G89_ABEFy#Btn#DtPYi)< zjDu|gaflunjm5k={kYG{qOD2o4xFkw=Txb;zr2-p+kybV{9=x6EiptMZXa0vxWcv; z?>&C!IbWUAJT-_2NfO3)o=@*Sk!Lx}nog;?G z=RZDEe_M0+`yG;m?O}_tt)=gK0Ah+nAL(~J$ITHzIH&_kD-dwr;RjD}0e}<}+V$=v z2L(QOLJVXkLl82P;i5yyXd}dcC_$8HkN$sx*62(#nM^>z>ZcWTT{EA}Nhx8PZNo4OWAfe- zeS|bR5)raI!w&X@UGEtBk*~DE6!~~>0Ama>L{N}YLMcV`kxXZ&m_iKbOphRei7t|7 zIlJQy1U|m|h$KOtfBWm^=a8Q>2tI%YQ(aV47ZnQ@tZ&y`es_rPx#32;bRa{vGf6951U69E94oEQKA00(qQO+^Ra0vZk?4Y@`4RsaA3mq|oHR5;5; zl1p#oL==U;TXuC9-T=~lD6G; z+iknbRV*CB`s$o>&qLn+@J;yQos{3*kDj1Qjk zpT485TV%U?6TDQU*&P7+ea3J)VQ4h*AjY+h&~e1SqpD+GwsXmPplnAMVmC zwCU9VYz_=8Q52!H0wDOncs!-U5rAq_QspHIV7!=OYYTux5l6=-B&#*sO+j!TfW_nq zJg5VV_a=xaV!Wf;Y}sF&5a{sqL{C5e1lKf-%$$LYxljKAKpTy%8?+fxBsp>C1#L8C zo6=UzgNclT{iirnVnaiotslX`c_db}RgH+Ce*g7Hf)5M^!#?rt4sA5W?iPnbq_?Pz z=KbZ0JjwCav-;x(*Er&~Zpq$fc%P8pZF>DxM&}$VQiK2^AR-g=Lx76hhGci1W@d{BwQ6vn^08zp)o+5Yk>tO4KtL%L&UWm!J4A%p;S7Lul>yL}HOFTsXfq_aS@YqO<43#l=G(8sbTPws z9YtC&Kbljl3!*r}`#@(M2d9S=>jDTk>w51xCWOGh?lxfL1s#mB00000NkvXXu0mjf D%aB|0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta index 143d4db36..772ddd313 100644 --- a/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta +++ b/src/main/resources/assets/chisel/textures/blocks/technical/new/TapeDrive.png.mcmeta @@ -1,117 +1,12 @@ { "animation": { - "frametime": 1, + "frametime": 5, "frames": [ 0, - 0, - 0, - 4, - 5, - 6, - 7, - 4, - 5, - 6, - 7, - 12, - 14, - 12, - 14, - 12, - 14, - 12, - 14, - 12, - 14, - 12, - 14, - 12, - 14, - 4, - 5, - 2, - 2, 2, - 11, - 8, - 9, - 10, - 11, - 8, - 9, - 10, - 19, - 17, - 19, - 17, - 19, - 17, - 19, - 17, - 19, - 17, - 11, - 8, - 1, - 1, - 1, - 6, - 7, - 4, - 5, - 6, - 7, - 4, - 13, - 15, - 13, - 15, - 13, - 15, - 13, - 15, - 13, - 15, - 13, - 15, - 5, - 6, - 7, 4, - 5, 6, - 3, - 3, - 3, - 8, - 9, - 10 - 11, - 8, - 9, - 10, - 11, - 8, - 9, - 18, - 16, - 18, - 16, - 18, - 16, - 18, - 16, - 18, - 16, - 18, - 8, - 9, - 10, - 11, 8, - 9, - 10, - 11, ] } } \ No newline at end of file From 47fd63ed81257288b158a97610928227c974a579 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 29 Jul 2015 12:45:29 -0700 Subject: [PATCH 16/57] Added crafting/chiseling for 1.9 content; Will work on new variations for these --- .../com/cricketcraft/chisel/Features.java | 42 +++++++++++++----- .../chisel/init/ChiselBlocks.java | 3 ++ .../resources/assets/chisel/lang/en_US.lang | 2 +- .../{MegaCell-bot.png => MegaCell-bottom.png} | Bin 4 files changed, 34 insertions(+), 13 deletions(-) rename src/main/resources/assets/chisel/textures/blocks/technical/new/{MegaCell-bot.png => MegaCell-bottom.png} (100%) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 2dc3b748d..380ee68d4 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -136,7 +136,7 @@ void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, 15), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustGlowstone")); } GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, meta), "BBB", "BdB", "BBB", - 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); + 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -622,10 +622,11 @@ void addBlocks() { @Override void addBlocks() { - //BlockCarvable end_stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - Carving.chisel.addVariation("end_stone", Blocks.end_stone , 0, 0); - //end_stone.carverHelper.registerAll(emerald_block, "endStone"); - Carving.chisel.registerOre("end_stone", "end_stone"); + BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + Carving.chisel.addVariation("end_Stone", Blocks.end_stone , 0, -1); + end_Stone.carverHelper.addVariation("tile.endstone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); + Carving.chisel.registerOre("end_Stone", "end_Stone"); } }, @@ -667,8 +668,8 @@ void addBlocks() { @Override void addRecipes() { - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', - new ItemStack(Items.iron_ingot, 1) }); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', + new ItemStack(Items.iron_ingot, 1)}); } }, @@ -1794,11 +1795,11 @@ void addBlocks() { makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.15.desc", 15, "ice/poison"); makerPackedIceStairs.create(new IStairsCreator() { - @Override - public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { - return new BlockCarvablePackedIceStairs(block, meta, helper); - } - }, "packedice_stairs", ChiselBlocks.packediceStairs); + @Override + public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { + return new BlockCarvablePackedIceStairs(block, meta, helper); + } + }, "packedice_stairs", ChiselBlocks.packediceStairs); Carving.chisel.registerOre("packedice_stairs", "packedIceStairs"); } }, @@ -1894,6 +1895,23 @@ boolean needsMetaRecipes() { } }, + PURPUR { + @Override + void addBlocks() { + BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); + purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); + + purpur.carverHelper.registerAll(purpur, "purpur"); + Carving.chisel.registerOre("purpur", "purpur"); + } + + @Override + void addRecipes() { + GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.purpur), new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), new ItemStack(Items.dye, 1, 5)); + } + }, + QUARTZ { @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index ead9941ba..f44edadb8 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -128,6 +128,9 @@ public final class ChiselBlocks { public static final BlockCarvable diorite = null; public static final BlockCarvable andesite = null; + // 1.9... drull pls + public static final BlockCarvable purpur = null; + private ChiselBlocks() { } } diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 6991f882c..90a98cfbb 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -351,7 +351,7 @@ tile.technical3.1.desc=Industrial Armor Plating tile.technical4.0.desc=Corroded Metal Chunks tile.technical4.1.desc=Rusted Metal Chunks tile.technical4.2.desc=Sturdy -tile.technical4.3.desc=MegaCell© +tile.technical4.3.desc=MegaCell™ Battery tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Tape Drive? (I'm too young for this.) diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png similarity index 100% rename from src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bot.png rename to src/main/resources/assets/chisel/textures/blocks/technical/new/MegaCell-bottom.png From 8effa08775b5c26d7f7b3a8ef0800698b6c400d5 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 29 Jul 2015 17:15:10 -0700 Subject: [PATCH 17/57] TEXTUUUUURRRRES (Added more Endstone+Purpur variants) --- .../com/cricketcraft/chisel/Features.java | 15 +++++++++++- .../resources/assets/chisel/lang/en_US.lang | 22 ++++++++++++++++++ .../blocks/end_purpur/prismaticPurpur.png | Bin 0 -> 3327 bytes .../blocks/end_purpur/purpurBricks.png | Bin 0 -> 3499 bytes .../blocks/end_purpur/purpurCobble.png | Bin 0 -> 3515 bytes .../blocks/end_purpur/shulker-side.png | Bin 0 -> 3238 bytes .../blocks/end_purpur/shulker-top.png | Bin 0 -> 3129 bytes .../blocks/end_purpur/tileBrokenPurpur.png | Bin 0 -> 3574 bytes .../textures/blocks/end_purpur/tilePurpur.png | Bin 0 -> 3527 bytes .../blocks/endstone/CheckeredTile.png | Bin 0 -> 3530 bytes .../blocks/endstone/chaoticBricks.png | Bin 0 -> 3642 bytes .../blocks/endstone/endFrenchBricks.png | Bin 0 -> 3564 bytes .../blocks/endstone/endPillar-side.png | Bin 0 -> 3546 bytes .../blocks/endstone/endPillar-top.png | Bin 0 -> 3552 bytes .../blocks/endstone/endStoneEtched-side.png | Bin 0 -> 3612 bytes .../blocks/endstone/endStoneEtched-top.png | Bin 0 -> 3602 bytes .../textures/blocks/endstone/enderCircuit.png | Bin 0 -> 3643 bytes .../blocks/endstone/prismaticEndStone.png | Bin 0 -> 3538 bytes 18 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurBricks.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/tileBrokenPurpur.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/chaoticBricks.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-top.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 380ee68d4..dc8a1f8b5 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -624,7 +624,14 @@ void addBlocks() { void addBlocks() { BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); Carving.chisel.addVariation("end_Stone", Blocks.end_stone , 0, -1); - end_Stone.carverHelper.addVariation("tile.endstone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.1.desc", 1, "endstone/chaoticBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.2.desc", 2, "endstone/CheckeredTile"); + end_Stone.carverHelper.addVariation("tile.end_Stone.3.desc", 3, "endstone/enderCircuit"); + end_Stone.carverHelper.addVariation("tile.end_Stone.4.desc", 4, "endstone/endFrenchBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); + end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); + end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); Carving.chisel.registerOre("end_Stone", "end_Stone"); } @@ -1901,6 +1908,12 @@ void addBlocks() { BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); + purpur.carverHelper.addVariation("tile.purpur.2.desc", 2, "end_purpur/shulker"); + purpur.carverHelper.addVariation("tile.purpur.3.desc", 3, "end_purpur/tilePurpur"); + purpur.carverHelper.addVariation("tile.purpur.4.desc", 4, "end_purpur/tileBrokenPurpur"); + purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); + purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); + purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); purpur.carverHelper.registerAll(purpur, "purpur"); Carving.chisel.registerOre("purpur", "purpur"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 90a98cfbb..5d5c6c910 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -356,6 +356,28 @@ tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Tape Drive? (I'm too young for this.) +#End Stone +tile.chisel.end_Stone.name=End Stone +tile.end_Stone.0.name=End Stone Bricks +tile.end_Stone.1.name=End Chaotic Bricks +tile.end_Stone.2.name=Checkered Tiles +tile.end_Stone.3.name=Ender Circuit +tile.end_Stone.4.name=Fancy Bricks +tile.end_Stone.5.name=End Stone Pillar +tile.end_Stone.6.name=Etched End Stone +tile.end_Stone.7.name=Prismatic End Stone + +#Purpur +tile.chisel.purpur.name=Purpur +tile.purpur.0.name=Medium Tiles +tile.purpur.1.name=Pillar +tile.purpur.2.name=Not Shulker +tile.purpur.3.name=Small Tiles +tile.purpur.4.name=Broken Small Tiles +tile.purpur.5.name=Prismatic Purpur +tile.purpur.6.name=Rough Bricks +tile.purpur.7.name=Cracked Surface + #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum tile.chisel.bronzeblock.name=Block of Bronze diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png new file mode 100644 index 0000000000000000000000000000000000000000..f5f16850ad599d12fa740a8fc1829a212b897c13 GIT binary patch literal 3327 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 Z9{?Quje+J_%xC}r002ovPDHLkV1nKZjnV)B literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png new file mode 100644 index 0000000000000000000000000000000000000000..de76e6465f6f52a312b5eedd11dc210536f2d5de GIT binary patch literal 3515 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/shulker-side.png new file mode 100644 index 0000000000000000000000000000000000000000..177ac788aecf7f155548fb330d4cbd182e9cafea GIT binary patch literal 3238 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png new file mode 100644 index 0000000000000000000000000000000000000000..746e2dfbeb0c051883bc8d206f3c717b6997b75f GIT binary patch literal 3527 zcmV;&4LI_NP)pPPiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0008=Nklu#H70D$3_gE<;-;>PK;L{%H9yMW%{uB(45wM(b0YEpGs4z?55 z0UI2Gv4IcxV9%p`{PSa9h=NVN!8UB(p1kGi?h0?{AzO(e6@1^PlO3WJ7^*>>#i*J} zQ52}&#ABH(*=={+T;34H5dcriCw_eW!N?sEzr?&0FI;}T1fZ%bcKMF!&nfD|^nt3Z zD2jr*sR@%1*+~rBppzW~V}Plfh+0sT1v{~$DH{5&$50LQBu&T`8J*Ul>pC4Bd7LBm zg5V(F_UV@ObWPpVj9!g+*}f3YLQLDlv`zF6e|#XCL=<&_J+SdikI)HeWs9L3O#BIs z>2Q2-Oxcv29GwsZ0iNYCeVn3pUdQTrMV4n=e7V3hOhhBtmwRsiy=Al8P}LRdbj`Q( zZf2zhvfsS`3lRm&@>IpvzTAc(R2+}Q`w{&nzBLGl3w=cV{eRY*&Mw- zLhCff2V+iuJEam8!7$+9_XBLpX6%pgEDtNNxSQV5^&NFnqbiC*p67^KaP`j>x~dar zF6qxNWJP!v;<_%I-G;~Lk#bv-hAF0FlI~N&`;e-vP*oLw z>=VyoyhD%RC_q1XeS&W2xR%SAe#X1^?}!&M(IjFLObGmd!C*k&^)#~KbbN|96TCTo z!&CZ%I&w$IT9Q3yM9T;om@Q`PvppB*7liAO^f@KXQWiH0hR%?-X<2XA++W_K?!_M2 zN)9K7 BsTBYK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png new file mode 100644 index 0000000000000000000000000000000000000000..a07a639b2171032151cdd367bdbbd3b0a80d96e9 GIT binary patch literal 3530 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 U^piD_IRF3v07*qoM6N<$f=oc4FaQ7m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png new file mode 100644 index 0000000000000000000000000000000000000000..60008c3a21dae9b9464951f39aee24bdf1f7382e GIT binary patch literal 3552 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 M07*qoM6N<$f?n>Zpa1{> literal 0 HcmV?d00001 From 5f50caf4f9b82b86a0627999d5276b361ce43d21 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 29 Jul 2015 17:39:44 -0700 Subject: [PATCH 18/57] Redid some textures. --- .../blocks/end_purpur/prismaticPurpur.png | Bin 3327 -> 3313 bytes .../blocks/end_purpur/purpurBricks.png | Bin 3499 -> 3466 bytes .../blocks/end_purpur/purpurCobble.png | Bin 3515 -> 3498 bytes .../blocks/end_purpur/tileBrokenPurpur.png | Bin 3574 -> 3540 bytes .../textures/blocks/end_purpur/tilePurpur.png | Bin 3527 -> 3464 bytes .../blocks/endstone/chaoticBricks.png | Bin 3642 -> 3558 bytes .../blocks/endstone/prismaticEndStone.png | Bin 3538 -> 3525 bytes 7 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png index f5f16850ad599d12fa740a8fc1829a212b897c13..a5229b3c619b044e3292e08fd42fc2980b3d097b 100644 GIT binary patch delta 573 zcmV-D0>b_O8SxpgzzTmHNklY)`x!+ejDQkwo@^n~h#1P$GHn<&}K;>r>zmJpd>}!QC0Af&J$_+n={g+lk&f zs!FdN?~WGbd3nZEl&=q8@o*3b56Vzzr^fs+bN$mbkN-R(B1C@#s(RUP?`~0m)*9hK z@15{qT~`PY6>MXe8N)E(II2pq0s=Nz7MOMuS`-x}2qc6aonajC=0pTQA$D8 z6t#pNk+{r^Wxs#$@z0O!c02AL?{S>&Jt1hKXtiYl5uvx9yaI0TZn?g>X8C*Jcs%m% z*LN(-0v+0^C6zdf*xnjy%4WBr)yA@4xcTFT!~FqOMT@f5mG{5BXaBNix|*=ju+fqN zKs{CJsWKmCKK%ZH!+gMsr4F?bJ^1$WjjQbyn_)verMQ1}t*8{CXrWkP)Db-0h=IFb z1oUuT|9fTnWx~Vpo+B}Dc~H^ID5IyT%nTWFtON*>cGrSv#?3~f_nuYH9V3EL@=uK0 zF^zS8bMXrDLjxNuop|N#j-&=;4rCxASnEpkKt(ScwJ6;?QUp~6 z$R-|mckDIGzh9Ui=Dd*L>F$Zc>mj?IjrD!GI8UFSm>=c~;{OK#(WhU+{UwH{00000 LNkvXXu0mjf+cFu% delta 587 zcmV-R0<`_{8UGouzzTmVNklnX`Y;3SKq38?oFTn`rNG=JvsoIm55*%26neQUj6zC zRmI&A5xhAbj*4>lav*zi_V;^K6%nDe#xM*Vk4Nq|_q=%hg2R92fQS$gwAKJ9rEqh5 zLk2K2%#55fwN@em01=^-LPXGe$K5HVkW!-ePSG+8TwPr;O%ozQ&Y6fnL|By--W*kB znkH0dd*=nfEKqA*d`1MS3czF&(F1p97zRWH5domJMs0OwP-~@>^1p$z@L_XUE_w>{ zbULA;h^Q>;5kY?`g`6`Fy9Yk~`H9P`OSaoBr4-zqloG1SIF48|M6;4o!ps(b*MDF0 z?vHnDt~Z?iJMreXH>~g0Lri@%HYP_aEQ0zuzyU&5YhV-~Rc=^Iw0SlUJE(nij|+Doei4E}vo5 zD5Wrt;{q=t$T{=<-|xJ9{c`C9Kn|Zb_1^LDW$U>}DJ62wxI4Xf!e_B_b8{|pamcvG!0GN z;H=|jbAuv+uYZ3fNT9B3x~?OHKtJ?sZa4IO4}c(Ct1II;f&wp|@?2tk@Hp!@J)aN} zlvdPrjnRgEvqz!G78%c{XN)q`O^tOHr4(6~VLtxxk*I%*2qDm18rHw8Y0oWg?)d!I zXNFI}V@94W8=N#tg_=L5V z_09SfON4)Enuw+dV+?OMZ?VpDx4XlS9+`yhrK4#ZR?8KtX&dJAIbGKQ5JeHzz9O}4 z%Mb>1qB;IJA|fo-3z9ftmd-f*d%$cq8;Wy*51xFHW36SL%`wLC?cp1d&Y63{I5hQ_45<|4*+!!f1#;nqiz5I002ov JPDHLkV1hO(XTJad delta 760 zcmV<_zzzToXNklxq;X1K_qb-5-8 z14OwgnM@{Bhl=OLbFw(2ZfbVzj?I3<)AOe|9Czg%gB=J}h#&f>NHM>eBQDM^xL@C+ zt!A-aJbsuIXsv(Al8o4ovDShIfgcbA0co5vbOY&0iqcw>`5AZh9iHdWHZ7H@u*R~w zUNQZ7O5gWHaYPUV?CU+c)u13h%Ms2v-v9L;fM(m^jKgY+t~KXBoufOAk_zAVsrNP3 zScDMx(q~g`P(wQqW+C^pd#ttyDR`(K2nkv4mIN+fJRX0uyj>E60o9=*mN7m)`7}qp z`TY&`Lyb0??RLwHUtTaT=S)Xa-u>~8+SU}m7EDeioMxw3ERi2U2$P2o@ z!&rk=mR7f9VTL$vk3><#u{+|d13(Fd84TUAquX`FVa)gPJ6dasyg)dC^dx0jqVn^c z!}fsmBxYogQt~8yLJ$Sq{&P!uno|9!=-Q5r+fZsJ9d=I5{cv_KVj$x{vQAw{EdO;Siy diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png index de76e6465f6f52a312b5eedd11dc210536f2d5de..f7110c110ee7d2231b5f59b8a1712ae30a88fc91 100644 GIT binary patch delta 759 zcmV$orf$Ph4DFP;N>*;jz45 z(sQ82}hkH*4di+PM!Kr9ktuq#TiHOT41rLRPp2L2f}{}I-L$-6k;kvTBej` zNv&Q30a=y-ptRPMMTs$n`Fu_kM0C4ds33Vr=ytm-77LV8Y|I90Ee^LWb_P{d6>&Z0 zc6Q5`&tGuP@$~eB@B17a9&kOqrhnQ8V6|E?z8a%TO{dc#Zp0`Y{R8TDc8fsZa0np~Qs7ySq9{;GVVy-dfz_6% z8L>)NTi!SZ!vWr>^G}=&&(Ir<)|#rSw&(bYW~)gUh8Sb;L!ZaxBi34;e?K!kAF@u@ zczKbNWf_NmA2OXx!GS>VkUTK@K0->#rrO{Mk3a?_cL{&JlODR%1W|yudRY3``gK9{3Qtg(2)V{kV3 z1Lk>7a-UGXmYklRZU?4Qdc7W5n&J7%XE9&!ZtorK{WiuJ;(AOF2I!3@2m{`qyeE!h pZf-`@i3fE;Ld|!XzYk3AnzzCdwlOg2nR!x8+i| z>rCfU-uK?)hd!-F3%B8-j#@`(t;vfVsU%5|Fuk7=r!gn}6C8ir!LlsEETqT_4x9sw zG3?Vl04m86_Te5~Xx7hb5HRotBw508vt-yGGF#4&Qj#VqMjC_^RP8F-XjHCqT-Rm( zFz5Q>8l7tv+XYp-O26A@azEkh(-{$)RGn>uWtT(8~r$-81AcaIofn{0P$|lZYDzZXZlvr4# zc}lm^hKLgktfu;OqHUf;gaBts*wN z4UJlZ{$G94IHg{z^LzQ5EXf#s7|}WE@U(iOebDC6J;Xh9@e`ktk{}6CwzBaM)j{(;qc#rfxRzWn`#-Rq8e zqs}(mk`{j{jYfmXuL--|4$t#gtQVNl(5yERx0722g8{?AkX^JRNCLdB$K-Z`!O&{7 zNV630*yCb!f#-S@d4cWN=t85;|2bzo9n(GRf`LqDSXh+h8(+<-p(=`It;sQ&`( zPLCfqKTs8g3X>40>Y$BAsyE-|(-OOCv)OJ~J}-aicl(G^5bE&l7a^$F70y1Lp^CEL z^usCRUt_X7!<2^6aD*uhLI{E+V6)q>%2teqBXXT{dw0vnlaIUxuP8@4%vW<-ZVQ0b zaz(q@Ce2g)(5L3q=(=6*{@gL0Ptm!i*Y6SMG3|pk{|x}b?u%QOAy~-(0000|4BqaRCwAX(#vw&Q~-eC|C}Sqb}Sc1ag39Ogf=NK(=@c1 z>4ISfnCSu@fp_5nSh8YWcJK&g)o!|B0cE=2l8{cDT8{6MEGtKsqr;-#GkoId4^M4b zmZYl`&-3tmKC|JBcBhT03@?gb7<{-*FzB%%e8h`SNLMLB3bKFe3@Lm;w2aWX=KSIu z9czp=ET#+2{yC%B@_7Hf4qJ}m;O;h3N%AsB=bBMCLSE0WDa#UDTk5)Iovty)prpcL z>Fow=-3;jMZgRVSfYurWAi!<7IE%%CWxT}J7AYh}S&+mDd7jg1x2V%%5#RcqcDspIn)PhS-uN3bozd>JDRe=z(GYB|+bV^5j%AY^w=uA`Sf?+u1ub_D1p!j#lA0PJ z1yV|Sy8*ZE?jcJ}qbDiL5-BCd8Z4GoyaEZzRjlF_&Uk-3Cd)FCI6(-(pnr$`ojYuA zH#qzE4~nACcrr#Qg+j5MEh(x3V+=?TPriR*^D0M52^DlUJLK0nRaw#6Xff^oN))9i zDQNBVn4S;uZ!`(^2Ur9SK$d1mDG9@n`=|Gbq6kMiT)eu#^HRE9pQDE#lSc_(KKz1} zz2fY*zW{%5Ol|O74`U6k>rxdJLJ2BcQP(vGM;~!x)8Z?*_uwnyI^@;!OE$Yc{ex|s z>10ZhBq&FrwdU&T3avFslF(>0m?a^{$Dh;a3F12B@8>TG23?Bu-4F5j=kM(N^$5>% z0l4RXi%ASglHmJ3Ex$#yh_JQA7(+McGM~%|wgP_^%LUH-^@yE8z~0RsvguI0gz;ny z7B1gha(Md?ooh^Kn9iqkdtHj6V6j+mIlM$3oE-AO{uWXS`a1#h;T+HPs7+0t=Xebd z1PCRl>zXu5ky29R1+L@bB%>Lhef@}1CS=RiyA$gKooQUpC0QlRXLG8mqSq2#FVf7wMfdcO+hbQ{Nz0ROLccB@rQ;6UT0BkC#j*;(WH?>{oS9-)8f8k(*l?f;&M~qESN$tgVF;|Qg-8V_XD2K_w^%n7UcTC;AQ>F|F=rVrnb;F9|GA{}T?yN^ znZ{EjBxG;m5yvs=ii)zLuwGwdYo|qiC8fBLV;L#0lkk zllG=b+0f`b{~AXO8NZuQs}-rV%Ba@NVstqopU*R2%;}H&`1d~c$VSU)*b9rs<1Z*S zbR03{^xZLQwMT@D@c+Sl^N?iCAm=1rYj4NX*W(CtX+5de&DqNx@qFLJE zaCk|p+Gc1EQT@5Y=F?B;w5v#(3jf0O;2I$W2d4*Y?`&h=*`!j6J+#^Wew#RoncPq4 z9(9p7K5Nr?S|OLyXg#TMcydT?HAfHxIG#gZ%VVq><>1M?~qsWOxy{x+Zj<1p&L5R!oj+>h=Ukemicc0kgA;QmK4a& P00000NkvXXu0mjf`=Xg! diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png index 746e2dfbeb0c051883bc8d206f3c717b6997b75f..0a67746417c22e1864e0640b09c617a6df886b03 100644 GIT binary patch delta 725 zcmV;`0xJE-8;BdQzzTn}NklYN|Y$@M~<8$`3?azmTkor z;_+xW3rAd6J zp&y7u#5j$JsEW8YSH@}N>FX17J7c}&a=h^6(-*Ql<9s@Ey&0Zc<)hC5eTS6k)|n9N{lni^NjNjB8bx%)ie#S-7CQdL?l?vO4oKQ z%R*k})Q6hm>4>$KA}i>Jp88P#4^{8~e9zt89qY0pr6kD`s;a_!j}U@9%PFdYa#OO- zE7>NaC=1G>WcPpX4&j8OZCdo8d3=0C!~(4~ec$u^{LHc}EYm`JY5Dx=GdR$_=CD6N z1VStV>n)Lp5JIqyE8csuJY)0I24f6TO02g80)5+q02xdAwnx=<%`{DPZATPE99|Aw zn=48wq>>bAL4B-|QX-LD&sSEv;+z8k>gL@Id69GX`yGE+*!;ZV{{9|oEP0U=l@VEy zQEe)ul0;cVckBouV2wqXLb9$a=hK-qODU@ob^pgbd7hJIDM~5I-%4EP=(>)os>rLH zBuxlD;GE;;_J-gBx4+!dTpL7|W%%G3^uT_<2Mha`Jz8r%Za>nVTSh%H4kNqW?oDr5 zXqtxayYC2N49+?7JZGL~E;0tU+C-&EVP00000NkvXX Hu0mjf^c!h< delta 789 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 f9W>24{|^9ON_JFSWL%;E0000j diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png index 8e1e5ea8a94d4fea350b371d2b1b06428036536d..4c7ada3a1bf78a532dc314811c09c6fcd790b01d 100644 GIT binary patch delta 787 zcmV+u1MK|L8^s&2zzToxNklcTcAk^Se2^t}29voA{b+kx~=| z0KK&p(xl*Yw$1!(ic$*Ow+^s2%YD9m`~wGXf8ot&moK(H zV|RBC6M9s%cz!@tRp5eb+m<5E5ha`)9r5gsU-|m+cZ^0qQCBTmYfcZ(`25o?UcVlp z8%3VQXrpi)=e~k)1g&g&y1mVpTTi%}@8b_bys$%_=QK^j@#UC)H{^pyAJI69>&cwS z;TWly5ii)>no420@)GnrGB6*jQwrfI0#hN!zj z$Lms2GC3S0gust{YAF~F9*~p?Srd~imIRTH78<1_S}3?0Pl?Tf$@mO~!u4I!MM|0G zXzencTwo&aUZ-uzvy9dl`n}=(NX8nvflt&6si}X7R{HeA2P~@v*)l;3!S!?ofNNcZ z6u8F4(Hd<64`VcWUb0M=6nW0w^({qN5QY(cC%_tmngWq|( zf50-2nN1fQ9Y5pj^qjjq=H~nguj>I21_Q>kbN2rEnVp>-RyT&!S;7AU07EEPd&vo- RX8;QT002ovPDHLkV1fkjcV++p delta 800 zcmV+*1K<3`8`2xFzzTo;NklI3v)SAPneqWA1GT!*SfYmJQ~YVV1X2pd{lUZR!8ng{_* zhGUAdAWS2SjnIFWlZ@fvzpM=gIPXwZg%AQ8M>y~3#3|t-W_)&rQi^mXeWKHnyjq}L z29*`X~8lv3E(l4o;*(2`xu&^kbN(=IkJL{UuJw4_T3 z$#TN&Pww);hwpRk+JLQlzmhJel#3Ff1fqep!Bwb1N~M1YLdz_h(qCC7?DYBU_IKR8 z`4$KJ_c{FIh}Uks!ky1|u)PpZOBluY+Jgewv<=m~L^$~8_?VAB`hs`gdxQPGZED}5 zmFD8VDX-snl{=sApc_S1%+W@n)c*@25VW%8)~!w6dHYRHPmhR}dvtmcWmVEN4WsFd ztAjqzt*?L61d2za373-$X_duTOK1W%UKn6I7HMkIBtZs>D{E_*$ROL6vtdruTV*<$ z;GIVsjjrpOrfo^OeS*N^+Je#X5P={{B5EmES$>M#<@mN@b~YhSBDBy5DbNIh@$j6v z$;f6i0s?|4pvVebQKGfsVswT{LVWFMnuf9{X>ET?Cydea@eFG%-EKtKu{hyL`hEI6 z!@_42iv?N;rsrb-!d?d<1;!YZl<0Ul!3-5;>8P9|pD(za&ZwND*Xt2?Vyv~8JSWfr zN^81tic$*KROp@UExz6Uoyu1nJ{+;Xx6Ajt52@;kJX;Xh003(u9{hR2_SPnMw|*u{ eVj39lc{~79B3sJBFhT(U0000 Date: Wed, 29 Jul 2015 17:53:14 -0700 Subject: [PATCH 19/57] Fix derp with lang --- .../resources/assets/chisel/lang/en_US.lang | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 5d5c6c910..0cc77194f 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -358,25 +358,25 @@ tile.technical4.6.desc=Tape Drive? (I'm too young for this.) #End Stone tile.chisel.end_Stone.name=End Stone -tile.end_Stone.0.name=End Stone Bricks -tile.end_Stone.1.name=End Chaotic Bricks -tile.end_Stone.2.name=Checkered Tiles -tile.end_Stone.3.name=Ender Circuit -tile.end_Stone.4.name=Fancy Bricks -tile.end_Stone.5.name=End Stone Pillar -tile.end_Stone.6.name=Etched End Stone -tile.end_Stone.7.name=Prismatic End Stone +tile.end_Stone.0.desc=End Stone Bricks +tile.end_Stone.1.desc=End Chaotic Bricks +tile.end_Stone.2.desc=Checkered Tiles +tile.end_Stone.3.desc=Ender Circuit +tile.end_Stone.4.desc=Fancy Bricks +tile.end_Stone.5.desc=End Stone Pillar +tile.end_Stone.6.desc=Etched End Stone +tile.end_Stone.7.desc=Prismatic End Stone #Purpur tile.chisel.purpur.name=Purpur -tile.purpur.0.name=Medium Tiles -tile.purpur.1.name=Pillar -tile.purpur.2.name=Not Shulker -tile.purpur.3.name=Small Tiles -tile.purpur.4.name=Broken Small Tiles -tile.purpur.5.name=Prismatic Purpur -tile.purpur.6.name=Rough Bricks -tile.purpur.7.name=Cracked Surface +tile.purpur.0.desc=Medium Tiles +tile.purpur.1.desc=Pillar +tile.purpur.2.desc=Not Shulker +tile.purpur.3.desc=Small Tiles +tile.purpur.4.desc=Broken Small Tiles +tile.purpur.5.desc=Prismatic Purpur +tile.purpur.6.desc=Rough Bricks +tile.purpur.7.desc=Cracked Surface #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum From 21efcfd0caf9c04bce41bd0d62f0fe1b25b200d1 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Thu, 30 Jul 2015 09:25:58 -0700 Subject: [PATCH 20/57] Pushing debug textures for @tterrag1098 to use --- .../java/com/cricketcraft/chisel/Features.java | 11 ++++------- .../technical/new/test/ExhaustPlating-0-ctm.png | Bin 0 -> 4581 bytes .../technical/new/test/ExhaustPlating-0.png | Bin 0 -> 3498 bytes .../technical/new/test/ExhaustPlating-1-ctm.png | Bin 0 -> 4634 bytes .../technical/new/test/ExhaustPlating-1.png | Bin 0 -> 3507 bytes .../technical/new/test/ExhaustPlating-2-ctm.png | Bin 0 -> 4530 bytes .../technical/new/test/ExhaustPlating-2.png | Bin 0 -> 3513 bytes .../technical/new/test/ExhaustPlating-3-ctm.png | Bin 0 -> 4625 bytes .../technical/new/test/ExhaustPlating-3.png | Bin 0 -> 3520 bytes .../technical/new/test/ExhaustPlating-ctm-0.png | Bin 0 -> 4581 bytes .../technical/new/test/ExhaustPlating-ctm-1.png | Bin 0 -> 4634 bytes .../technical/new/test/ExhaustPlating-ctm-2.png | Bin 0 -> 4530 bytes .../technical/new/test/ExhaustPlating-ctm-3.png | Bin 0 -> 4625 bytes 13 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-2-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-3-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-3.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-0.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-3.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index dc8a1f8b5..9b05176d4 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -14,7 +14,10 @@ import java.util.List; +import com.cricketcraft.chisel.api.rendering.TextureType; +import com.cricketcraft.chisel.client.render.*; import com.cricketcraft.chisel.item.chisel.ItemChisel; +import com.cricketcraft.ctmlib.ISubmapManager; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -31,12 +34,6 @@ import com.cricketcraft.chisel.api.carving.IVariationInfo; import com.cricketcraft.chisel.block.*; import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.render.SubmapManagerAntiblock; -import com.cricketcraft.chisel.client.render.SubmapManagerCarpetFloor; -import com.cricketcraft.chisel.client.render.SubmapManagerFakeController; -import com.cricketcraft.chisel.client.render.SubmapManagerLeaves; -import com.cricketcraft.chisel.client.render.SubmapManagerSlab; -import com.cricketcraft.chisel.client.render.SubmapManagerVoidstone; import com.cricketcraft.chisel.compat.fmp.ItemBlockChiselTorchPart; import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.entity.EntityBallOMoss; @@ -2235,7 +2232,7 @@ void addBlocks() { technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); - technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerRCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..c9c7254f21fb24343d72359bbe39bde8cb590d84 GIT binary patch literal 4581 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 P00000NkvXXu0mjfN!GlJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-0.png new file mode 100644 index 0000000000000000000000000000000000000000..7150adc9a23830c090ab75aeaedd3abc4dfafc4f GIT binary patch literal 3498 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 Y09%Z3+lspyAOHXW07*qoM6N<$g6+13S^xk5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..57b5ee4f7961305eb59370935faec5e528f258d0 GIT binary patch literal 4634 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 QbN~PV07*qoM6N<$g4l(^>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-1.png new file mode 100644 index 0000000000000000000000000000000000000000..bfd12cc11bf3cdc1daacdc09519f4e6dd5e57dff GIT binary patch literal 3507 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 Hu0mjfmr2i5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-3.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-3.png new file mode 100644 index 0000000000000000000000000000000000000000..d608cbf74454ec592fdd82afeb856c703fb4deb2 GIT binary patch literal 3520 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 P00000NkvXXu0mjfN!GlJ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-1.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-1.png new file mode 100644 index 0000000000000000000000000000000000000000..57b5ee4f7961305eb59370935faec5e528f258d0 GIT binary patch literal 4634 zcmV+#66NiQP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000L?NklwGD--v`oiB(=)S!YG$AH8r zi~>S3fTG5P1uG4S3lkGvtAU6M5E37t6UGryru+7E-@ZNFb?foHT-3dlZtM;TQ=8i- z)xWR4`p!B3^Di+xb3AzOvDQ*=SD*#>fX*WZg8^BVkt7M$TDhtr4*xk{sDlLil(U%QnL2dzaPri53Es@ zB}GxNxU@`J*GPb>s36c?!{LxT&$~E^B9v15V&_~N2thTSwtNWh$TxLO9LG54h~fw> zAH0H4dx!<<^bwYqm&vk>G)+1A^ADr7#(U5D`Z~$ON6}iNwFY4EiEEjz75Ly0QX-Y& zgTMSJ-I50(VVvcwp3D31fB6pb->?@6+>-N3P*z8|F&bzKue z;EEsKKvh*VO@sHI^pRtP5V|)Uo;gk&$Al0_l9(*Zu%@A|Yhs%m$~Rjz-uw3Sk_0Iv zGRrceD8d+na}Mu4RaJFIl%^>{2!_KUTI*TPldc}pG(|@drfKlb;hZ~^Clv@Gh~v2B zr9{4Y=bzcx**gSQvgY9=OQhxhFd&E+*dFmXKd;f(Hf)E1hUptF!47)o! z6h%Q@*Zk!Z&mGE#N5`|xw_U3ujRq)+0wF|~s=a?ho42m-0b@+pip6xwbUMX3hm`Ui z`2bk!W}46-ORaNns@ol{F(w}Iml1q~b>RSWO zpFe*fKOT=c`Rf%v{)I2Hxi;dJmtI6Fr5Fx}IOmAtxa;2}Nsv>e6{6UO$i*_b(x5FA_pPM-kFmyDwjR^Jk3NHv_UP z>)HsQ-|u6sCDNLzEP4C&c0TI0CmaB+HN9RB9mg@*_utzIO;uHh2bKvT5JeGbn$myj zM&dZeT8p)o#V4*M&vVMMBuNsIEJI022(1_$#;>id;bt$qxU@)P8uaZOpTxO>sA=tV9O{$w0DW_95Ms%lV@p${5UANaAFZy^G!05h)J%i`sgp;*QLyrhBl~zQ?(Y%L6fDnkmX?-KN_D*(LSTD5#_mQ)B9b)iX2NtjMOjU>htKnz zBuNhR16pe)cQy=%X=~By8j^>PhM7W!Yo5M2oOtGzE2ec4bXADHcV!nZJ$YTY>L>5(;wyiAG8}p8 z#(nqSEq~d5;Bt8(?idCnFqBZu)Tj#Jfn2~qw)>6*XrKuYi}rWNxBr(2;v;ES4@FTN z>IW!8yOwErz4F3Q(k#OmgOqZn=WTJ#J^b7U8e>{j6M}L&#aY`vXb*q!j@{0@%>BUJ zKT-rf@Z9zLc>USC@1brQlv3R{AJBo$Ir2P5Yu#3F6wx#d&CGu9Oj>y^rzI~w_j|G| zWBa~04)z20wtnCvw|)$%HOotj=<((T{ow+aE?w$!XN>6{K36sGJ#iGZBiXt3RN|Oz zAJ`a;7;ju`rFBnj7-NXznE982>bJ5il_mn3vP7SK^;L>u3L)TJJMV=M1mE^*l4oeC zh-M#@&RLxIWNAiKm8`6+w2~SEAq48WKGY9fxNreyExkMkYxvc(&+@+k04XH%1N;t_ QbN~PV07*qoM6N<$g4l(^>Hq)$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-2.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/test/ExhaustPlating-ctm-2.png new file mode 100644 index 0000000000000000000000000000000000000000..c6eceba474a687be884a8e01aea031bd7291e19d GIT binary patch literal 4530 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 Hu0mjfmr2i5 literal 0 HcmV?d00001 From d49b7aa6ba910fc54c59b22496499567615f11a0 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 31 Jul 2015 16:13:53 -0400 Subject: [PATCH 21/57] Fix RCTM --- .../client/render/SubmapManagerRCTM.java | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java index afb460a18..27c224523 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java @@ -6,7 +6,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.event.TextureStitchEvent.Post; import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.tuple.Triple; @@ -29,42 +28,42 @@ private class RenderBlocksRCTM extends RenderBlocksCTM { public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.WEST.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.WEST.ordinal()); - super.renderFaceXNeg(block, x, y, z, icon); + super.renderFaceXNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.EAST.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.EAST.ordinal()); - super.renderFaceXPos(block, x, y, z, icon); + super.renderFaceXPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.DOWN.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.DOWN.ordinal()); - super.renderFaceYNeg(block, x, y, z, icon); + super.renderFaceYNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); - super.renderFaceYPos(block, x, y, z, icon); + super.renderFaceYPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.NORTH.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); - super.renderFaceZNeg(block, x, y, z, icon); + super.renderFaceZNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.SOUTH.ordinal()); submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.SOUTH.ordinal()); - super.renderFaceZPos(block, x, y, z, icon); + super.renderFaceZPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } } @@ -78,12 +77,11 @@ public Submap(IIcon base, int wh, TextureSubmap[][] submap) { } @Override - public void TexturesStitched(Post event) { - super.TexturesStitched(event); + public void texturesStitched() { for (int i = 0; i < icons.length; i++) { for (int j = 0; j < icons[i].length; j++) { icons[i][j] = submap[i][j]; - submap[i][j].TexturesStitched(event); + submap[i][j].texturesStitched(); } } } @@ -127,16 +125,16 @@ public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, I @Override public void registerIcons(String modName, Block block, IIconRegister register) { IIcon base = register.registerIcon(modName + ":" + texturePath); - TextureSubmap[][] submaps = new TextureSubmap[size][size]; - TextureSubmap[][] submapsSmall = new TextureSubmap[size][size]; int wh = (int) Math.sqrt(size); + TextureSubmap[][] submaps = new TextureSubmap[wh][wh]; + TextureSubmap[][] submapsSmall = new TextureSubmap[wh][wh]; for (int i = 0; i < size; i++) { - AbstractSubmapManager manager = (AbstractSubmapManager) TextureType.CTMX.createManagerFor(CarvingUtils.getDefaultVariationFor(block, meta, 0), texturePath + "-ctm-" + i); + AbstractSubmapManager manager = (AbstractSubmapManager) TextureType.CTMX.createManagerFor(CarvingUtils.getDefaultVariationFor(block, meta, 0), texturePath + "-" + i); manager.registerIcons(modName, block, register); Object cached = manager.getCachedObject(); Triple triple = (Triple) cached; - submaps[size % wh][size / wh] = triple.getMiddle(); - submapsSmall[size % wh][size / wh] = triple.getRight(); + submaps[i % wh][i / wh] = triple.getMiddle(); + submapsSmall[i % wh][i / wh] = triple.getRight(); if (i == 0) { defaultIcon = triple.getRight().getSubIcon(0, 0); } From 883f5cdf9f1e7c8a3b6c44c849696439e494f74a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 31 Jul 2015 16:19:18 -0400 Subject: [PATCH 22/57] Update CTMLib version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a63d06a63..e6be616c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mod_version=2.5.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 -ctmlib_version=1.2.0-7 +ctmlib_version=1.2.0-9 ccl_version=1.1.3.136 ccc_version=1.0.6.43 nei_version=1.0.4.107 From 03b5dfc91666cfb97753bf09f020ee747139a7d8 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Fri, 31 Jul 2015 13:34:32 -0700 Subject: [PATCH 23/57] Add Piping --- .../java/com/cricketcraft/chisel/Features.java | 1 + src/main/resources/assets/chisel/lang/en_US.lang | 1 + .../textures/blocks/technical/new/Piping-r9.png | Bin 0 -> 5117 bytes 3 files changed, 2 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/technical/new/Piping-r9.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 9b05176d4..c13168011 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2235,6 +2235,7 @@ void addBlocks() { technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerRCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); + technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/Piping"); technical4.carverHelper.registerBlock(technical4, "technical4"); technical4.carverHelper.registerVariations("technical"); diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 0cc77194f..31e39b4a6 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -355,6 +355,7 @@ tile.technical4.3.desc=MegaCell™ Battery tile.technical4.4.desc=Thermal Exhaust Plating tile.technical4.5.desc=Makeshift Plating tile.technical4.6.desc=Tape Drive? (I'm too young for this.) +tile.technical4.7.desc=Pipe Dream #End Stone tile.chisel.end_Stone.name=End Stone diff --git a/src/main/resources/assets/chisel/textures/blocks/technical/new/Piping-r9.png b/src/main/resources/assets/chisel/textures/blocks/technical/new/Piping-r9.png new file mode 100644 index 0000000000000000000000000000000000000000..cf1ed4a2f75099180c2a586b46e509b0d3b86b2c GIT binary patch literal 5117 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 Date: Sat, 1 Aug 2015 14:16:03 -0400 Subject: [PATCH 24/57] #375 Fix bookshelf pick block --- .../chisel/block/BlockCarvableBookshelf.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java index 5d809a1e4..ef557bb80 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java @@ -45,9 +45,14 @@ public Item getItemDropped(int ammount, Random random, int meta) { } @Override - public int damageDropped(int damage){ - return 0; - } + public int damageDropped(int damage) { + return 0; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } @Override public float getEnchantPowerBonus(World world, int x, int y, int z) { From 5c34d19ed7a830a430d0a15a60cbf2031752c74c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 3 Aug 2015 18:46:46 -0400 Subject: [PATCH 25/57] Support for v* in RCTM, change name of class to match --- .../com/cricketcraft/chisel/Features.java | 2 +- .../chisel/api/rendering/TextureType.java | 2 +- ...CTM.java => SubmapManagerCombinedCTM.java} | 38 +++++++++++-------- 3 files changed, 25 insertions(+), 17 deletions(-) rename src/main/java/com/cricketcraft/chisel/client/render/{SubmapManagerRCTM.java => SubmapManagerCombinedCTM.java} (61%) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index c13168011..3ad115272 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2232,7 +2232,7 @@ void addBlocks() { technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); - technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerRCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/Piping"); diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java index 5c9fa0d09..53b14859e 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -29,7 +29,7 @@ /** * Handles all default {@link ISubmapManager} behavior */ -@SuppressWarnings({ "unchecked", "deprecation" }) +@SuppressWarnings("unchecked") public enum TextureType { // @formatter:off diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java similarity index 61% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java rename to src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java index 27c224523..3a4de1ba0 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerRCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java @@ -19,52 +19,59 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class SubmapManagerRCTM extends SubmapManagerBase { +public class SubmapManagerCombinedCTM extends SubmapManagerBase { @SideOnly(Side.CLIENT) private class RenderBlocksRCTM extends RenderBlocksCTM { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.WEST.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.WEST.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.WEST); super.renderFaceXNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.EAST.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.EAST.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.EAST); super.renderFaceXPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.DOWN.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.DOWN.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.DOWN); super.renderFaceYNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.UP); super.renderFaceYPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.NORTH.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.UP.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.NORTH); super.renderFaceZNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); } @Override public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { - submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.submap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.SOUTH.ordinal()); - submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerRCTM.this.smallSubmap, MathHelper.floor_double(x), MathHelper.floor_double(y), MathHelper.floor_double(z), ForgeDirection.SOUTH.ordinal()); + setIcons(rType, x, y, z, ForgeDirection.SOUTH); super.renderFaceZPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } + + private void setIcons(TextureType type, double x, double y, double z, ForgeDirection side) { + int ix = MathHelper.floor_double(x); + int iy = MathHelper.floor_double(y); + int iz = MathHelper.floor_double(z); + if (type == TextureType.V4 || type == TextureType.V9) { + submap = (TextureSubmap) TextureType.getVIcon(rType, SubmapManagerCombinedCTM.this.submap, ix, iy, iz, side.ordinal()); + submapSmall = (TextureSubmap) TextureType.getVIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); + } else { + submap = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerCombinedCTM.this.submap, ix, iy, iz, side.ordinal()); + submapSmall = (TextureSubmap) TextureType.getRIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); + } + } } private class Submap extends TextureSubmap { @@ -97,8 +104,9 @@ public void texturesStitched() { private IIcon defaultIcon; private TextureType rType; - public SubmapManagerRCTM(int meta, String texturePath, TextureType rType) { - assert rType == TextureType.R16 || rType == TextureType.R9 || rType == TextureType.R4 + public SubmapManagerCombinedCTM(int meta, String texturePath, TextureType rType) { + assert rType == TextureType.R16 || rType == TextureType.R9 || rType == TextureType.R4 || + rType == TextureType.V4 || rType == TextureType.V9 : "Not a valid random type!"; this.meta = meta; From 1796b8221f471c616d6f5ad8e6bb72dc390cf198 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 4 Aug 2015 00:08:26 -0400 Subject: [PATCH 26/57] Undo removal of compat blocks --- .../com/cricketcraft/chisel/Features.java | 367 ++++++++++++++++-- .../cricketcraft/chisel/init/ChiselTabs.java | 17 +- 2 files changed, 349 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 3ad115272..6257e7b2a 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1,23 +1,7 @@ package com.cricketcraft.chisel; -import static com.cricketcraft.chisel.init.ChiselBlocks.andesite; -import static com.cricketcraft.chisel.init.ChiselBlocks.diorite; -import static com.cricketcraft.chisel.init.ChiselBlocks.granite; -import static com.cricketcraft.chisel.init.ChiselBlocks.jackolantern; -import static com.cricketcraft.chisel.init.ChiselBlocks.planks; -import static com.cricketcraft.chisel.init.ChiselBlocks.pumpkin; -import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlass; -import static com.cricketcraft.chisel.init.ChiselBlocks.stainedGlassPane; -import static com.cricketcraft.chisel.init.ChiselBlocks.torches; -import static com.cricketcraft.chisel.utils.General.featureColors; -import static com.cricketcraft.chisel.utils.General.sGNames; - import java.util.List; -import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.chisel.client.render.*; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.ctmlib.ISubmapManager; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -27,13 +11,25 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.CarvingUtils.SimpleCarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.TextureType; import com.cricketcraft.chisel.block.*; import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.client.render.SubmapManagerAntiblock; +import com.cricketcraft.chisel.client.render.SubmapManagerCarpetFloor; +import com.cricketcraft.chisel.client.render.SubmapManagerCombinedCTM; +import com.cricketcraft.chisel.client.render.SubmapManagerFakeController; +import com.cricketcraft.chisel.client.render.SubmapManagerLeaves; +import com.cricketcraft.chisel.client.render.SubmapManagerSlab; +import com.cricketcraft.chisel.client.render.SubmapManagerVoidstone; import com.cricketcraft.chisel.compat.fmp.ItemBlockChiselTorchPart; import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.entity.EntityBallOMoss; @@ -42,26 +38,53 @@ import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.chisel.init.ChiselItems; import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.*; +import com.cricketcraft.chisel.item.ItemBallOMoss; +import com.cricketcraft.chisel.item.ItemBlockPresent; +import com.cricketcraft.chisel.item.ItemCarvable; +import com.cricketcraft.chisel.item.ItemCarvablePumpkin; +import com.cricketcraft.chisel.item.ItemCarvableSlab; +import com.cricketcraft.chisel.item.ItemCloudInABottle; +import com.cricketcraft.chisel.item.ItemSmashingRock; +import com.cricketcraft.chisel.item.ItemUpgrade; +import com.cricketcraft.chisel.item.chisel.ItemChisel; import com.google.common.collect.Lists; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; +import static com.cricketcraft.chisel.init.ChiselBlocks.*; +import static com.cricketcraft.chisel.utils.General.*; public enum Features { - + + AE_CERTUS_QUARTZ("appliedenergistics2") { + + @Override + void addBlocks() { + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), 0, 0); + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), 0, 1); + Carving.chisel.addVariation("AECertusQuartz", GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), 0, 2); + Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); + } + }, + + AE_SKY_STONE("appliedenergistics2") { + + @Override + void addBlocks() { + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 1, 0); + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 2, 1); + Carving.chisel.addVariation("AESkyStone", GameRegistry.findBlock("appliedenergistics2", "tile.BlockSkyStone"), 3, 2); + Carving.chisel.registerOre("AESkyStone", "AESkyStone"); + } + }, ALUMINUM { @Override void addBlocks() { - BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); aluminum.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/aluminum/caution", 20); aluminum.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/aluminum/crate", 21); @@ -85,6 +108,17 @@ void addBlocks() { } }, + AMBER("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 0, 0); + Carving.chisel.addVariation("amber", GameRegistry.findBlock("Thaumcraft", "blockCosmeticOpaque"), 1, 1); + amber.carverHelper.registerAll(amber, "amber"); + Carving.chisel.registerOre("amber", "amber"); + } + }, ANDESITE { @@ -142,6 +176,29 @@ boolean needsMetaRecipes() { } }, + ARCANE("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable arcane = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 6, -5); + Carving.chisel.addVariation("arcane", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 7, -4); + arcane.carverHelper.addVariation("tile.arcane.0.desc", 0, "arcane/moonEngrave"); + arcane.carverHelper.addVariation("tile.arcane.1.desc", 1, "arcane/moonGlowAnim"); + arcane.carverHelper.addVariation("tile.arcane.2.desc", 2, "arcane/arcaneTile"); + arcane.carverHelper.addVariation("tile.arcane.3.desc", 3, "arcane/runes"); + arcane.carverHelper.addVariation("tile.arcane.4.desc", 4, "arcane/runesGlow"); + arcane.carverHelper.addVariation("tile.arcane.5.desc", 5, "arcane/bigBrick"); + arcane.carverHelper.addVariation("tile.arcane.6.desc", 6, "arcane/conduitGlowAnim"); + arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); + arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); + arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); + arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); + arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/arcaneCrackAnim"); + arcane.carverHelper.registerAll(arcane, "arcane"); + Carving.chisel.registerOre("arcane", "arcane"); + } + }, AUTO_CHISEL { @@ -204,7 +261,35 @@ void addBlocks(){ Carving.chisel.registerOre("beacon", "beacon"); } }, - + + BLOOD_RUNE("AWWayofTime") { + + @Override + void addBlocks() { + BlockCarvable bloodRune = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("bloodRune", GameRegistry.findBlock("AWWayofTime", "AlchemicalWizardrybloodRune"), 0, 0); + bloodRune.carverHelper.addVariation("tile.bloodRune.0.desc", 0, "bloodMagic/bloodRuneArranged"); + bloodRune.carverHelper.addVariation("tile.bloodRune.1.desc", 1, "bloodMagic/bloodRuneBricks"); + bloodRune.carverHelper.addVariation("tile.bloodRune.2.desc", 2, "bloodMagic/bloodRuneCarved"); + bloodRune.carverHelper.addVariation("tile.bloodRune.3.desc", 3, "bloodMagic/bloodRuneCarvedRadial"); + bloodRune.carverHelper.addVariation("tile.bloodRune.4.desc", 4, "bloodMagic/bloodRuneClassicPanel"); + bloodRune.carverHelper.addVariation("tile.bloodRune.5.desc", 5, "bloodMagic/bloodRuneTiles"); + bloodRune.carverHelper.registerAll(bloodRune, "bloodRune"); + Carving.chisel.registerOre("bloodRune", "bloodRune"); + } + }, + + BLOOD_BLOCK("AWWayofTime") { + + @Override + void addBlocks() { + BlockCarvable bloodBrick = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "largeBloodStoneBrick"), 0, 0); + Carving.chisel.addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "bloodStoneBrick"), 0, 1); + bloodBrick.carverHelper.registerAll(bloodBrick, "bloodBrick"); + Carving.chisel.registerOre("bloodBrick", "bloodBrick"); + } + }, BOOKSHELF { @@ -248,7 +333,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); bronze.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/bronze/caution", 20); bronze.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/bronze/crate", 21); @@ -499,7 +584,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); copper.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/copper/caution", 20); copper.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/copper/crate", 21); @@ -922,7 +1007,7 @@ void addBlocks() { gold_block.carverHelper.addVariation("tile.gold.13.desc", 13, "gold/terrain-gold-spaceblack"); gold_block.carverHelper.addVariation("tile.gold.14.desc", 14, "gold/terrain-gold-simple"); - BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution", 20); gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate", 21); @@ -1181,7 +1266,7 @@ void addBlocks() { iron_block.carverHelper.addVariation("tile.iron.14.desc", 14, "iron/terrain-iron-vents"); iron_block.carverHelper.addVariation("tile.iron.15.desc", 15, "iron/terrain-iron-simple"); - BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution", 20); iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate", 21); @@ -1295,7 +1380,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); lead.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/lead/caution"); lead.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/lead/crate"); @@ -1933,6 +2018,142 @@ void addBlocks() { } }, + /** + * Dummy feature for all RC subsets + */ + RAILCRAFT("Railcraft"), + + RC_ABYSSAL_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block abyssal = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.abyssal"); + if (abyssal == null) { + abyssal = GameRegistry.findBlock("Railcraft", "brick.abyssal"); + } + + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 0, 0); + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 1, 1); + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 2, 2); + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 3, 3); + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 4, 4); + Carving.chisel.addVariation("RCAbyssalBlock", abyssal, 5, 5); + Carving.chisel.registerOre("RCAbyssalBlock", "RCAbyssalBlock"); + } + + ; + }, + RC_BLEACHED_BONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block bleachedBone = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bleachedbone"); + if (bleachedBone == null) { + bleachedBone = GameRegistry.findBlock("Railcraft", "brick.bleachedbone"); + } + + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 0, 0); + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 1, 1); + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 2, 2); + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 3, 3); + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 4, 4); + Carving.chisel.addVariation("RCBleachedBone", bleachedBone, 5, 5); + Carving.chisel.registerOre("RCBleachedBone", "RCBleachedBone"); + } + }, + + RC_BLOOD_STAINED(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block bloodStained = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.bloodstained"); + if (bloodStained == null) { + bloodStained = GameRegistry.findBlock("Railcraft", "brick.bloodstained"); + } + + Carving.chisel.addVariation("RCBloodStained", bloodStained, 0, 0); + Carving.chisel.addVariation("RCBloodStained", bloodStained, 1, 1); + Carving.chisel.addVariation("RCBloodStained", bloodStained, 2, 2); + Carving.chisel.addVariation("RCBloodStained", bloodStained, 3, 3); + Carving.chisel.addVariation("RCBloodStained", bloodStained, 4, 4); + Carving.chisel.addVariation("RCBloodStained", bloodStained, 5, 5); + Carving.chisel.registerOre("RCBloodStained", "RCBloodStained"); + } + }, + + RC_FROST_BOUND_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block frostBound = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.frostbound"); + if (frostBound == null) { + frostBound = GameRegistry.findBlock("Railcraft", "brick.frostbound"); + } + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 0, 0); + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 1, 1); + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 2, 2); + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 3, 3); + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 4, 4); + Carving.chisel.addVariation("RCFrostBoundBlock", frostBound, 5, 5); + Carving.chisel.registerOre("RCFrostBoundBlock", "RCFrostBoundBlock"); + } + }, + + RC_INFERNAL_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block infernal = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.infernal"); + if (infernal == null) { + infernal = GameRegistry.findBlock("Railcraft", "brick.infernal"); + } + Carving.chisel.addVariation("RCInfernalStone", infernal, 0, 0); + Carving.chisel.addVariation("RCInfernalStone", infernal, 1, 1); + Carving.chisel.addVariation("RCInfernalStone", infernal, 2, 2); + Carving.chisel.addVariation("RCInfernalStone", infernal, 3, 3); + Carving.chisel.addVariation("RCInfernalStone", infernal, 4, 4); + Carving.chisel.addVariation("RCInfernalStone", infernal, 5, 5); + Carving.chisel.registerOre("RCInfernalStone", "RCInfernalStone"); + } + }, + + RC_QUARRIED_BLOCK(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block quarried = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.quarried"); + if (quarried == null) { + quarried = GameRegistry.findBlock("Railcraft", "brick.quarried"); + } + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 0, 0); + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 1, 1); + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 2, 2); + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 3, 3); + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 4, 4); + Carving.chisel.addVariation("RCQuarriedBlock", quarried, 5, 5); + Carving.chisel.registerOre("RCQuarriedBlock", "RCQuarriedBlock"); + } + + ; + }, + + RC_SANDY_STONE(RAILCRAFT.getRequiredMod(), RAILCRAFT) { + + @Override + void addBlocks() { + Block sandy = GameRegistry.findBlock("Railcraft", "tile.railcraft.brick.sandy"); + if (sandy == null) { + sandy = GameRegistry.findBlock("Railcraft", "brick.sandy"); + } + Carving.chisel.addVariation("RCSandyStone", sandy, 0, 0); + Carving.chisel.addVariation("RCSandyStone", sandy, 1, 1); + Carving.chisel.addVariation("RCSandyStone", sandy, 2, 2); + Carving.chisel.addVariation("RCSandyStone", sandy, 3, 3); + Carving.chisel.addVariation("RCSandyStone", sandy, 4, 4); + Carving.chisel.addVariation("RCSandyStone", sandy, 5, 5); + Carving.chisel.registerOre("RCSandyStone", "RCSandyStone"); + } + }, REDSTONE_BLOCK { @@ -2054,7 +2275,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); silver.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/silver/caution", 20); silver.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/silver/crate", 21); @@ -2135,7 +2356,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); steel.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/steel/caution", 20); steel.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/steel/crate", 21); @@ -2189,6 +2410,18 @@ void addBlocks() { } }, + TALLOW("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); + Carving.chisel.addVariation("tallow", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 5, 0); + tallow.carverHelper.addVariation("tile.tallow.0.desc", 0, "tallow/smooth"); + tallow.carverHelper.addVariation("tile.tallow.0.desc", 1, "tallow/faces"); + tallow.carverHelper.registerAll(tallow, "tallow"); + Carving.chisel.registerOre("tallow", "tallow"); + } + }, TECHNICAL { @@ -2318,7 +2551,7 @@ void addBlocks() { @Override void addBlocks() { - BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); tin.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/tin/caution", 20); tin.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/tin/crate", 21); @@ -2331,6 +2564,66 @@ void addBlocks() { } }, + /** + * Dummy feature for all TF subsets + */ + TWILGHT_FOREST("TwilightForest"), + + TF_MAZESTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { + + @Override + void addBlocks() { + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); + Carving.chisel.addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); + Carving.chisel.registerOre("TFMazestone", "TFMazestone"); + } + }, + + TF_TOWERSTONE(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { + + @Override + void addBlocks() { + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); + Carving.chisel.addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 3, 3); + Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); + } + }, + + TF_UNDER_BRICK(TWILGHT_FOREST.getRequiredMod(), TWILGHT_FOREST) { + + @Override + void addBlocks() { + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); + Carving.chisel.addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); + Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); + } + }, + + THAUMIUM("Thaumcraft") { + + @Override + void addBlocks() { + BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); + Carving.chisel.addVariation("thaumium", GameRegistry.findBlock("Thaumcraft", "blockCosmeticSolid"), 4, 0); + thaumium.carverHelper.addVariation("tile.thaumium.0.desc", 0, "thaumium/ornate", 20); + thaumium.carverHelper.addVariation("tile.thaumium.1.desc", 1, "thaumium/totem", 21); + thaumium.carverHelper.addVariation("tile.thaumium.2.desc", 2, "thaumium/thaumiumBigBricks", 22); + thaumium.carverHelper.addVariation("tile.thaumium.3.desc", 3, "thaumium/small", 23); + thaumium.carverHelper.addVariation("tile.thaumium.4.desc", 4, "thaumium/lattice", 24); + thaumium.carverHelper.addVariation("tile.thaumium.5.desc", 5, "thaumium/planks", 25); + thaumium.carverHelper.registerAll(thaumium, "thaumium"); + Carving.chisel.registerOre("thaumium", "thaumium"); + } + }, TORCH { @@ -2393,7 +2686,7 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F) + BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) .setResistance(10F); uranium.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/uranium/caution", 20); uranium.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/uranium/crate", 21); @@ -2697,6 +2990,14 @@ private static void logDisabled(Features f) { } } + public static boolean oneModdedFeatureLoaded() { + for (Features f : values()) { + if (f.hasRequiredMod()) { + return true; + } + } + return false; + } static void preInit() { Chisel.logger.info("Starting pre-init..."); diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index b4a74f3ad..24064a51d 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -58,18 +58,19 @@ public boolean hasSearchBar() { } } + private static boolean atLeastOneModIsLoaded = false; public static final CustomCreativeTab tabChisel = new CustomCreativeTab("tabChisel", false); public static final CustomCreativeTab tabStoneChiselBlocks = new CustomCreativeTab("tabStoneChiselBlocks", true); public static final CustomCreativeTab tabWoodChiselBlocks = new CustomCreativeTab("tabWoodChiselBlocks", true); public static final CustomCreativeTab tabMetalChiselBlocks = new CustomCreativeTab("tabMetalChiselBlocks", true); public static final CustomCreativeTab tabOtherChiselBlocks = new CustomCreativeTab("tabOtherChiselBlocks", true); + public static final CustomCreativeTab tabModdedChiselBlocks = new CustomCreativeTab("tabModdedChiselBlocks", true); public static final CustomCreativeTab tabStairChiselBlocks = new CustomCreativeTab("tabStairChiselBlocks", true); - // this serves mostly just to load the static initializers public static void preInit() { - + atLeastOneModIsLoaded = Features.oneModdedFeatureLoaded(); } public static void postInit() { @@ -99,5 +100,17 @@ public static void postInit() { else tabStairChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.nether_brick_stairs)); + if (atLeastOneModIsLoaded) { + if (Features.ARCANE.enabled()) { + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.arcane)); + } else if (Features.BLOOD_RUNE.enabled()) { + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.bloodRune)); + } else { + if (ChiselBlocks.voidstone != null) + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(ChiselBlocks.voidstone)); + else + tabModdedChiselBlocks.setTabIconItemStack(new ItemStack(Blocks.obsidian)); + } + } } } From 425cb18bdf389b32f95b799f6f6c3b4a1219d8a3 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Mon, 3 Aug 2015 21:32:39 -0700 Subject: [PATCH 27/57] The End? --- .../com/cricketcraft/chisel/Features.java | 6 ++++++ .../blocks/endstone/CheckeredTile.png | Bin 3530 -> 3505 bytes .../blocks/endstone/EnderFrame-0-ctm.png | Bin 0 -> 5303 bytes .../textures/blocks/endstone/EnderFrame-0.png | Bin 0 -> 3542 bytes .../blocks/endstone/EnderFrame-1-ctm.png | Bin 0 -> 5337 bytes .../textures/blocks/endstone/EnderFrame-1.png | Bin 0 -> 3538 bytes .../blocks/endstone/EnderFrame-2-ctm.png | Bin 0 -> 5356 bytes .../textures/blocks/endstone/EnderFrame-2.png | Bin 0 -> 3547 bytes .../blocks/endstone/EnderFrame-3-ctm.png | Bin 0 -> 5357 bytes .../textures/blocks/endstone/EnderFrame-3.png | Bin 0 -> 3540 bytes .../blocks/endstone/EnderFrame-4-ctm.png | Bin 0 -> 5328 bytes .../textures/blocks/endstone/EnderFrame-4.png | Bin 0 -> 3536 bytes .../blocks/endstone/EnderFrame-5-ctm.png | Bin 0 -> 5330 bytes .../textures/blocks/endstone/EnderFrame-5.png | Bin 0 -> 3540 bytes .../blocks/endstone/EnderFrame-6-ctm.png | Bin 0 -> 5377 bytes .../textures/blocks/endstone/EnderFrame-6.png | Bin 0 -> 3549 bytes .../blocks/endstone/EnderFrame-7-ctm.png | Bin 0 -> 5357 bytes .../textures/blocks/endstone/EnderFrame-7.png | Bin 0 -> 3551 bytes .../blocks/endstone/EnderFrame-8-ctm.png | Bin 0 -> 5343 bytes .../textures/blocks/endstone/EnderFrame-8.png | Bin 0 -> 3545 bytes .../blocks/endstone/arcaneEndStone.png | Bin 0 -> 3513 bytes .../blocks/endstone/chaoticBricks.png | Bin 3558 -> 3540 bytes .../blocks/endstone/endFrenchBricks.png | Bin 3564 -> 3497 bytes .../blocks/endstone/endPillar-side.png | Bin 3546 -> 3476 bytes .../blocks/endstone/endPillar-top.png | Bin 3552 -> 3523 bytes .../blocks/endstone/endStoneChunk-v9.png | Bin 0 -> 8958 bytes .../blocks/endstone/endStoneEtched-side.png | Bin 3612 -> 3586 bytes .../blocks/endstone/endStoneEtched-top.png | Bin 3602 -> 3555 bytes .../blocks/endstone/endStoneLargeTile.png | Bin 0 -> 3322 bytes .../blocks/endstone/endStoneOrnate.png | Bin 0 -> 3466 bytes .../textures/blocks/endstone/enderCircuit.png | Bin 3643 -> 3624 bytes .../blocks/endstone/framedEndStone-ctm.png | Bin 0 -> 5017 bytes .../blocks/endstone/framedEndStone.png | Bin 0 -> 3580 bytes .../blocks/endstone/prismaticEndStone.png | Bin 3525 -> 3468 bytes 34 files changed, 6 insertions(+) create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-3.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-4.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-6.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-7.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/arcaneEndStone.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone.png diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 6257e7b2a..2ad979b57 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -714,6 +714,12 @@ void addBlocks() { end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.8.desc", 8, "endstone/endStoneChunk"); + end_Stone.carverHelper.addVariation("tile.end_Stone.9.desc", 9, "endstone/EnderFrame", new SubmapManagerCombinedCTM(9, "endstone/EnderFrame", TextureType.V9)); + end_Stone.carverHelper.addVariation("tile.end_Stone.10.desc", 10, "endstone/arcaneEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.11.desc", 11, "endstone/framedEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endstoneOrnate"); + end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endstoneLargeTile"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); Carving.chisel.registerOre("end_Stone", "end_Stone"); } diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png index a07a639b2171032151cdd367bdbbd3b0a80d96e9..9e831d9e60dfc0b9d061c75e3e4ed8cbb13458c2 100644 GIT binary patch delta 766 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 JPDHLkV1gk<8sY!| literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-0.png new file mode 100644 index 0000000000000000000000000000000000000000..f10508a3b948ca2c9ec45db258eaeb0c5f25a3ec GIT binary patch literal 3542 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 QRsaA107*qoM6N<$f*DezUjP6A literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-1-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..b3205a127cad82cf4daac9232adc15bafde81f52 GIT binary patch literal 5337 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 M07*qoM6N<$g2vya*#H0l literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..46dca7cbc52aead598eeaf8c985088127d6028b0 GIT binary patch literal 5356 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 KMNUMnLSTXj={>># literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-2.png new file mode 100644 index 0000000000000000000000000000000000000000..dfc0caaa0d050f56b5c59fea5f2e0a0bb7da0fb9 GIT binary patch literal 3547 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 KMNUMnLSTZtx}t9Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-5-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..23a65aa8718f2b5103cd6ea9a73aa238b948d921 GIT binary patch literal 5330 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 x_FL=pF!blQ3C(~002ovPDHLkV1gQqKfwS1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png b/src/main/resources/assets/chisel/textures/blocks/endstone/EnderFrame-8.png new file mode 100644 index 0000000000000000000000000000000000000000..1ac066049130d8d4d6e5721dbc086200def0a996 GIT binary patch literal 3545 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 hV+UdBQrtCEFp~|^=6B^ zi)$+N3PK2$S{+m&hzluWXG9@}TC;}j*a)LmWppz@ujqt9$SjyK59c_JgC6NDv={JZ zPmt%#=Q&^OJVUA)7iaI0LZARNSK7F?izo_o(?l((Y<4#(*UF6g0}c-lIX>>;xh|Kz z3z8(kSTLzn8x((j{OS8VO;fs`d`g<87^M=jSY(z4T))3y_sf@Px?nsUVD&9lHkJWE zs94qjp=&z3FLuxjgWrDn6;)MH6ovX?gQdk)5;bD(PBBX+s;1IAK1G&v(s@F2xq~?P z?tq8!1XV~()8ysXU!fKSd7g89cT2rmL$)PjYe*bK9K3%%K$iw_o^sYZM>*~F5W2+k zT^g+xhOvMY6=r^j-5+psensFvVVY&MszE|d$*fQ=ms#IlM?5+XgBuImwsBpT&z^M& z!(zpLR70&7Pq$XJ)fMMXd0r35@xH4F)0y6 z5m}ZID>;8t*P~wV-~>}*KO}Mkgdq$xT_*}=*bk4KI3GYJ+t5)x6I-hv+0z* z-F+_Z&N%%09a2hEO+_S0LYik(DhjpY_;n&LPPQ5a%YP0F=8;`aQS zoSZlNulcukitSHmH(KOL5m_^-H0wx3MJ)= zyIb7f-V#P30)?_!p}VzB7zG4z#OC%kCnsm9ih`nn@a#t>MH4^p7>{iJ{QVDBSJruo zrz91lFLdv6Mv$nQIbEQoh#{543u=9jQ#jHOE00000NkvXXu0mjfoJ)L7 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png index 089cd8ec2edeb944c06915fa0eb6073e159495a9..1baf1887d21a0f5a3267307216252f4ebeb867a1 100644 GIT binary patch delta 759 zcmVt(xzY2c>)Ja4^RCwAf(%DiRRRDnD|76z~7(`WO>?-@QZ%ikxVBqVUwA%#F{g)*8yfBS{Ky&uV1 zDo5JDg^gb*l)Guo>iblX5Oi1G9wr4(poT}I;rR##smgdpNs z6vwQz_VD3?@nnC1QHs_|2Pq{*RdRZIicB%Gv?q+``<$O0L?76CwngxYvbtdz zCg=qDG^g9`5*v!Ye*c4?fBK#(98pazM~8=Kg+WS1k{;(AT6f4+BFc4$F|yNt&U`sx zS(fa+dINvbkv}{lr6h`kPHD>i!CN|wK1Q{O;+%JXzoo8g(2|e>yW3y$SWbyLFu41N zS^mg)I3$t~dHHX$Wr382m;za|gZuw_S)S1AeF>?7Fd7p0+Jgv48JI6_(Y~58%P;7( znz#^&x{Y^^w%Opr^(EiEdChcofcG`6ZU;ibdxvi}P2RsdLhG!JR0-z-A$iK8z$n9L zeo0+gw9>3SS*KVQn5H2n$YPJGs_3n^(cV^^p4{NllH?*WMP9zxWjMQMG8hu#HHSxs p$kb&SCd@}OwzjsAnSucS4FL1+ri3)p`=I~;002ovPDHLkV1jroYhM5W delta 827 zcmV-B1H}BP8|)jfzY2c?7fD1xRCwA1!COxwRRF;8|D1DXIx}sdMHDCnmh8h`WW$U4 zVxmv$s~^L}&*Dch`($D??yiZNECeMKr0WuBfws^KZKwCSoHPD@R;PECN+mIAN;DfG zq=!@z+i`gH;}5)i`7M5S150>FOJPh%luXdkg!**_Wig@~Trz*@jnGCTl*Q(w9p0b( zhjb*CHK%sTzd~}o$B@yvFVy%BvA{>V(VP&wr3=jPt*?gXd z!707Ym}aBSbQ*A=U(swga9tmnk&K2TK7F#s$@v+H&?rO9Y&a$B`}BJ~KK`i0C#z3+ z^0<#w8B(M9ObC=rxVk%MXYC85OxfRG=3)E~3MBbr9-U~mcDG2P0=?lW<8XjTq1)_G zEEW;I&Fg<(e&ze`zM&JmW7e2(cyNePmWQ%!tke+4F^=n#EjZXwkvK`%Tr1P-cbHD6 z?7#RNgrReDk8RsnwuLh374HrYC}azGZjMP@;qA|_iJ}PQDhw%m&tC8l4A4Sze)2_gud;u${hTz-Af07Qs)-i?mSqq!q20Yj zh4UNgH&vFG^29p9FSgK0LOxUEymmo(`)g|T-&jN;ODjdvL=!C*xSq%H-xZYO6|rr> zd>#^~5y`;dD4Tlc1B=NFrC`0ZNe~QieIIQMS#OEOe9rP}9u+SF&Z`%MdO;G#Xrp=l zY>zWWr%AKkU^qJE=;(-yoo5mUwCgQOr4n8-iw+b19{`tWsp_S4#HauO002ovPDHLk FV1i5@kmLXW diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-side.png index 94ac7259d720f17f7266b6c23242994cf010e388..3f8ccc19b4c53ace67b42733c1e53249d7915292 100644 GIT binary patch delta 738 zcmV<80v-L@8zez+vRCwAX(#vimMHqn5ul}y;o0HfiG4>23C~OcyNW9GO zplo0ti8p}7L}6qcC9&Ohcf0SG>SDophNJT0Pj_zKaL)0^Z@=^D)320GNf1Z8ZC+Te zR-h*E6m{OSTK&N8^f$H{czk?BzyUDU1KRf~s)8U6Ilk@LZ2y0y$a9*erK>xhw@*y2 z#x?`tMU40w5gk#U3MMt7JjF0{*cJesbHtZ3ln4%mSc8b+>UM$c20Rfo!1aeE=R=D2 zgrceW=lO-UFKOC_WVhozNf3OpEMx2{hM`BthA6y3k6lHUqPv|;yJ4ROjTy=cVEcU1I~^lyOgZmk{sR` z`<|EgSEjMST1%A`7-P`dkI|k_=tnr`h%RER9TBIHz#%v;Z?2d|hwVC?Qpn_3TwkL` zjaEt!-=l6T;)?}Usn~2@fsWU=FI)yQ-jh9X7?U?84u^j>G1FvmdPGlH#&!hYc--+} zeZzdNDe|0~n>i2n-?3aSF-BP5eMC87uocD+(Vm9@h!&KB+2xG%^vX0vsK{_gb{vue z!!Xb|$MfeWv{`~D)Ok&D%n^?mV|=s`wAO^t*I;VmD8hNd)%*r8FnE*WGG2kyGoSulK=n! delta 809 zcmV+^1J?YM8`>MNzY2c?1xZ9fRCwAX(%EhsRRDnD|C~9qcs$OG9hWqz)3geq1yls6 zN)f$8^cDI5yaTVsRYh+=NT>ypUX&zFY-i#nX1tDP@oZf58NN@9Zr@bn*;|UT5YvE;s#C8qTNKjS49>vTTl_4ms<+B3VS7oSdMjDiD8ybP;3MZ8Y^Ct87O1 z^iOVsTb@7LqI)?+Q;I<_=J=Zfl0}5O?PAylQkfRF{Smpy5lWEf5m}T0Kna%J1SKh| z0+CCUrm_3r9_c#8PznX`@bg0kmp)2Y%%eHoi!Q76g86FBaBzX|`)JZ&G#nC#3*sck z@@yJgEmRtX46c8C_BtK>!GN9SQ+A&{B4Db{5=CQX2e(*u0~HET8q?Jj zRpco`!91K1OeQ4JITs(!@b0!4U60w`e!$;venZnVf<-{P{S{f3vz!E2H4AClE~ai$ zw;jr|#H_ivZ5LUAZYuq>si@T*@;nCvR7J%mOcB6!uSd;1;Jf2(qHx51=N_%**K|6E zC}r~57mtyZMw*1wyatA@e^d~WaFv_c2Ua@kzS_vSL1(l4m)VW1-5b zq^L^VMhm;vU>2S6$Lrq_LNHs+czkrpI*f_32;cX4bo3m@t)qlO(6Zv8FiZnoDU?}nV48|F%~;24vUJI6wqTQOP)Ky$ z!ELrM;)r;&L244mX`(cZC<~FBIHc})2vZ`3#(2_a9mY(T3*P;8$|U%}$;m&AhcmkU n9!ViMV>+2oXa(sy;r{^u=Miu8lQoe!00000NkvXXu0mjf)c%81 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png index 60008c3a21dae9b9464951f39aee24bdf1f7382e..5bdf0a062c7d39dc65010000363adeb640b2ea43 100644 GIT binary patch delta 786 zcmV+t1MU3a8^as0zY2c>?ny*JRCwAX(#vw&Q~-eC{~VnoOG+Fk4s9XvP|`GMATuok z0}EEXEIXcn4I7wY!9b^_&D2gJ*H&W3Hnt?ox>%RPg6|nVaXtLWShm6#Ll&hR9UZey z*R(vB>-QfxIX%TtgC&^XuQ=#-$;vf#RwAWDf?+ruGI-ZV**1T1665T+ET?mB{9EEM zB+m=B*_IFf6{ShJxf(E;KOk*|)UM0=-Yf`k1}7>$2MJb(TpLQJVCXzB_jI!IZw$yQwV`@DSh9qV+7k>LA2YO$DsWmxAS z|GfR1MT8GMO;Ay`icq;v|1Z$^$HEfPy57sEQixw(uMe z%e5KZ1J0-)dTV@!+?DeEXgDut91s)n*iQM$#;i&rF1L$vD< zj00r6S%L&(8fJ?bRhc2gE^61oac!!qqG=koQnJl*iqfJHkgO8k{P`Mb3lFVrl$I!^ z(E2gx6wiNkF_vVnbBNW_SdF3WJprAPMJcAPQ7w%ckH-v#S9p4lu&(q zo`VsFU1y)7Nf}(vIeYsVqhO4Zl84z0F`WKv){79O6jjr3^7N8fIHb->=JN+GFTWv* z7Fez#2mDMgt>CJ;u@)Cmd;$9A!VWUDn=+n^LJdyg0AFDRM~Dqp93 zdGR%Ql>m~vQNU`Mkk=cAgByCiV|?Go(OvH5_gp+X=gFf3w#^1p8U7mpUwe%37QFY@ Q000UA07*qoM6N<$f_k%gmH+?% delta 815 zcmV+~1JL}#8{iwTzY2c?3rR#lRCwA1!AWl$WdMNT_xt9X-JWrrrD7$6LI|PR7e@Jdf!1{z|2?NYjMrc!X_#gHl6u z%jf#?h^O0!IN1~_HOAv6`P>uc(Uiq3K+`lNY06dQg0quj9M^wAQv+tsuMQuwcc z5It(uBK6w8oSvT&r3=oEPN_9(7`A~_rbp*<3vb;+NI?_@gh2=Z30Te=C`p{gh)AL| zldautT+>BKg#vi<^KVRsO{7#b`ZX$76=sk3^oBid$_2`wD`?W7QLi(d4ESpQ003Rf zB3kXUG)Y=yvd@3$-d(VsKST;iL`)imXqts41wk<3_V$$L2R{L0kQ$Xn0ToAe>g_7F z+v4=y3BUfb$4%uux$QibW)nmKqgEeH(>VHY#Qy#PoqnC^S9_ZN-5%H!hH6C zWjTEL#cQ7LjZkKmm#?l+FygjbCW#Xo?FKJb3#71cH#~HyG3*SGQnHdMkM~myE2ZA8 zu$nD6K01F!Dq&+<7M7`F7zU>0AC^20&7Z&jfe-@McR>pB{yISzP&ga$?TdF*>lKtx)ay0GVDdH{+_f-G zlQ@Z4%N?>@)rnSf+MNdbdq0xWLo;lecO`O`hg5%H=q8r6iF}-nDBqN+R&U5=JYq3o zGVc>CSCncu#I$KNOI()TQ!Ey7G8rx|FDQK~p-F{uygW(?TsO-+d_+$qv++HvaD_sm z>lysDJjOi09t@D0fo*$iZEg}K52$%C=KJqnvx*;xqL6B>#BeZXwtV2@NrA5q4k#9j tc$p^+KGn*+dU43^&JKQllQ>-P{{Z{rcUyjSYS#b&002ovPDHLkV1h)QgJ=K% diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png new file mode 100644 index 0000000000000000000000000000000000000000..b0cb0fac531562c9d2deb63b13efe3c02ca27378 GIT binary patch literal 8958 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 Y00t*%_S?e6UH||907*qoM6N<$f-S)qJOBUy literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png index 7410b52bcf2e7f4d63a82086f2ed7c2a60be78eb..c27e9c8c1af0bcb61f1baff69e86a79c0a0fc631 100644 GIT binary patch delta 848 zcmV-W1F!s?9D*FMzzTmYNklY@LZ^A!;Q5OUB*0E#pXyNs%dr@nxJEXc#f(`D^bNB4?@Kl| zHptwVVSRlaw|;+u)oBAD^%!z^=rXlhjmfK1-1*}Urf@*hn4ZqyE1%KyXXJ7ZaNR10 z`){~?`$qusT<4VTI5Q^Q-uNhJCZLO>AVdoE)W6SNyG63GrqW!&Yv4ZS_U$TBL2$$j$9d0000U(7Gzm+_T}`og$3i!lx*iVh_(z_C#7%q^@G4p3<6zz5hzk1T{`CGHl5LSR8?i?ZGzpn$xf`&oEptMHiUFgg(R2Gu(Gy<1UR(P>@Ax3gMRw^Z!-5{ z62IZ6rKN-QwN-zXmzNnH8euUO<0zG)p~(Qi>(i0l(Ju1&JeThdF!tLM+`@|xf=@oa zhi#YXzj>S4xoNCimd!VBc=YH?05Zkb2%(@I`Oh{axTm`pPB@-I-} z+4MMOB7sY~keXy-;xSXRKQcQxjpo&mp->o)%frz9hirdsZGh@<`N|#UUjBkhm7Hxl z!^3-D;Mf(02ZwNbTpZ^MZ13+v1tdb^@_KkS^(z6b0aa?WzN;gJoAr%lat9gg`Uy*` zi&#aA>S>imJ&Y}EaDxP!8-3URe`PXknQ;o`H4c+W{JtnsO0aE8#|3VEG(ag^z%X=< zPO@0}Jo10}{1mm*3U=Mb!9mm=6rtgd=y-J>rfIUbzeh!JnErc`pmCN`&7!B{61xc# z>6Kot-gp4cJ`NF7B}B>DAZQqbB4L`(ox|;O({r(#=E!XvcKG(2uZX_WiWbn2wOWnm z^FLwu40=Df%gn-Ka>)!r2)f!jsMx2ZQyGfYB4>Xh1%CMcYXXKJMG>f~g1pv$jaMt{ z#1u|j+0}+3Tv!E*Lf#^4 ztuSIcH;b+tI1cpn_F@=8Qu!3`wYQ_%Djv6+xVee6(piKa;^g#*+G!QLR>$1gBNz$O z+u6g|_!!4l9z75tp4cL_okR#hxTOiFQsch?0Mtxyw+)-lbN~PV07*qoM6N<$f%3!iYXoWFwTODJ-%BiL8+rEeA;B|>+>#-L~gZCuSDM~6T zn^h(!=U82N#Fy8u@v8QMv9U?EHn$iVDPwF8XBn&OoF!r1{i7|1EQi|HkU0SUTW~L_C z*x96$gk&=X^pk&;hdAd5u9m1&|HN2}l#*1$Bxy=tFvP^zC8DH3b$y*ob^wWDe*PQY z?7czX8o!Mb5s7UPcAAvSvjD`t$%PxU7?l3|I@#Km_c;~Tk3_?&Iok5jz>>q!;K(so4d50yjO#)RUNd?Y1 zoa+(A=M;h>I@3o+zt3-rKVghz_|hkMX*p?}AQo4C^e695DV0iuVaUMX0OL2tsn-vY zT9Xd~`mzC1Nl<;*G(xEyQVS01uhHY9U*oSw;4*jt>whnSD58r2Ss^j0L5P@)E`W)6 zzP(H88ytTho?wy$y}YzYf2n}831c_s2y!2Q>~itKMT|??tZb3k9s60~-RGgge5_dmFh$1R;fs}~p$?q|~3m8oFDPG1rf40SO;|z_m ztUOw#)9KJ??xTIc+GYjYOPQKlKp05kGpgImc<+Cy@4e&B^leh_7`nuUeC zI0Uov^GK27pK1l66-SL@yol+xJIqYqW8FSx=ieRrf;?I&v4!IlNLU8G@9qMJ6(Ed!hf|Y v#-u6KUe^d)p8C-d;aLkI1o=_{Ec`zJuy~lYL7Uik00000NkvXXu0mjfKC_J) delta 864 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 Ef>fR-0RR91 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png new file mode 100644 index 0000000000000000000000000000000000000000..cb0596413348967827bf906e014e7d5d9c061e26 GIT binary patch literal 3466 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png index 0b38ce66dccebc146ea7b7d421807cd748416f68..8e427eba4440f2900ce911476fa897d9f00e0b85 100644 GIT binary patch delta 886 zcmV-+1Bv{*9H<g77C+Wi#(%tbh3eC32|}B zj7yem^M!k<*{AR$_$^G#mblEAID`5^iDU~XlVwBFF~-wi9MBf%!(AWldc8Y;KjFds zZ~RbaoYB!?mi~A`=IS)H^|yR>_a1GlMayvrN9t@WJ!c|2#mRrJPCT3D%xW_K(_`do zcWx4J9kyO>(VI^5@%Svk>@^y-29nfZe=|o=RjHhoaDx^{r~9a<3NbCo=U?ANc=+qL z{_(4Anyy7kOL60vYoi|GmgzyB@p0KSmC8Cg{|SmK_$s{_~hnRma9us|2A-H;gu%#0S#b_Po z*9eatnfi5gB5^7uYnbhqHi4`C%QUGC_N;nt{{s+1VKg_QPG4A>Scq? z%{??xV1M&11*1ZvT&EpLVpi+a1RHte(`j0{ZSbHuzepq)LYN-p==Bb<@jk-7NPjv_ zkJdxo5pjR&7EZH{WjSnGA>^)Q9nVz}OdT)m<4z`!V=8&0K)~yzR6OIaN59cGon>cb zjfvPO5mlns3-M)#hG5p-_~q?Y;-jM+udR|lsBvJHDccQZKgkmF0<7x?XcNQuR*;F2 z40gjp6a;+1NA~?Q3Pqjn;X%?DXV5NI7^{@=JQsf{9HF8YiN?E8;xSArI87T#mN;Bo zpiLXm7cDB)8c&v&crf>ny?T?VGDtLi|) zTSkqNX^>3zlCTwqItCC00i+m*=)5}HquMfXZI~Xqj5%mfYFE)ZqX@|a^4vd9DW1L~ z(w}ak)H12GtNi@KcT`W#7|>D#lsFDP_kZ~w!S@h7xOejwD^LH$4%^5=*E!z5b%BTk z#^1Xfdj*tOg2@lZ2{_Pn9ok--KzE9nOJl4ozrgV=tP2SmhRy#20BWs}uXGp|ZvX%Q M07*qoM6N<$f(b3AaR2}S delta 906 zcmV;519kkU9J?H_zzTn6Nkl4ky<(h@ETVhzc% zF_URVwk-3(Z7<6%A7D@W8oumdFEd$;F44p}m-rw-T?UH~lmR*vidk7(dV%)zoZjnc z&wfAQ+O@9?n=Er`=p>KtKV)J)MtwKIr{8=>qf(>MY|>*<*j|6x;QZ7K2k`@Z(I9U$ zjYoIyBfWohf$kRUto}p)$w4ljyNu;s8>QnET~eJF&o=4xcqnF$&}SN?j*|5Bn(>YH zv+(U_2tVHX-iWVm(Gp=G)W_A&zofHvz{=(m=0CcK>C_~KVSrJj%McOt3Z<+FBf&ZF+6$tr1l!7#HQU!hj5APPFsGpE_wc!_QptlhqYgx!fV zCgUFL$E!m^dKi1Q@Ym(faDo<3b9Uo3HUa+-g#S|gXvlWSu!Jt z5`jrOl4*}(I?wjjD^%kx=|qZD;h5@i8POF&RmxONZKUB#vou#_2~nJQjb#CP;++A$-9AQ-+C#QlZ_fqZ<%!S&`g-q|jS-$i?Y6C8P-#La!C2rO;yv zbCk)mc>4kU7p91>Z8GgUO_$A#vt?qT(~FQlerBY%R|$-du)n%NAy*|;siHJ%#OB86 zZHv4}91xfoq8lsIky*-$hRI~Y5L-x{Mw(nc!{C4DFp+oWXty;22ZtC&2aCgwnm)$k z58(F7l+_Y7t%})VX7Awxbef2|sFTU$xwrI)A8!22u39A!8sdb@hitJE_IOZAMf@&5 zM-`1<|GZ0DPv95}GwwTsq~r>e>s5k-1N0d>5l=G zA1<)Iyw2aYHqu*LFJo6ezy?%S-jLQZc>Da!OnPXm4Ro=C-q9J6M~Iz`@?>d+X01$p g>I9Wyh5rWtml=&vhv91X00000NkvXXu0jG}f}JhGJOBUy diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone-ctm.png b/src/main/resources/assets/chisel/textures/blocks/endstone/framedEndStone-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..2cf1db838bd90a57985e4e6473bd0e16e002c56c GIT binary patch literal 5017 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 delta 787 zcmV+u1MK{a8^s&2zzToxNklcTcAk^Se2^t}29voA{b+kx~=| z0KK&p(xl*Yw$1!(ic$*Ow+^s2%YD9m`~wGXf8ot&moK(H zV|RBC6M9s%cz!@tRp5eb+m<5E5ha`)9r5gsU-|m+cZ^0qQCBTmYfcZ(`25o?UcVlp z8%3VQXrpi)=e~k)1g&g&y1mVpTTi%}@8b_bys$%_=QK^j@#UC)H{^pyAJI69>&cwS z;TWly5ii)>no420@)GnrGB6*jQwrfI0#hN!zj z$Lms2GC3S0gust{YAF~F9*~p?Srd~imIRTH78<1_S}3?0Pl?Tf$@mO~!u4I!MM|0G zXzencTwo&aUZ-uzvy9dl`n}=(NX8nvflt&6si}X7R{HeA2P~@v*)l;3!S!?ofNNcZ z6u8F4(Hd<64`VcWUb0M=6nW0w^({qN5QY(cC%_tmngWq|( zf50-2nN1fQ9Y5pj^qjjq=H~nguj>I21_Q>kbN2rEnVp>-RyT&!S;7AU07EEPd&vo- RX8;QT002ovPDHLkV1g~LcOU=& From caa54cc6592b122b039a25e940e0b83ae5bdb445 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Mon, 3 Aug 2015 21:41:28 -0700 Subject: [PATCH 28/57] Updated lib mods --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index e6be616c5..4b45ff9dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 ctmlib_version=1.2.0-9 -ccl_version=1.1.3.136 -ccc_version=1.0.6.43 -nei_version=1.0.4.107 +ccl_version=1.1.3.140 +ccc_version=1.0.7.46 +nei_version=1.0.5.111 waila_version=1.5.10 fmp_version=1.2.0.344 From 38a587f9091adfb0563919a9068ca9fde09f884e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 4 Aug 2015 17:21:55 -0400 Subject: [PATCH 29/57] Add some missing SideOnly annotations to CombinedCTM --- .../chisel/client/render/SubmapManagerCombinedCTM.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java index 3a4de1ba0..23942a6e1 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java @@ -22,7 +22,7 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase { @SideOnly(Side.CLIENT) - private class RenderBlocksRCTM extends RenderBlocksCTM { + private class RenderBlocksCombinedCTM extends RenderBlocksCTM { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { @@ -121,9 +121,10 @@ public IIcon getIcon(int side, int meta) { } @Override + @SideOnly(Side.CLIENT) public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { if (rb == null) { - rb = new RenderBlocksRCTM(); + rb = new RenderBlocksCombinedCTM(); } rb.setRenderBoundsFromBlock(block); return rb; @@ -131,6 +132,7 @@ public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, I @SuppressWarnings("unchecked") @Override + @SideOnly(Side.CLIENT) public void registerIcons(String modName, Block block, IIconRegister register) { IIcon base = register.registerIcon(modName + ":" + texturePath); int wh = (int) Math.sqrt(size); From 928652952bb713bd1460427ddebcaa68a47d1958 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 5 Aug 2015 12:05:29 -0700 Subject: [PATCH 30/57] This should be it for the new blocks in the next chisel version. --- .../com/cricketcraft/chisel/Features.java | 10 +++++++--- .../blocks/end_purpur/prismaticPurpur.png | Bin 3313 -> 3289 bytes .../blocks/end_purpur/purpurCobble.png | Bin 3498 -> 3466 bytes .../blocks/end_purpur/tileBrokenPurpur.png | Bin 3540 -> 3521 bytes .../textures/blocks/end_purpur/tilePurpur.png | Bin 3464 -> 3442 bytes .../blocks/endstone/CheckeredTile.png | Bin 3505 -> 3504 bytes .../blocks/endstone/chaoticBricks.png | Bin 3540 -> 3531 bytes .../blocks/endstone/endFrenchBricks.png | Bin 3497 -> 3473 bytes .../blocks/endstone/endPillar-side.png | Bin 3476 -> 3452 bytes .../blocks/endstone/endPillar-top.png | Bin 3523 -> 3473 bytes .../blocks/endstone/endStoneChunk-v9.png | Bin 8958 -> 9034 bytes .../blocks/endstone/endStoneEtched-side.png | Bin 3586 -> 3564 bytes .../blocks/endstone/endStoneEtched-top.png | Bin 3555 -> 3571 bytes .../blocks/endstone/endStoneLargeTile.png | Bin 3322 -> 3400 bytes .../blocks/endstone/endStoneOrnate.png | Bin 3466 -> 3449 bytes .../textures/blocks/endstone/enderCircuit.png | Bin 3624 -> 3626 bytes .../blocks/endstone/prismaticEndStone.png | Bin 3468 -> 3459 bytes 17 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index 2ad979b57..f7310edcf 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -2002,6 +2002,9 @@ void addBlocks() { purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); + purpur.carverHelper.addVariation("tile.purpur.8.desc", 8, "end_purpur/arcanePurpur"); + purpur.carverHelper.addVariation("tile.purpur.9.desc", 9, "end_purpur/purpurLargeTile"); + purpur.carverHelper.addVariation("tile.purpur.10.desc", 10, "end_purpur/purpurOrnate"); purpur.carverHelper.registerAll(purpur, "purpur"); Carving.chisel.registerOre("purpur", "purpur"); @@ -2471,10 +2474,11 @@ void addBlocks() { technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); - technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/test/ExhaustPlating", new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)); + technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"/*, new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)*/); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); - technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/TapeDrive"); - technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/Piping"); + technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/Piping"); + //The animation is malfunctioning. :( + //technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); technical4.carverHelper.registerVariations("technical"); diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/prismaticPurpur.png index a5229b3c619b044e3292e08fd42fc2980b3d097b..a919365bfe7fa01446fe3787f637eb314b08647b 100644 GIT binary patch delta 549 zcmV+=0^0rY8QB@IzzTl^NklMG+BZb(R86(;y-s;O=NB=Ei(BCx*bx=!YH&K}0ai4*@EG*G5D78QU4&gy51%Q6+Q6HS}$O6)yn`5IfGP2oha7$N2ju4)%R1}p)656B?9;hnY z-IlxWcbuJ_@%VrAh`Hh6Stkj4^bu9nY@7fBES3u{uP=G|{X*aOTzt7;v)&*`u5-Fo zD{5T=DWwn|?Du~`T00000NkvXXu0mjf-c|d^ delta 573 zcmV-D0>b^-8SxpgzzTmHNklY)`x!+ejDQkwo@^n~h#1P$GHn<&}K;>r>zmJpd>}!QC0Af&J$_+n={g+lk&f zs!FdN?~WGbd3nZEl&=q8@o*3b56Vzzr^fs+bN$mbkN-R(B1C@#s(RUP?`~0m)*9hK z@15{qT~`PY6>MXe8N)E(II2pq0s=Nz7MOMuS`-x}2qc6aonajC=0pTQA$D8 z6t#pNk+{r^Wxs#$@z0O!c02AL?{S>&Jt1hKXtiYl5uvx9yaI0TZn?g>X8C*Jcs%m% z*LN(-0v+0^C6zdf*xnjy%4WBr)yA@4xcTFT!~FqOMT@f5mG{5BXaBNix|*=ju+fqN zKs{CJsWKmCKK%ZH!+gMsr4F?bJ^1$WjjQbyn_)verMQ1}t*8{CXrWkP)Db-0h=IFb z1oUuT|9fTnWx~Vpo+B}Dc~H^ID5IyT%nTWFtON*>cGrSv#?3~f_nuYH9V3EL@=uK0 zF^zS8bMXrDLjxNuop|N#j-&=;4rCxASnEpkKt(ScwJ6;?QUp~6 z$R-|mckDIGzh9Ui=Dd*L>F$Zc>mj?IjrD!GI8UFSm>=c~;{OK#(WhU+{UwH{00000 LNkvXXu0mjfh9nuD diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurCobble.png index f7110c110ee7d2231b5f59b8a1712ae30a88fc91..08674bbf085819646cfeecf2243d628b20026684 100644 GIT binary patch delta 727 zcmV;|0x12e8;TpSzzTo0NklU6< zJRWm>eNC2Sv|25~Fhrl9pM!(E$O(b~&+~Zs_XQ;tNs{3C9@c+Y4u=D$@fQs;bb&7<}Jnxm@z| z*H3V;|J2yL!!ROZ}KazhR2n5zy7V`x{2=x2=J2-I80U)G6p*R&Mlu}r05eP641|i4v2#uAy zyF27)G~#}APg#{zRYg@+IOh;j5VazF-^bJj?P+$OJB&5#zxLdZ?kS1_nPnMinvx_5 z)9DldDJ8q@j>&j}loDeM0zu#hY&TnmgCTWQqqRond5(YY`*b=TOx+B+SS+ZjihjRO zx7%gDoHxHmAyE{OrYXjlh855A_!Cmq6_d$?IF4zz+6W<#Qlh0sDaG;YNLiK$A(~r_ zX#(c|&5=qn8jbKgkLQUX4hh4M zG)<}NnyY`_730?i+bD|IZns=sUJ}PK&N()l4N^+#szyFMJg{6Y(Vj*K(F`U8N~@-V zlK6qo+1VLYRgq;G{eGXfw>RdCIl3qclvI?b5^F8S7^br+p7z-9_ZVa7^?C$;z%f1I zoI`7kKrk2%(AHXR2e&*wKjUynA$b@*{MC7$vszEDI29)bg8|lBrqe06{af-pM+ZT` zdc7u&V*oxrJ{ow8X$)F(bA7{nK4&(YVXfuj;(|0wX}8<_KLFC&bbe=D09XJ3002ov JPDHLkV1fq#RcQbK delta 759 zcmV$orf$Ph4DFP;N>*;jz45 z(sQ82}hkH*4di+PM!Kr9ktuq#TiHOT41rLRPp2L2f}{}I-L$-6k;kvTBej` zNv&Q30a=y-ptRPMMTs$n`Fu_kM0C4ds33Vr=ytm-77LV8Y|I90Ee^LWb_P{d6>&Z0 zc6Q5`&tGuP@$~eB@B17a9&kOqrhnQ8V6|E?z8a%TO{dc#Zp0`Y{R8TDc8fsZa0np~Qs7ySq9{;GVVy-dfz_6% z8L>)NTi!SZ!vWr>^G}=&&(Ir<)|#rSw&(bYW~)gUh8Sb;L!ZaxBi34;e?K!kAF@u@ zczKbNWf_NmA2OXx!GS>VkUTK@K0->#rrO{Mk3a?_cL{&JlODR%1W|yudRY3``gK9{3Qtg(2)V{kV3 z1Lk>7a-UGXmYklRZU?4Qdc7W5n&J7%XE9&!ZtorK{WiuJ;(AOF2I!3@2m{`qyeE!h pZfJn9z6-9qsV6nt$%s>w?xuKkw zgmFmkrpLAI0b5Ekd3Vgy-wc_~aFxsJ#cLb@Qyc20rmRXD(_l&i797W6v=?x7KVY;s z!b2Gr)n#7uBqFaOlO?0&aqfL*Q3cQ0FI810m!4Am*GpKl(b!o zc=+u@Ycc}@*7JWg;^ZH$Tk7G)HsAkJbOsU)83fq=Ga8SMqU{r+{F zy2Kwj0Jx5ea0G4FVueL0L4Tu9(=;fP8p1fFsw+%wm`;Cgabx!u-;;PwH9E@+#UDy!(;`-M18k&a+vcf|bfGd8z+ z1UIHw1j^)wVqE~R)Jw*COu9+|m?v|*IAv#NlcT$LF!7qt?|z21=REuQPXLru5+MZA zl_;e^fa`y|z-5!equXo^Et?WPIQfF4d&9qvUNPL+WO6u0C5wdldQQ*lQC21CDrFYU z=-Q6fwk*~W$H$-Ij|55gh9{5yAein@rI&xG>f|xaiy4*YvH=ACDgEs}2*~4{QFO}V z?^|k9qa)4e;A5Wulp|e9p5&*(F)Frdk?9#ohN#+S*93mY_(>44*05gJ~ny-ECHvj+t N07(Z$PDHLkV1kITg$V!v delta 802 zcmV+-1Ks?=8`K-HzzTo=Nkli^sci{n8vSM9!@CaqqZn|LsWxC*!kWQOgj_;BzD@T{3!=m3aeB$X3PiPu#EVZzS1CdYvg>~gDSSb+jL^B}{NfxP zYm7B4rVGygIiuO~c>lc)TaM!3?lw|M@-j!~no&4HUeB*7%Mx2#>bho~t}(`-q{3q9 z?FMY!4Cw7{a=U+k)*1vLz-_oVi^YOvyu{WPDI`T%ki-djp3`c#sMZAlM@Pp1tkM2snLoN=JOkpFid3OjGEBVL0UE!3o#vYtlFc0aE6Yni?Sm zQc8Ne0k`h%Axll8Cn?JkDJ8}lES6Qg0tw1htl|~Ucsze5%QBKUK?uR1e~0~@J8W+^ zIQ#bxilWbWGDazdLb04JDXIcv3`h`9zJFr#Do08Q6?8T`S<%{PG420K6s0IB zXzlcvo)7VFGzs4r}v4X2uC_xyt=^iQo3EAqlX`pM+sj({DPIe z;_SD-0C0ayZSY(VV-2qBQWX_K2`XDr*EI)6A8}*T;w!lK;49)f55YYfNdF&Zl&HU5cV$u~=|9yhI+H9P+{b7E%iOI|1|I9MAQrO--KXcnuE( z2qmcNnlwt0Qc~mvuH)h)qZyxl{fJT~WXsjN6YB(>XMM*=({-*Gwi8 gYFip3mE`{c0DW|u{d5}ShX4Qo07*qoM6N<$f-$y+;Q#;t diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/tilePurpur.png index 0a67746417c22e1864e0640b09c617a6df886b03..38b70b2e3e1173349e381e3a2894c9b87c4a2dac 100644 GIT binary patch delta 703 zcmV;w0zmzU8}b^kzzTnzNklmq6~lcX%QF&{5Pf87C-zT!rgkDx z33ETA-0YZ|iAbaw8utAjJ6h)3Owkm){Q1IIjz}fBmRDYPub6+{kgAlo@(l%G7mE;r z+0CqW#m*KYBuPTLNzqm#gdoI#)RHXAh%u6-8ER}soOkqN&*B$MZ}_M_h(vU%Y0H+f zE3u2kEsn7s`BnTvN{J61b^3l{YqmU#XS!R*;rYP+yhjMZ)K27=oa57xKwzpTPQRbn zop%tRxiu)$82W#@M=Q-|^GSZr>F+%VxOF#P_Am5Jk4z*V)d$E0JJFbiL@J3+ zH3;y*BN9QHrszzQZ*u_BBt;|wA3RY+gc58Ywyf)lvV)~)3f$tbi^WuixAF}Dw>oxu zM^P6jshHhNUDQ;41;7#()b70F_4o=v@n6B^uM4}=4!?hToN*k#9XUK5NJN6E4X5uX z9;ZhDOl?qhv`pOuz`eio*grB<0|2-7hT16n>{-LgwY>7Mf1s;6Ql0Yi<0ncgi4X#r zN|aI{Ak9+X%OsHr9*+=$EX@#7;Jrt#5&+efEw}E*MsJwi%uo%y*Y5-$@X<35Gp%W{ z&f-?b*o=RaT}hT^xW%EK|9K{_bCNXSP#rk`ab|nif`G9Zx%_?MG@n@PLSOeBza7yJ z8ktHi?d8j0nHI2c@9yM7&e)B_5V_v3=&dHWz%);Mwx8^O+tW8a8@-|GDiVMY0x?8J zJK~*3AaJV#Adv|n1~Q$Yl?EWj$hxj9>w;=OTi!S8cK}wu(ziXvny>d)$K21nS6_Yc l3+=6?XbNN^S;NZz0|0!PrG1HbWd#5L002ovPDHLkV1i((SzG`B delta 725 zcmV;`0xJFT8i*UPzzTn}NklYN|Y$@M~<8$`3?azmTkor z;_+xW3rAd6J zp&y7u#5j$JsEW8YSH@}N>FX17J7c}&a=h^6(-*Ql<9s@Ey&0Zc<)hC5eTS6k)|n9N{lni^NjNjB8bx%)ie#S-7CQdL?l?vO4oKQ z%R*k})Q6hm>4>$KA}i>Jp88P#4^{8~e9zt89qY0pr6kD`s;a_!j}U@9%PFdYa#OO- zE7>NaC=1G>WcPpX4&j8OZCdo8d3=0C!~(4~ec$u^{LHc}EYm`JY5Dx=GdR$_=CD6N z1VStV>n)Lp5JIqyE8csuJY)0I24f6TO02g80)5+q02xdAwnx=<%`{DPZATPE99|Aw zn=48wq>>bAL4B-|QX-LD&sSEv;+z8k>gL@Id69GX`yGE+*!;ZV{{9|oEP0U=l@VEy zQEe)ul0;cVckBouV2wqXLb9$a=hK-qODU@ob^pgbd7hJIDM~5I-%4EP=(>)os>rLH zBuxlD;GE;;_J-gBx4+!dTpL7|W%%G3^uT_<2Mha`Jz8r%Za>nVTSh%H4kNqW?oDr5 zXqtxayYC2N49+?7JZGL~E;0tU+C-&EVP00000NkvXX Hu0mjfYaMB% diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/CheckeredTile.png index 9e831d9e60dfc0b9d061c75e3e4ed8cbb13458c2..e4f340df6c70d15f995cc50708e8fe1bf674b9de 100644 GIT binary patch delta 765 zcmV7(XTy1`Jd2wL7&FGtf)oMjN zkI0LHBu@D1{3X__D2@f8NtpQwlk2$pbcNO$1@Pw2Hyri_VH|(4+hxRynCxc9Cfo4S zk1yF~8ME08=}+WChLHi!oXOKW^tNN@Kt6x+ zIh&h|v&T1P-$oGs>!y;ND5GY?!cR8x-I+PL|s{_u0 zF^2rGCtWS@y?}|F%nHv-sD_W!Rn2TRW3$?fn)e zn5GdWchog>_Q>VCzj$)?jLXYQOl;U>8MEk=rr%RnE&sg#8!1>21R-G@FpeWyr_7g% zG)-{=(&c}OsyR|0E5_cZpK`L>9Yfdi=wyj_zy8H7Pv#FGN)ai|_CBL5OFrFvWSeCS z-9$SavDVVp1IB2C5bO_og)%iU&A+f>w53201Y0O*>Q7w0dy+ij5ul&6qVG7LRV zIN~Tp-rijzmB)M@vzng*5+Px+c+B8NCM-c@sH$~}VHi+a;)KKVJSID$maCMYsTs$K zPS@zkQRXG%IAZ*OAP6x!AW0t9o+by*$BvSb4z*tY$A^E{Sl6LE#WY!>FhM9w-}bzE v^*h(s*PNYv!AMDdSKypuv79rGmj4F;H%5SJN9)ev00000NkvXXu0mjf&?$R{ delta 766 zcmV(^9`hC7efvFmz9vmm zP$S#pic}@Mc>g^vE-nzG5Nz((^sdJa7HeDDvd0*MloH{G1WHlW4RMg6!;sclo>prn zS%&}BHy{5HWeJDPoqlqiZYMTw3zO=qwzh!4*`Ab+>w z*~uA`bV;lx$RK~fNkL-_FJFF57SAY(9d2lu&zDFMAOl5V_Q=i{gzq>uJN(i^Yt8Oy zN4m(6p2o1JDi7!&ps_7Od89N3Q#Tl65OEfxRfLintu;~y=vd?W5gB<19MO9X--a05kr8yxw+w37YxII_7mK3z&U`5&X&~simQL$erK9Z*_S))-#ww9;42Rq zd3d|}Cr9sLjA5G1kaEGHxWm*nNtTg6KC;|oLUmZB2WeZi~0UUByPjO*)byhy<+Cyh_3yPU4JyuP_XXm5d1nk0=Fh5=vB$re7# z#e%_u$#j27(Nx&FVdylS+p}A3v2DwAF+=?G`VWKzK}eR&iL#NdXgK6sr04U?<rYZcN)+#6c4v zeinbI_uO!S#KjOdMQmk2S2R*qwjSIhP2$*2Y=8F0^N3f;p);Na1edR`I6FJzn{U5H z8^ic|%+b*iUq1evFbZ*v=H%oBVaL#q`;0~-wD0@$!alQfM%aIeh@uefX_AWsBve&J zmgUs7MQTaIn(e{cC?hexM!Xsyx*}a66j*B+z5ItDh*>Td7^7L0D~7`%>vf5eJ|+Nx zU^bc4IEx;QMhGF8PZk7`$A=$(L~=FZ)6Wj*bULi^0%bJMp8mn!-X4Mm2d>DcIP0gh#vvZ_*a(=-e^8?4I= za$O>wp>`9d$t|vFX=zBa8MbXm(uoKZ((5I)T?7sUR)>_{Dcg=tP!^dc&F-9<7+>oUOLFCix z_L--*{PpJv5ANT`_=?JwNTDR2@zKg~@#Y+%)^tOkx?0hTH`v+PVQX`U6pkQ>Xj^Eh z*xtOua5zK*IM-mSiYN|A=L_O!o3dFWEEL(AAPCTbrd+QXZ0rzsyA);4WIRS25paE- zuv{*PS#esHDD>2(GaMZqGS z@Y}D?I5;?<+mA_ZZkSC|s-{2)!E8LIX)N7t7oh|?@I2~j&8o;yNPN@53q3r~!&e@= zJG%sC!ujiex%b1q%isR?M^TqyG$lKYJvaWwR|M;B?{Ft)NX>3DXSKPb%fZ?4Dp8WJPLV@Rbg#Lh5=FBGx>bhoQ(8Jn>{|5j% XRdNwtt_|vZ00000NkvXXu0mjf_-T;- delta 802 zcmV+-1Ks?~8`K-HzzTo=Nkl&hmvBKELJsTiw3 z2o(^Yicd7&ka*x30fIen(F&uiEvYEICQX`)9ba;6A0GI9g`XIny|9ie0T^G5I6Xb( z)6YLcd7A0*xhWdD>TtUGgGlqu(dX za-`6x0Hh;XPUe`pL=A^S9LHgKJHu;u>^y##@#U1~AM6oD5m}PpXw9!bAMkYW6y?-d z7vvMk>sLpporiyqP)gC=?IWe+`sRkQxFhVekU|nPwkXRLtJMO}6?D3rSS+(-PEssT zby?EvMx-XjD_xfJ3CZ$~b)Hex9=Tnz7)`NNg|QWj`IL2CvzX1%S|f&MFKjc6z;T$4 z#=JQ>LMe%q64&>L<0X#ckR}&t!9hK{FcMRzj!j(MR^YEYK>Fciogxi_@% diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endFrenchBricks.png index 1baf1887d21a0f5a3267307216252f4ebeb867a1..85030ee1bfa3234a05e596241e813d54702b1da3 100644 GIT binary patch delta 734 zcmV<40wMjW8<88ZzzTo7Nkl|JmvOw&f(D^KYsTmtLA?kr4(77A*JMDv1I3y zDaUV*kUG=U4{IWUEK^w9<6I=hND2{C7=#djK&BiiB~L!vV_k0$LZEG!aXGtSc~?_Z zhL|AFX7qMLQ56L5ky4^nPK=RyzGOVzqTDK|%55}ukLS;RX6xHA{V*d_pMwxY9P7Dq>6eL_e#oV~jsO3Pw#he)7} zqHj9@ob_m}k$IWphd`DYQc9S@ke3<3dqfry2zGY2F-1o7fsg`z@JuEXM9dy5D5Kdl z8^)6zVp{Xh;RPuWPv^x_#x2^=@b_$f+BOm67?H41m%sjwR%o)!U}J|;iXtBqRE>-!F-D$#u}5nku-39wJptud&TFKU zl%U&2mzDvE<t(xzzToVNklDdB@9dPklgqajhbGwi&=$B2}I_00_ipY9P#B1Oeyc8Pyd3SksV3i8n-Pd3*% zxi~{gZ78M-theZfrYPoAg(HN3wHDKClYp2&rzTPvW@Zo~-WPpEBiq=X8DJ4Z!a(a4-Ofj;wCyeL&oSz-z>WbNPpUR!`@#>B!Yo?O{ z5)ejFEfxTzI*?@<(liXN4rpmuEEbrCK{qwYN4&5I61|N+I%|OUSnmk7W~JZ9l@Tq3 zKsFTfB1bpcEUSCQqnd|@Yiyl!b^a^24|iy(F)d9|lze~j;w$cl9|$6#BN1CzvMi%4 zbK0#ncD6s``O|L@Qb9^=zZ6Ji8RloKb-zU^!S>D%SbvTN==QoqAJ}@fMevHUx?ve6 z=mhyRr`zok8;ZYv|AU`@`kpErQB5sJhlgl|K}toE9_JidcgR*E%5{h_veSRgd^urR zmh8TI1JZwyKRhC(B#MMiY0Cb=TRM$CMzx6IoOge}rLJqxl8^$s+h6loPKi1&xci4$ z{>XSZB$5z$`ERmifs}@r0$H#U7b3FiVKdCH=|D8p!e zNnKjB(yTpMr&t!4rXeQCVvnk-=&iTW-d3ER+~CrZoV24ynC`BbBfptTU=OdJJ(v_x{}P)Z@9keH)HvAfzbh6xeD09<|CbAGANS`p$K z)uAN}Ev|Ib%@gOk!f1zxB6NY2Efi}#+3eP|wP&+#I2`W~5$d*LU4A0Q zNMC!5F(_MDv>2Q#NGXxKf^zLhF(O$+5O(_u%5}j!PKbiEBzC(U60`RQIydybXLE5$ zOe5#Fk(4HUXn5w1syR~@E8NNff^#cUiX=5*L{F08 zG$od0Mj6ej+@XekKpBm-8Lo6h@g!YitmfQSAR~S{a;ok*9*<~(A87hFwwD{GVdDD$qJeMhhetTJ00000NkvXXu0mjf1Bg)T delta 737 zcmV<70v`SR8k8HbzzToANklR zY+xUWH-N=NVPqU7vE6oeyYH9kV!?Taqw?ZUcW&Nr&hf`@zw_zSuar$m5J$XiURbVH zpeFDXb>6dD{lM<@H?|pge0)T}0Wj7B+V?4{f*=k#zU|p;|D}J(bDE~5t2>^zPfV`H zHUr^BjQAQ69Z{YNCN-fv#V~Z(766=c#FsOa2o8lyw*E@G@55vP#AAvi8?u9!xL?K+%N$mCdDU!z8i zR!R`xqi!qWiv?Aw*lb>bj@P#@Tn01VlRa@5lQ$&}hcHSIS=>Wv0N@OMp)l{L^)xw6~+(Io`(R47LE86V`tX#K9b2$0YfNr@uY}P_{LPkME?1f^Mogr6-2=XZ$cgi=af%h^5Xddfky_ z3HR$CiJ}4tc`Z7Sv@%yqIBo%YOp^9kYh! T%GfBl00000NkvXXu0mjfuDx!u diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endPillar-top.png index 5bdf0a062c7d39dc65010000363adeb640b2ea43..d5876b35b56be6427e2575be76f4e5923e723740 100644 GIT binary patch delta 734 zcmV<40wMjw8<88ZzzTo7Nkl+in|G7(n6m@5Agl*v=#sQd;7KK&c#UHO5-D+Y6j|O_IeZ zrRe0UN3MFF^!P$IuN}ouZVd ztV*hSPJZ$Z0HuEw`|29wy{8`L3}wW>pU(OCxSFS8s!p)7DF5-gb;}0h;$Sayhp4@M99x3q@#qs?GOcF2;_N=c#EmKIbRlE z8HR!Ji#axP)~gLDPf&jyCUM{M;q5B`wvQL|z9NK* z;;BGujZ%uC^VF1xXkz;v@7}&4auIdEc&^a&3&Ids-`()y^aDz#q>~nfurEqP1hIy; zX-M3dvb$opZMZo9jM5mKi%~|EveqfY-1G;1XbRY~KmqeJV zTXA)Li8Fs0F3PC-DS!R(HvnWXTWDb)2Q@=13Q#lptE;q8!y6OEyn8Jnh%mD8|b`(03Tuuvjla0#)~wZSk4e zY=(6acaL+n#R{ba#X(X{pRXv&bp6Go#ky{|BB zQ}OM~kMw-zuFLx0nA7u9ge54;f;tBPV+>w<2O%W}fvh!3Yubk$ zo_+oWmXs)fZ-4lnc)p_LwYYznG8w%i-zG$H#K+rPg6R~A&1^O!3pez7#{jri8?g$1 zF^lDbgZ)n!jYfYwfBqvvOsOeo>Ix+~NLjPVR$TY{ynOW?>vV~c;QKymv6z8nSmz=C zy#1TwqsN3{h}-edxI`u(Tdk2&^4FW!^m<326xk*v2m+MX_ShCBj_qQM!Sy_fsz4fn zbPO^#v=8@aDnnfq7%8wC!+y7ms1#~4nJ~D$p{gq4Bu9VB11xEPf+UKliW=><@Ei}z zwHe(7%NSunK7hg_IJihO$Uey2ZmSnGUh}F_qjiK#50iBXXDWC7Zvfby zgAs;ZXP=@;8C=gfd;1xqV2qNIhuI7UGC=hTs%AH$)f|d%?48${u=;adyMcFy!Y1t P000R9NkvXXu0mjffc<$z diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneChunk-v9.png index b0cb0fac531562c9d2deb63b13efe3c02ca27378..6e4aff58e1b72e655b6047c67d49949c7b34a76a 100644 GIT binary patch delta 6339 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 FV1kB*oOb{K delta 6262 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneEtched-side.png index c27e9c8c1af0bcb61f1baff69e86a79c0a0fc631..1f0d00871663dadd8b205efae9c99e46a92f7cb5 100644 GIT binary patch delta 826 zcmV-A1I7G;9PAsgzzTmCNkl?s0H% zz|!K^>=zE0nwVl^V}qAVixf@@tFLPH9HG)$`H zD(!3=Aq1t;9k<02mFhcEsT6*-PNK`9)9D~B$6}~|nDOxmq?E*+2o-Ap)N4LY(nbiu z%uJ4_PX<8`(a`X{I{%)YAOUXOB30MJPMFNje!kYXQvbj1y){t!}0Mk zwTBAHo&*4Y%n+Zf_H!Xim5q(#>@F7qBta%TV!|lZ)(2B)yH#wT>S}v z`^E)QN~BVXi;GhZ5BCY0ZT>kq#H*IsKKejzdXD!y>(nYfmNAPobvEC>MVbb!R=~oG zd1QB25?zz5e)|I-iMgd{FL&EL`p->`3YMNkr>Nx;Gv&H%4 z8D8TUuUf{jpCN=Giep;MI=Q(ynvE9ST?st@0pItLyGOf(L5PYJ2vAXs&=Mqi9Gs+u z>$F|BQS-kK;Tpn;pwynij6-GB`Ahu9@h%Y@LZ^A!;Q5OUB*0E#pXyNs%dr@nxJEXc#f(`D^bNB4?@Kl| zHptwVVSRlaw|;+u)oBAD^%!z^=rXlhjmfK1-1*}Urf@*hn4ZqyE1%KyXXJ7ZaNR10 z`){~?`$qusT<4VTI5Q^Q-uNhJCZLO>AVdoE)W6SNyG63GrqW!&Yv4ZS_U$TBL2$$j$9d0000=GsZw6Es2Pdra~>y1XGL& z0aA5SRZ%vTy2#^n*%zu*MU_%QRK+PlL=}WvjByOc!T2`5%;n5X7yaJg6OQ{lHdF#) zs9)DnN^y96z*0U>@$VutGc#1GWfpP^9PEE!c6N>kpTG@}QeuAqY`=R$-x-1wJS-Hj zM{IhX9zqGU*7$zFr}`B-cG-OOC%tx`Thli&O%s_gOvD7mrunG@KpaM- z?G#ca1Ox^gLAkt_*Kq!B~(&7>+!{XnAJw(rc9>)k; z-4+@9c%7rztunp;!1K}Iy1SBTB+-{RVNow2boyrIkJ zc$V33<~XmOqm;t7ZBnTeiG;*3O@;%Pk&FdOaD04>kzdH;%s7|{6D0goe1jAgRyK`9 z5QZV1=aGN3M({n4v(rm->`=R?qx}Hmugxv8V;OwkWqGN9ZQlT6$i&11T5C=Y%Xoet z&cIGj((cvBeY?o?&D&HjK4LstTf+@{yxZ9$M$v3n8FVMfX0zC4h9Go#{O}1;JRl~Z zH<)HP98fNw(rh;|P@3(nw>XYN?V^e#$FxJW~>va$?Pvbs^gQWkG__Yq3c?zZqEmwvy`#_D52{hCU(LNaM$D2b67 zwMir-CnqI@g3eBd_4Rf7!v;#skxHcrd`&WG(&#j}bN5S>NTQU%Mg0u*@lvIbsAR%3!iYXoWFwTODJ-%BiL8+rEeA;B|>+>#-L~gZCuSDM~6T zn^h(!=U82N#Fy8u@v8QMv9U?EHn$iVDPwF8XBn&OoF!r1{i7|1EQi|HkU0SUTW~L_C z*x96$gk&=X^pk&;hdAd5u9m1&|HN2}l#*1$Bxy=tFvP^zC8DH3b$y*ob^wWDe*PQY z?7czX8o!Mb5s7UPcAAvSvjD`t$%PxU7?l3|I@#Km_c;~Tk3_?&Iok5jz>>q!;K(so4d50yjO#)RUNd?Y1 zoa+(A=M;h>I@3o+zt3-rKVghz_|hkMX*p?}AQo4C^e695DV0iuVaUMX0OL2tsn-vY zT9Xd~`mzC1Nl<;*G(xEyQVS01uhHY9U*oSw;4*jt>whnSD58r2Ss^j0L5P@)E`W)6 zzP(H88ytTho?wy$y}YzYf2n}831c_s2y!2Q>~itKMT|??tZb3k9s60~-RGgge5_dmFh$1R;fs}~p$?q|~3m8oFDPG1rf40SO;|z_m ztUOw#)9KJ??xTIc+GYjYOPQKlKp05kGpgImc<+Cy@4e&B^leh_7`nuUeC zI0Uov^GK27pK1l66-SL@yol+xJIqYqW8FSx=ieRrf;?I&v4!IlNLU8G@9qMJ6(Ed!hf|Y v#-u6KUe^d)p8C-d;aLkI1o=_{Ec`zJuy~lYL7Uik00000NkvXXu0mjfaU+d- diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneLargeTile.png index 0e5c0705429acd0e74da4ecad03b55ce606aea45..48e45b61661ec80e761a984e01673491fee88682 100644 GIT binary patch delta 661 zcmV;G0&4yG8OR#2zzTnJNklr9EbN;%DmEALjm5uePb&X=M>ikni(laQci4T#W_b8dH`-;cWSNl zyF`k6{PI}1P8Z(ZK4`U4TLXj;1M9Mq^9RmV&et!TD0$ao%}}pQ<%(~u;k_`;HQ}6kO+dOb_-iM^rit!))b#y-?mhD*~I1iNnH(9rLK*68WC~SYRu&hYJ?D;6uf^|oCtZ>Q|1MgOn&LEDQVL10Mpn%gA_npbk%r>0b{V!|)CGi5Mf|l*93z5It?H?D8|ao$pv}hy&k% zMrFtcYOOT8bNd_tNI6nvX1_a9>Vu6N_tQv95s{~C9;sYUH=KK5W*iQ0gj84_%ky<{ zT$U645NUsAm>IQhsCVp!Bf2~m)H`Afq@1Wy=yT$D{EjY1P(vJyoRQK#oBeDPgSNSds68InxwwRsi z>8YyB^r7v9j7vg9JW_6tKT1?7it34ofC*|wj>(K*SsEpvI8_kUVHRWlg##Sp2lYxy z1QBp+9RKX78##j!ej2+{8RQYz+W7Y8H&o0Rk4{R0Ld1Y!{6BxbHV~l@EEm*_WxK#k zM(-%V`sE!0R6v?jRoLQqb81dR1d|1T*as047C~jja|HeQ;&R!jDx~U6bR{A&|3GE% z>N_TaUrwWx;*~p27NSY7C-fvU0kAj6^+K0Bxpzc_TAUh#GGq3^wr#jIL#Jcf7$03*IJIbNqs9QPaB;jTnMqaARmm}N z|4OM4N1zkbs$u4+fvRHuLHUE`PO7k8HgLtVSpU1lb3%V6ui5dcBAG09C94Rz5s!Hm zTbwB`R=+Yhn0%7^z?x$s6yRmaybV%6N#L?xnJu6v5`l;@<^vX?s?N>d U(S+AzHUIzs07*qoM6N<$f>WCclmGw# diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png b/src/main/resources/assets/chisel/textures/blocks/endstone/endStoneOrnate.png index cb0596413348967827bf906e014e7d5d9c061e26..997310a53419e4e554d565cf1b2e213cd9fdf40f 100644 GIT binary patch delta 710 zcmV;%0y+JP8~GZrzzTn)NklL;|;7;6w~na7zW1gfS) zYmHU~DJPa?Cd`4+zefP(wyuG)=?D`v;1$z)v2ZEn0tTT;)h9aeVBlR~6Tr zD@3gD@Udlc^A@c&VfIwj3CClLwSqDVYb`m0(GF82UVZb5p&LmlJr$gP{+#79^7Bu> zk~4@nLYOed5WGjM#b^skvD;tc+Om6m%coD*ym|8nRxD*xB4R15Bj*feK`Vc)m?uy03w_rTVoS~=V}B%u z{QsE+?`M=UfW|K~=!~`Y>4J#HC`C~g^utVw1&g`o=Fbh&;1Lm&G5BG|niWP2`$JEE z7!ZTtT#2z7tu;;af^RQsD*KWjUVnu`SeBWb6077Lu|JH*uv zyJ);$2=NXzDFAZLR8f#c6v@yo^F3c s3WL@fYfcHdC5#Ip1fHFrL4yAV0NP`0-M#T)?*IS*07*qoM6N<$f<(1RdjJ3c delta 727 zcmV;|0x13Y8j2gRzzTo0NklgkwwA3tEU zwd`+poWD6|GM&*id+KVA@Aufsfxvh&A;tlP#g2uSFJ96=whS>o6)caR;oiUJm($-! zC1aFh7(B)pVhCt!5ey>2W_?C&PZ-84oSk4o7uamq%;rn9ay0uDN-3gvaywwv0+SPu zyERs8R#%@mUA})pl%@%fn35Ap7Y6Zo-_q_kTwGjWCyvAEGrD}q_U4|`(^Im7X1gWl zOtaZBpU*L_b{Ov<3#AlB(=oQT{QC3nXlsZua{J9+Oy@6H-=9&GAO#MVOIE9YFd~9- z8dSkmV={*<<|lyR_VzV{Pkg@l!tv3M=#j(L6GQG~7sCZL4& zp(X5lj1h;m4(l{ZDeBSJy!v6vr23AQHrGJ0uXn2hq*AyvC>jQjlL7?9@m~RbL<(~FN7urq3c5}!5`i!@4J|HgBtar?2 z6SQ#z?=fSG)|$;`LrRHQG6(Y`&t&Jc2r?np=ml&Ij3la7EMkA^=LvV1*=aDVF(m$i9wGShb*uci61xx{kx=OUh9Ae*j#!aaXrMY~la_002ov JPDHLkV1nUPU!(v4 diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png b/src/main/resources/assets/chisel/textures/blocks/endstone/enderCircuit.png index 8e427eba4440f2900ce911476fa897d9f00e0b85..44814ca51262cc09359e88ec9a72898eb4e145c0 100644 GIT binary patch delta 888 zcmV-;1Bd*m9I70!zzTm=NklSw-0D$3lj=k@0_iC5Iww6jS&VoU!CL|_^ zR=)VjMEw{31Al~xUraPgns_8a3`i}Bv^2J%gzW*ncehKod++S*%%;H}QT$sH|dt;AVcfZEa4J^~bIG*D^P8zWo8J(m|3t9PMXu_`Fn3%k&%?Zz?%FWgp>KoZDY~jxhh|Tf4Ba zhu+gkB@%r4$ydnhyR7a!WBQ}_5X0xdwn4CvB^!h~dZA3M+GInmAt=VCt%yyIDmk_n zmYJLT81s1rc_M#~=yJ01>z_Ei9(?{FrfqX@v`--D=f?FbxRaB}&+h+1!&B$ zNMeMBd4j!uK(SGzFP3I(_7tD>_7Y+S&l^MOUDVN5~KwQU9aN1 zn8f7{5#uKH*DG{7D%q_C3dItaE?z-ZH0t#>o{9l`{XS0g)MGoP09)~l4c~WF& zc@gY=1h`1*i~(xP2aFuXC8rix-~$YbxnLwjS3UeBiU@$=vm(5Zd~--8y`MH=Uuh`J9u2LatGxrmMU=J4FB|*~3GU6B*DQjGq~& zqiTqPh#=X>wq2uiddz5Mh=Hjaq$ZnWlnT9`g~NaCrjak>4Mz!vg0vcS^p1fn%jB0H zV+$rCVuy0A$>P(0`SHQe9Cq9IJQ+OB1TG;+A{wEswHR~^Qr9~C{qiAduTFU49K)e; zWWB9WZ8eC+`U!h|3^|7o1ObPXZgwyxqqG_-{|^AeIgPu<)RxZx O0000g77C+Wi#(%tbh3eC32|}B zj7yem^M!k<*{AR$_$^G#mblEAID`5^iDU~XlVwBFF~-wi9MBf%!(AWldc8Y;KjFds zZ~RbaoYB!?mi~A`=IS)H^|yR>_a1GlMayvrN9t@WJ!c|2#mRrJPCT3D%xW_K(_`do zcWx4J9kyO>(VI^5@%Svk>@^y-29nfZe=|o=RjHhoaDx^{r~9a<3NbCo=U?ANc=+qL z{_(4Anyy7kOL60vYoi|GmgzyB@p0KSmC8Cg{|SmK_$s{_~hnRma9us|2A-H;gu%#0S#b_Po z*9eatnfi5gB5^7uYnbhqHi4`C%QUGC_N;nt{{s+1VKg_QPG4A>Scq? z%{??xV1M&11*1ZvT&EpLVpi+a1RHte(`j0{ZSbHuzepq)LYN-p==Bb<@jk-7NPjv_ zkJdxo5pjR&7EZH{WjSnGA>^)Q9nVz}OdT)m<4z`!V=8&0K)~yzR6OIaN59cGon>cb zjfvPO5mlns3-M)#hG5p-_~q?Y;-jM+udR|lsBvJHDccQZKgkmF0<7x?XcNQuR*;F2 z40gjp6a;+1NA~?Q3Pqjn;X%?DXV5NI7^{@=JQsf{9HF8YiN?E8;xSArI87T#mN;Bo zpiLXm7cDB)8c&v&crf>ny?T?VGDtLi|) zTSkqNX^>3zlCTwqItCC00i+m*=)5}HquMfXZI~Xqj5%mfYFE)ZqX@|a^4vd9DW1L~ z(w}ak)H12GtNi@KcT`W#7|>D#lsFDP_kZ~w!S@h7xOejwD^LH$4%^5=*E!z5b%BTk z#^1Xfdj*tOg2@lZ2{_Pn9ok--KzE9nOJl4ozrgV=tP2SmhRy#20BWs}uXGp|ZvX%Q M07*qoM6N<$g3d^$U;qFB diff --git a/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png b/src/main/resources/assets/chisel/textures/blocks/endstone/prismaticEndStone.png index 2ef7e78fe30f2fd6fe81bbef1783279f73f42567..5e63a01b9e22ccc3e15c35d041b7a2daebfb07ba 100644 GIT binary patch delta 720 zcmV;>0x$iH8-p9LzzTn^Nkli4AIBHe>mW(94TC+GiVdzGbQV77=*Gr}$ptYbg zOH2u0IDFv=(}dQV%;o@8n*$*P@|mZ|PcVJcvu}4Sm*>O~2r&W*>n!6q;<7ms_iXnY zv=WM0PKpUJLOXx#F)>DrQM6q}-wuQj0GKak2$m*%q}m)%N?{7i(Dj(i((GG|F^J0@ zS{c00Nhwjxa*CPf&$n-R_390|U2=DSOEJrth7qL|DI^w)1uEL3fzAv~+c1A}in9x@ zukLvH;uqH2YaSl%c>2RjZm!?sOAjc#FG(qpWJHuG`fh(<8UyRq7k>ZaSDrunnJ*8Q zgfSr^REHHmegB-x%fAUB(G3TXgx304V2q%Z;;(m?Jp1uA)hm z`8nq&-(jq!+SP0ycZkN|oJWkJEK9tbgK2Tjp|r3#J;ORfoC3Se09sLP52O%rd4`EV zBv2L$TvmS)>DjIJ0QkZYRL6XF$`BeRD%wMf_YS3wvl&!izpl`_VY^u&XsoyNO@CBZ znq9vpFC8&NQc8p{Ax2Xci{nUQG%mCF!V^^>FFb`?GNwIaKcaxTt^u&l(2PewEehib zhn<9Jii9vR4kK;fl2SvS7iez~CG899W`J6m6aCA;5&~fg&2*thR=5w z)b&>sWdQ;jOUjuLJ5or@W;Yms<>oDZ)034#L{X21O#b`K<@J9RFHXMZVS0^-U^>js238fX@cf=L|a?aR+Ly3@4NVFJh**)ANb{;K)033YzlpHcf z3wq#4DdEZiWmS?wKx>WF1pwRm2Jd@JWhskYjPE@2$&CHILt>05A}EC}9KH8wQ{!~W zay7$hO}SG))(L;Cy9Fkvgy_tsUlO;T7$X4XsA4s5m^N2zXDdVmRXF^1i#W%2*A$#e>ge*p6knNbm@p>jIBs1kxhR<5{b|T2r!w9`R&awJU{t? zPal6LMTLkko8I#6@e3|4uaPA9xIq~(T0dS8BPa#0e|^n&$FEp7x0qo;Q942hq?CAA zk9qdwkY`W70WCC(hSg+&Xe`z`j1`WKjxeSM+fbDySqrdY>*ec(ufDJ6tiqh@eC;=u9);(3_6=`~k@Z zHPFPZC-ps|E$ihJT^eHWWFUl|Y#ntu!i2U*jG-tTRaKHyq^c^EtLa$KcO6;@-D(Yh zu^JQ@W6&ZPQ#g!OgplyQBZNTPw4}JEC~LGUvD#74+ea%zCM??#CD0+`OX= zYwqtKm`?xX{kwl@w268K Date: Wed, 5 Aug 2015 12:16:19 -0700 Subject: [PATCH 31/57] Forgot these. --- .../textures/blocks/end_purpur/arcanePurpur.png | Bin 0 -> 3417 bytes .../blocks/end_purpur/purpurLargeTile.png | Bin 0 -> 3214 bytes .../textures/blocks/end_purpur/purpurOrnate.png | Bin 0 -> 3341 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurLargeTile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/arcanePurpur.png new file mode 100644 index 0000000000000000000000000000000000000000..d952275f0464531f883a3334e00610dd131c0402 GIT binary patch literal 3417 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 Ae*gdg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png b/src/main/resources/assets/chisel/textures/blocks/end_purpur/purpurOrnate.png new file mode 100644 index 0000000000000000000000000000000000000000..78adad2e1f4face851256dfb334872b92e729641 GIT binary patch literal 3341 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 XqA6UruiBC~00000NkvXXu0mjfQu9MD literal 0 HcmV?d00001 From 5c72d5184039ade93b587846a3cb724e2ad495d7 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Wed, 5 Aug 2015 12:22:22 -0700 Subject: [PATCH 32/57] Added more entries to lang --- src/main/resources/assets/chisel/lang/en_US.lang | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/chisel/lang/en_US.lang b/src/main/resources/assets/chisel/lang/en_US.lang index 31e39b4a6..11545f650 100644 --- a/src/main/resources/assets/chisel/lang/en_US.lang +++ b/src/main/resources/assets/chisel/lang/en_US.lang @@ -258,6 +258,7 @@ tile.futura.1.desc=Glowing Screen with Cyan Borders tile.futura.2.desc=Applied Labyrinthic Neon Lines tile.futura.3.desc=Poptart Rainbow tile.futura.4.desc=Purple Applied Labyrinthic Neon Lines +tile.futura.5.desc=Psychedelic Poptart Rainbow.v02 tile.futuraCircuit.black.desc=Black tile.futuraCircuit.blue.desc=Blue tile.futuraCircuit.brown.desc=Brown @@ -367,9 +368,15 @@ tile.end_Stone.4.desc=Fancy Bricks tile.end_Stone.5.desc=End Stone Pillar tile.end_Stone.6.desc=Etched End Stone tile.end_Stone.7.desc=Prismatic End Stone +tile.end_Stone.8.desc=End Stone Chunk +tile.end_Stone.9.desc=Framed End Stone Chunk +tile.end_Stone.10.desc=Arcane Block of End Stone +tile.end_Stone.11.desc=Framed End Stone +tile.end_Stone.12.desc=Ornate End Stone +tile.end_Stone.13.desc=End Stone Large Tile #Purpur -tile.chisel.purpur.name=Purpur +tile.chisel.purpur.name=Purpur Block tile.purpur.0.desc=Medium Tiles tile.purpur.1.desc=Pillar tile.purpur.2.desc=Not Shulker @@ -378,6 +385,9 @@ tile.purpur.4.desc=Broken Small Tiles tile.purpur.5.desc=Prismatic Purpur tile.purpur.6.desc=Rough Bricks tile.purpur.7.desc=Cracked Surface +tile.purpur.8.desc=Arcane Block of Purpur +tile.purpur.9.desc=Purpur Large Tile +tile.purpur.10.desc=Ornate Purpur #Metal Blocks tile.chisel.aluminumblock.name=Block of Aluminum From fccfb614d91db660c0d289068586a06b2712c662 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 5 Aug 2015 23:55:42 -0400 Subject: [PATCH 33/57] Delete PlayerSpecials and annoying logging --- .../java/com/cricketcraft/chisel/Chisel.java | 7 - .../chisel/client/player/PlayerSpecials.java | 157 ------------------ .../chisel/proxy/ClientProxy.java | 13 +- 3 files changed, 5 insertions(+), 172 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 44e9b7671..9de3195e6 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -3,14 +3,9 @@ import java.io.File; import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.event.entity.EntityJoinWorldEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -182,8 +177,6 @@ private void addWorldgen(Features feature, Block block, double... data) { public void postInit(FMLPostInitializationEvent event) { ChiselTabs.postInit(); Compatibility.init(event); - FMLLog.severe("Unable to lookup chisel:... is not an error, please do not treat it as such"); - FMLLog.bigWarning("In case you didn't see the red above I suggest you read it - Cricket"); } @EventHandler diff --git a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java b/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java deleted file mode 100644 index beb1599fd..000000000 --- a/src/main/java/com/cricketcraft/chisel/client/player/PlayerSpecials.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.cricketcraft.chisel.client.player; - -import java.util.Collection; -import java.util.UUID; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.ItemRenderer; -import net.minecraft.client.renderer.OpenGlHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraftforge.client.event.RenderLivingEvent; -import net.minecraftforge.client.event.RenderPlayerEvent; -import net.minecraftforge.common.MinecraftForge; - -import org.lwjgl.opengl.GL11; - -import com.cricketcraft.chisel.init.ChiselItems; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; - -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class PlayerSpecials { - - private interface IDevRenderer { - - void renderPlayer(EntityPlayer player, boolean post); - - void renderExtras(EntityPlayer player, boolean post); - } - - private class RenderHolstered implements IDevRenderer { - - private ItemStack toRender; - - private RenderHolstered(ItemStack toRender) { - this.toRender = toRender; - } - - @Override - public void renderExtras(EntityPlayer player, boolean post) { - if (!post) { - GL11.glPushMatrix(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationItemsTexture); - if (player.isSneaking()) { - GL11.glRotatef(28.64789F, 1.0F, 0.0F, 0.0F); - } - boolean armor = player.getCurrentArmor(1) != null; - GL11.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glTranslatef(-0.25F, -0.85F, armor ? 0.2F : 0.28F); - GL11.glScalef(0.5F, 0.5F, 0.5F); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - int light = 0xF000F0; - int lightmapX = light % 0x10000; - int lightmapY = light / 0x10000; - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightmapX, lightmapY); - - IIcon icon = toRender.getIconIndex(); - ItemRenderer.renderItemIn2D(Tessellator.instance, icon.getMaxU(), icon.getMinV(), icon.getMinU(), icon.getMaxV(), icon.getIconWidth(), icon.getIconHeight(), 1.0F / 16.0F); - GL11.glPopMatrix(); - } - } - - @Override - public void renderPlayer(EntityPlayer player, boolean post) { - } - } - - private class RenderTranslucent implements IDevRenderer { - - @Override - public void renderExtras(EntityPlayer player, boolean post) { - } - - @Override - public void renderPlayer(EntityPlayer player, boolean post) { - if (!post) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } else { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - } - } - } - - public static final PlayerSpecials INSTANCE = new PlayerSpecials(); - - private Multimap renderMap = ArrayListMultimap.create(); - - private PlayerSpecials() { - RenderHolstered backChisel = new RenderHolstered(new ItemStack(ChiselItems.obsidianChisel)); - RenderTranslucent translucent = new RenderTranslucent(); - - renderMap.putAll(UUID.fromString("a7529984-8cb2-4fb9-b799-97980f770101"), Lists.newArrayList(backChisel, translucent)); // Cricket - renderMap.putAll(UUID.fromString("a1d2532b-ee11-4ca3-b4c5-76e168d4c98e"), Lists.newArrayList(backChisel, translucent)); // TheCricket26 - renderMap.putAll(UUID.fromString("5399b615-3440-4c66-939d-ab1375952ac3"), Lists.newArrayList(backChisel, translucent)); // Drullkus - - renderMap.put(UUID.fromString("671516b1-4fb3-4c03-aa7c-9c88cfab3ae8"), new RenderHolstered(new ItemStack(ChiselItems.diamondChisel))); // tterrag - renderMap.put(UUID.fromString("ad18f501-08fa-4e7e-b324-86750009106e"), new RenderHolstered(new ItemStack(ChiselItems.chisel)));//minecreatr - - MinecraftForge.EVENT_BUS.register(this); - } - - public static void init() { - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerRenderPre(RenderLivingEvent.Pre event) { - if(nameIsGood(event.entity)){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 0.75F); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - } - } - - @SubscribeEvent - public void onPlayerRenderPost(RenderLivingEvent.Post event) { - if(nameIsGood(event.entity)){ - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - GL11.glDisable(GL11.GL_BLEND); - } - } - - @SubscribeEvent - public void onPlayerRenderSpecialPre(RenderPlayerEvent.Specials.Pre event) { - Collection renders = renderMap.get(event.entityPlayer.getUniqueID()); - for (IDevRenderer r : renders) { - r.renderExtras(event.entityPlayer, false); - } - } - - @SubscribeEvent - public void onPlayerRenderSpecialPost(RenderPlayerEvent.Specials.Post event) { - Collection renders = renderMap.get(event.entityPlayer.getUniqueID()); - for (IDevRenderer r : renders) { - r.renderExtras(event.entityPlayer, true); - } - } - - private boolean nameIsGood(Entity entity){ - if(EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("Cricket") - || EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("Drullkus") - || EnumChatFormatting.getTextWithoutFormattingCodes(entity.getCommandSenderName()).equals("minecreatr")) - return true; - return false; - } -} diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index 915eb09a4..70950a781 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -11,7 +11,6 @@ import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.player.PlayerSpecials; import com.cricketcraft.chisel.client.render.RenderChiselSnowman; import com.cricketcraft.chisel.client.render.RendererCTM; import com.cricketcraft.chisel.client.render.RendererCTMPane; @@ -39,7 +38,7 @@ public class ClientProxy extends CommonProxy { ItemChiselRenderer renderer = new ItemChiselRenderer(); - + @Override public void preInit() { } @@ -54,19 +53,19 @@ public void init() { RenderingRegistry.registerBlockHandler(new RendererEldritch()); RenderingRegistry.registerBlockHandler(new RendererLayeredGlow()); RenderingRegistry.registerBlockHandler(new RendererSimpleLayered()); - + RenderingRegistry.registerBlockHandler(new RendererMultiLayer()); RenderAutoChisel rac = new RenderAutoChisel(); RenderingRegistry.registerBlockHandler(rac); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.autoChisel), rac); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityAutoChisel.class, rac); - + RenderCarvableBeacon rcb = new RenderCarvableBeacon(); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCarvableBeacon.class, rcb); RenderingRegistry.registerBlockHandler(rcb); BlockCarvableBeacon.renderId = rcb.getRenderId(); - + RenderPresent rp = new RenderPresent(); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.present), rp); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityPresent.class, rp); @@ -74,12 +73,10 @@ public void init() { RenderingRegistry.registerEntityRenderingHandler(EntityCloudInABottle.class, new RenderSnowball(ChiselItems.cloudinabottle)); RenderingRegistry.registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss)); RenderingRegistry.registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock)); - RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman()); + RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman()); MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer); MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer); - - PlayerSpecials.init(); } @Override From 72f36d8bb58b4ae1b1ba15f364bef6feaf9669f2 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 6 Aug 2015 00:00:22 -0400 Subject: [PATCH 34/57] Full cleanup and format. Remove all warnings. --- .../java/com/cricketcraft/chisel/Chisel.java | 6 +- .../com/cricketcraft/chisel/Features.java | 363 +++++++++--------- .../chisel/api/ChiselAPIProps.java | 2 +- .../chisel/api/IAdvancedChisel.java | 10 +- .../cricketcraft/chisel/api/ICarvable.java | 3 +- .../com/cricketcraft/chisel/api/IFacade.java | 69 ++-- .../cricketcraft/chisel/api/Statistics.java | 10 +- .../chisel/api/carving/CarvableHelper.java | 57 ++- .../chisel/api/carving/CarvingUtils.java | 1 + .../chisel/api/carving/IVariationInfo.java | 2 +- .../chisel/api/rendering/ClientUtils.java | 3 +- .../chisel/block/BlockCarvable.java | 1 + .../chisel/block/BlockCarvableAntiBlock.java | 2 +- .../chisel/block/BlockCarvableBeacon.java | 92 ++--- .../chisel/block/BlockCarvableBookshelf.java | 2 +- .../chisel/block/BlockCarvableCarpet.java | 3 +- .../chisel/block/BlockCarvableColor.java | 30 +- .../chisel/block/BlockCarvableGlass.java | 1 + .../chisel/block/BlockCarvableGlow.java | 8 +- .../chisel/block/BlockCarvableGlowstone.java | 12 +- .../chisel/block/BlockCarvableIce.java | 3 +- .../chisel/block/BlockCarvableLamp.java | 7 +- .../chisel/block/BlockCarvableLayered.java | 4 + .../chisel/block/BlockCarvablePackedIce.java | 3 +- .../chisel/block/BlockCarvablePane.java | 1 + .../chisel/block/BlockCarvablePowered.java | 10 +- .../chisel/block/BlockCarvablePumpkin.java | 118 +++--- .../chisel/block/BlockCarvableSand.java | 1 + .../chisel/block/BlockCarvableSlab.java | 34 +- .../chisel/block/BlockCarvableStairs.java | 2 +- .../chisel/block/BlockCarvableTorch.java | 9 +- .../chisel/block/BlockCarvableWall.java | 1 + .../cricketcraft/chisel/block/BlockCloud.java | 1 + .../chisel/block/BlockConcrete.java | 4 +- .../chisel/block/BlockMultiLayer.java | 1 + .../chisel/block/BlockPresent.java | 18 +- .../chisel/block/BlockSnakestone.java | 4 +- .../chisel/block/CarvableStairsMaker.java | 2 +- .../tileentity/TileEntityCarvableBeacon.java | 15 +- .../block/tileentity/TileEntityPresent.java | 9 +- .../cricketcraft/chisel/carving/Carving.java | 9 +- .../client/render/RenderChiselSnowman.java | 83 ++-- .../client/render/RendererEldritch.java | 25 +- .../client/render/RendererLayeredGlow.java | 4 +- .../client/render/RendererMultiLayer.java | 14 +- .../client/render/RendererSimpleLayered.java | 2 +- .../client/render/SubmapManagerAntiblock.java | 2 +- .../client/render/SubmapManagerBase.java | 3 +- .../render/SubmapManagerCombinedCTM.java | 8 +- .../render/SubmapManagerFakeController.java | 37 +- .../client/render/SubmapManagerSlab.java | 2 +- .../client/render/SubmapManagerVoidstone.java | 4 +- .../render/tile/RenderCarvableBeacon.java | 227 +++++------ .../client/render/tile/RenderPresent.java | 10 +- .../chisel/compat/Compatibility.java | 96 ++--- .../chisel/compat/IMCHandler.java | 2 +- .../chisel/compat/fmp/FMPCompat.java | 8 +- .../compat/fmp/ItemBlockChiselTorchPart.java | 1 + .../chisel/compat/fmp/PartChiselTorch.java | 4 +- .../compat/nei/RecipeHandlerChisel.java | 3 +- .../chisel/config/Configurations.java | 8 +- .../chisel/entity/EntityChiselSnowman.java | 10 +- .../entity/fx/EntitySnakestoneObsidianFX.java | 2 +- .../chisel/init/ChiselBlocks.java | 4 +- .../cricketcraft/chisel/init/ChiselItems.java | 1 + .../chisel/inventory/ContainerPresent.java | 20 +- .../inventory/InventoryChiselSelection.java | 4 +- .../cricketcraft/chisel/item/BaseItem.java | 2 +- .../chisel/item/ItemBlockPresent.java | 3 +- .../chisel/item/ItemCarvablePumpkin.java | 14 +- .../chisel/item/chisel/ChiselMode.java | 4 +- .../chisel/item/chisel/ItemChisel.java | 45 ++- .../network/message/MessageAutoChisel.java | 7 +- .../network/message/MessageChiselMode.java | 12 +- .../message/MessagePresentConnect.java | 17 +- .../chisel/proxy/CommonProxy.java | 2 +- .../cricketcraft/chisel/utils/General.java | 9 +- .../chisel/utils/GeneralClient.java | 15 +- 78 files changed, 830 insertions(+), 817 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 9de3195e6..fb0309263 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -72,8 +72,8 @@ public class Chisel { @Instance(MOD_ID) public static Chisel instance; - - public Chisel() { + + public Chisel() { ChiselAPIProps.MOD_ID = MOD_ID; CarvableHelper.itemCarvableClass = ItemCarvable.class; Carving.construct(); @@ -152,7 +152,7 @@ public void init(FMLInitializationEvent event) { addWorldgen(Features.DIORITE, ChiselBlocks.diorite, Configurations.dioriteAmount, 40, 100, 0.5); GameRegistry.registerWorldGenerator(GeneratorChisel.INSTANCE, 1000); - EntityRegistry.registerModEntity(EntityChiselSnowman.class, "snowman", 0, this, 80, 1, true); + EntityRegistry.registerModEntity(EntityChiselSnowman.class, "snowman", 0, this, 80, 1, true); proxy.init(); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java index f7310edcf..05f08c4bc 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -125,13 +125,13 @@ void addBlocks() { @Override void addBlocks() { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - andesite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.andesite.0.desc", 0, "andesite/andesite"); + andesite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.andesite.0.desc", 0, "andesite/andesite"); andesite.carverHelper.addVariation("tile.andesite.1.desc", 1, "andesite/andesitePolished"); - andesite.carverHelper.addVariation("tile.andesite.2.desc", 2, "andesite/andesitePillar"); - andesite.carverHelper.addVariation("tile.andesite.3.desc", 3, "andesite/andesiteLBrick"); - andesite.carverHelper.addVariation("tile.andesite.4.desc", 4, "andesite/andesiteOrnate"); - andesite.carverHelper.addVariation("tile.andesite.5.desc", 5, "andesite/andesitePrism"); - andesite.carverHelper.addVariation("tile.andesite.6.desc", 6, "andesite/andesiteTiles"); + andesite.carverHelper.addVariation("tile.andesite.2.desc", 2, "andesite/andesitePillar"); + andesite.carverHelper.addVariation("tile.andesite.3.desc", 3, "andesite/andesiteLBrick"); + andesite.carverHelper.addVariation("tile.andesite.4.desc", 4, "andesite/andesiteOrnate"); + andesite.carverHelper.addVariation("tile.andesite.5.desc", 5, "andesite/andesitePrism"); + andesite.carverHelper.addVariation("tile.andesite.6.desc", 6, "andesite/andesiteTiles"); andesite.carverHelper.registerAll(andesite, "andesite"); andesite.carverHelper.registerOre("blockAndesite"); andesite.carverHelper.registerOre("stoneAndesite"); @@ -166,8 +166,8 @@ void addRecipes() { if (meta == 0) { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, 15), "SSS", "SGS", "SSS", 'S', "stone", 'G', "dustGlowstone")); } - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, meta), "BBB", "BdB", "BBB", - 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.antiBlock, 8, meta), "BBB", "BdB", "BBB", 'd', dyeOres[meta], 'B', new ItemStack(ChiselBlocks.antiBlock, 1, + OreDictionary.WILDCARD_VALUE))); } @Override @@ -190,11 +190,11 @@ void addBlocks() { arcane.carverHelper.addVariation("tile.arcane.4.desc", 4, "arcane/runesGlow"); arcane.carverHelper.addVariation("tile.arcane.5.desc", 5, "arcane/bigBrick"); arcane.carverHelper.addVariation("tile.arcane.6.desc", 6, "arcane/conduitGlowAnim"); - arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); - arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); - arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); - arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); - arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/arcaneCrackAnim"); + arcane.carverHelper.addVariation("tile.arcane.7.desc", 7, "arcane/BorderBrain"); + arcane.carverHelper.addVariation("tile.arcane.8.desc", 8, "arcane/ArcaneBorder"); + arcane.carverHelper.addVariation("tile.arcane.9.desc", 9, "arcane/arcaneMatrix"); + arcane.carverHelper.addVariation("tile.arcane.10.desc", 10, "arcane/thaumcraftLogo"); + arcane.carverHelper.addVariation("tile.arcane.11.desc", 11, "arcane/arcaneCrackAnim"); arcane.carverHelper.registerAll(arcane, "arcane"); Carving.chisel.registerOre("arcane", "arcane"); } @@ -250,11 +250,12 @@ void addRecipes() { }, BEACON { + @Override - void addBlocks(){ + void addBlocks() { BlockCarvableBeacon beacon = (BlockCarvableBeacon) new BlockCarvableBeacon().setCreativeTab(ChiselTabs.tabOtherChiselBlocks); Carving.chisel.addVariation("beacon", Blocks.beacon, 0, 0); - for(int meta = 0; meta < 16; meta++){ + for (int meta = 0; meta < 16; meta++) { beacon.carverHelper.addVariation("tile.beacon." + ItemDye.field_150923_a[meta] + ".desc", meta, "beacon", (meta + 1)); } beacon.carverHelper.registerAll(beacon, "beacon"); @@ -391,8 +392,8 @@ boolean needsMetaRecipes() { @Override void addBlocks() { - BlockCarvableCarpet carpet = (BlockCarvableCarpet) new BlockCarvableCarpet(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.1F).setStepSound(Block.soundTypeCloth) - .setLightOpacity(0).setStepSound(Block.soundTypeCloth); + BlockCarvableCarpet carpet = (BlockCarvableCarpet) new BlockCarvableCarpet(Material.cloth).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.1F) + .setStepSound(Block.soundTypeCloth).setLightOpacity(0).setStepSound(Block.soundTypeCloth); carpet.carverHelper.addVariation("tile.carpet.0.desc", 0, new SubmapManagerCarpetFloor("white")); carpet.carverHelper.addVariation("tile.carpet.1.desc", 1, new SubmapManagerCarpetFloor("orange")); @@ -579,8 +580,7 @@ void addRecipes() { } }, - COPPER - { + COPPER { @Override void addBlocks() { @@ -616,7 +616,7 @@ void addBlocks() { diamond_block.carverHelper.addVariation("tile.diamond.10.desc", 10, "diamond/terrain-diamond-fourornate"); diamond_block.carverHelper.addVariation("tile.diamond.11.desc", 11, "diamond/terrain-diamond-zelda"); diamond_block.carverHelper.addVariation("tile.diamond.12.desc", 12, "diamond/terrain-diamond-ornatelayer"); - diamond_block.carverHelper.registerAll(diamond_block, "diamond_block"); + diamond_block.carverHelper.registerAll(diamond_block, "diamond_block"); Carving.chisel.registerOre("diamond_block", "blockDiamond"); } }, @@ -627,13 +627,13 @@ void addBlocks() { void addBlocks() { BlockCarvable diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - diorite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.diorite.0.desc", 0, "diorite/diorite"); + diorite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.diorite.0.desc", 0, "diorite/diorite"); diorite.carverHelper.addVariation("tile.diorite.1.desc", 1, "diorite/dioritePolished"); diorite.carverHelper.addVariation("tile.diorite.2.desc", 2, "diorite/dioritePillar"); - diorite.carverHelper.addVariation("tile.diorite.3.desc", 3, "diorite/dioriteLBrick"); - diorite.carverHelper.addVariation("tile.diorite.4.desc", 4, "diorite/dioriteOrnate"); - diorite.carverHelper.addVariation("tile.diorite.5.desc", 5, "diorite/dioritePrism"); - diorite.carverHelper.addVariation("tile.diorite.6.desc", 6, "diorite/dioriteTiles"); + diorite.carverHelper.addVariation("tile.diorite.3.desc", 3, "diorite/dioriteLBrick"); + diorite.carverHelper.addVariation("tile.diorite.4.desc", 4, "diorite/dioriteOrnate"); + diorite.carverHelper.addVariation("tile.diorite.5.desc", 5, "diorite/dioritePrism"); + diorite.carverHelper.addVariation("tile.diorite.6.desc", 6, "diorite/dioriteTiles"); diorite.carverHelper.registerAll(diorite, "diorite"); diorite.carverHelper.registerOre("blockDiorite"); diorite.carverHelper.registerOre("stoneDiorite"); @@ -700,30 +700,30 @@ void addBlocks() { } }, - END_STONE { - - @Override - void addBlocks() { - BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - Carving.chisel.addVariation("end_Stone", Blocks.end_stone , 0, -1); - end_Stone.carverHelper.addVariation("tile.end_Stone.0.desc", 0, "endstone/end_bricks"); - end_Stone.carverHelper.addVariation("tile.end_Stone.1.desc", 1, "endstone/chaoticBricks"); - end_Stone.carverHelper.addVariation("tile.end_Stone.2.desc", 2, "endstone/CheckeredTile"); - end_Stone.carverHelper.addVariation("tile.end_Stone.3.desc", 3, "endstone/enderCircuit"); - end_Stone.carverHelper.addVariation("tile.end_Stone.4.desc", 4, "endstone/endFrenchBricks"); - end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); - end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); - end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); - end_Stone.carverHelper.addVariation("tile.end_Stone.8.desc", 8, "endstone/endStoneChunk"); - end_Stone.carverHelper.addVariation("tile.end_Stone.9.desc", 9, "endstone/EnderFrame", new SubmapManagerCombinedCTM(9, "endstone/EnderFrame", TextureType.V9)); - end_Stone.carverHelper.addVariation("tile.end_Stone.10.desc", 10, "endstone/arcaneEndStone"); - end_Stone.carverHelper.addVariation("tile.end_Stone.11.desc", 11, "endstone/framedEndStone"); - end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endstoneOrnate"); - end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endstoneLargeTile"); - end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); - Carving.chisel.registerOre("end_Stone", "end_Stone"); - } - }, + END_STONE { + + @Override + void addBlocks() { + BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + Carving.chisel.addVariation("end_Stone", Blocks.end_stone, 0, -1); + end_Stone.carverHelper.addVariation("tile.end_Stone.0.desc", 0, "endstone/end_bricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.1.desc", 1, "endstone/chaoticBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.2.desc", 2, "endstone/CheckeredTile"); + end_Stone.carverHelper.addVariation("tile.end_Stone.3.desc", 3, "endstone/enderCircuit"); + end_Stone.carverHelper.addVariation("tile.end_Stone.4.desc", 4, "endstone/endFrenchBricks"); + end_Stone.carverHelper.addVariation("tile.end_Stone.5.desc", 5, "endstone/endPillar"); + end_Stone.carverHelper.addVariation("tile.end_Stone.6.desc", 6, "endstone/endStoneEtched"); + end_Stone.carverHelper.addVariation("tile.end_Stone.7.desc", 7, "endstone/prismaticEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.8.desc", 8, "endstone/endStoneChunk"); + end_Stone.carverHelper.addVariation("tile.end_Stone.9.desc", 9, "endstone/EnderFrame", new SubmapManagerCombinedCTM(9, "endstone/EnderFrame", TextureType.V9)); + end_Stone.carverHelper.addVariation("tile.end_Stone.10.desc", 10, "endstone/arcaneEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.11.desc", 11, "endstone/framedEndStone"); + end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endstoneOrnate"); + end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endstoneLargeTile"); + end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); + Carving.chisel.registerOre("end_Stone", "end_Stone"); + } + }, FACTORY { @@ -763,8 +763,8 @@ void addBlocks() { @Override void addRecipes() { - GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[]{"*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', - new ItemStack(Items.iron_ingot, 1)}); + GameRegistry.addRecipe(new ItemStack(ChiselBlocks.factoryblock, Configurations.factoryBlockAmount, 0), new Object[] { "*X*", "X X", "*X*", '*', new ItemStack(Blocks.stone, 1), 'X', + new ItemStack(Items.iron_ingot, 1) }); } }, @@ -835,14 +835,14 @@ void addBlocks() { futura.carverHelper.addVariation("tile.futura.5.desc", 5, "futura/WIP/controller", new SubmapManagerFakeController(5, "futura/WIP/uberWavy")); futura.carverHelper.registerAll(futura, "futura"); - BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); - for (int i = 0; i < 16; i++) { - circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate", (i+20)); - } + BlockCarvable circuits = (BlockCarvable) new BlockCarvableGlow("animations/strobe").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10.0F); + for (int i = 0; i < 16; i++) { + circuits.carverHelper.addVariation("tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", i, "futura/circuitPlate", (i + 20)); + } - circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); - circuits.carverHelper.registerVariations("futura"); - Carving.chisel.registerOre("futura", "futura"); + circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); + circuits.carverHelper.registerVariations("futura"); + Carving.chisel.registerOre("futura", "futura"); } @Override @@ -877,8 +877,8 @@ void addBlocks() { BlockCarvableGlass glass2 = (BlockCarvableGlass) new BlockCarvableGlass().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setStepSound(Block.soundTypeGlass); glass2.carverHelper.addVariation("tile.glass2.0.desc", 0, "glass/chrono", 20); - glass2.carverHelper.registerBlock(glass2, "glass2"); - glass2.carverHelper.registerVariations("glass"); + glass2.carverHelper.registerBlock(glass2, "glass2"); + glass2.carverHelper.registerVariations("glass"); } }, @@ -1013,18 +1013,18 @@ void addBlocks() { gold_block.carverHelper.addVariation("tile.gold.13.desc", 13, "gold/terrain-gold-spaceblack"); gold_block.carverHelper.addVariation("tile.gold.14.desc", 14, "gold/terrain-gold-simple"); - BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) - .setResistance(10F); - gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution", 20); - gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate", 21); - gold2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/gold/thermal", 22); - gold2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/gold/adv", 23); - gold2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/gold/egregious", 24); - gold2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/gold/bolted", 25); - gold2.carverHelper.registerBlock(gold2, "gold2"); - gold2.carverHelper.registerVariations("gold_block"); - - gold_block.carverHelper.registerAll(gold_block, "gold_block"); + BlockCarvable gold2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + .setResistance(10F); + gold2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/gold/caution", 20); + gold2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/gold/crate", 21); + gold2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/gold/thermal", 22); + gold2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/gold/adv", 23); + gold2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/gold/egregious", 24); + gold2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/gold/bolted", 25); + gold2.carverHelper.registerBlock(gold2, "gold2"); + gold2.carverHelper.registerVariations("gold_block"); + + gold_block.carverHelper.registerAll(gold_block, "gold_block"); Carving.chisel.registerOre("gold_block", "blockGold"); } }, @@ -1035,13 +1035,13 @@ void addBlocks() { void addBlocks() { BlockCarvable granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - granite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.granite.0.desc", 0, "granite/granite"); + granite.carverHelper.addVariation(Configurations.imTooGoodForDescriptions ? "" : "tile.granite.0.desc", 0, "granite/granite"); granite.carverHelper.addVariation("tile.granite.1.desc", 1, "granite/granitePolished"); granite.carverHelper.addVariation("tile.granite.2.desc", 2, "granite/granitePillar"); - granite.carverHelper.addVariation("tile.granite.3.desc", 3, "granite/graniteLBrick"); - granite.carverHelper.addVariation("tile.granite.4.desc", 4, "granite/graniteOrnate"); - granite.carverHelper.addVariation("tile.granite.5.desc", 5, "granite/granitePrism"); - granite.carverHelper.addVariation("tile.granite.6.desc", 6, "granite/graniteTiles"); + granite.carverHelper.addVariation("tile.granite.3.desc", 3, "granite/graniteLBrick"); + granite.carverHelper.addVariation("tile.granite.4.desc", 4, "granite/graniteOrnate"); + granite.carverHelper.addVariation("tile.granite.5.desc", 5, "granite/granitePrism"); + granite.carverHelper.addVariation("tile.granite.6.desc", 6, "granite/graniteTiles"); granite.carverHelper.registerAll(granite, "granite"); granite.carverHelper.registerOre("blockGranite"); granite.carverHelper.registerOre("stoneGranite"); @@ -1087,21 +1087,21 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); - for (int i = 0; i < 16; i++) { - hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); - } - hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); - Carving.chisel.registerOre("hexPlating", "hexPlating"); + BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); + for (int i = 0; i < 16; i++) { + hexPlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexBase"); + } + hexPlating.carverHelper.registerAll(hexPlating, "hexPlating"); + Carving.chisel.registerOre("hexPlating", "hexPlating"); - BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); - for (int i = 0; i < 16; i++) { - hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew", (i+20)); - } + BlockCarvable hexLargePlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); + for (int i = 0; i < 16; i++) { + hexLargePlating.carverHelper.addVariation("tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", i, "hexPlating/hexNew", (i + 20)); + } - hexLargePlating.carverHelper.registerBlock(hexLargePlating, "hexLargePlating"); - hexLargePlating.carverHelper.registerVariations("hexPlating"); - Carving.chisel.registerOre("hexPlating", "hexPlating"); + hexLargePlating.carverHelper.registerBlock(hexLargePlating, "hexLargePlating"); + hexLargePlating.carverHelper.registerVariations("hexPlating"); + Carving.chisel.registerOre("hexPlating", "hexPlating"); } @Override @@ -1272,18 +1272,18 @@ void addBlocks() { iron_block.carverHelper.addVariation("tile.iron.14.desc", 14, "iron/terrain-iron-vents"); iron_block.carverHelper.addVariation("tile.iron.15.desc", 15, "iron/terrain-iron-simple"); - BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) - .setResistance(10F); - iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution", 20); - iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate", 21); - iron2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/iron/thermal", 22); - iron2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/iron/adv", 23); - iron2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/iron/egregious", 24); - iron2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/iron/bolted", 25); - iron2.carverHelper.registerBlock(iron2, "iron2"); - iron2.carverHelper.registerVariations("iron_block"); - - iron_block.carverHelper.registerAll(iron_block, "iron_block"); + BlockCarvable iron2 = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) + .setResistance(10F); + iron2.carverHelper.addVariation("tile.metalOre.0.desc", 0, "metals/iron/caution", 20); + iron2.carverHelper.addVariation("tile.metalOre.1.desc", 1, "metals/iron/crate", 21); + iron2.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/iron/thermal", 22); + iron2.carverHelper.addVariation("tile.metalOre.3.desc", 3, "metals/iron/adv", 23); + iron2.carverHelper.addVariation("tile.metalOre.4.desc", 4, "metals/iron/egregious", 24); + iron2.carverHelper.addVariation("tile.metalOre.5.desc", 5, "metals/iron/bolted", 25); + iron2.carverHelper.registerBlock(iron2, "iron2"); + iron2.carverHelper.registerVariations("iron_block"); + + iron_block.carverHelper.registerAll(iron_block, "iron_block"); Carving.chisel.registerOre("iron_block", "blockIron"); } }, @@ -1353,7 +1353,7 @@ void addBlocks() { lapis_block.carverHelper.addVariation("tile.lapis.7.desc", 7, "lapis/a1-blocklapis-smooth"); lapis_block.carverHelper.addVariation("tile.lapis.8.desc", 8, "lapis/a1-blocklapis-ornatelayer"); - lapis_block.carverHelper.registerAll(lapis_block, "lapis_block"); + lapis_block.carverHelper.registerAll(lapis_block, "lapis_block"); Carving.chisel.registerOre("lapis_block", "lapis"); } }, @@ -1406,6 +1406,7 @@ void addBlocks() { BlockLeaf leaves = (BlockLeaf) new BlockLeaf(Material.leaves).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.2F).setStepSound(Block.soundTypeGrass); Carving.chisel.addGroup(new SimpleCarvingGroup("leaves") { + @Override public List getVariations() { if (Configurations.chiselBackToVanillaLeaves) { return super.getVariations(); @@ -1693,38 +1694,37 @@ void addRecipes() { } }, - NATION { + NATION { - @Override - void addBlocks() { - BlockCarvable imperial = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - imperial.carverHelper.addVariation("tile.imperial.0.desc", 0, "military/imperialCamo"); - imperial.carverHelper.addVariation("tile.imperial.1.desc", 1, "military/imperialCamoSecluded"); - imperial.carverHelper.addVariation("tile.imperial.2.desc", 2, "military/imperialPlate"); - imperial.carverHelper.addVariation("tile.imperial.3.desc", 3, "military/imperialCautionWhite"); - imperial.carverHelper.addVariation("tile.imperial.4.desc", 4, "military/imperialCautionOrange"); - imperial.carverHelper.registerBlock(imperial, "nation"); + @Override + void addBlocks() { + BlockCarvable imperial = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + imperial.carverHelper.addVariation("tile.imperial.0.desc", 0, "military/imperialCamo"); + imperial.carverHelper.addVariation("tile.imperial.1.desc", 1, "military/imperialCamoSecluded"); + imperial.carverHelper.addVariation("tile.imperial.2.desc", 2, "military/imperialPlate"); + imperial.carverHelper.addVariation("tile.imperial.3.desc", 3, "military/imperialCautionWhite"); + imperial.carverHelper.addVariation("tile.imperial.4.desc", 4, "military/imperialCautionOrange"); + imperial.carverHelper.registerBlock(imperial, "nation"); - BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); - rebel.carverHelper.addVariation("tile.rebel.0.desc", 0, "military/rebelCamo", 20); - rebel.carverHelper.addVariation("tile.rebel.1.desc", 1, "military/rebelCamoSecluded", 21); - rebel.carverHelper.addVariation("tile.rebel.2.desc", 2, "military/rebelPlate", 22); - rebel.carverHelper.addVariation("tile.rebel.3.desc", 3, "military/rebelCautionWhite", 23); - rebel.carverHelper.addVariation("tile.rebel.4.desc", 4, "military/rebelCautionRed", 24); - rebel.carverHelper.registerBlock(rebel, "rebel"); + BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + rebel.carverHelper.addVariation("tile.rebel.0.desc", 0, "military/rebelCamo", 20); + rebel.carverHelper.addVariation("tile.rebel.1.desc", 1, "military/rebelCamoSecluded", 21); + rebel.carverHelper.addVariation("tile.rebel.2.desc", 2, "military/rebelPlate", 22); + rebel.carverHelper.addVariation("tile.rebel.3.desc", 3, "military/rebelCautionWhite", 23); + rebel.carverHelper.addVariation("tile.rebel.4.desc", 4, "military/rebelCautionRed", 24); + rebel.carverHelper.registerBlock(rebel, "rebel"); - imperial.carverHelper.registerVariations("military"); - rebel.carverHelper.registerVariations("military"); + imperial.carverHelper.registerVariations("military"); + rebel.carverHelper.registerVariations("military"); - Carving.chisel.registerOre("military", "military"); - } + Carving.chisel.registerOre("military", "military"); + } - @Override - void addRecipes() { - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.rebel, 32, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', - Items.iron_ingot, 'z', Items.gold_nugget })); - } - }, + @Override + void addRecipes() { + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.rebel, 32, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', Items.iron_ingot, 'z', Items.gold_nugget })); + } + }, NETHER_BRICK { @@ -1793,7 +1793,8 @@ public boolean isFireSource(World world, int x, int y, int z, ForgeDirection sid @Override void addBlocks() { - BlockCarvable obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F).setStepSound(Block.soundTypeStone); + BlockCarvable obsidian = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("obsidian", Blocks.obsidian, 0, 0); obsidian.carverHelper.addVariation("tile.obsidian.1.desc", 1, "obsidian/pillar"); @@ -1812,7 +1813,7 @@ void addBlocks() { obsidian.carverHelper.addVariation("tile.obsidian.14.desc", 14, "obsidian/greek"); obsidian.carverHelper.addVariation("tile.obsidian.15.desc", 15, "obsidian/crate"); - obsidian.carverHelper.registerAll(obsidian, "obsidian"); + obsidian.carverHelper.registerAll(obsidian, "obsidian"); Carving.chisel.registerOre("obsidian", "obsidian"); } }, @@ -1842,6 +1843,7 @@ void addBlocks() { packedice.carverHelper.registerAll(packedice, "packedice"); Carving.chisel.registerOre("packedice", "packedice"); } + @Override void addRecipes() { GameRegistry.addRecipe(new ItemStack(ChiselBlocks.packedice_pillar, 6, 0), "XX", "XX", "XX", 'X', new ItemStack(ChiselBlocks.packedice, 1, OreDictionary.WILDCARD_VALUE)); @@ -1852,8 +1854,8 @@ void addRecipes() { @Override void addBlocks() { - BlockCarvablePackedIce packedice_pillar = (BlockCarvablePackedIce) new BlockCarvablePackedIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks) - .setHardness(0.5F).setLightOpacity(3).setStepSound(Block.soundTypeGlass); + BlockCarvablePackedIce packedice_pillar = (BlockCarvablePackedIce) new BlockCarvablePackedIce().setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) + .setStepSound(Block.soundTypeGlass); packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.0.desc", 0, "icepillar/plainplain"); packedice_pillar.carverHelper.addVariation("tile.packedice_pillar.1.desc", 1, "icepillar/plaingreek"); @@ -1890,11 +1892,11 @@ void addBlocks() { makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.15.desc", 15, "ice/poison"); makerPackedIceStairs.create(new IStairsCreator() { - @Override - public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { - return new BlockCarvablePackedIceStairs(block, meta, helper); - } - }, "packedice_stairs", ChiselBlocks.packediceStairs); + @Override + public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper) { + return new BlockCarvablePackedIceStairs(block, meta, helper); + } + }, "packedice_stairs", ChiselBlocks.packediceStairs); Carving.chisel.registerOre("packedice_stairs", "packedIceStairs"); } }, @@ -1990,31 +1992,32 @@ boolean needsMetaRecipes() { } }, - PURPUR { - @Override - void addBlocks() { - BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); - purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); - purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); - purpur.carverHelper.addVariation("tile.purpur.2.desc", 2, "end_purpur/shulker"); - purpur.carverHelper.addVariation("tile.purpur.3.desc", 3, "end_purpur/tilePurpur"); - purpur.carverHelper.addVariation("tile.purpur.4.desc", 4, "end_purpur/tileBrokenPurpur"); - purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); - purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); - purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); - purpur.carverHelper.addVariation("tile.purpur.8.desc", 8, "end_purpur/arcanePurpur"); - purpur.carverHelper.addVariation("tile.purpur.9.desc", 9, "end_purpur/purpurLargeTile"); - purpur.carverHelper.addVariation("tile.purpur.10.desc", 10, "end_purpur/purpurOrnate"); - - purpur.carverHelper.registerAll(purpur, "purpur"); - Carving.chisel.registerOre("purpur", "purpur"); - } - - @Override - void addRecipes() { - GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.purpur), new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), new ItemStack(Items.dye, 1, 5)); - } - }, + PURPUR { + + @Override + void addBlocks() { + BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + purpur.carverHelper.addVariation("tile.purpur.0.desc", 0, "end_purpur/purpur_block"); + purpur.carverHelper.addVariation("tile.purpur.1.desc", 1, "end_purpur/purpur_pillar"); + purpur.carverHelper.addVariation("tile.purpur.2.desc", 2, "end_purpur/shulker"); + purpur.carverHelper.addVariation("tile.purpur.3.desc", 3, "end_purpur/tilePurpur"); + purpur.carverHelper.addVariation("tile.purpur.4.desc", 4, "end_purpur/tileBrokenPurpur"); + purpur.carverHelper.addVariation("tile.purpur.5.desc", 5, "end_purpur/prismaticPurpur"); + purpur.carverHelper.addVariation("tile.purpur.6.desc", 6, "end_purpur/purpurBricks"); + purpur.carverHelper.addVariation("tile.purpur.7.desc", 7, "end_purpur/purpurCobble"); + purpur.carverHelper.addVariation("tile.purpur.8.desc", 8, "end_purpur/arcanePurpur"); + purpur.carverHelper.addVariation("tile.purpur.9.desc", 9, "end_purpur/purpurLargeTile"); + purpur.carverHelper.addVariation("tile.purpur.10.desc", 10, "end_purpur/purpurOrnate"); + + purpur.carverHelper.registerAll(purpur, "purpur"); + Carving.chisel.registerOre("purpur", "purpur"); + } + + @Override + void addRecipes() { + GameRegistry.addShapelessRecipe(new ItemStack(ChiselBlocks.purpur), new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), new ItemStack(Items.dye, 1, 5)); + } + }, QUARTZ { @@ -2187,7 +2190,7 @@ void addBlocks() { redstone_block.carverHelper.addVariation("tile.redstone_block.14.desc", 14, "redstone/a1-blockredstone-skullred"); redstone_block.carverHelper.addVariation("tile.redstone_block.15.desc", 15, "redstone/a1-blockredstone-redstonezelda"); - redstone_block.carverHelper.registerAll(redstone_block, "redstone_block"); + redstone_block.carverHelper.registerAll(redstone_block, "redstone_block"); Carving.chisel.registerOre("redstone_block", "redstone"); } }, @@ -2395,10 +2398,10 @@ void addBlocks() { } } - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain", 16); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic", 17); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic", 18); - stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.3.desc", 3, "stonebrick2/masonBricksMixed", 19); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain", 16); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic", 17); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic", 18); + stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.3.desc", 3, "stonebrick2/masonBricksMixed", 19); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.4.desc", 4, "stonebrick/smallbricks"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.5.desc", 5, "stonebrick/largebricks"); stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.6.desc", 6, "stonebrick/smallchaotic"); @@ -2413,9 +2416,9 @@ void addBlocks() { stonebricksmooth.carverHelper.addVariation("tile.stonebricksmooth.15.desc", 15, "stonebrick/poison"); stonebricksmooth.carverHelper.registerAll(stonebricksmooth, "stonebricksmooth"); - Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth"); + Carving.chisel.registerOre("stonebricksmooth", "stonebricksmooth"); - //Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("Chisel-2", "tile.TFTowerStone"), 0, 0); + // Carving.chisel.addVariation("stonebricksmooth", GameRegistry.findBlock("Chisel-2", "tile.TFTowerStone"), 0, 0); } }, @@ -2474,11 +2477,12 @@ void addBlocks() { technical4.carverHelper.addVariation("tile.technical4.1.desc", 1, "technical/new/weatheredOrangePanels"); technical4.carverHelper.addVariation("tile.technical4.2.desc", 2, "technical/new/Sturdy"); technical4.carverHelper.addVariation("tile.technical4.3.desc", 3, "technical/new/MegaCell"); - technical4.carverHelper.addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"/*, new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4)*/); + technical4.carverHelper + .addVariation("tile.technical4.4.desc", 4, "technical/new/ExhaustPlating"/* , new SubmapManagerCombinedCTM(4, "technical/new/test/ExhaustPlating", TextureType.R4) */); technical4.carverHelper.addVariation("tile.technical4.5.desc", 5, "technical/new/MakeshiftPanels"); technical4.carverHelper.addVariation("tile.technical4.6.desc", 6, "technical/new/Piping"); - //The animation is malfunctioning. :( - //technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); + // The animation is malfunctioning. :( + // technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); technical4.carverHelper.registerVariations("technical"); @@ -2489,8 +2493,10 @@ void addBlocks() { void addRecipes() { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y', Items.iron_ingot })); - /*GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', - "ingotIron", 'z', Blocks.glass })); //*/ + /* + * GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ChiselBlocks.technical2, Configurations.factoryBlockAmount, 0), new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', + * "ingotIron", 'z', Blocks.glass })); // + */ } }, @@ -2753,8 +2759,7 @@ void addBlocks() { voidstone.carverHelper.registerAll(voidstone, "voidstone"); Carving.chisel.registerOre("voidstone", "voidstone"); - BlockCarvable voidstone2 = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + BlockCarvable voidstone2 = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); voidstone2.carverHelper.addVariation("tile.voidstone.0.desc", 0, new SubmapManagerVoidstone("voidstone/animated/raw", 0)); voidstone2.carverHelper.addVariation("tile.voidstone.1.desc", 1, new SubmapManagerVoidstone("voidstone/animated/quarters", 1)); voidstone2.carverHelper.addVariation("tile.voidstone.2.desc", 2, new SubmapManagerVoidstone("voidstone/animated/smooth", 2)); @@ -2769,7 +2774,6 @@ void addBlocks() { BlockCarvable voidstonerunic = (BlockCarvable) new BlockCarvable(Material.rock).setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); - for (int i = 1; i < 16; i++) voidstonerunic.carverHelper.addVariation("tile.voidstoneRunic." + sGNames[i].replaceAll(" ", "").toLowerCase() + ".desc", i, "voidstone/runes/rune" + sGNames[i].replaceAll(" ", "")); voidstonerunic.carverHelper.registerAll(voidstonerunic, "voidstoneRunic"); @@ -2904,7 +2908,6 @@ void addBlocks() { void addBlocks() { BlockCarvable woolen_clay = (BlockCarvable) new BlockCarvable(Material.clay).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F).setResistance(10F); - for (int i = 0; i < 16; i++) woolen_clay.carverHelper.addVariation("tile.woolenClay." + i + ".desc", i, "woolenClay/" + sGNames[i].replaceAll(" ", "").toLowerCase()); woolen_clay.carverHelper.registerAll(woolen_clay, "woolen_clay"); diff --git a/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java b/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java index dc50c1c55..04a4683fd 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java +++ b/src/main/java/com/cricketcraft/chisel/api/ChiselAPIProps.java @@ -3,5 +3,5 @@ public class ChiselAPIProps { public static final String VERSION = "0.1.0"; - public static String MOD_ID = null; // Set by Chisel + public static String MOD_ID = null; // Set by Chisel } diff --git a/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java b/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java index 6a01ed971..c6832c0aa 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java +++ b/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java @@ -1,18 +1,16 @@ package com.cricketcraft.chisel.api; -import com.cricketcraft.chisel.api.carving.IChiselMode; - import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.api.carving.IChiselMode; + /** - * Implement this on chisel items which require more control over chisel modes - * (including adding new modes). + * Implement this on chisel items which require more control over chisel modes (including adding new modes). */ public interface IAdvancedChisel { /** - * Gets the next mode the button in the GUI should switch to given the - * current mode. + * Gets the next mode the button in the GUI should switch to given the current mode. * * @param stack * The {@link ItemStack} representing the chisel diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java index a2d815492..2d56407cd 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java +++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java @@ -1,6 +1,5 @@ package com.cricketcraft.chisel.api; -import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -32,6 +31,7 @@ public interface ICarvable extends ICTMBlock { * The metadata of the block * @return The {@link ISubmapManager} that represents this block in the world. */ + @Override public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata); /** @@ -39,5 +39,6 @@ public interface ICarvable extends ICTMBlock { * * @return A {@link ISubmapManager} */ + @Override public IVariationInfo getManager(int meta); } diff --git a/src/main/java/com/cricketcraft/chisel/api/IFacade.java b/src/main/java/com/cricketcraft/chisel/api/IFacade.java index 202a63a1b..3a4af7721 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IFacade.java +++ b/src/main/java/com/cricketcraft/chisel/api/IFacade.java @@ -5,36 +5,45 @@ import net.minecraft.world.World; /** - * To be implemented on blocks that "hide" another block inside, so connected textuers can still be - * accomplished. + * To be implemented on blocks that "hide" another block inside, so connected textuers can still be accomplished. */ -public interface IFacade -{ - /** - * Gets the block this facade is acting as. - * - * @param world {@link World} - * @param x X coord of your block - * @param y Y coord of your block - * @param z Z coord of your block - * @param side The side being rendered, NOT the side being connected from. - *

- * This value can be -1 if no side is specified. Please handle this appropriately. - * @return The block inside of your facade block. - */ - Block getFacade(IBlockAccess world, int x, int y, int z, int side); +public interface IFacade { - /** - * Gets the metadata of the block that this facade is acting as. - * - * @param world {@link World} - * @param x X coord of your block - * @param y Y coord of your block - * @param z Z coord of your block - * @param side The side being rendered, NOT the side being connected from. - *

- * This value can be -1 if no side is specified. Please handle this appropriately. - * @return The metadata of your facade block. - */ - int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side); + /** + * Gets the block this facade is acting as. + * + * @param world + * {@link World} + * @param x + * X coord of your block + * @param y + * Y coord of your block + * @param z + * Z coord of your block + * @param side + * The side being rendered, NOT the side being connected from. + *

+ * This value can be -1 if no side is specified. Please handle this appropriately. + * @return The block inside of your facade block. + */ + Block getFacade(IBlockAccess world, int x, int y, int z, int side); + + /** + * Gets the metadata of the block that this facade is acting as. + * + * @param world + * {@link World} + * @param x + * X coord of your block + * @param y + * Y coord of your block + * @param z + * Z coord of your block + * @param side + * The side being rendered, NOT the side being connected from. + *

+ * This value can be -1 if no side is specified. Please handle this appropriately. + * @return The metadata of your facade block. + */ + int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side); } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/api/Statistics.java b/src/main/java/com/cricketcraft/chisel/api/Statistics.java index b34c5cc57..64e8c6b72 100644 --- a/src/main/java/com/cricketcraft/chisel/api/Statistics.java +++ b/src/main/java/com/cricketcraft/chisel/api/Statistics.java @@ -6,10 +6,10 @@ public class Statistics { - public static StatBase blocksChiseled = (new StatBasic("stat.blockChiseled", new ChatComponentTranslation("stat.blockChiseled", new Object[0]))); + public static StatBase blocksChiseled = (new StatBasic("stat.blockChiseled", new ChatComponentTranslation("stat.blockChiseled", new Object[0]))); - public static void init(){ - blocksChiseled.initIndependentStat(); - blocksChiseled.registerStat(); - } + public static void init() { + blocksChiseled.initIndependentStat(); + blocksChiseled.registerStat(); + } } diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java index 5f9ba175e..5d6f695e7 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java @@ -26,42 +26,42 @@ import cpw.mods.fml.relauncher.SideOnly; public class CarvableHelper { - + public static Class itemCarvableClass = null; private Block theBlock; - + public ArrayList infoList = new ArrayList(); IVariationInfo[] infoMap = new IVariationInfo[16]; public boolean forbidChiseling = false; - + public CarvableHelper(Block block) { this.theBlock = block; } - - public void addVariation(String description, int metadata, ISubmapManager manager) { - addVariation(description, metadata, null, manager); - } - public void addVariation(String description, int metadata, Block bb) { - addVariation(description, metadata, null, bb, 0, ChiselAPIProps.MOD_ID); - } + public void addVariation(String description, int metadata, ISubmapManager manager) { + addVariation(description, metadata, null, manager); + } + + public void addVariation(String description, int metadata, Block bb) { + addVariation(description, metadata, null, bb, 0, ChiselAPIProps.MOD_ID); + } + + public void addVariation(String description, int metadata, Block bb, int blockMeta) { + addVariation(description, metadata, null, bb, blockMeta, ChiselAPIProps.MOD_ID); + } - public void addVariation(String description, int metadata, Block bb, int blockMeta) { - addVariation(description, metadata, null, bb, blockMeta, ChiselAPIProps.MOD_ID); - } + public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material) { + addVariation(description, metadata, null, bb, blockMeta, ChiselAPIProps.MOD_ID); + } - public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material) { - addVariation(description, metadata, null, bb, blockMeta, ChiselAPIProps.MOD_ID); - } + public void addVariation(String description, int metadata, String texture) { + addVariation(description, metadata, texture, (ISubmapManager) null); + } - public void addVariation(String description, int metadata, String texture) { - addVariation(description, metadata, texture, (ISubmapManager) null); - } - - public void addVariation(String description, int metadata, String texture, ISubmapManager manager) { - addVariation(description, metadata, texture, null, 0, ChiselAPIProps.MOD_ID, manager, metadata); - } + public void addVariation(String description, int metadata, String texture, ISubmapManager manager) { + addVariation(description, metadata, texture, null, 0, ChiselAPIProps.MOD_ID, manager, metadata); + } public void addVariation(String description, int metadata, Block bb, String modid) { addVariation(description, metadata, null, bb, 0, modid); @@ -92,9 +92,8 @@ public void addVariation(String description, int metadata, String texture, Block if (infoList.size() >= 16) return; - IVariationInfo info = FMLCommonHandler.instance().getSide().isClient() - ? getClientInfo(modid, texture, description, metadata, block, blockMeta, customManager, order) - : getServerInfo(modid, texture, description, metadata, block, blockMeta, customManager, order); + IVariationInfo info = FMLCommonHandler.instance().getSide().isClient() ? getClientInfo(modid, texture, description, metadata, block, blockMeta, customManager, order) : getServerInfo(modid, + texture, description, metadata, block, blockMeta, customManager, order); infoList.add(info); infoMap[metadata] = info; @@ -106,7 +105,7 @@ private IVariationInfo getClientInfo(String modid, String texture, String descri if (type == TextureType.CUSTOM && customManager == null && block == null) { throw new IllegalArgumentException(String.format("Could not find texture %s, and no custom texture manager was provided.", texture)); } - + ISubmapManager manager; if (customManager != null) { manager = customManager; @@ -117,7 +116,7 @@ private IVariationInfo getClientInfo(String modid, String texture, String descri } return new VariationInfoBase(var, description, manager); } - + private IVariationInfo getServerInfo(String modid, String texture, String description, int metadata, Block block, int blockMeta, ISubmapManager customManager, int order) { ICarvingVariation var = CarvingUtils.getDefaultVariationFor(theBlock, metadata, order); return new VariationInfoBase(var, description, null); @@ -141,7 +140,7 @@ public IIcon getIcon(int side, int metadata) { IVariationInfo info = infoMap[metadata]; if (info == null) return getMissingIcon(); - + return info.getIcon(side, metadata); } diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java index 36fc02bf8..ad6be70af 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java @@ -119,6 +119,7 @@ public SimpleCarvingGroup(String name) { this.name = name; } + @Override public List getVariations() { return Lists.newArrayList(variations); } diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java index 1592977e2..ce213ef0a 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java @@ -8,6 +8,6 @@ public interface IVariationInfo extends ISubmapManager { ICarvingVariation getVariation(); String getDescription(); - + TextureType getType(); } diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java index fc3f3ded5..071182be9 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/ClientUtils.java @@ -1,8 +1,7 @@ package com.cricketcraft.chisel.api.rendering; - public class ClientUtils { - + public static int renderCTMId; } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index 08fe7058f..af0ca33e6 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -71,6 +71,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons(Chisel.MOD_ID, this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java index bf4489358..7c4b5a396 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java @@ -14,6 +14,6 @@ public BlockCarvableAntiBlock() { @Override public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { - return false; + return false; } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java index 3d6abd10d..143fc0935 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java @@ -17,58 +17,58 @@ public class BlockCarvableBeacon extends BlockBeacon implements ICarvable { public static int renderId; - - public CarvableHelper carverHelper; - public BlockCarvableBeacon() { - super(); - setCreativeTab(ChiselTabs.tabOtherChiselBlocks); - setLightLevel(5.0F); - setBlockTextureName("beacon"); - carverHelper = new CarvableHelper(this); - } + public CarvableHelper carverHelper; - @Override - public TileEntity createNewTileEntity(World world, int meta) { - return new TileEntityCarvableBeacon(); - } + public BlockCarvableBeacon() { + super(); + setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + setLightLevel(5.0F); + setBlockTextureName("beacon"); + carverHelper = new CarvableHelper(this); + } - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par5, float hitX, float hitY, float hitZ) { - if (world.isRemote) { - return true; - } else { - TileEntityCarvableBeacon tileentitybeacon = (TileEntityCarvableBeacon) world.getTileEntity(x, y, z); + @Override + public TileEntity createNewTileEntity(World world, int meta) { + return new TileEntityCarvableBeacon(); + } - if (tileentitybeacon != null) { - player.func_146104_a(tileentitybeacon); - } + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par5, float hitX, float hitY, float hitZ) { + if (world.isRemote) { + return true; + } else { + TileEntityCarvableBeacon tileentitybeacon = (TileEntityCarvableBeacon) world.getTileEntity(x, y, z); - return true; - } - } + if (tileentitybeacon != null) { + player.func_146104_a(tileentitybeacon); + } - @Override - public int getRenderType() { - return renderId; - } - - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { - super.onBlockPlacedBy(world, x, y, z, player, stack); + return true; + } + } - if (stack.hasDisplayName()) { - ((TileEntityCarvableBeacon) world.getTileEntity(x, y, z)).func_145999_a(stack.getDisplayName()); - } - } - - @Override - public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { - return carverHelper.getVariation(metadata); - } + @Override + public int getRenderType() { + return renderId; + } - @Override - public IVariationInfo getManager(int meta) { - return carverHelper.getVariation(meta); - } + @Override + public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) { + super.onBlockPlacedBy(world, x, y, z, player, stack); + + if (stack.hasDisplayName()) { + ((TileEntityCarvableBeacon) world.getTileEntity(x, y, z)).func_145999_a(stack.getDisplayName()); + } + } + + @Override + public IVariationInfo getManager(IBlockAccess world, int x, int y, int z, int metadata) { + return carverHelper.getVariation(metadata); + } + + @Override + public IVariationInfo getManager(int meta) { + return carverHelper.getVariation(meta); + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java index ef557bb80..d3418ec4d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java @@ -44,7 +44,7 @@ public Item getItemDropped(int ammount, Random random, int meta) { return Items.book; } - @Override + @Override public int damageDropped(int damage) { return 0; } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java index e55f9a072..6e9dce426 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java @@ -43,11 +43,12 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); } - + @Override public int getRenderType() { return ClientUtils.renderCTMId; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java index 46f93eb76..9bdd7d842 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java @@ -6,21 +6,21 @@ public class BlockCarvableColor extends BlockCarvable { - public BlockCarvableColor() { - this(Material.rock); - } + public BlockCarvableColor() { + this(Material.rock); + } - public BlockCarvableColor(Material m) { - super(m); - } + public BlockCarvableColor(Material m) { + super(m); + } - @Override - public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int color) { - int newColor = 15 - color; - if (world.getBlockMetadata(x, y, z) != newColor) { - world.setBlockMetadataWithNotify(x, y, z, newColor, 3); - return true; - } - return false; - } + @Override + public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int color) { + int newColor = 15 - color; + if (world.getBlockMetadata(x, y, z) != newColor) { + world.setBlockMetadataWithNotify(x, y, z, newColor, 3); + return true; + } + return false; + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index ae2b852a6..d717320fa 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -66,6 +66,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java index af963c6c8..c6e0ec417 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java @@ -1,11 +1,11 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.client.render.SubmapManagerBase; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.client.render.SubmapManagerBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -29,7 +29,7 @@ public BlockCarvableGlow(Material mat, String glowTexture) { this.glowTexturePath = glowTexture; } - public BlockCarvableGlow(Material material, String glowTexture, SubmapManagerBase submapManagerBase){ + public BlockCarvableGlow(Material material, String glowTexture, SubmapManagerBase submapManagerBase) { super(material); this.glowTexturePath = glowTexture; this.submapManagerBase = submapManagerBase; @@ -41,11 +41,11 @@ public void registerBlockIcons(IIconRegister register) { glowTexture = register.registerIcon(Chisel.MOD_ID + ":" + glowTexturePath); } - public boolean hasSubmapManager(){ + public boolean hasSubmapManager() { return submapManagerBase == null; } - public SubmapManagerBase getSubmapManager(){ + public SubmapManagerBase getSubmapManager() { return hasSubmapManager() ? submapManagerBase : null; } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java index c38c4fedc..e5cbece46 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java @@ -32,11 +32,11 @@ public Item getItemDropped(int i, Random random, int a) { public int damageDropped(int i) { return 0; } + @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) - { - Block glowstone = world.getBlock(x, y, z); - int meta = world.getBlockMetadata(x, y, z); - return new ItemStack(Item.getItemFromBlock(glowstone), 1, meta); - } + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { + Block glowstone = world.getBlock(x, y, z); + int meta = world.getBlockMetadata(x, y, z); + return new ItemStack(Item.getItemFromBlock(glowstone), 1, meta); + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java index f354aae82..df1d801ee 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java @@ -26,7 +26,7 @@ public BlockCarvableIce() { super(); carverHelper = new CarvableHelper(this); } - + @Override public int getRenderType() { return ClientUtils.renderCTMId; @@ -42,6 +42,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java index de9214f50..559f125ae 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java @@ -63,12 +63,9 @@ public void onNeighborBlockChange(World world, int x, int y, int z, Block block) } /* - * @Override public void updateTick(World world, int x, int y, int z, Random - * rand){ if (world.isRemote) return; + * @Override public void updateTick(World world, int x, int y, int z, Random rand){ if (world.isRemote) return; * - * if(powered && !world.isBlockIndirectlyGettingPowered(x, y, z)){ int - * meta=world.getBlockMetadata(x, y, z); world.setBlock(x, y, z, - * Block.redstoneLampIdle.blockID, meta, 2); } } + * if(powered && !world.isBlockIndirectlyGettingPowered(x, y, z)){ int meta=world.getBlockMetadata(x, y, z); world.setBlock(x, y, z, Block.redstoneLampIdle.blockID, meta, 2); } } */ @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java index 2cf740ab3..bd4da53f3 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java @@ -10,6 +10,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvableLayered extends BlockCarvable { + @SideOnly(Side.CLIENT) private IIcon baseTexture; private String baseTexLocation; @@ -18,14 +19,17 @@ public BlockCarvableLayered(Material mat, String baseTexLocation) { super(mat); this.baseTexLocation = baseTexLocation; } + @Override public void registerBlockIcons(IIconRegister register) { super.registerBlockIcons(register); baseTexture = register.registerIcon(Chisel.MOD_ID + ":" + baseTexLocation); } + public IIcon getBaseTex() { return baseTexture; } + @Override public int getRenderType() { return Chisel.renderLayeredId; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java index 0de0ab89c..1dfeb8588 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java @@ -34,7 +34,7 @@ public BlockCarvablePackedIce() { public int getRenderType() { return ClientUtils.renderCTMId; } - + @Override public IIcon getIcon(int side, int metadata) { return carverHelper.getIcon(side, metadata); @@ -50,6 +50,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java index b8dff33ce..f5f9d430a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java @@ -63,6 +63,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java index f922b9da8..1bf298188 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java @@ -10,8 +10,7 @@ public BlockCarvablePowered(Material m) { } /** - * Can this block provide power. Only wire currently seems to have this - * change based on its state. + * Can this block provide power. Only wire currently seems to have this change based on its state. */ @Override public boolean canProvidePower() { @@ -19,11 +18,8 @@ public boolean canProvidePower() { } /** - * Returns true if the block is emitting indirect/weak redstone power on the - * specified side. If isBlockNormalCube returns true, standard redstone - * propagation rules will apply instead and this will not be called. Args: - * World, X, Y, Z, side. Note that the side is reversed - eg it is 1 (up) - * when checking the bottom of the block. + * Returns true if the block is emitting indirect/weak redstone power on the specified side. If isBlockNormalCube returns true, standard redstone propagation rules will apply instead and this will + * not be called. Args: World, X, Y, Z, side. Note that the side is reversed - eg it is 1 (up) when checking the bottom of the block. */ @Override public int isProvidingWeakPower(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java index 143d6f438..f3237ccc5 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java @@ -36,65 +36,65 @@ public BlockCarvablePumpkin(boolean isOn) { carverHelper = new CarvableHelper(this); } - @Override - public void onBlockAdded(World world, int x, int y, int z){ - if(world.getBlock(x, y - 1, z) == Blocks.snow && world.getBlock(x, y - 2, z) == Blocks.snow){ - if(!world.isRemote){ - //Let's grab the pumpkin before we start - ItemStack pumpkin = new ItemStack(world.getBlock(x, y, z), world.getBlockMetadata(x, y, z)); - - world.setBlock(x, y, z, Blocks.air, 0, 2); - world.setBlock(x, y - 1, z, Blocks.air, 0, 2); - world.setBlock(x, y - 2, z, Blocks.air, 0, 2); - EntityChiselSnowman snowman = new EntityChiselSnowman(world); - snowman.setCurrentItemOrArmor(2, pumpkin); - snowman.setLocationAndAngles((double) x + 0.5D, (double) y - 1.95D, (double) z + 0.5D, 0.0F, 0.0F); - world.spawnEntityInWorld(snowman); - world.notifyBlockChange(x, y, z, Blocks.air); - world.notifyBlockChange(x, y - 1, z, Blocks.air); - world.notifyBlockChange(x, y - 2, z, Blocks.air); - } - - //Spawn some lovely particles - for(int c = 0; c < 120; ++c){ - world.spawnParticle("snowshovel", (double)x + world.rand.nextDouble(), (double) (y - 2) + world.rand.nextDouble() * 2.5D, (double) z + world.rand.nextDouble(), 0.0D, 0.0D, 0.0D); - } - } else if(world.getBlock(x, y - 1, z) == Blocks.iron_block || world.getBlock(x, y - 2, z) == Blocks.iron_block){ - boolean flag = world.getBlock(x - 1, y - 1, z) == Blocks.iron_block && world.getBlock(x + 1, y - 1, z) == Blocks.iron_block; - boolean flag1 = world.getBlock(x, y - 1, z - 1) == Blocks.iron_block && world.getBlock(x, y - 1, z + 1) == Blocks.iron_block; - - if(flag || flag1){ - world.setBlock(x, y, z, Blocks.air, 0, 2); - world.setBlock(x, y - 1, z, Blocks.air, 0, 2); - world.setBlock(x, y - 2, z, Blocks.air, 0, 2); - - if(flag){ - world.setBlock(x - 1, y - 1, z, Blocks.air, 0, 2); - world.setBlock(x + 1, y - 1, z, Blocks.air, 0, 2); - } else { - world.setBlock(x, y - 1, z - 1, Blocks.air, 0, 2); - world.setBlock(x, y - 1, z + 1, Blocks.air, 0, 2); - } - - EntityIronGolem ironGolem = new EntityIronGolem(world); - ironGolem.setPlayerCreated(true); - ironGolem.setLocationAndAngles((double) x + 0.5D, (double) y - 1.95D, (double) z + 0.5D, 0.0F, 0.0F); - world.spawnEntityInWorld(ironGolem); - - world.notifyBlockChange(x, y, z, Blocks.air); - world.notifyBlockChange(x, y - 1, z, Blocks.air); - world.notifyBlockChange(x, y - 2, z, Blocks.air); - - if(flag){ - world.notifyBlockChange(x - 1, y - 1, z, Blocks.air); - world.notifyBlockChange(x + 1, y - 1, z, Blocks.air); - } else { - world.notifyBlockChange(x, y - 1, z - 1, Blocks.air); - world.notifyBlockChange(x, y - 1, z + 1, Blocks.air); - } - } - } - } + @Override + public void onBlockAdded(World world, int x, int y, int z) { + if (world.getBlock(x, y - 1, z) == Blocks.snow && world.getBlock(x, y - 2, z) == Blocks.snow) { + if (!world.isRemote) { + // Let's grab the pumpkin before we start + ItemStack pumpkin = new ItemStack(world.getBlock(x, y, z), world.getBlockMetadata(x, y, z)); + + world.setBlock(x, y, z, Blocks.air, 0, 2); + world.setBlock(x, y - 1, z, Blocks.air, 0, 2); + world.setBlock(x, y - 2, z, Blocks.air, 0, 2); + EntityChiselSnowman snowman = new EntityChiselSnowman(world); + snowman.setCurrentItemOrArmor(2, pumpkin); + snowman.setLocationAndAngles(x + 0.5D, y - 1.95D, z + 0.5D, 0.0F, 0.0F); + world.spawnEntityInWorld(snowman); + world.notifyBlockChange(x, y, z, Blocks.air); + world.notifyBlockChange(x, y - 1, z, Blocks.air); + world.notifyBlockChange(x, y - 2, z, Blocks.air); + } + + // Spawn some lovely particles + for (int c = 0; c < 120; ++c) { + world.spawnParticle("snowshovel", x + world.rand.nextDouble(), y - 2 + world.rand.nextDouble() * 2.5D, z + world.rand.nextDouble(), 0.0D, 0.0D, 0.0D); + } + } else if (world.getBlock(x, y - 1, z) == Blocks.iron_block || world.getBlock(x, y - 2, z) == Blocks.iron_block) { + boolean flag = world.getBlock(x - 1, y - 1, z) == Blocks.iron_block && world.getBlock(x + 1, y - 1, z) == Blocks.iron_block; + boolean flag1 = world.getBlock(x, y - 1, z - 1) == Blocks.iron_block && world.getBlock(x, y - 1, z + 1) == Blocks.iron_block; + + if (flag || flag1) { + world.setBlock(x, y, z, Blocks.air, 0, 2); + world.setBlock(x, y - 1, z, Blocks.air, 0, 2); + world.setBlock(x, y - 2, z, Blocks.air, 0, 2); + + if (flag) { + world.setBlock(x - 1, y - 1, z, Blocks.air, 0, 2); + world.setBlock(x + 1, y - 1, z, Blocks.air, 0, 2); + } else { + world.setBlock(x, y - 1, z - 1, Blocks.air, 0, 2); + world.setBlock(x, y - 1, z + 1, Blocks.air, 0, 2); + } + + EntityIronGolem ironGolem = new EntityIronGolem(world); + ironGolem.setPlayerCreated(true); + ironGolem.setLocationAndAngles(x + 0.5D, y - 1.95D, z + 0.5D, 0.0F, 0.0F); + world.spawnEntityInWorld(ironGolem); + + world.notifyBlockChange(x, y, z, Blocks.air); + world.notifyBlockChange(x, y - 1, z, Blocks.air); + world.notifyBlockChange(x, y - 2, z, Blocks.air); + + if (flag) { + world.notifyBlockChange(x - 1, y - 1, z, Blocks.air); + world.notifyBlockChange(x + 1, y - 1, z, Blocks.air); + } else { + world.notifyBlockChange(x, y - 1, z - 1, Blocks.air); + world.notifyBlockChange(x, y - 1, z + 1, Blocks.air); + } + } + } + } @Override @SideOnly(Side.CLIENT) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java index eca4ccea4..629fcfa60 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java @@ -62,6 +62,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java index 99f369123..a6404099c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java @@ -16,7 +16,6 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import static net.minecraftforge.common.util.ForgeDirection.UP; public class BlockCarvableSlab extends BlockCarvable { @@ -63,6 +62,7 @@ public void setBlockBoundsForItemRender() { setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.5F, 1.0F); } + @SuppressWarnings("rawtypes") @Override public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) { setBlockBoundsBasedOnState(par1World, par2, par3, par4); @@ -101,25 +101,31 @@ public IIcon getIcon(int side, int metadata) { // return master.getIcon(side, metadata); } + @SuppressWarnings("rawtypes") @Override public void getSubBlocks(Item block, CreativeTabs tabs, List list) { if (isBottom) super.getSubBlocks(block, tabs, list); } + /** - * Checks if the block is a solid face on the given side, used by placement logic. - * - * @param world The current world - * @param x X Position - * @param y Y position - * @param z Z position - * @param side The side to check - * @return True if the block is solid on the specified side. - */ + * Checks if the block is a solid face on the given side, used by placement logic. + * + * @param world + * The current world + * @param x + * X Position + * @param y + * Y position + * @param z + * Z position + * @param side + * The side to check + * @return True if the block is solid on the specified side. + */ @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) - { - return !isBottom && (side == UP); - } + public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { + return !isBottom && (side == UP); + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java index f4dcc75f9..9cf27ff62 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java @@ -72,7 +72,7 @@ public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, Entit if (par6ItemStack.getItemDamage() >= 8) { meta += 8; } - + par1World.setBlockMetadataWithNotify(par2, par3, par4, meta, 2); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java index ab496c526..8cfc1fe50 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java @@ -47,19 +47,20 @@ public IVariationInfo getManager(int meta) { public void registerBlockIcons(IIconRegister icon) { this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":torch/" + texLocation); } - + public BlockCarvableTorch disableParticles() { this.emitsParticles = false; return this; } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(World p_149734_1_, int p_149734_2_, int p_149734_3_, int p_149734_4_, Random p_149734_5_) { if (emitsParticles) { int l = p_149734_1_.getBlockMetadata(p_149734_2_, p_149734_3_, p_149734_4_); - double d0 = (double) ((float) p_149734_2_ + 0.5F); - double d1 = (double) ((float) p_149734_3_ + 0.7F); - double d2 = (double) ((float) p_149734_4_ + 0.5F); + double d0 = p_149734_2_ + 0.5F; + double d1 = p_149734_3_ + 0.7F; + double d2 = p_149734_4_ + 0.5F; double d3 = 0.2199999988079071D; double d4 = 0.27000001072883606D; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java index 5f61549e3..128000d6f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java @@ -36,6 +36,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item block, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java index 7a644302c..9fb9d2d9f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java @@ -43,6 +43,7 @@ public int getRenderBlockPass() { return Configurations.ghostCloud ? 1 : 0; } + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { Block block = world.getBlock(x, y, z); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java index 5eea1404b..fa17d88ae 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java @@ -18,10 +18,10 @@ public BlockConcrete() { @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) { - if(Configurations.fullBlockConcrete) + if (Configurations.fullBlockConcrete) return AxisAlignedBB.getBoundingBox(par2, par3, par4, (par2 + 1), ((par3 + 1)), (par4 + 1)); else - return AxisAlignedBB.getBoundingBox(par2, par3, par4, (par2 + 1), ((par3 + 1) - 0.125F), (par4 + 1)); + return AxisAlignedBB.getBoundingBox(par2, par3, par4, (par2 + 1), ((par3 + 1) - 0.125F), (par4 + 1)); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java index 54badd10e..74dd0e3b1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java @@ -47,6 +47,7 @@ public void registerBlockIcons(IIconRegister register) { carverHelper.registerBlockIcons("Chisel", this, register); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item block, CreativeTabs tabs, List list) { carverHelper.registerSubBlocks(this, tabs, list); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java index cb726b13e..57e2aa7b4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java @@ -118,16 +118,18 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p @Override public AxisAlignedBB getSelectedBoundingBoxFromPool(World world, int x, int y, int z) { - if(world.getTileEntity(x, y, z) instanceof TileEntityPresent) - return getBoundingBox((TileEntityPresent) world.getTileEntity(x, y, z)); - else return null; + if (world.getTileEntity(x, y, z) instanceof TileEntityPresent) + return getBoundingBox((TileEntityPresent) world.getTileEntity(x, y, z)); + else + return null; } @Override public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - if(world.getTileEntity(x, y, z) instanceof TileEntityPresent) - return getBoundingBox((TileEntityPresent) world.getTileEntity(x, y, z)); - else return null; + if (world.getTileEntity(x, y, z) instanceof TileEntityPresent) + return getBoundingBox((TileEntityPresent) world.getTileEntity(x, y, z)); + else + return null; } public AxisAlignedBB getBoundingBox(TileEntityPresent me) { @@ -147,8 +149,8 @@ public AxisAlignedBB getBoundingBox(TileEntityPresent me) { return AxisAlignedBB.getBoundingBox(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); } - public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) - { + @Override + public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) { TileEntityPresent te = (TileEntityPresent) world.getTileEntity(x, y, z); if (!te.isConnected()) { setBlockBounds(0.0625F, 0, 0.0625F, 0.9375F, 0.875F, 0.9365F); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java index 5fa597d37..999971c5e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java @@ -211,7 +211,6 @@ public int[] getConnections(World world, int ox, int oy, int oz) { public boolean rotateBodyPart(World world, int x, int y, int z) { int[] con = getConnections(world, x, y, z); int blockMeta = world.getBlockMetadata(x, y, z); - int kind = blockMeta & 0xc; if (con[1] == -1) return false; @@ -288,8 +287,6 @@ public boolean connectedTo(World par1World, int x, int y, int z, int direction) @Override public IIcon getIcon(int side, int meta) { - int type = meta & 0xc; - int orient = meta & 0x3; switch (meta | (side << 4)) { @@ -506,6 +503,7 @@ public IIcon getIcon(int side, int meta) { return iconCross; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void getSubBlocks(Item item, CreativeTabs tabs, List list) { list.add(new ItemStack(item, 1, 1)); diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java index f4e2074ab..fe39d3cd9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java @@ -1,11 +1,11 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.init.ChiselTabs; import com.cricketcraft.chisel.item.ItemCarvable; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java index 03637ac19..e57284a3f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java @@ -1,14 +1,15 @@ package com.cricketcraft.chisel.block.tileentity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.AxisAlignedBB; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntityCarvableBeacon extends TileEntityBeacon { - @Override - @SideOnly(Side.CLIENT) - public AxisAlignedBB getRenderBoundingBox() { - return INFINITE_EXTENT_AABB; - } + + @Override + @SideOnly(Side.CLIENT) + public AxisAlignedBB getRenderBoundingBox() { + return INFINITE_EXTENT_AABB; + } } diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java index d24e2505d..40ca0ff5b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java @@ -34,7 +34,7 @@ public void updateEntity() { if (!isConnected() && autoSearch && worldObj != null /* ugh */) { if (cachedDir != null) { connectTo(cachedDir); - } else if (!worldObj.isRemote){ + } else if (!worldObj.isRemote) { findConnections(); } autoSearch = false; @@ -46,7 +46,8 @@ public boolean isConnected() { } private boolean connectTo(TileEntityPresent present, ForgeDirection dir) { - if (present.getBlockMetadata() == getBlockMetadata() && !present.isConnected() && (present.cachedDir == null || present.cachedDir == dir.getOpposite()) && Math.abs(present.xCoord - xCoord + present.yCoord - yCoord + present.zCoord - zCoord) == 1) { + if (present.getBlockMetadata() == getBlockMetadata() && !present.isConnected() && (present.cachedDir == null || present.cachedDir == dir.getOpposite()) + && Math.abs(present.xCoord - xCoord + present.yCoord - yCoord + present.zCoord - zCoord) == 1) { connection = present; connection.connection = this; connection.cachedDir = dir.getOpposite(); @@ -71,9 +72,7 @@ public boolean connectTo(ForgeDirection dir) { /** * @param preserveDir - * If true, this is only a virtual disconnect, meaning the other - * chest still exists, but is still loaded, so maintain a - * cachedDir for reconnection upon chunk load. + * If true, this is only a virtual disconnect, meaning the other chest still exists, but is still loaded, so maintain a cachedDir for reconnection upon chunk load. */ public void disconnect(boolean preserveDir) { if (isConnected()) { diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java index 7d50fefa7..6ed636e3f 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java +++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java @@ -22,12 +22,13 @@ public class Carving implements ICarvingRegistry { public static final ICarvingRegistry chisel = new Carving(); public static final Carving needle = new Carving(); - + static { CarvingUtils.chisel = chisel; } - - public static void construct() {} + + public static void construct() { + } private Carving() { } @@ -142,7 +143,7 @@ public ICarvingGroup removeGroup(String groupName) { ICarvingGroup g = groups.getGroupByName(groupName); return groups.remove(g) ? g : null; } - + @Override public ICarvingVariation removeVariation(Block block, int metadata) { return removeVariation(block, metadata, null); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java b/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java index 559539015..700b176d4 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java @@ -1,6 +1,5 @@ package com.cricketcraft.chisel.client.render; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; import net.minecraft.block.Block; import net.minecraft.client.model.ModelSnowMan; import net.minecraft.client.renderer.RenderBlocks; @@ -12,54 +11,58 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.MinecraftForgeClient; -import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*; -import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.*; + import org.lwjgl.opengl.GL11; -public class RenderChiselSnowman extends RenderLiving{ +import com.cricketcraft.chisel.entity.EntityChiselSnowman; + +import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; + +public class RenderChiselSnowman extends RenderLiving { - private static final ResourceLocation snowManTextures = new ResourceLocation("textures/entity/snowman.png"); - private ModelSnowMan snowMan; + private static final ResourceLocation snowManTextures = new ResourceLocation("textures/entity/snowman.png"); + private ModelSnowMan snowMan; - public RenderChiselSnowman() { - super(new ModelSnowMan(), 0.5F); - snowMan = (ModelSnowMan)super.mainModel; - setRenderPassModel(this.snowMan); - } + public RenderChiselSnowman() { + super(new ModelSnowMan(), 0.5F); + snowMan = (ModelSnowMan) super.mainModel; + setRenderPassModel(this.snowMan); + } - @Override - protected void renderEquippedItems(EntityLivingBase entityLivingBase, float size){ - this.renderEquippedItems((EntityChiselSnowman) entityLivingBase, size); - } + @Override + protected void renderEquippedItems(EntityLivingBase entityLivingBase, float size) { + this.renderEquippedItems((EntityChiselSnowman) entityLivingBase, size); + } - @Override - protected ResourceLocation getEntityTexture(Entity entity) { - return this.getEntityTexture((EntityChiselSnowman) entity); - } + @Override + protected ResourceLocation getEntityTexture(Entity entity) { + return this.getEntityTexture((EntityChiselSnowman) entity); + } - protected ResourceLocation getEntityTexture(EntityChiselSnowman snowman){ - return snowManTextures; - } + protected ResourceLocation getEntityTexture(EntityChiselSnowman snowman) { + return snowManTextures; + } - protected void renderEquippedItems(EntityChiselSnowman snowman, float size){ - super.renderEquippedItems(snowman, size); - ItemStack itemStack = snowman.getEquipmentInSlot(2); + protected void renderEquippedItems(EntityChiselSnowman snowman, float size) { + super.renderEquippedItems(snowman, size); + ItemStack itemStack = snowman.getEquipmentInSlot(2); - if(itemStack.getItem() instanceof ItemBlock){ - GL11.glPushMatrix(); - this.snowMan.head.postRender(0.0625F); + if (itemStack.getItem() instanceof ItemBlock) { + GL11.glPushMatrix(); + this.snowMan.head.postRender(0.0625F); - IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemStack, EQUIPPED); - boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, itemStack, BLOCK_3D)); + IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemStack, EQUIPPED); + boolean is3D = (customRenderer != null && customRenderer.shouldUseRenderHelper(EQUIPPED, itemStack, BLOCK_3D)); - if(is3D || RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType())){ - float f1 = 0.625F; - GL11.glTranslatef(0.0F, -0.34375F, 0.0F); - GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); - GL11.glScalef(f1, -f1, f1); - } - this.renderManager.itemRenderer.renderItem(snowman, itemStack, 0); - GL11.glPopMatrix(); - } - } + if (is3D || RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType())) { + float f1 = 0.625F; + GL11.glTranslatef(0.0F, -0.34375F, 0.0F); + GL11.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL11.glScalef(f1, -f1, f1); + } + this.renderManager.itemRenderer.renderItem(snowman, itemStack, 0); + GL11.glPopMatrix(); + } + } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java index 9d63228d1..d1638f5ec 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java @@ -33,24 +33,17 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b // tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, // y, z)); /* - * double d0 = 0.4000000059604645D; double d1 = 0.5D - d0; double d2 = - * 0.20000000298023224D; + * double d0 = 0.4000000059604645D; double d1 = 0.5D - d0; double d2 = 0.20000000298023224D; */ // renderer.renderTorchAtAngle(Block.torchWood, x - d1, y + d2, z, -d0, // 0.0D, 0); /* - * Icon icon = block.getIcon(2, meta); double u0 = icon.getMinU(); - * double v0 = icon.getMaxV(); double u1 = icon.getMaxU(); double v1 = - * icon.getMinV(); double uu = icon.getInterpolatedU(8.0D); double vv = - * icon.getInterpolatedV(8.0D); + * Icon icon = block.getIcon(2, meta); double u0 = icon.getMinU(); double v0 = icon.getMaxV(); double u1 = icon.getMaxU(); double v1 = icon.getMinV(); double uu = icon.getInterpolatedU(8.0D); + * double vv = icon.getInterpolatedV(8.0D); * * - * int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z); int - * lym=block.getMixedBrightnessForBlock(world, x, y-1, z); int - * lxp=block.getMixedBrightnessForBlock(world, x+1, y, z); int - * lxm=block.getMixedBrightnessForBlock(world, x-1, y, z); int - * lzp=block.getMixedBrightnessForBlock(world, x, y, z+1); int - * lzm=block.getMixedBrightnessForBlock(world, x, y, z-1); + * int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z); int lym=block.getMixedBrightnessForBlock(world, x, y-1, z); int lxp=block.getMixedBrightnessForBlock(world, x+1, y, z); int + * lxm=block.getMixedBrightnessForBlock(world, x-1, y, z); int lzp=block.getMixedBrightnessForBlock(world, x, y, z+1); int lzm=block.getMixedBrightnessForBlock(world, x, y, z-1); * * * @@ -63,13 +56,9 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b * * * - * icon = block.getIcon(0, meta); u0 = icon.getMinU(); v0 = - * icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); - * vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1); + * icon = block.getIcon(0, meta); u0 = icon.getMinU(); v0 = icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1); * - * icon = block.getIcon(1, meta); u0 = icon.getMinU(); v0 = - * icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); - * vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0); + * icon = block.getIcon(1, meta); u0 = icon.getMinU(); v0 = icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0); */ renderer.blockAccess = world; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java index 59e5c32eb..88df45ebe 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java @@ -27,7 +27,7 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB GL11.glTranslatef(-0.5F, -0.5F, -0.5F); GeneralClient.setGLColorFromInt(Configurations.configColors[metadata]); GL11.glDisable(GL11.GL_LIGHTING); - Drawing.drawBlock(block, ((BlockCarvableGlow)block).getGlowTexture(), renderer); + Drawing.drawBlock(block, ((BlockCarvableGlow) block).getGlowTexture(), renderer); GL11.glEnable(GL11.GL_LIGHTING); GL11.glColor3f(1, 1, 1); Drawing.drawBlock(block, metadata, renderer); @@ -42,7 +42,7 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b renderer.renderStandardBlock(block, x, y, z); return true; } - + @Override public boolean shouldRender3DInInventory(int modelId) { return true; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java index 1d059d5c1..415c9fd5b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java @@ -1,15 +1,17 @@ package com.cricketcraft.chisel.client.render; -import com.cricketcraft.chisel.block.BlockMultiLayerBase; -import com.cricketcraft.ctmlib.Drawing; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; + +import com.cricketcraft.chisel.block.BlockMultiLayerBase; +import com.cricketcraft.ctmlib.Drawing; + +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + import static org.lwjgl.opengl.GL11.*; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { @@ -35,7 +37,7 @@ public void renderInventoryBlock(Block blck, int meta, int modelID, RenderBlocks } else if (block.base != null) { renderer.renderBlockAsItem(block.base, meta, 1.0f); } - + glPushMatrix(); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java b/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java index 55c893a67..2d7830654 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java @@ -23,7 +23,7 @@ public RendererSimpleLayered() { public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { GL11.glTranslatef(-0.5F, -0.5F, -0.5F); GL11.glDisable(GL11.GL_LIGHTING); - Drawing.drawBlock(block, ((BlockCarvableLayered)block).getBaseTex(), renderer); + Drawing.drawBlock(block, ((BlockCarvableLayered) block).getBaseTex(), renderer); GL11.glEnable(GL11.GL_LIGHTING); Drawing.drawBlock(block, metadata, renderer); GL11.glTranslatef(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java index cfd84aed8..969411bd8 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java @@ -32,7 +32,7 @@ protected void fillColormap(float bottomLeft, float bottomRight, float topRight, @SideOnly(Side.CLIENT) private static RenderBlocksCTMFullbright rb; - + private String color; private TextureSubmap submap, submapSmall; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java index a970a9b7a..426c3d399 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java @@ -11,14 +11,13 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - public abstract class SubmapManagerBase implements ISubmapManager { @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { return getIcon(side, world.getBlockMetadata(x, y, z)); } - + @Override @SideOnly(Side.CLIENT) public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java index 23942a6e1..9c119ec59 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java @@ -59,7 +59,7 @@ public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon setIcons(rType, x, y, z, ForgeDirection.SOUTH); super.renderFaceZPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); } - + private void setIcons(TextureType type, double x, double y, double z, ForgeDirection side) { int ix = MathHelper.floor_double(x); int iy = MathHelper.floor_double(y); @@ -73,7 +73,7 @@ private void setIcons(TextureType type, double x, double y, double z, ForgeDirec } } } - + private class Submap extends TextureSubmap { private TextureSubmap[][] submap; @@ -105,9 +105,7 @@ public void texturesStitched() { private TextureType rType; public SubmapManagerCombinedCTM(int meta, String texturePath, TextureType rType) { - assert rType == TextureType.R16 || rType == TextureType.R9 || rType == TextureType.R4 || - rType == TextureType.V4 || rType == TextureType.V9 - : "Not a valid random type!"; + assert rType == TextureType.R16 || rType == TextureType.R9 || rType == TextureType.R4 || rType == TextureType.V4 || rType == TextureType.V9 : "Not a valid random type!"; this.meta = meta; this.texturePath = texturePath; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java index 9e2d04bc4..fe5138a36 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java @@ -1,33 +1,33 @@ package com.cricketcraft.chisel.client.render; -import com.cricketcraft.chisel.Chisel; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.ctmlib.CTM; import com.cricketcraft.ctmlib.TextureSubmap; import com.google.common.base.Optional; -import static com.cricketcraft.ctmlib.Dir.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import static com.cricketcraft.ctmlib.Dir.*; + public class SubmapManagerFakeController extends SubmapManagerBase { private TextureSubmap map; private CTM ctm = CTM.getInstance(); private int meta; - private String texturePath; + private String texturePath; - public SubmapManagerFakeController(int meta, String texture) { - ctm.disableObscuredFaceCheck = Optional.of(true); - this.meta = meta; - texturePath = texture; - } + public SubmapManagerFakeController(int meta, String texture) { + ctm.disableObscuredFaceCheck = Optional.of(true); + this.meta = meta; + texturePath = texture; + } public SubmapManagerFakeController(int meta) { ctm.disableObscuredFaceCheck = Optional.of(true); @@ -40,8 +40,7 @@ public IIcon getIcon(int side, int meta) { } @Override - public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) - { + public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { ctm.buildConnectionMap(world, x, y, z, side, ChiselBlocks.futura, meta); if (ctm.connectedAnd(TOP, TOP_RIGHT, RIGHT, BOTTOM_RIGHT, BOTTOM, BOTTOM_LEFT, LEFT, TOP_LEFT)) { @@ -59,15 +58,11 @@ public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) @SideOnly(Side.CLIENT) public void registerIcons(String modName, Block block, IIconRegister register) { - if (texturePath != null) - { - map = new TextureSubmap(register.registerIcon(modName + ":" + texturePath), 2, 2); - } - else - { - Chisel.logger.info("SubmapManagerFakeController was called on block " + block.getUnlocalizedName() - + " without declaring texture, using a default texture instead."); - map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); - } + if (texturePath != null) { + map = new TextureSubmap(register.registerIcon(modName + ":" + texturePath), 2, 2); + } else { + Chisel.logger.info("SubmapManagerFakeController was called on block " + block.getUnlocalizedName() + " without declaring texture, using a default texture instead."); + map = new TextureSubmap(register.registerIcon(modName + ":futura/WIP/controller"), 2, 2); + } } } diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java index d3928aaa3..c258d7fdb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java @@ -58,7 +58,7 @@ public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, I rb.submapSmall = submapSmall; return rb; } - + private boolean hadOverride = false; @Override diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java index 139827f78..48884c888 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java @@ -22,7 +22,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { // TODO there must be a better more generic way to do this... @SideOnly(Side.CLIENT) private class RenderBlocksVoidstone extends RenderBlocksCTM { - + @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { super.renderFaceXNeg(block, x, y, z, icon); @@ -100,7 +100,7 @@ public SubmapManagerVoidstone(String texture, int meta) { public IIcon getIcon(int side, int meta) { return overlay.getIcon(side, meta); } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { return overlay.getIcon(world, x, y, z, side); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java index f76105140..28e1c208c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java @@ -3,7 +3,6 @@ import java.awt.Color; import net.minecraft.block.Block; -import net.minecraft.block.BlockBeacon; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -23,109 +22,111 @@ import cpw.mods.fml.client.registry.RenderingRegistry; public class RenderCarvableBeacon extends TileEntityBeaconRenderer implements ISimpleBlockRenderingHandler { - private static final ResourceLocation texture = new ResourceLocation("textures/entity/beacon_beam.png"); - private int renderId; - + private static final ResourceLocation texture = new ResourceLocation("textures/entity/beacon_beam.png"); + + private int renderId; + public RenderCarvableBeacon() { - this.renderId = RenderingRegistry.getNextAvailableRenderId(); + this.renderId = RenderingRegistry.getNextAvailableRenderId(); } - - public void renderTileEntityAt(TileEntityCarvableBeacon beacon, double x, double y, double z, float partialTicks) { - float f1 = beacon.func_146002_i(); - GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); - if(f1 > 0.1F){ - Color color = new Color(ItemDye.field_150922_c[beacon.getWorldObj().getBlockMetadata(beacon.xCoord, beacon.yCoord, beacon.zCoord)]); - Tessellator tessellator = Tessellator.instance; - this.bindTexture(texture); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); - GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_CULL_FACE); - GL11.glDisable(GL11.GL_BLEND); - GL11.glDepthMask(true); - OpenGlHelper.glBlendFunc(770, 1, 1, 0); - float f2 = (float) beacon.getWorldObj().getTotalWorldTime() + partialTicks; - float f3 = -f2 * 0.2F - (float) MathHelper.floor_float(-f2 * 0.1F); - byte b0 = 1; - double d3 = (double) f2 * 0.025D * (1.0D - (double) (b0 & 1) * 2.5D); - tessellator.startDrawingQuads(); - tessellator.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 32); - double d5 = (double) b0 * 0.2D; - double d7 = 0.5D + Math.cos(d3 + 2.356194490192345D) * d5; - double d9 = 0.5D + Math.sin(d3 + 2.356194490192345D) * d5; - double d11 = 0.5D + Math.cos(d3 + (Math.PI / 4D)) * d5; - double d13 = 0.5D + Math.sin(d3 + (Math.PI / 4D)) * d5; - double d15 = 0.5D + Math.cos(d3 + 3.9269908169872414D) * d5; - double d17 = 0.5D + Math.sin(d3 + 3.9269908169872414D) * d5; - double d19 = 0.5D + Math.cos(d3 + 5.497787143782138D) * d5; - double d21 = 0.5D + Math.sin(d3 + 5.497787143782138D) * d5; - double d23 = (double) (256.0F * f1); - double d25 = 0.0D; - double d27 = 1.0D; - double d28 = (double) (-1.0F + f3); - double d29 = (double) (256.0F * f1) * (0.5D / d5) + d28; - tessellator.addVertexWithUV(x + d7, y + d23, z + d9, d27, d29); - tessellator.addVertexWithUV(x + d7, y, z + d9, d27, d28); - tessellator.addVertexWithUV(x + d11, y, z + d13, d25, d28); - tessellator.addVertexWithUV(x + d11, y + d23, z + d13, d25, d29); - tessellator.addVertexWithUV(x + d19, y + d23, z + d21, d27, d29); - tessellator.addVertexWithUV(x + d19, y, z + d21, d27, d28); - tessellator.addVertexWithUV(x + d15, y, z + d17, d25, d28); - tessellator.addVertexWithUV(x + d15, y + d23, z + d17, d25, d29); - tessellator.addVertexWithUV(x + d11, y + d23, z + d13, d27, d29); - tessellator.addVertexWithUV(x + d11, y, z + d13, d27, d28); - tessellator.addVertexWithUV(x + d19, y, z + d21, d25, d28); - tessellator.addVertexWithUV(x + d19, y + d23, z + d21, d25, d29); - tessellator.addVertexWithUV(x + d15, y + d23, z + d17, d27, d29); - tessellator.addVertexWithUV(x + d15, y, z + d17, d27, d28); - tessellator.addVertexWithUV(x + d7, y, z + d9, d25, d28); - tessellator.addVertexWithUV(x + d7, y + d23, z + d9, d25, d29); - tessellator.draw(); - GL11.glEnable(GL11.GL_BLEND); - OpenGlHelper.glBlendFunc(770, 771, 1, 0); - GL11.glDepthMask(false); - tessellator.startDrawingQuads(); - tessellator.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 32); - double d30 = 0.2D; - double d4 = 0.2D; - double d6 = 0.8D; - double d8 = 0.2D; - double d10 = 0.2D; - double d12 = 0.8D; - double d14 = 0.8D; - double d16 = 0.8D; - double d18 = (double) (256.0F * f1); - double d20 = 0.0D; - double d22 = 1.0D; - double d24 = (double) (-1.0F + f3); - double d26 = (double) (256.0F * f1) + d24; - tessellator.addVertexWithUV(x + d30, y + d18, z + d4, d22, d26); - tessellator.addVertexWithUV(x + d30, y, z + d4, d22, d24); - tessellator.addVertexWithUV(x + d6, y, z + d8, d20, d24); - tessellator.addVertexWithUV(x + d6, y + d18, z + d8, d20, d26); - tessellator.addVertexWithUV(x + d14, y + d18, z + d16, d22, d26); - tessellator.addVertexWithUV(x + d14, y, z + d16, d22, d24); - tessellator.addVertexWithUV(x + d10, y, z + d12, d20, d24); - tessellator.addVertexWithUV(x + d10, y + d18, z + d12, d20, d26); - tessellator.addVertexWithUV(x + d6, y + d18, z + d8, d22, d26); - tessellator.addVertexWithUV(x + d6, y, z + d8, d22, d24); - tessellator.addVertexWithUV(x + d14, y, z + d16, d20, d24); - tessellator.addVertexWithUV(x + d14, y + d18, z + d16, d20, d26); - tessellator.addVertexWithUV(x + d10, y + d18, z + d12, d22, d26); - tessellator.addVertexWithUV(x + d10, y, z + d12, d22, d24); - tessellator.addVertexWithUV(x + d30, y, z + d4, d20, d24); - tessellator.addVertexWithUV(x + d30, y + d18, z + d4, d20, d26); - tessellator.draw(); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_TEXTURE_2D); - GL11.glDepthMask(true); - } - } - public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { - this.renderTileEntityAt((TileEntityCarvableBeacon) tile, x, y, z, partialTicks); - } + public void renderTileEntityAt(TileEntityCarvableBeacon beacon, double x, double y, double z, float partialTicks) { + float f1 = beacon.func_146002_i(); + GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F); + if (f1 > 0.1F) { + Color color = new Color(ItemDye.field_150922_c[beacon.getWorldObj().getBlockMetadata(beacon.xCoord, beacon.yCoord, beacon.zCoord)]); + Tessellator tessellator = Tessellator.instance; + this.bindTexture(texture); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F); + GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, 10497.0F); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_CULL_FACE); + GL11.glDisable(GL11.GL_BLEND); + GL11.glDepthMask(true); + OpenGlHelper.glBlendFunc(770, 1, 1, 0); + float f2 = beacon.getWorldObj().getTotalWorldTime() + partialTicks; + float f3 = -f2 * 0.2F - MathHelper.floor_float(-f2 * 0.1F); + byte b0 = 1; + double d3 = f2 * 0.025D * (1.0D - (b0 & 1) * 2.5D); + tessellator.startDrawingQuads(); + tessellator.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 32); + double d5 = b0 * 0.2D; + double d7 = 0.5D + Math.cos(d3 + 2.356194490192345D) * d5; + double d9 = 0.5D + Math.sin(d3 + 2.356194490192345D) * d5; + double d11 = 0.5D + Math.cos(d3 + (Math.PI / 4D)) * d5; + double d13 = 0.5D + Math.sin(d3 + (Math.PI / 4D)) * d5; + double d15 = 0.5D + Math.cos(d3 + 3.9269908169872414D) * d5; + double d17 = 0.5D + Math.sin(d3 + 3.9269908169872414D) * d5; + double d19 = 0.5D + Math.cos(d3 + 5.497787143782138D) * d5; + double d21 = 0.5D + Math.sin(d3 + 5.497787143782138D) * d5; + double d23 = 256.0F * f1; + double d25 = 0.0D; + double d27 = 1.0D; + double d28 = -1.0F + f3; + double d29 = 256.0F * f1 * (0.5D / d5) + d28; + tessellator.addVertexWithUV(x + d7, y + d23, z + d9, d27, d29); + tessellator.addVertexWithUV(x + d7, y, z + d9, d27, d28); + tessellator.addVertexWithUV(x + d11, y, z + d13, d25, d28); + tessellator.addVertexWithUV(x + d11, y + d23, z + d13, d25, d29); + tessellator.addVertexWithUV(x + d19, y + d23, z + d21, d27, d29); + tessellator.addVertexWithUV(x + d19, y, z + d21, d27, d28); + tessellator.addVertexWithUV(x + d15, y, z + d17, d25, d28); + tessellator.addVertexWithUV(x + d15, y + d23, z + d17, d25, d29); + tessellator.addVertexWithUV(x + d11, y + d23, z + d13, d27, d29); + tessellator.addVertexWithUV(x + d11, y, z + d13, d27, d28); + tessellator.addVertexWithUV(x + d19, y, z + d21, d25, d28); + tessellator.addVertexWithUV(x + d19, y + d23, z + d21, d25, d29); + tessellator.addVertexWithUV(x + d15, y + d23, z + d17, d27, d29); + tessellator.addVertexWithUV(x + d15, y, z + d17, d27, d28); + tessellator.addVertexWithUV(x + d7, y, z + d9, d25, d28); + tessellator.addVertexWithUV(x + d7, y + d23, z + d9, d25, d29); + tessellator.draw(); + GL11.glEnable(GL11.GL_BLEND); + OpenGlHelper.glBlendFunc(770, 771, 1, 0); + GL11.glDepthMask(false); + tessellator.startDrawingQuads(); + tessellator.setColorRGBA(color.getRed(), color.getGreen(), color.getBlue(), 32); + double d30 = 0.2D; + double d4 = 0.2D; + double d6 = 0.8D; + double d8 = 0.2D; + double d10 = 0.2D; + double d12 = 0.8D; + double d14 = 0.8D; + double d16 = 0.8D; + double d18 = 256.0F * f1; + double d20 = 0.0D; + double d22 = 1.0D; + double d24 = -1.0F + f3; + double d26 = 256.0F * f1 + d24; + tessellator.addVertexWithUV(x + d30, y + d18, z + d4, d22, d26); + tessellator.addVertexWithUV(x + d30, y, z + d4, d22, d24); + tessellator.addVertexWithUV(x + d6, y, z + d8, d20, d24); + tessellator.addVertexWithUV(x + d6, y + d18, z + d8, d20, d26); + tessellator.addVertexWithUV(x + d14, y + d18, z + d16, d22, d26); + tessellator.addVertexWithUV(x + d14, y, z + d16, d22, d24); + tessellator.addVertexWithUV(x + d10, y, z + d12, d20, d24); + tessellator.addVertexWithUV(x + d10, y + d18, z + d12, d20, d26); + tessellator.addVertexWithUV(x + d6, y + d18, z + d8, d22, d26); + tessellator.addVertexWithUV(x + d6, y, z + d8, d22, d24); + tessellator.addVertexWithUV(x + d14, y, z + d16, d20, d24); + tessellator.addVertexWithUV(x + d14, y + d18, z + d16, d20, d26); + tessellator.addVertexWithUV(x + d10, y + d18, z + d12, d22, d26); + tessellator.addVertexWithUV(x + d10, y, z + d12, d22, d24); + tessellator.addVertexWithUV(x + d30, y, z + d4, d20, d24); + tessellator.addVertexWithUV(x + d30, y + d18, z + d4, d20, d26); + tessellator.draw(); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + GL11.glDepthMask(true); + } + } + + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { + this.renderTileEntityAt((TileEntityCarvableBeacon) tile, x, y, z, partialTicks); + } @Override public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { @@ -134,19 +135,19 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - float f = 0.1875F; - renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.glass)); - renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); - renderer.renderAllFaces = true; - renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.obsidian)); - renderer.setRenderBounds(0.125D, 0.00625D, 0.125D, 0.875D, (double)f, 0.875D); - renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); - renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.beacon)); - renderer.setRenderBounds(0.1875D, (double)f, 0.1875D, 0.8125D, 0.875D, 0.8125D); - renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); - renderer.renderAllFaces = false; - renderer.clearOverrideBlockTexture(); - return true; + float f = 0.1875F; + renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.glass)); + renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); + renderer.renderAllFaces = true; + renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.obsidian)); + renderer.setRenderBounds(0.125D, 0.00625D, 0.125D, 0.875D, f, 0.875D); + renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); + renderer.setOverrideBlockTexture(renderer.getBlockIcon(Blocks.beacon)); + renderer.setRenderBounds(0.1875D, f, 0.1875D, 0.8125D, 0.875D, 0.8125D); + renderer.renderStandardBlockWithAmbientOcclusion(block, x, y, z, 1, 1, 1); + renderer.renderAllFaces = false; + renderer.clearOverrideBlockTexture(); + return true; } @Override diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java index 0c66ba49b..3b7154b40 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java @@ -25,7 +25,7 @@ public class RenderPresent extends TileEntitySpecialRenderer implements IItemRen private ModelChest smallChest = new ModelChest(); private ModelChest largeChest = new ModelLargeChest(); - + private HashMap textureCache = Maps.newHashMap(); public void renderTileEntityAt(TileEntityPresent present, double x, double y, double z, float partialTicks) { @@ -38,7 +38,7 @@ public void renderTileEntityAt(TileEntityPresent present, double x, double y, do bindTexture(present); if (!present.isConnected()) { GL11.glRotatef(90 * rotation + 180, 0, 1, 0); - switch(rotation) { + switch (rotation) { case 0: GL11.glTranslatef(-1, 0, -1); break; @@ -52,7 +52,7 @@ public void renderTileEntityAt(TileEntityPresent present, double x, double y, do smallChest.renderAll(); } else if (present.isParent()) { ForgeDirection dir = present.getConnectionDir(); - switch(dir) { + switch (dir) { case NORTH: GL11.glRotatef(-90, 0, 1, 0); GL11.glTranslatef(0, 0, -1); @@ -75,7 +75,7 @@ public void renderTileEntityAt(TileEntityPresent present, double x, double y, do } GL11.glPopMatrix(); } - + private void bindTexture(TileEntityPresent present) { int idx = present.getWorldObj().getBlockMetadata(present.xCoord, present.yCoord, present.zCoord) + (present.isConnected() ? 0 : 16); ResourceLocation rl = textureCache.get(idx); @@ -92,7 +92,7 @@ private void bindTexture(TileEntityPresent present) { public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTicks) { this.renderTileEntityAt((TileEntityPresent) tileEntity, x, y, z, partialTicks); } - + @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { return type != ItemRenderType.FIRST_PERSON_MAP; diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index 78a447064..1dec0ef48 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -5,6 +5,8 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import org.apache.logging.log4j.Level; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.carving.Carving; import com.cricketcraft.chisel.init.ChiselBlocks; @@ -17,24 +19,21 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import org.apache.logging.log4j.Level; - public class Compatibility { public static String[] rockColorNames = { "gray", "lightgray", "brown", "tan", "reddish", "bluish", "greenish" }; - public static Map tconMap = Maps.newHashMap(); + public static Map tconMap = Maps.newHashMap(); - static - { - tconMap.put(0, "obsidian"); - tconMap.put(1, "sandstone"); - tconMap.put(2, "netherrack"); - tconMap.put(3, "stonebricksmooth"); - tconMap.put(12, "end_stone"); - } + static { + tconMap.put(0, "obsidian"); + tconMap.put(1, "sandstone"); + tconMap.put(2, "netherrack"); + tconMap.put(3, "stonebricksmooth"); + tconMap.put(12, "end_stone"); + } - public static void init(FMLPostInitializationEvent event) { + public static void init(FMLPostInitializationEvent event) { /* Proj Red */ addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99); @@ -71,24 +70,23 @@ public static void init(FMLPostInitializationEvent event) { /* Thaumcraft TODO There is probably a cleaner way of doing this */ if (Loader.isModLoaded("Thaumcraft")) { loadThaumcraftAspects(); - } + } - for (Integer i : tconMap.keySet()) - { - addSupport("TConstruct", "decoration.multibrick", tconMap.get(i), i, 99); - addSupport("TConstruct", "decoration.multibrickfancy", tconMap.get(i), i, 99); - } + for (Integer i : tconMap.keySet()) { + addSupport("TConstruct", "decoration.multibrick", tconMap.get(i), i, 99); + addSupport("TConstruct", "decoration.multibrickfancy", tconMap.get(i), i, 99); + } - addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); - addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); + addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); + addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); - addSupport("Botania", "endStoneBrick", "end_stone", 0, 0); - addSupport("Botania", "endStoneBrick", "end_stone", 1, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 0, 0); + addSupport("Botania", "endStoneBrick", "end_stone", 1, 0); - if(Loader.isModLoaded("EE3")){ + if (Loader.isModLoaded("EE3")) { loadEE3Values(); } - } + } public static void addSupport(String modname, String blockname, String name, int metadata, int order) { if (Loader.isModLoaded(modname) && GameRegistry.findBlock(modname, blockname) != null) { @@ -101,11 +99,11 @@ public static void addSupport(String name, Block block, int metadata, int order) } private static void loadThaumcraftAspects() { -// ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestone, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); -// ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestoneWall, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + // ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestone, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); + // ThaumcraftApi.registerObjectTag(new ItemStack(ChiselBlocks.cobblestoneWall, 1, OreDictionary.WILDCARD_VALUE), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); } - private static void loadEE3Values(){ + private static void loadEE3Values() { FMLLog.log(Chisel.MOD_ID, Level.INFO, "[Chisel 2] Oooh is that Equivalent Exchange I see?"); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselItems.ballomoss, 1), 16); @@ -136,25 +134,29 @@ private static void loadEE3Values(){ EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass2, 1), 1); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 32); - for(int x = 0; x < ChiselBlocks.pumpkin.length; x++){ + for (int x = 0; x < ChiselBlocks.pumpkin.length; x++) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.pumpkin[x], 1), 144); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.jackolantern[x], 1), 153); } - for(int x = 0; x < ChiselBlocks.torches.length; x++){ + for (int x = 0; x < ChiselBlocks.torches.length; x++) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.torches[x], 1), 9); } - for(int x = 0; x < 10; x++){ + for (int x = 0; x < 10; x++) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.valentines, 1, x), 3); } - for(int x = 0 ; x < 16; x++){ - if(x <= 10)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.concrete, 1, x), 8); - if(x <= 14)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 5); - if(x < 14)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 7); - if(x < 12)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.dirt, 1, x), 1); - if(x < 5){ + for (int x = 0; x < 16; x++) { + if (x <= 10) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.concrete, 1, x), 8); + if (x <= 14) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 5); + if (x < 14) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 7); + if (x < 12) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.dirt, 1, x), 1); + if (x < 5) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.rebel, 1, x), 39); } @@ -182,19 +184,22 @@ private static void loadEE3Values(){ EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.circuits, 1, x), 37); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); - if(x < 15)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.warningSign, 1, x), 6); + if (x < 15) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.warningSign, 1, x), 6); - if(x < 4)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); + if (x < 4) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); - for(int c = 0; c < ChiselBlocks.stainedGlass.length; c++){ + for (int c = 0; c < ChiselBlocks.stainedGlass.length; c++) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlass[c], 1, x), 1); } - for(int c = 0; c < ChiselBlocks.stainedGlassPane.length; c++){ - if(x <= 13)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlassPane[c], 1, x), 1); + for (int c = 0; c < ChiselBlocks.stainedGlassPane.length; c++) { + if (x <= 13) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlassPane[c], 1, x), 1); } - if(x > 0) { + if (x > 0) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cobblestone, 1, x), 1); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_cobblestone, 1, x), 1); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.netherrack, 1, x), 1); @@ -203,7 +208,8 @@ private static void loadEE3Values(){ EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstonerunic, 1, x), 160); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass, 1, x), 1); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.redstone_block, 1, x), 288); - if(x <= 8)EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.bookshelf, 1, x), 528); + if (x <= 8) + EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.bookshelf, 1, x), 528); if (x <= 12) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diamond_block, 1, x), 73728); if (x != 12) @@ -216,7 +222,7 @@ private static void loadEE3Values(){ } } - for(int x = 0; x <= 6; x++){ + for (int x = 0; x <= 6; x++) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.andesite, 1, x), 129); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diorite, 1, x), 257); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.granite, 1, x), 513); @@ -238,7 +244,7 @@ private static void loadEE3Values(){ EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, x), 32); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 7), 32); EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 8), 32); - if(x > 0){ + if (x > 0) { EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.brickCustom, 1, x), 256); } } diff --git a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java b/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java index 80d702f48..499636865 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java +++ b/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java @@ -14,7 +14,7 @@ public class IMCHandler { public static final IMCHandler INSTANCE = new IMCHandler(); private int order = 1000; - + private IMCHandler() { } diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java b/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java index 3c6c864a4..2081d8d2c 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java +++ b/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java @@ -1,16 +1,16 @@ package com.cricketcraft.chisel.compat.fmp; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.google.common.collect.Lists; - import net.minecraft.block.Block; import net.minecraft.world.World; import codechicken.lib.vec.BlockCoord; +import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartConverter; import codechicken.multipart.MultiPartRegistry.IPartFactory; -import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.TMultiPart; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.google.common.collect.Lists; + public class FMPCompat implements IPartFactory, IPartConverter { public void init() { diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java b/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java index 4f7c9f481..e744caa03 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java +++ b/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java @@ -25,6 +25,7 @@ public ItemBlockChiselTorchPart(Block block, BlockCarvableTorch torch) { this.torch = torch; } + @Override @SideOnly(Side.CLIENT) public boolean func_150936_a(World world, int x, int y, int z, int side, EntityPlayer player, ItemStack stack) { return (placePart(world, new BlockCoord(x, y, z).offset(side), stack, side, false)) || (super.func_150936_a(world, x, y, z, side, player, stack)); diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java b/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java index 90a6c4565..45072d9e7 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java +++ b/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java @@ -1,13 +1,13 @@ package com.cricketcraft.chisel.compat.fmp; -import com.cricketcraft.chisel.init.ChiselBlocks; - import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.minecraft.TorchPart; +import com.cricketcraft.chisel.init.ChiselBlocks; + public class PartChiselTorch extends TorchPart { private int idx; diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java index f4a54520e..83a5124be 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java +++ b/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java @@ -83,7 +83,7 @@ public String getRecipeName() { public String getGuiTexture() { return "Chisel:textures/chiselNEI.png"; } - + @Override public Class getGuiClass() { return GuiChisel.class; @@ -111,6 +111,7 @@ public void loadTransferRects() { this.transferRects.add(new TemplateRecipeHandler.RecipeTransferRect(new Rectangle(75, 22, 15, 13), "chisel2.chisel", new Object[0])); } + @Override public void loadCraftingRecipes(String outputId, Object... results) { if (outputId.equals("chisel2.chisel")) { for (String name : Carving.chisel.getSortedGroupNames()) { diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index 1d99bc997..3bc7b9fbe 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -1,15 +1,15 @@ package com.cricketcraft.chisel.config; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Features; -import com.cricketcraft.ctmlib.CTM; +import java.util.Locale; import net.minecraft.item.ItemDye; import net.minecraftforge.common.config.Configuration; import org.apache.commons.lang3.StringUtils; -import java.util.Locale; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.Features; +import com.cricketcraft.ctmlib.CTM; public class Configurations { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java b/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java index bffbc7ab3..9a4eb2ec3 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java @@ -3,11 +3,11 @@ import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.world.World; -public class EntityChiselSnowman extends EntitySnowman{ +public class EntityChiselSnowman extends EntitySnowman { - public EntityChiselSnowman(World world){ - super(world); - } + public EntityChiselSnowman(World world) { + super(world); + } - //No special features just needed to get around the hardcoding + // No special features just needed to get around the hardcoding } diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 1b06e5665..99aa017bc 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -60,7 +60,7 @@ public EntitySnakestoneObsidianFX(World world, BlockSnakestoneObsidian b, int x, noClip = true; - setParticleIcon(block.particles[General.rand.nextInt(block.particles.length)]); + setParticleIcon(BlockSnakestoneObsidian.particles[General.rand.nextInt(BlockSnakestoneObsidian.particles.length)]); } @Override diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index f44edadb8..c9dbce6f4 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -34,7 +34,7 @@ public final class ChiselBlocks { public static final BlockCarvableGlowstone glowstone = null; public static final BlockCarvable lapis_block = null; public static final BlockCarvable emerald_block = null; - public static final BlockCarvable rebel = null; + public static final BlockCarvable rebel = null; public static final BlockCarvable nether_brick = null; public static final BlockCarvable netherrack = null; public static final BlockCarvable mossy_cobblestone = null; @@ -88,7 +88,7 @@ public final class ChiselBlocks { public static final BlockCarvable arcane = null; public static final BlockCarvable thaumium = null; public static final BlockCarvable tallow = null; - + public static final BlockCarvable copperblock = null; public static final BlockCarvable bronzeblock = null; public static final BlockCarvable aluminumblock = null; diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java index 8ca3cf86a..7ae2e22d2 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java @@ -6,6 +6,7 @@ import com.cricketcraft.chisel.item.ItemSmashingRock; import com.cricketcraft.chisel.item.ItemUpgrade; import com.cricketcraft.chisel.item.chisel.ItemChisel; + import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java index db0688640..a39203be8 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java @@ -44,29 +44,21 @@ public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) { ItemStack itemstack = null; Slot slot = (Slot) this.inventorySlots.get(p_82846_2_); - if (slot != null && slot.getHasStack()) - { + if (slot != null && slot.getHasStack()) { ItemStack itemstack1 = slot.getStack(); itemstack = itemstack1.copy(); - if (p_82846_2_ < rows * 9) - { - if (!this.mergeItemStack(itemstack1, rows * 9, inventorySlots.size(), true)) - { + if (p_82846_2_ < rows * 9) { + if (!this.mergeItemStack(itemstack1, rows * 9, inventorySlots.size(), true)) { return null; } - } - else if (!this.mergeItemStack(itemstack1, 0, rows * 9, false)) - { + } else if (!this.mergeItemStack(itemstack1, 0, rows * 9, false)) { return null; } - if (itemstack1.stackSize == 0) - { + if (itemstack1.stackSize == 0) { slot.putStack((ItemStack) null); - } - else - { + } else { slot.onSlotChanged(); } } diff --git a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java index bb42c15f9..bb5a9c094 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java @@ -128,7 +128,7 @@ public void updateItems() { activeVariations = 0; while (activeVariations < normalSlots && activeVariations < list.size()) { - if(Block.blockRegistry.getNameForObject(Block.getBlockFromItem(list.get(activeVariations).getItem())) != null) { + if (Block.blockRegistry.getNameForObject(Block.getBlockFromItem(list.get(activeVariations).getItem())) != null) { inventory[activeVariations] = list.get(activeVariations); activeVariations++; } @@ -165,7 +165,7 @@ public void closeInventory() { @Override public boolean isItemValidForSlot(int i, ItemStack stack) { - //Really didn't think people would chisel a shovel + // Really didn't think people would chisel a shovel if (stack.getItem() instanceof ItemTool) { return false; } diff --git a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java b/src/main/java/com/cricketcraft/chisel/item/BaseItem.java index ab2433072..8b870cb78 100644 --- a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java +++ b/src/main/java/com/cricketcraft/chisel/item/BaseItem.java @@ -73,7 +73,7 @@ public static String[] wrap(String input, int len) { String[] ret = new String[lines.size()]; int c = 0; // counter for (Enumeration e = lines.elements(); e.hasMoreElements(); c++) { - ret[c] = (String) e.nextElement(); + ret[c] = e.nextElement(); } return ret; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java b/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java index d9acdc072..87213e2a4 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java @@ -2,13 +2,12 @@ import net.minecraft.block.Block; - public class ItemBlockPresent extends ItemCarvable { public ItemBlockPresent(Block block) { super(block); } - + @Override public int getMetadata(int i) { return 0; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java index f8df77e5e..6fe1beec0 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java @@ -6,12 +6,12 @@ public class ItemCarvablePumpkin extends ItemCarvable { - public ItemCarvablePumpkin(Block block) { - super(block); - } + public ItemCarvablePumpkin(Block block) { + super(block); + } - @Override - public boolean isValidArmor(ItemStack itemStack, int armorType, Entity entity){ - return true; - } + @Override + public boolean isValidArmor(ItemStack itemStack, int armorType, Entity entity) { + return true; + } } diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java index 9bfb5ed21..47283f978 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java @@ -49,7 +49,7 @@ public void chiselAll(EntityPlayer player, World world, int x, int y, int z, For public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, ICarvingVariation variation) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - int facing = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int facing = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; for (int i = -1; i <= 1; i++) { if (side != ForgeDirection.DOWN && side != ForgeDirection.UP) { setVariation(player, world, x, y + i, z, block, meta, variation); @@ -69,7 +69,7 @@ public void chiselAll(EntityPlayer player, World world, int x, int y, int z, For public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, ICarvingVariation variation) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); - int facing = MathHelper.floor_double((double) (player.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int facing = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; for (int i = -1; i <= 1; i++) { if (side != ForgeDirection.DOWN && side != ForgeDirection.UP) { if (side == ForgeDirection.EAST || side == ForgeDirection.WEST) { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java index 7f90a83f9..19387505c 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java @@ -1,13 +1,7 @@ package com.cricketcraft.chisel.item.chisel; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; @@ -21,14 +15,20 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import java.util.List; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.carving.ICarvingRegistry; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.config.Configurations; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; public class ItemChisel extends Item implements IChiselItem { public enum ChiselType { - IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), - DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), - OBSIDIAN(Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); + IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), OBSIDIAN( + Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); final int maxDamage; final int attackDamage; @@ -52,27 +52,26 @@ public ItemChisel(ChiselType type) { } @Override - public int getMaxDamage(ItemStack stack){ - if(Configurations.allowChiselDamage) + public int getMaxDamage(ItemStack stack) { + if (Configurations.allowChiselDamage) return type.maxDamage; return 0; } @Override - public boolean isDamageable(){ + public boolean isDamageable() { return Configurations.allowChiselDamage; } @Override - public boolean getIsRepairable(ItemStack damagedItem, ItemStack repairMaterial) - { + public boolean getIsRepairable(ItemStack damagedItem, ItemStack repairMaterial) { switch (type) { - case DIAMOND: - return repairMaterial.getItem().equals(Items.diamond); - case IRON: - return repairMaterial.getItem().equals(Items.iron_ingot); - case OBSIDIAN: - return repairMaterial.getItem().equals(Item.getItemFromBlock(Blocks.obsidian)); + case DIAMOND: + return repairMaterial.getItem().equals(Items.diamond); + case IRON: + return repairMaterial.getItem().equals(Items.iron_ingot); + case OBSIDIAN: + return repairMaterial.getItem().equals(Item.getItemFromBlock(Blocks.obsidian)); } return false; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java index 1d4410cad..0024c06c9 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java @@ -20,7 +20,7 @@ public MessageAutoChisel() { ItemStack base; boolean playSound, breakChisel; int chiseled; - + public MessageAutoChisel(TileEntityAutoChisel tile, int chiseled, boolean playSound, boolean breakChisel) { super(tile); this.base = tile.getStackInSlot(TileEntityAutoChisel.BASE); @@ -31,7 +31,7 @@ public MessageAutoChisel(TileEntityAutoChisel tile, int chiseled, boolean playSo this.breakChisel = breakChisel; this.chiseled = chiseled; } - + @Override public void toBytes(ByteBuf buf) { super.toBytes(buf); @@ -40,7 +40,7 @@ public void toBytes(ByteBuf buf) { buf.writeInt(chiseled); ByteBufUtils.writeItemStack(buf, base); } - + @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); @@ -52,6 +52,7 @@ public void fromBytes(ByteBuf buf) { public static class Handler implements IMessageHandler { + @Override public IMessage onMessage(MessageAutoChisel message, MessageContext ctx) { TileEntity te = message.getTileEntity(ctx); diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java index 855c41a7f..e549b835d 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java @@ -16,25 +16,27 @@ public class MessageChiselMode implements IMessage { - public MessageChiselMode(){ + public MessageChiselMode() { } - + private String mode; - + public MessageChiselMode(IChiselMode iChiselMode) { this.mode = iChiselMode.name(); } + @Override public void toBytes(ByteBuf buf) { ByteBufUtils.writeUTF8String(buf, mode); } - + @Override public void fromBytes(ByteBuf buf) { this.mode = ByteBufUtils.readUTF8String(buf); } - + public static class Handler implements IMessageHandler { + @Override public IMessage onMessage(MessageChiselMode message, MessageContext ctx) { ItemStack stack = ctx.getServerHandler().playerEntity.getCurrentEquippedItem(); diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java b/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java index 829075743..6f775f7ea 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java +++ b/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java @@ -11,27 +11,26 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; - public class MessagePresentConnect extends MessageCoords { - + private ForgeDirection dir; private boolean connect, preserveDir; - + public MessagePresentConnect() { super(); } - + public MessagePresentConnect(TileEntityPresent present, ForgeDirection dir, boolean connecting) { this(present, dir, connecting, false); } - + public MessagePresentConnect(TileEntityPresent present, ForgeDirection dir, boolean connecting, boolean preserveDir) { super(present); this.dir = dir; this.connect = connecting; this.preserveDir = preserveDir; } - + @Override public void toBytes(ByteBuf buf) { super.toBytes(buf); @@ -39,7 +38,7 @@ public void toBytes(ByteBuf buf) { buf.writeBoolean(connect); buf.writeBoolean(preserveDir); } - + @Override public void fromBytes(ByteBuf buf) { super.fromBytes(buf); @@ -47,9 +46,9 @@ public void fromBytes(ByteBuf buf) { connect = buf.readBoolean(); preserveDir = buf.readBoolean(); } - + public static class Handler implements IMessageHandler { - + @Override public IMessage onMessage(MessagePresentConnect message, MessageContext ctx) { TileEntity te = message.getTileEntity(ctx); diff --git a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java index 15faabd24..d70045662 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java @@ -1,10 +1,10 @@ package com.cricketcraft.chisel.proxy; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/utils/General.java b/src/main/java/com/cricketcraft/chisel/utils/General.java index 174a28a89..cf13cf818 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/General.java +++ b/src/main/java/com/cricketcraft/chisel/utils/General.java @@ -125,24 +125,25 @@ private static void initTag(ItemStack stack) { } private static final String MODE_KEY = "chiselMode"; + public static IChiselMode getChiselMode(ItemStack chisel) { if (chisel == null) { return ChiselMode.SINGLE; } - + if (chisel.stackTagCompound == null || Strings.isNullOrEmpty(chisel.stackTagCompound.getString(MODE_KEY))) { initTag(chisel); chisel.stackTagCompound.setString(MODE_KEY, ChiselMode.SINGLE.name()); } - + String name = chisel.stackTagCompound.getString(MODE_KEY); if (chisel.getItem() instanceof IAdvancedChisel) { - return ((IAdvancedChisel)chisel.getItem()).getMode(chisel, name); + return ((IAdvancedChisel) chisel.getItem()).getMode(chisel, name); } return Enum.valueOf(ChiselMode.class, chisel.stackTagCompound.getString(MODE_KEY)); } - + public static void setChiselMode(ItemStack chisel, IChiselMode mode) { initTag(chisel); chisel.stackTagCompound.setString(MODE_KEY, mode.name()); diff --git a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java b/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java index 4a1354f65..7790c5f34 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java +++ b/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java @@ -29,12 +29,11 @@ public static void bind(String textureName) { Minecraft.getMinecraft().getTextureManager().bindTexture(res); } - - public static void setGLColorFromInt(int color) - { - float red = (color >> 16 & 255) / 255.0F; - float green = (color >> 8 & 255) / 255.0F; - float blue = (color & 255) / 255.0F; - GL11.glColor4f(red, green, blue, 1.0F); - } + + public static void setGLColorFromInt(int color) { + float red = (color >> 16 & 255) / 255.0F; + float green = (color >> 8 & 255) / 255.0F; + float blue = (color & 255) / 255.0F; + GL11.glColor4f(red, green, blue, 1.0F); + } } From 782097e24712190f084ddfdc362afdf425d0c1d6 Mon Sep 17 00:00:00 2001 From: MrBurd Date: Tue, 4 Aug 2015 22:04:43 +0200 Subject: [PATCH 35/57] Added a limestone retexture birdstone. looks nicer --- .../blocks/birdstone/birdstone-darkpanel.png | Bin 0 -> 3358 bytes .../textures/blocks/birdstone/birdstone-dent.png | Bin 0 -> 3361 bytes .../blocks/birdstone/birdstone-emboss.png | Bin 0 -> 3379 bytes .../blocks/birdstone/birdstone-fourtile.png | Bin 0 -> 3359 bytes .../blocks/birdstone/birdstone-french-creep.png | Bin 0 -> 3421 bytes .../blocks/birdstone/birdstone-french.png | Bin 0 -> 3359 bytes .../blocks/birdstone/birdstone-french2.png | Bin 0 -> 3355 bytes .../blocks/birdstone/birdstone-marker.png | Bin 0 -> 3358 bytes .../blocks/birdstone/birdstone-ornate1.png | Bin 0 -> 3355 bytes .../blocks/birdstone/birdstone-ornate2.png | Bin 0 -> 3336 bytes .../blocks/birdstone/birdstone-rough-ctmv.png | Bin 0 -> 4347 bytes .../blocks/birdstone/birdstone-rough.png | Bin 0 -> 3407 bytes .../blocks/birdstone/birdstone-smallbrick.png | Bin 0 -> 3363 bytes .../blocks/birdstone/birdstone-smallbroken.png | Bin 0 -> 3439 bytes .../blocks/birdstone/birdstone-smalltile.png | Bin 0 -> 3367 bytes .../blocks/birdstone/birdstone-smooth-creep.png | Bin 0 -> 3406 bytes .../blocks/birdstone/birdstone-smooth.png | Bin 0 -> 3149 bytes 17 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-darkpanel.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-dent.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-emboss.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-fourtile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-french-creep.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-french.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-french2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-marker.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate1.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate2.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-rough-ctmv.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-rough.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smallbrick.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smallbroken.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smalltile.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smooth-creep.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smooth.png diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-darkpanel.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-darkpanel.png new file mode 100644 index 0000000000000000000000000000000000000000..8fa338ba8f8893cf71cf3414a46480063720eee6 GIT binary patch literal 3358 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-emboss.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-emboss.png new file mode 100644 index 0000000000000000000000000000000000000000..76e3f792f646f98bbe0206b21c2b9bbb68ebbb20 GIT binary patch literal 3379 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 JPDHLkV1oO`P_zI5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-fourtile.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-fourtile.png new file mode 100644 index 0000000000000000000000000000000000000000..e5a6f3056060d29317fc14b9af7873529e451153 GIT binary patch literal 3359 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-french.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-french.png new file mode 100644 index 0000000000000000000000000000000000000000..36f1b5190d703b8fce7e930423886d1111f183f9 GIT binary patch literal 3359 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-marker.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-marker.png new file mode 100644 index 0000000000000000000000000000000000000000..f431a957658be34297b38e2461bac322eb40ec38 GIT binary patch literal 3358 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate1.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate1.png new file mode 100644 index 0000000000000000000000000000000000000000..8dac4c73d75e4545cb9c4d06b4f3dfc6892fba1a GIT binary patch literal 3355 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate2.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-ornate2.png new file mode 100644 index 0000000000000000000000000000000000000000..32d3911e9e9f35558f8abdc16c8029b705eb153f GIT binary patch literal 3336 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-rough.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-rough.png new file mode 100644 index 0000000000000000000000000000000000000000..fde10d7ab5fe7becaac40358ad01d74d12f104cb GIT binary patch literal 3407 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smallbroken.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smallbroken.png new file mode 100644 index 0000000000000000000000000000000000000000..5291e261f07741463243a193957443f1f7b6f02b GIT binary patch literal 3439 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smooth-creep.png b/src/main/resources/assets/chisel/textures/blocks/birdstone/birdstone-smooth-creep.png new file mode 100644 index 0000000000000000000000000000000000000000..e55c8054e0e86358521b3b56417da1a3d7e8482c GIT binary patch literal 3406 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 literal 0 HcmV?d00001 From c78502ddb927b9410e5f2c0cd23d3803288b5d50 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 6 Aug 2015 00:10:46 -0400 Subject: [PATCH 36/57] Fix enum formatting, remove some unused classes --- eclipseFormat.xml | 4 +- .../tileentity/TileEntityAutoChisel.java | 5 +- .../chisel/item/chisel/ItemChisel.java | 5 +- .../chisel/utils/BlockTexturedOre.java | 55 ------------- .../utils/BlockTexturedOreRenderer.java | 78 ------------------- .../chisel/utils/DummyContainer.java | 12 --- .../cricketcraft/chisel/utils/GuiHandler.java | 67 ---------------- .../chisel/utils/ItemMetaBlock.java | 28 ------- 8 files changed, 9 insertions(+), 245 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOre.java delete mode 100644 src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOreRenderer.java delete mode 100644 src/main/java/com/cricketcraft/chisel/utils/DummyContainer.java delete mode 100644 src/main/java/com/cricketcraft/chisel/utils/GuiHandler.java delete mode 100644 src/main/java/com/cricketcraft/chisel/utils/ItemMetaBlock.java diff --git a/eclipseFormat.xml b/eclipseFormat.xml index 9c789066e..cedf6acd2 100644 --- a/eclipseFormat.xml +++ b/eclipseFormat.xml @@ -26,12 +26,12 @@ - + - + diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 359998bec..1c6f16773 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -29,7 +29,10 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory { public enum Upgrade { - SPEED, AUTOMATION, STACK, REVERSION; + SPEED, + AUTOMATION, + STACK, + REVERSION; public String getUnlocalizedName() { return ChiselItems.upgrade.getUnlocalizedName() + "_" + this.name().toLowerCase(); diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java index 19387505c..b61da447a 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java @@ -27,8 +27,9 @@ public class ItemChisel extends Item implements IChiselItem { public enum ChiselType { - IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), OBSIDIAN( - Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); + IRON(Configurations.ironChiselMaxDamage, Configurations.ironChiselAttackDamage), + DIAMOND(Configurations.diamondChiselMaxDamage, Configurations.diamondChiselAttackDamage), + OBSIDIAN(Configurations.obsidianChiselMaxDamage, Configurations.obsidianChiselAttackDamage); final int maxDamage; final int attackDamage; diff --git a/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOre.java b/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOre.java deleted file mode 100644 index 9e501e5ee..000000000 --- a/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOre.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.cricketcraft.chisel.utils; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - -public class BlockTexturedOre extends Block { - - int currentPass; - Block base; - IIcon icon; - String iconFile; - - public BlockTexturedOre(Material mat, Block base) { - super(mat); - - this.base = base; - } - - public BlockTexturedOre(Material mat, String iconFile) { - super(mat); - - this.iconFile = iconFile; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int getRenderType() { - return BlockTexturedOreRenderer.id; - } - - @Override - public int getRenderBlockPass() { - return 1; - } - - @Override - public boolean canRenderInPass(int pass) { - currentPass = pass; - - return pass == 1 || pass == 0; - } - - @Override - public void registerBlockIcons(IIconRegister register) { - if (iconFile != null) - icon = register.registerIcon(iconFile); - } - -} diff --git a/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOreRenderer.java deleted file mode 100644 index 72e431113..000000000 --- a/src/main/java/com/cricketcraft/chisel/utils/BlockTexturedOreRenderer.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.cricketcraft.chisel.utils; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.init.Blocks; -import net.minecraft.world.IBlockAccess; - -import org.lwjgl.opengl.GL11; - -import com.cricketcraft.ctmlib.Drawing; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; - -public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler { - - float bot = -0.001f, top = 1.0f - bot; - static int id; - - public BlockTexturedOreRenderer() { - id = RenderingRegistry.getNextAvailableRenderId(); - } - - @Override - public void renderInventoryBlock(Block blck, int meta, int modelID, RenderBlocks renderer) { - if (blck == null || !(blck instanceof BlockTexturedOre)) - return; - - BlockTexturedOre block = (BlockTexturedOre) blck; - - if (block.icon != null) { - renderer.overrideBlockTexture = block.icon; - renderer.renderBlockAsItem(Blocks.stone, meta, 1.0f); - renderer.overrideBlockTexture = null; - } else if (block.base != null) { - renderer.renderBlockAsItem(block.base, meta, 1.0f); - } - - GL11.glEnable(3042); - GL11.glBlendFunc(770, 771); - renderer.setRenderBounds(bot, bot, bot, top, top, top); - GL11.glTranslatef(-0.5F, -0.5F, -0.5F); - Drawing.drawBlock(block, meta, renderer); - GL11.glDisable(3042); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block blck, int modelId, RenderBlocks renderer) { - if (blck == null || !(blck instanceof BlockTexturedOre)) - return false; - BlockTexturedOre block = (BlockTexturedOre) blck; - - if (block.currentPass == 0) { - if (block.icon != null) { - renderer.overrideBlockTexture = block.icon; - renderer.renderStandardBlock(block, x, y, z); - renderer.overrideBlockTexture = null; - } else if (block.base != null) { - renderer.renderBlockByRenderType(block.base, x, y, z); - } - } else { - renderer.setRenderBounds(bot, bot, bot, top, top, top); - renderer.renderStandardBlock(block, x, y, z); - } - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return id; - } -} diff --git a/src/main/java/com/cricketcraft/chisel/utils/DummyContainer.java b/src/main/java/com/cricketcraft/chisel/utils/DummyContainer.java deleted file mode 100644 index a0567933b..000000000 --- a/src/main/java/com/cricketcraft/chisel/utils/DummyContainer.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cricketcraft.chisel.utils; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; - -public class DummyContainer extends Container { - - @Override - public boolean canInteractWith(EntityPlayer entityplayer) { - return true; - } -} diff --git a/src/main/java/com/cricketcraft/chisel/utils/GuiHandler.java b/src/main/java/com/cricketcraft/chisel/utils/GuiHandler.java deleted file mode 100644 index 5e3b4a03f..000000000 --- a/src/main/java/com/cricketcraft/chisel/utils/GuiHandler.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.cricketcraft.chisel.utils; - -import java.util.ArrayList; -import java.util.Collections; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; - -public abstract class GuiHandler implements Comparable { - - static ArrayList items = new ArrayList(); - - int index; - Object mod; - String name; - - public GuiHandler(String n) { - items.add(this); - name = n; - } - - public void open(EntityPlayer player, World world, int x, int y, int z) { - player.openGui(mod, index, world, x, y, z); - } - - @Override - public int compareTo(Object a) { - return name.compareTo(((GuiHandler) a).name); - } - - public static void register(Object mod) { - Collections.sort(items); - int index = 0; - - for (GuiHandler h : items) { - h.mod = mod; - h.index = index++; - } - - NetworkRegistry.INSTANCE.registerGuiHandler(mod, new IGuiHandler() { - - @Override - public Object getServerGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - if (id < 0 || id >= items.size()) { - return null; - } - - return items.get(id).getServerGuiElement(id, player, world, x, y, z); - } - - @Override - public Object getClientGuiElement(int id, EntityPlayer player, World world, int x, int y, int z) { - if (id < 0 || id >= items.size()) { - return null; - } - - return items.get(id).getClientGuiElement(id, player, world, x, y, z); - } - }); - } - - public abstract Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); - - public abstract Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z); -} diff --git a/src/main/java/com/cricketcraft/chisel/utils/ItemMetaBlock.java b/src/main/java/com/cricketcraft/chisel/utils/ItemMetaBlock.java deleted file mode 100644 index 002f01c35..000000000 --- a/src/main/java/com/cricketcraft/chisel/utils/ItemMetaBlock.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.cricketcraft.chisel.utils; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -public class ItemMetaBlock extends ItemBlock { - - public ItemMetaBlock(Block b) { - super(b); - setMaxDamage(0); - setHasSubtypes(true); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - if (itemstack == null) { - return Block.getBlockFromItem(this).getUnlocalizedName(); - } - - return Block.getBlockFromItem(this).getUnlocalizedName(); - } - - @Override - public int getMetadata(int i) { - return i; - } -} From 9127673efc2c9dba28c38e825c9b454cb722711a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Mon, 10 Aug 2015 01:19:58 -0400 Subject: [PATCH 37/57] Fix the Turkey bug (thanks immibis) --- .../java/com/cricketcraft/chisel/item/chisel/ItemChisel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java index b61da447a..9183c7ca9 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.item.chisel; import java.util.List; +import java.util.Locale; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; @@ -48,7 +49,7 @@ public ItemChisel(ChiselType type) { super(); this.type = type; setMaxStackSize(1); - setTextureName(Chisel.MOD_ID + ":chisel_" + type.name().toLowerCase()); + setTextureName(Chisel.MOD_ID + ":chisel_" + type.name().toLowerCase(Locale.ENGLISH)); MinecraftForge.EVENT_BUS.register(this); } From a33085181dffdee7d730e32d6c000d05851ca89e Mon Sep 17 00:00:00 2001 From: minecreatr Date: Tue, 11 Aug 2015 10:17:23 -0700 Subject: [PATCH 38/57] Made EMC System more dynamic --- .../chisel/compat/Compatibility.java | 317 ++++++++++-------- .../chisel/compat/TinkersChiselCompat.java | 103 ++++++ .../cricketcraft/chisel/utils/RecipeUtil.java | 36 ++ 3 files changed, 316 insertions(+), 140 deletions(-) create mode 100644 src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java create mode 100644 src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index 1dec0ef48..0ae08177c 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -1,7 +1,14 @@ package com.cricketcraft.chisel.compat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import java.util.Map; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.utils.RecipeUtil; +import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -76,6 +83,7 @@ public static void init(FMLPostInitializationEvent event) { addSupport("TConstruct", "decoration.multibrick", tconMap.get(i), i, 99); addSupport("TConstruct", "decoration.multibrickfancy", tconMap.get(i), i, 99); } + TinkersChiselCompat.addTConstructDetailingSupport(); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); @@ -88,6 +96,7 @@ public static void init(FMLPostInitializationEvent event) { } } + public static void addSupport(String modname, String blockname, String name, int metadata, int order) { if (Loader.isModLoaded(modname) && GameRegistry.findBlock(modname, blockname) != null) { addSupport(name, GameRegistry.findBlock(modname, blockname), metadata, order); @@ -104,149 +113,177 @@ private static void loadThaumcraftAspects() { } private static void loadEE3Values() { - FMLLog.log(Chisel.MOD_ID, Level.INFO, "[Chisel 2] Oooh is that Equivalent Exchange I see?"); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselItems.ballomoss, 1), 16); - - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 1), 8); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 13), 8); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 0), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 1), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 2), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 3), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 4), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 1), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 2), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 3), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 4), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 12), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 13), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 14), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 15), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.present, 1, 4), 80); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 0), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 1), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 2), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 3), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 1), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 2), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 3), 24); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass2, 1), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 32); - - for (int x = 0; x < ChiselBlocks.pumpkin.length; x++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.pumpkin[x], 1), 144); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.jackolantern[x], 1), 153); - } - - for (int x = 0; x < ChiselBlocks.torches.length; x++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.torches[x], 1), 9); - } - - for (int x = 0; x < 10; x++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.valentines, 1, x), 3); - } - - for (int x = 0; x < 16; x++) { - if (x <= 10) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.concrete, 1, x), 8); - if (x <= 14) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 5); - if (x < 14) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 7); - if (x < 12) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.dirt, 1, x), 1); - if (x < 5) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.rebel, 1, x), 39); - } - - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 29444); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 31444); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.limestone, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar, 1, x), 8); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar_slab, 1, x), 4); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone_scribbles, 1, x), 4); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stonebricksmooth, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.templeblock, 1, x), 108); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_templeblock, 1, x), 108); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glowstone, 1, x), 1536); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.woolen_clay, 1, x), 153); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock, 1, x), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexPlating, 1, x), 37); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.gold_block, 1, x), 18432); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_block, 1, x), 2304); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.laboratoryblock, 1, x), 33); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical, 1, x), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.tyrian, 1, x), 33); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexLargePlating, 1, x), 37); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.circuits, 1, x), 37); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); - - if (x < 15) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.warningSign, 1, x), 6); - - if (x < 4) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); - - for (int c = 0; c < ChiselBlocks.stainedGlass.length; c++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlass[c], 1, x), 1); - } - - for (int c = 0; c < ChiselBlocks.stainedGlassPane.length; c++) { - if (x <= 13) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlassPane[c], 1, x), 1); - } - - if (x > 0) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cobblestone, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_cobblestone, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.netherrack, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.obsidian, 1, x), 64); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone, 1, x), 4); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstonerunic, 1, x), 160); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.redstone_block, 1, x), 288); - if (x <= 8) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.bookshelf, 1, x), 528); - if (x <= 12) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diamond_block, 1, x), 73728); - if (x != 12) - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.emerald_block, 1, x), 73728); - } - - for (int c = 0; c < ChiselBlocks.planks.length; c++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.planks[c], 1, x), 8); + for (String groupName : Carving.chisel.getSortedGroupNames()){ + ICarvingGroup group = Carving.chisel.getGroup(groupName); + List baseStacks = new ArrayList(); + for (ICarvingVariation variation : group.getVariations()){ + if (RecipeUtil.isCreatable(new ItemStack(variation.getBlock(), 1, variation.getBlockMeta()))){ + baseStacks.add(new ItemStack(variation.getBlock(), 1, variation.getBlockMeta())); } } - } - - for (int x = 0; x <= 6; x++) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.andesite, 1, x), 129); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diorite, 1, x), 257); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.granite, 1, x), 513); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, x), 9); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, 7), 9); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, x), 160); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, 7), 160); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, x), 256); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, 7), 256); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.waterstone, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice_pillar, 1, x), 1); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, x), 96); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 7), 96); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 8), 96); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 9), 96); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, x), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 7), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 8), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, x), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 7), 32); - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 8), 32); - if (x > 0) { - EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.brickCustom, 1, x), 256); + for (ICarvingVariation variation : group.getVariations()){ + ItemStack stack = new ItemStack(variation.getBlock(), 1, variation.getBlockMeta()); + for (ItemStack baseStack : baseStacks) { +// if (baseStack==null){ +// Chisel.logger.error("Base Stack is null"); +// if (stack!=null){ +// Chisel.logger.info("Non base for base stack is "+stack); +// } +// continue; +// } +// if (stack==null){ +// Chisel.logger.error("Non Base stack is null"); +// Chisel.logger.info("Base stack for null stack is "+baseStack); +// continue; +// } + //Chisel.logger.info("Adding emc recipe for "+baseStack+" to "+stack); + RecipeRegistryProxy.addRecipe(stack, Arrays.asList(baseStack)); + } } } +// FMLLog.log(Chisel.MOD_ID, Level.INFO, "[Chisel 2] Oooh is that Equivalent Exchange I see?"); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselItems.ballomoss, 1), 16); +// +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 1), 8); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sand_snakestone, 1, 13), 8); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 0), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 1), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 2), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 3), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cloud, 1, 4), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 1), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 2), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 3), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 4), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 12), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 13), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 14), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass_pane, 1, 15), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.present, 1, 4), 80); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 0), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 1), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 2), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.road_line, 1, 3), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 1), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 2), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 3), 24); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass2, 1), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical2, 1, 0), 32); +// +// for (int x = 0; x < ChiselBlocks.pumpkin.length; x++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.pumpkin[x], 1), 144); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.jackolantern[x], 1), 153); +// } +// +// for (int x = 0; x < ChiselBlocks.torches.length; x++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.torches[x], 1), 9); +// } +// +// for (int x = 0; x < 10; x++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.valentines, 1, x), 3); +// } +// +// for (int x = 0; x < 16; x++) { +// if (x <= 10) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.concrete, 1, x), 8); +// if (x <= 14) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 5); +// if (x < 14) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.grimstone, 1, x), 7); +// if (x < 12) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.dirt, 1, x), 1); +// if (x < 5) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.rebel, 1, x), 39); +// } +// +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 29444); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.fantasyblock, 1, x), 31444); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.limestone, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar, 1, x), 8); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.marble_pillar_slab, 1, x), 4); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone_scribbles, 1, x), 4); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stonebricksmooth, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.templeblock, 1, x), 108); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_templeblock, 1, x), 108); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glowstone, 1, x), 1536); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.woolen_clay, 1, x), 153); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock, 1, x), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexPlating, 1, x), 37); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.gold_block, 1, x), 18432); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_block, 1, x), 2304); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.laboratoryblock, 1, x), 33); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.technical, 1, x), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.tyrian, 1, x), 33); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.hexLargePlating, 1, x), 37); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.circuits, 1, x), 37); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); +// +// if (x < 15) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.warningSign, 1, x), 6); +// +// if (x < 4) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.factoryblock2, 1, x), 32); +// +// for (int c = 0; c < ChiselBlocks.stainedGlass.length; c++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlass[c], 1, x), 1); +// } +// +// for (int c = 0; c < ChiselBlocks.stainedGlassPane.length; c++) { +// if (x <= 13) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.stainedGlassPane[c], 1, x), 1); +// } +// +// if (x > 0) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.cobblestone, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.mossy_cobblestone, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.netherrack, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.obsidian, 1, x), 64); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.sandstone, 1, x), 4); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstonerunic, 1, x), 160); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.glass, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.redstone_block, 1, x), 288); +// if (x <= 8) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.bookshelf, 1, x), 528); +// if (x <= 12) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diamond_block, 1, x), 73728); +// if (x != 12) +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.emerald_block, 1, x), 73728); +// } +// +// for (int c = 0; c < ChiselBlocks.planks.length; c++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.planks[c], 1, x), 8); +// } +// } +// } +// +// for (int x = 0; x <= 6; x++) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.andesite, 1, x), 129); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.diorite, 1, x), 257); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.granite, 1, x), 513); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, x), 9); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.lavastone, 1, 7), 9); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, x), 160); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone, 1, 7), 160); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, x), 256); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.voidstone2, 1, 7), 256); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.waterstone, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.ice_pillar, 1, x), 1); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, x), 96); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 7), 96); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 8), 96); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.iron_bars, 1, 9), 96); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, x), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 7), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall, 1, 8), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, x), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 7), 32); +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.paperwall_block, 1, 8), 32); +// if (x > 0) { +// EnergyValueRegistryProxy.addPreAssignedEnergyValue(new ItemStack(ChiselBlocks.brickCustom, 1, x), 256); +// } +// } } } diff --git a/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java b/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java new file mode 100644 index 000000000..cc1ff08bb --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java @@ -0,0 +1,103 @@ +package com.cricketcraft.chisel.compat; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.carving.Carving; +import cpw.mods.fml.common.Loader; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +/** + * Combat for the tinkers chisel, in its own class as to not cause clutter + * + * @author minecreatr + */ +public class TinkersChiselCompat { + + + public static final String TINKERS_ID = "TConstruct"; + + private static Class TINKERS_MOD_CLASS; + private static Class DETAILING_CLASS; + private static Class DETAIL_INPUT_CLASS; + + private static Method GET_DETAILING; + + private static Field DETAIL_FIELD; + + private static Field INPUT_STACK; + private static Field INPUT_META; + private static Field OUTPUT_STACK; + private static Field OUTPUT_META; + + public static void addTConstructDetailingSupport(){ + if (Loader.isModLoaded(TINKERS_ID)){ + loadReflection(); + List stacks = getAllChiseling(); + for (ItemStack stack : stacks) { + if (Block.getBlockFromItem(stack.getItem()) != null) { + Chisel.logger.info("Added variation for stack "+stack.toString()); + Carving.chisel.addVariation("tinkers", Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 0); + } else { + Chisel.logger.info("Item "+stack.getItem()+" has no block form"); + } + } + } + } + + + private static void loadReflection(){ + if (TINKERS_MOD_CLASS == null || DETAILING_CLASS == null || DETAIL_INPUT_CLASS == null || GET_DETAILING == null || DETAIL_FIELD == null) { + try { + TINKERS_MOD_CLASS = Class.forName("tconstruct.TConstruct"); + DETAILING_CLASS = Class.forName("tconstruct.library.crafting.Detailing"); + DETAIL_INPUT_CLASS = Class.forName("tconstruct.library.crafting.Detailing$DetailInput"); + + GET_DETAILING = TINKERS_MOD_CLASS.getDeclaredMethod("getChiselDetailing"); + + DETAIL_FIELD = DETAILING_CLASS.getDeclaredField("detailing"); + + INPUT_STACK = DETAIL_INPUT_CLASS.getDeclaredField("input"); + INPUT_META = DETAIL_INPUT_CLASS.getDeclaredField("inputMeta"); + OUTPUT_STACK = DETAIL_INPUT_CLASS.getDeclaredField("output"); + OUTPUT_META = DETAIL_INPUT_CLASS.getDeclaredField("outputMeta"); + + } catch (Exception exception) { + exception.printStackTrace(); + Chisel.logger.error("Error adding tinkers detailing support"); + } + } + } + + private static List getAllChiseling(){ + try { + List toReturn = new ArrayList(); + Object detailingObj = GET_DETAILING.invoke(null); + Object detailList = DETAIL_FIELD.get(detailingObj); + if (detailList instanceof List){ + List list = (List) detailList; + for (Object detail : list){ + ItemStack stackInput = (ItemStack) INPUT_STACK.get(detail); + int inMeta = (Integer) INPUT_META.get(detail); + + ItemStack stackOutput = (ItemStack) OUTPUT_STACK.get(detail); + int outMeta = (Integer) OUTPUT_META.get(detail); + + stackInput.setItemDamage(inMeta); + stackOutput.setItemDamage(outMeta); + toReturn.add(stackInput); + toReturn.add(stackOutput); + } + } + return toReturn; + } catch (Exception exception){ + exception.printStackTrace(); + Chisel.logger.error("Error adding tinkers detailing support"); + return null; + } + } +} diff --git a/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java b/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java new file mode 100644 index 000000000..20187c61a --- /dev/null +++ b/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java @@ -0,0 +1,36 @@ +package com.cricketcraft.chisel.utils; + +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; + +import java.util.List; + +/** + * Utility for crafting/recipe things + */ +public class RecipeUtil { + + public static boolean isCraftable(ItemStack stack){ + for (IRecipe recipe : (List)CraftingManager.getInstance().getRecipeList()){ + if (recipe.getRecipeOutput()==null){ + continue; + } + if (stack.isItemEqual(recipe.getRecipeOutput())){ + return true; + } + } + return false; + } + + public static boolean isSmeltable(ItemStack stack){ + return FurnaceRecipes.smelting().getSmeltingList().containsKey(stack); + } + + public static boolean isCreatable(ItemStack stack){ + return isCraftable(stack) || isSmeltable(stack); + } + +} From 2ff7d52fd1ce557109f87c4b72d12c2afeed9358 Mon Sep 17 00:00:00 2001 From: minecreatr Date: Tue, 11 Aug 2015 10:24:31 -0700 Subject: [PATCH 39/57] Remove bad TCON Code --- .../chisel/compat/Compatibility.java | 1 - .../chisel/compat/TinkersChiselCompat.java | 103 ------------------ 2 files changed, 104 deletions(-) delete mode 100644 src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java index 0ae08177c..48ad6c284 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java @@ -83,7 +83,6 @@ public static void init(FMLPostInitializationEvent event) { addSupport("TConstruct", "decoration.multibrick", tconMap.get(i), i, 99); addSupport("TConstruct", "decoration.multibrickfancy", tconMap.get(i), i, 99); } - TinkersChiselCompat.addTConstructDetailingSupport(); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 14, 99); addSupport("TConstruct", "decoration.multibrickfancy", "stonebricksmooth", 15, 99); diff --git a/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java b/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java deleted file mode 100644 index cc1ff08bb..000000000 --- a/src/main/java/com/cricketcraft/chisel/compat/TinkersChiselCompat.java +++ /dev/null @@ -1,103 +0,0 @@ -package com.cricketcraft.chisel.compat; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.carving.Carving; -import cpw.mods.fml.common.Loader; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -/** - * Combat for the tinkers chisel, in its own class as to not cause clutter - * - * @author minecreatr - */ -public class TinkersChiselCompat { - - - public static final String TINKERS_ID = "TConstruct"; - - private static Class TINKERS_MOD_CLASS; - private static Class DETAILING_CLASS; - private static Class DETAIL_INPUT_CLASS; - - private static Method GET_DETAILING; - - private static Field DETAIL_FIELD; - - private static Field INPUT_STACK; - private static Field INPUT_META; - private static Field OUTPUT_STACK; - private static Field OUTPUT_META; - - public static void addTConstructDetailingSupport(){ - if (Loader.isModLoaded(TINKERS_ID)){ - loadReflection(); - List stacks = getAllChiseling(); - for (ItemStack stack : stacks) { - if (Block.getBlockFromItem(stack.getItem()) != null) { - Chisel.logger.info("Added variation for stack "+stack.toString()); - Carving.chisel.addVariation("tinkers", Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 0); - } else { - Chisel.logger.info("Item "+stack.getItem()+" has no block form"); - } - } - } - } - - - private static void loadReflection(){ - if (TINKERS_MOD_CLASS == null || DETAILING_CLASS == null || DETAIL_INPUT_CLASS == null || GET_DETAILING == null || DETAIL_FIELD == null) { - try { - TINKERS_MOD_CLASS = Class.forName("tconstruct.TConstruct"); - DETAILING_CLASS = Class.forName("tconstruct.library.crafting.Detailing"); - DETAIL_INPUT_CLASS = Class.forName("tconstruct.library.crafting.Detailing$DetailInput"); - - GET_DETAILING = TINKERS_MOD_CLASS.getDeclaredMethod("getChiselDetailing"); - - DETAIL_FIELD = DETAILING_CLASS.getDeclaredField("detailing"); - - INPUT_STACK = DETAIL_INPUT_CLASS.getDeclaredField("input"); - INPUT_META = DETAIL_INPUT_CLASS.getDeclaredField("inputMeta"); - OUTPUT_STACK = DETAIL_INPUT_CLASS.getDeclaredField("output"); - OUTPUT_META = DETAIL_INPUT_CLASS.getDeclaredField("outputMeta"); - - } catch (Exception exception) { - exception.printStackTrace(); - Chisel.logger.error("Error adding tinkers detailing support"); - } - } - } - - private static List getAllChiseling(){ - try { - List toReturn = new ArrayList(); - Object detailingObj = GET_DETAILING.invoke(null); - Object detailList = DETAIL_FIELD.get(detailingObj); - if (detailList instanceof List){ - List list = (List) detailList; - for (Object detail : list){ - ItemStack stackInput = (ItemStack) INPUT_STACK.get(detail); - int inMeta = (Integer) INPUT_META.get(detail); - - ItemStack stackOutput = (ItemStack) OUTPUT_STACK.get(detail); - int outMeta = (Integer) OUTPUT_META.get(detail); - - stackInput.setItemDamage(inMeta); - stackOutput.setItemDamage(outMeta); - toReturn.add(stackInput); - toReturn.add(stackOutput); - } - } - return toReturn; - } catch (Exception exception){ - exception.printStackTrace(); - Chisel.logger.error("Error adding tinkers detailing support"); - return null; - } - } -} From e5438ecffa4664958c4d78da37f9816f580aa459 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 15 Aug 2015 01:05:06 -0400 Subject: [PATCH 40/57] Fix item icon for CombinedCTM --- .../client/render/SubmapManagerCombinedCTM.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java index 9c119ec59..3406a02dd 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java @@ -27,37 +27,37 @@ private class RenderBlocksCombinedCTM extends RenderBlocksCTM { @Override public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.WEST); - super.renderFaceXNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceXNeg(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } @Override public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.EAST); - super.renderFaceXPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceXPos(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } @Override public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.DOWN); - super.renderFaceYNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceYNeg(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } @Override public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.UP); - super.renderFaceYPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceYPos(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } @Override public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.NORTH); - super.renderFaceZNeg(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceZNeg(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } @Override public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) { setIcons(rType, x, y, z, ForgeDirection.SOUTH); - super.renderFaceZPos(block, x, y, z, submapSmall.getSubIcon(0, 0)); + super.renderFaceZPos(block, x, y, z, inWorld ? submapSmall.getSubIcon(0, 0) : icon); } private void setIcons(TextureType type, double x, double y, double z, ForgeDirection side) { @@ -144,7 +144,7 @@ public void registerIcons(String modName, Block block, IIconRegister register) { submaps[i % wh][i / wh] = triple.getMiddle(); submapsSmall[i % wh][i / wh] = triple.getRight(); if (i == 0) { - defaultIcon = triple.getRight().getSubIcon(0, 0); + defaultIcon = triple.getRight().getBaseIcon(); } } submap = new Submap(base, wh, submaps); From 4b106c310b7c5d151a816d37627bdecf8182127d Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 15 Aug 2015 16:01:37 -0400 Subject: [PATCH 41/57] Update CTMLib dep for fixed voidstone --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 4b45ff9dc..6eac38f80 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ mod_version=2.5.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 -ctmlib_version=1.2.0-9 +ctmlib_version=1.2.0-10 ccl_version=1.1.3.140 ccc_version=1.0.7.46 nei_version=1.0.5.111 From 9fee55c1f08c6fa507744760becb34b20ab5c79e Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 15 Aug 2015 16:03:13 -0400 Subject: [PATCH 42/57] Fix beveled voidstone (animated) small texture --- .../blocks/voidstone/animated/bevel.png | Bin 1381 -> 4356 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel.png index ceccd547a7262322345e73c5beb6d17bd77ba2a3..e33d9773834ff3bf753e15ca6cc02f40fdbb38a9 100644 GIT binary patch literal 4356 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 I=^eY~9~chV?f?J) literal 1381 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Lb6AYF9SoBDg#49GXulV|3LaB z14F3+1H-EX1_rAc3=HD=lj4uMF)%PQ1o(uw0`)L3FfuZ*GBR*6F>o_6@G>*-GcyP> zGYGRX2(vJVurP?RFo?4{kd6q0i711a9D|7>gMto&o+g8#2AhFCmz{=)fu@Lswup_2s)4$y zjk>D6u8M)KilM%W4I_gi1GAF~gQEt6lRks127`w_Lx8S`ldg!H8H2wCLx{DAzlN%V zo~oO!s;7a9gMo^(sj8>Bs=u|0pP_2Fol1;`YO<+nu9aDqGi$h~WVnk;h^uOazf~^S zr=!GZ2%v-je}v#SUfeQv7=CeGvm6&5?{vWGk9{&wlV0RxhMD9lJRv#gX1NE z1a+kYdQzer`ZEsv;hz`DCL1by-eZ6E?RziNmM}a@e!V0iVDqZhnw^|?yk$~uKDw}q e!Fyjk%MYe2djdKeGlaW93BuFW&t;ucLK6Vf#gyOx From efe0e83be4d4d8c84f4f3cec3a440cedca717dd5 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sun, 16 Aug 2015 15:45:22 -0400 Subject: [PATCH 43/57] Fix crash when trying to revert an unchiselable block --- .../chisel/block/tileentity/TileEntityAutoChisel.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java index 1c6f16773..36eabe85a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -181,7 +181,8 @@ public void updateEntity() { private ItemStack getTarget() { if (inventory[BASE] != null && hasUpgrade(Upgrade.REVERSION)) { // if we have a reversion upgrade, use that for the target - return Carving.chisel.getItemsForChiseling(inventory[BASE]).get(0); + List possible = Carving.chisel.getItemsForChiseling(inventory[BASE]); + return possible.isEmpty() ? null : possible.get(0); } else { return inventory[TARGET]; } From 74cdb6355c501cc30a88b3c99a72b3a22f0a98e8 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 18 Aug 2015 20:40:55 -0400 Subject: [PATCH 44/57] Repackage to team.chisel (excepting API) --- .../chisel/BlockNameConversion.java | 6 +- .../cricketcraft => team}/chisel/Chisel.java | 34 +++++------ .../chisel/Features.java | 61 +++++++++---------- .../chisel/block/BlockAutoChisel.java | 7 +-- .../chisel/block/BlockBeaconBase.java | 2 +- .../chisel/block/BlockCarvable.java | 17 +++--- .../chisel/block/BlockCarvableAntiBlock.java | 6 +- .../chisel/block/BlockCarvableBeacon.java | 14 ++--- .../chisel/block/BlockCarvableBookshelf.java | 2 +- .../chisel/block/BlockCarvableCarpet.java | 12 ++-- .../chisel/block/BlockCarvableColor.java | 2 +- .../chisel/block/BlockCarvableGlass.java | 15 +++-- .../chisel/block/BlockCarvableGlow.java | 8 +-- .../chisel/block/BlockCarvableGlowstone.java | 2 +- .../chisel/block/BlockCarvableIce.java | 12 ++-- .../chisel/block/BlockCarvableIceStairs.java | 8 +-- .../chisel/block/BlockCarvableLamp.java | 2 +- .../chisel/block/BlockCarvableLayered.java | 6 +- .../chisel/block/BlockCarvablePackedIce.java | 12 ++-- .../block/BlockCarvablePackedIceStairs.java | 8 +-- .../chisel/block/BlockCarvablePane.java | 15 +++-- .../chisel/block/BlockCarvablePowered.java | 2 +- .../chisel/block/BlockCarvablePumpkin.java | 15 +++-- .../chisel/block/BlockCarvableSand.java | 17 +++--- .../chisel/block/BlockCarvableSlab.java | 2 +- .../chisel/block/BlockCarvableStairs.java | 12 ++-- .../chisel/block/BlockCarvableTorch.java | 15 +++-- .../chisel/block/BlockCarvableWall.java | 6 +- .../chisel/block/BlockCloud.java | 6 +- .../chisel/block/BlockConcrete.java | 8 +-- .../chisel/block/BlockEldritch.java | 4 +- .../chisel/block/BlockGrimstone.java | 9 ++- .../chisel/block/BlockHolystone.java | 7 +-- .../chisel/block/BlockLavastone.java | 5 +- .../chisel/block/BlockLeaf.java | 2 +- .../chisel/block/BlockMultiLayer.java | 10 +-- .../chisel/block/BlockMultiLayerBase.java | 5 +- .../chisel/block/BlockPresent.java | 15 +++-- .../chisel/block/BlockRoadLine.java | 8 +-- .../chisel/block/BlockSnakestone.java | 5 +- .../chisel/block/BlockSnakestoneObsidian.java | 5 +- .../chisel/block/BlockWaterstone.java | 2 +- .../chisel/block/CarvableStairsMaker.java | 11 ++-- .../chisel/block/IStairsCreator.java | 6 +- .../chisel/block/tileentity/IDoubleChest.java | 2 +- .../tileentity/TileEntityAutoChisel.java | 21 +++---- .../tileentity/TileEntityCarvableBeacon.java | 2 +- .../block/tileentity/TileEntityPresent.java | 9 ++- .../chisel/carving/Carving.java | 14 ++--- .../chisel/carving/GroupList.java | 2 +- .../chisel/client/GeneralChiselClient.java | 27 ++++---- .../chisel/client/gui/GuiAutoChisel.java | 7 ++- .../chisel/client/gui/GuiChisel.java | 19 +++--- .../chisel/client/gui/GuiChiselConfig.java | 8 +-- .../chisel/client/gui/GuiFactory.java | 2 +- .../chisel/client/gui/GuiPresent.java | 6 +- .../client/render/RenderBlocksEldritch.java | 2 +- .../client/render/RenderChiselSnowman.java | 5 +- .../chisel/client/render/RendererCTM.java | 2 +- .../chisel/client/render/RendererCTMPane.java | 2 +- .../client/render/RendererEldritch.java | 5 +- .../client/render/RendererLayeredGlow.java | 11 ++-- .../client/render/RendererMultiLayer.java | 5 +- .../client/render/RendererRoadLine.java | 6 +- .../client/render/RendererSimpleLayered.java | 7 ++- .../client/render/RendererSnakeStone.java | 5 +- .../chisel/client/render/RendererStairs.java | 5 +- .../client/render/SubmapManagerAntiblock.java | 2 +- .../client/render/SubmapManagerBase.java | 2 +- .../render/SubmapManagerCarpetFloor.java | 2 +- .../render/SubmapManagerCombinedCTM.java | 2 +- .../render/SubmapManagerFakeController.java | 7 +-- .../client/render/SubmapManagerLeaves.java | 2 +- .../client/render/SubmapManagerSlab.java | 2 +- .../client/render/SubmapManagerVoidstone.java | 2 +- .../render/item/ItemChiselRenderer.java | 2 +- .../client/render/tile/RenderAutoChisel.java | 9 +-- .../render/tile/RenderCarvableBeacon.java | 5 +- .../client/render/tile/RenderPresent.java | 9 +-- .../chisel/compat/Compatibility.java | 18 +++--- .../chisel/compat/IMCHandler.java | 9 ++- .../chisel/compat/WailaCompat.java | 6 +- .../chisel/compat/fmp/FMPCompat.java | 4 +- .../compat/fmp/ItemBlockChiselTorchPart.java | 6 +- .../chisel/compat/fmp/PartChiselTorch.java | 5 +- .../chisel/compat/nei/NEIChiselConfig.java | 8 +-- .../compat/nei/RecipeHandlerChisel.java | 14 ++--- .../chisel/config/Configurations.java | 7 ++- .../chisel/entity/EntityBallOMoss.java | 11 ++-- .../chisel/entity/EntityChiselSnowman.java | 2 +- .../chisel/entity/EntityCloudInABottle.java | 5 +- .../chisel/entity/EntitySmashingRock.java | 5 +- .../chisel/entity/fx/EntityBallOMossFX.java | 9 ++- .../chisel/entity/fx/EntityGrimstoneFX.java | 7 +-- .../chisel/entity/fx/EntityHolystoneFX.java | 7 +-- .../entity/fx/EntitySnakestoneObsidianFX.java | 6 +- .../chisel/init/ChiselBlocks.java | 8 +-- .../chisel/init/ChiselItems.java | 15 +++-- .../chisel/init/ChiselTabs.java | 6 +- .../chisel/inventory/ContainerAutoChisel.java | 9 ++- .../chisel/inventory/ContainerChisel.java | 12 ++-- .../chisel/inventory/ContainerPresent.java | 2 +- .../inventory/InventoryChiselSelection.java | 10 +-- .../chisel/inventory/SlotChiselInput.java | 2 +- .../chisel/inventory/SlotChiselPlayer.java | 2 +- .../chisel/inventory/SlotChiselSelection.java | 14 ++--- .../chisel/item/BaseItem.java | 2 +- .../chisel/item/ItemBallOMoss.java | 5 +- .../chisel/item/ItemBlockPresent.java | 2 +- .../chisel/item/ItemCarvable.java | 12 ++-- .../chisel/item/ItemCarvablePumpkin.java | 2 +- .../chisel/item/ItemCarvableSlab.java | 5 +- .../chisel/item/ItemCloudInABottle.java | 5 +- .../chisel/item/ItemSmashingRock.java | 5 +- .../chisel/item/ItemUpgrade.java | 7 +-- .../chisel/item/chisel/ChiselController.java | 19 +++--- .../chisel/item/chisel/ChiselMode.java | 16 ++--- .../chisel/item/chisel/ItemChisel.java | 8 +-- .../chisel/network/ChiselGuiHandler.java | 22 +++---- .../chisel/network/PacketHandler.java | 15 +++-- .../network/message/MessageAutoChisel.java | 8 +-- .../network/message/MessageChiselMode.java | 11 ++-- .../network/message/MessageChiselSound.java | 15 +++-- .../message/MessagePresentConnect.java | 8 +-- .../network/message/MessageSlotUpdate.java | 8 +-- .../network/message/base/MessageCoords.java | 6 +- .../chisel/proxy/ClientProxy.java | 52 ++++++++-------- .../chisel/proxy/CommonProxy.java | 10 ++- .../chisel/utils/General.java | 16 ++--- .../chisel/utils/GeneralClient.java | 2 +- .../chisel/utils/RecipeUtil.java | 2 +- .../chisel/world/GeneratorChisel.java | 2 +- 132 files changed, 526 insertions(+), 596 deletions(-) rename src/main/java/{com/cricketcraft => team}/chisel/BlockNameConversion.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/Chisel.java (88%) rename src/main/java/{com/cricketcraft => team}/chisel/Features.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockAutoChisel.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockBeaconBase.java (91%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvable.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableAntiBlock.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableBeacon.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableBookshelf.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableCarpet.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableColor.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableGlass.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableGlow.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableGlowstone.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableIce.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableIceStairs.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableLamp.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableLayered.java (91%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvablePackedIce.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvablePackedIceStairs.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvablePane.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvablePowered.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvablePumpkin.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableSand.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableSlab.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableStairs.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableTorch.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCarvableWall.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockCloud.java (94%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockConcrete.java (86%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockEldritch.java (69%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockGrimstone.java (80%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockHolystone.java (83%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockLavastone.java (84%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockLeaf.java (87%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockMultiLayer.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockMultiLayerBase.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockPresent.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockRoadLine.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockSnakestone.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockSnakestoneObsidian.java (88%) rename src/main/java/{com/cricketcraft => team}/chisel/block/BlockWaterstone.java (86%) rename src/main/java/{com/cricketcraft => team}/chisel/block/CarvableStairsMaker.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/block/IStairsCreator.java (84%) rename src/main/java/{com/cricketcraft => team}/chisel/block/tileentity/IDoubleChest.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/block/tileentity/TileEntityAutoChisel.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/block/tileentity/TileEntityCarvableBeacon.java (87%) rename src/main/java/{com/cricketcraft => team}/chisel/block/tileentity/TileEntityPresent.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/carving/Carving.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/carving/GroupList.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/client/GeneralChiselClient.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/client/gui/GuiAutoChisel.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/client/gui/GuiChisel.java (89%) rename src/main/java/{com/cricketcraft => team}/chisel/client/gui/GuiChiselConfig.java (81%) rename src/main/java/{com/cricketcraft => team}/chisel/client/gui/GuiFactory.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/client/gui/GuiPresent.java (86%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RenderBlocksEldritch.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RenderChiselSnowman.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererCTM.java (87%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererCTMPane.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererEldritch.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererLayeredGlow.java (87%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererMultiLayer.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererRoadLine.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererSimpleLayered.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererSnakeStone.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/RendererStairs.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerAntiblock.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerBase.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerCarpetFloor.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerCombinedCTM.java (99%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerFakeController.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerLeaves.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerSlab.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/SubmapManagerVoidstone.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/item/ItemChiselRenderer.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/tile/RenderAutoChisel.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/tile/RenderCarvableBeacon.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/client/render/tile/RenderPresent.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/Compatibility.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/IMCHandler.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/WailaCompat.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/fmp/FMPCompat.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/fmp/ItemBlockChiselTorchPart.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/fmp/PartChiselTorch.java (91%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/nei/NEIChiselConfig.java (85%) rename src/main/java/{com/cricketcraft => team}/chisel/compat/nei/RecipeHandlerChisel.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/config/Configurations.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/EntityBallOMoss.java (91%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/EntityChiselSnowman.java (87%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/EntityCloudInABottle.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/EntitySmashingRock.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/fx/EntityBallOMossFX.java (93%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/fx/EntityGrimstoneFX.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/fx/EntityHolystoneFX.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/entity/fx/EntitySnakestoneObsidianFX.java (94%) rename src/main/java/{com/cricketcraft => team}/chisel/init/ChiselBlocks.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/init/ChiselItems.java (61%) rename src/main/java/{com/cricketcraft => team}/chisel/init/ChiselTabs.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/ContainerAutoChisel.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/ContainerChisel.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/ContainerPresent.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/InventoryChiselSelection.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/SlotChiselInput.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/SlotChiselPlayer.java (94%) rename src/main/java/{com/cricketcraft => team}/chisel/inventory/SlotChiselSelection.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/item/BaseItem.java (98%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemBallOMoss.java (88%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemBlockPresent.java (84%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemCarvable.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemCarvablePumpkin.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemCarvableSlab.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemCloudInABottle.java (88%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemSmashingRock.java (88%) rename src/main/java/{com/cricketcraft => team}/chisel/item/ItemUpgrade.java (89%) rename src/main/java/{com/cricketcraft => team}/chisel/item/chisel/ChiselController.java (95%) rename src/main/java/{com/cricketcraft => team}/chisel/item/chisel/ChiselMode.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/item/chisel/ItemChisel.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/network/ChiselGuiHandler.java (72%) rename src/main/java/{com/cricketcraft => team}/chisel/network/PacketHandler.java (66%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/MessageAutoChisel.java (89%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/MessageChiselMode.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/MessageChiselSound.java (85%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/MessagePresentConnect.java (90%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/MessageSlotUpdate.java (89%) rename src/main/java/{com/cricketcraft => team}/chisel/network/message/base/MessageCoords.java (92%) rename src/main/java/{com/cricketcraft => team}/chisel/proxy/ClientProxy.java (63%) rename src/main/java/{com/cricketcraft => team}/chisel/proxy/CommonProxy.java (71%) rename src/main/java/{com/cricketcraft => team}/chisel/utils/General.java (97%) rename src/main/java/{com/cricketcraft => team}/chisel/utils/GeneralClient.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/utils/RecipeUtil.java (96%) rename src/main/java/{com/cricketcraft => team}/chisel/world/GeneratorChisel.java (98%) diff --git a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java b/src/main/java/team/chisel/BlockNameConversion.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/BlockNameConversion.java rename to src/main/java/team/chisel/BlockNameConversion.java index d791cd62f..fd543ba8b 100644 --- a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java +++ b/src/main/java/team/chisel/BlockNameConversion.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.util.HashMap; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.item.Item; - -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/Chisel.java rename to src/main/java/team/chisel/Chisel.java index fb0309263..562e5663d 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.io.File; @@ -13,23 +13,23 @@ import com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.Statistics; import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.compat.Compatibility; -import com.cricketcraft.chisel.compat.IMCHandler; -import com.cricketcraft.chisel.compat.fmp.FMPCompat; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.item.chisel.ChiselController; -import com.cricketcraft.chisel.network.ChiselGuiHandler; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.proxy.CommonProxy; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.world.GeneratorChisel; +import team.chisel.block.BlockCarvable; +import team.chisel.carving.Carving; +import team.chisel.compat.Compatibility; +import team.chisel.compat.IMCHandler; +import team.chisel.compat.fmp.FMPCompat; +import team.chisel.config.Configurations; +import team.chisel.entity.EntityChiselSnowman; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemCarvable; +import team.chisel.item.chisel.ChiselController; +import team.chisel.network.ChiselGuiHandler; +import team.chisel.network.PacketHandler; +import team.chisel.proxy.CommonProxy; +import team.chisel.utils.General; +import team.chisel.world.GeneratorChisel; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/team/chisel/Features.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/Features.java rename to src/main/java/team/chisel/Features.java index 05f08c4bc..1d5e1142b 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -1,7 +1,33 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.util.List; +import team.chisel.block.*; +import team.chisel.carving.Carving; +import team.chisel.client.render.SubmapManagerAntiblock; +import team.chisel.client.render.SubmapManagerCarpetFloor; +import team.chisel.client.render.SubmapManagerCombinedCTM; +import team.chisel.client.render.SubmapManagerFakeController; +import team.chisel.client.render.SubmapManagerLeaves; +import team.chisel.client.render.SubmapManagerSlab; +import team.chisel.client.render.SubmapManagerVoidstone; +import team.chisel.compat.fmp.ItemBlockChiselTorchPart; +import team.chisel.config.Configurations; +import team.chisel.entity.EntityBallOMoss; +import team.chisel.entity.EntityCloudInABottle; +import team.chisel.entity.EntitySmashingRock; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemBallOMoss; +import team.chisel.item.ItemBlockPresent; +import team.chisel.item.ItemCarvable; +import team.chisel.item.ItemCarvablePumpkin; +import team.chisel.item.ItemCarvableSlab; +import team.chisel.item.ItemCloudInABottle; +import team.chisel.item.ItemSmashingRock; +import team.chisel.item.ItemUpgrade; +import team.chisel.item.chisel.ItemChisel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -17,45 +43,18 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.CarvingUtils.SimpleCarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.carving.CarvingUtils.SimpleCarvingGroup; import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.chisel.block.*; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.render.SubmapManagerAntiblock; -import com.cricketcraft.chisel.client.render.SubmapManagerCarpetFloor; -import com.cricketcraft.chisel.client.render.SubmapManagerCombinedCTM; -import com.cricketcraft.chisel.client.render.SubmapManagerFakeController; -import com.cricketcraft.chisel.client.render.SubmapManagerLeaves; -import com.cricketcraft.chisel.client.render.SubmapManagerSlab; -import com.cricketcraft.chisel.client.render.SubmapManagerVoidstone; -import com.cricketcraft.chisel.compat.fmp.ItemBlockChiselTorchPart; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.chisel.item.ItemBlockPresent; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.item.ItemCarvablePumpkin; -import com.cricketcraft.chisel.item.ItemCarvableSlab; -import com.cricketcraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.chisel.item.ItemUpgrade; -import com.cricketcraft.chisel.item.chisel.ItemChisel; import com.google.common.collect.Lists; +import static team.chisel.init.ChiselBlocks.*; +import static team.chisel.utils.General.*; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import static com.cricketcraft.chisel.init.ChiselBlocks.*; -import static com.cricketcraft.chisel.utils.General.*; - public enum Features { AE_CERTUS_QUARTZ("appliedenergistics2") { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java b/src/main/java/team/chisel/block/BlockAutoChisel.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java rename to src/main/java/team/chisel/block/BlockAutoChisel.java index 6ade4931e..21f38b70c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/team/chisel/block/BlockAutoChisel.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -8,9 +10,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - public class BlockAutoChisel extends BlockContainer { public BlockAutoChisel() { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java b/src/main/java/team/chisel/block/BlockBeaconBase.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java rename to src/main/java/team/chisel/block/BlockBeaconBase.java index 6abf5196a..3bfecfda0 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java +++ b/src/main/java/team/chisel/block/BlockBeaconBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/team/chisel/block/BlockCarvable.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java rename to src/main/java/team/chisel/block/BlockCarvable.java index af0ca33e6..dd2a7df92 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/team/chisel/block/BlockCarvable.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,14 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java b/src/main/java/team/chisel/block/BlockCarvableAntiBlock.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java rename to src/main/java/team/chisel/block/BlockCarvableAntiBlock.java index 7c4b5a396..2ac779182 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java +++ b/src/main/java/team/chisel/block/BlockCarvableAntiBlock.java @@ -1,11 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; + +import com.cricketcraft.chisel.api.ICarvable; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; - public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarvable { public BlockCarvableAntiBlock() { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java b/src/main/java/team/chisel/block/BlockCarvableBeacon.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java rename to src/main/java/team/chisel/block/BlockCarvableBeacon.java index 143fc0935..b0ee3f4db 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java +++ b/src/main/java/team/chisel/block/BlockCarvableBeacon.java @@ -1,5 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockBeacon; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -8,12 +14,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.init.ChiselTabs; - public class BlockCarvableBeacon extends BlockBeacon implements ICarvable { public static int renderId; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java b/src/main/java/team/chisel/block/BlockCarvableBookshelf.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java rename to src/main/java/team/chisel/block/BlockCarvableBookshelf.java index d3418ec4d..0d940f7de 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java +++ b/src/main/java/team/chisel/block/BlockCarvableBookshelf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/team/chisel/block/BlockCarvableCarpet.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java rename to src/main/java/team/chisel/block/BlockCarvableCarpet.java index 6e9dce426..1700e8704 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/team/chisel/block/BlockCarvableCarpet.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.BlockCarpet; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,11 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvableCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java b/src/main/java/team/chisel/block/BlockCarvableColor.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java rename to src/main/java/team/chisel/block/BlockCarvableColor.java index 9bdd7d842..1d63b8c1f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java +++ b/src/main/java/team/chisel/block/BlockCarvableColor.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/team/chisel/block/BlockCarvableGlass.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java rename to src/main/java/team/chisel/block/BlockCarvableGlass.java index d717320fa..ced2665a0 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlass.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,13 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/team/chisel/block/BlockCarvableGlow.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java rename to src/main/java/team/chisel/block/BlockCarvableGlow.java index c6e0ec417..e1cead806 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlow.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.client.render.SubmapManagerBase; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.render.SubmapManagerBase; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java b/src/main/java/team/chisel/block/BlockCarvableGlowstone.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java rename to src/main/java/team/chisel/block/BlockCarvableGlowstone.java index e5cbece46..731e6047b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlowstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/team/chisel/block/BlockCarvableIce.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java rename to src/main/java/team/chisel/block/BlockCarvableIce.java index df1d801ee..6986d0829 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/team/chisel/block/BlockCarvableIce.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,11 +18,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvableIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java rename to src/main/java/team/chisel/block/BlockCarvableIceStairs.java index 4f954edfb..cc2cf87db 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java @@ -1,14 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class BlockCarvableIceStairs extends BlockCarvableStairs { public BlockCarvableIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java b/src/main/java/team/chisel/block/BlockCarvableLamp.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java rename to src/main/java/team/chisel/block/BlockCarvableLamp.java index 559f125ae..806e52835 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java +++ b/src/main/java/team/chisel/block/BlockCarvableLamp.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java b/src/main/java/team/chisel/block/BlockCarvableLayered.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java rename to src/main/java/team/chisel/block/BlockCarvableLayered.java index bd4da53f3..02889ac7a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java +++ b/src/main/java/team/chisel/block/BlockCarvableLayered.java @@ -1,11 +1,9 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import com.cricketcraft.chisel.Chisel; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/team/chisel/block/BlockCarvablePackedIce.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java rename to src/main/java/team/chisel/block/BlockCarvablePackedIce.java index 1dfeb8588..22c97afee 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/team/chisel/block/BlockCarvablePackedIce.java @@ -1,8 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; import java.util.Random; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,11 +20,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvablePackedIce extends Block implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java rename to src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java index 2cd199dd2..d3d1cf3a8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java @@ -1,14 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class BlockCarvablePackedIceStairs extends BlockCarvableStairs { public BlockCarvablePackedIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/team/chisel/block/BlockCarvablePane.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java rename to src/main/java/team/chisel/block/BlockCarvablePane.java index f5f9d430a..e4e9f63c3 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/team/chisel/block/BlockCarvablePane.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.client.render.RendererCTMPane; +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,13 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.client.render.RendererCTMPane; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java b/src/main/java/team/chisel/block/BlockCarvablePowered.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java rename to src/main/java/team/chisel/block/BlockCarvablePowered.java index 1bf298188..b6f7fa433 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/team/chisel/block/BlockCarvablePowered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java rename to src/main/java/team/chisel/block/BlockCarvablePumpkin.java index f3237ccc5..5af4e17bf 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java @@ -1,5 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.Chisel; +import team.chisel.entity.EntityChiselSnowman; import net.minecraft.block.Block; import net.minecraft.block.BlockPumpkin; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,13 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/team/chisel/block/BlockCarvableSand.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java rename to src/main/java/team/chisel/block/BlockCarvableSand.java index 629fcfa60..4968828bf 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/team/chisel/block/BlockCarvableSand.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.block.BlockSand; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,14 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java b/src/main/java/team/chisel/block/BlockCarvableSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java rename to src/main/java/team/chisel/block/BlockCarvableSlab.java index a6404099c..cc25e8d36 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java +++ b/src/main/java/team/chisel/block/BlockCarvableSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java b/src/main/java/team/chisel/block/BlockCarvableStairs.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java rename to src/main/java/team/chisel/block/BlockCarvableStairs.java index 9cf27ff62..48d23e36a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableStairs.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.client.render.RendererStairs; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,11 +19,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.client.render.RendererStairs; - public class BlockCarvableStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/team/chisel/block/BlockCarvableTorch.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java rename to src/main/java/team/chisel/block/BlockCarvableTorch.java index 8cfc1fe50..1e3ac285f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/team/chisel/block/BlockCarvableTorch.java @@ -1,18 +1,17 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; -import net.minecraft.block.BlockTorch; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.init.ChiselTabs; +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; +import net.minecraft.block.BlockTorch; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java b/src/main/java/team/chisel/block/BlockCarvableWall.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java rename to src/main/java/team/chisel/block/BlockCarvableWall.java index 128000d6f..ae89959a4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java +++ b/src/main/java/team/chisel/block/BlockCarvableWall.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,8 +11,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.api.carving.CarvableHelper; - public class BlockCarvableWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/team/chisel/block/BlockCloud.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/block/BlockCloud.java rename to src/main/java/team/chisel/block/BlockCloud.java index 9fb9d2d9f..928c5cdd3 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/team/chisel/block/BlockCloud.java @@ -1,7 +1,8 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -9,9 +10,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java b/src/main/java/team/chisel/block/BlockConcrete.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java rename to src/main/java/team/chisel/block/BlockConcrete.java index fa17d88ae..32ba888e0 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java +++ b/src/main/java/team/chisel/block/BlockConcrete.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.client.GeneralChiselClient; +import team.chisel.config.Configurations; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java b/src/main/java/team/chisel/block/BlockEldritch.java similarity index 69% rename from src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java rename to src/main/java/team/chisel/block/BlockEldritch.java index 6d3366b96..9063b2fa1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java +++ b/src/main/java/team/chisel/block/BlockEldritch.java @@ -1,6 +1,6 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; -import com.cricketcraft.chisel.Chisel; +import team.chisel.Chisel; public class BlockEldritch extends BlockCarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java b/src/main/java/team/chisel/block/BlockGrimstone.java similarity index 80% rename from src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java rename to src/main/java/team/chisel/block/BlockGrimstone.java index decf4cdf6..14f6b5973 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/team/chisel/block/BlockGrimstone.java @@ -1,16 +1,15 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.utils.General; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.utils.General; - public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java b/src/main/java/team/chisel/block/BlockHolystone.java similarity index 83% rename from src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java rename to src/main/java/team/chisel/block/BlockHolystone.java index 4d937ea0f..652e80295 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java +++ b/src/main/java/team/chisel/block/BlockHolystone.java @@ -1,15 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; +import team.chisel.utils.General; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.utils.General; - public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java b/src/main/java/team/chisel/block/BlockLavastone.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java rename to src/main/java/team/chisel/block/BlockLavastone.java index b212e9e06..e77400428 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java +++ b/src/main/java/team/chisel/block/BlockLavastone.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; - public class BlockLavastone extends BlockMultiLayer { public BlockLavastone(Material mat, String baseIcon) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java b/src/main/java/team/chisel/block/BlockLeaf.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java rename to src/main/java/team/chisel/block/BlockLeaf.java index 00ecc295a..ea523fd1c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java +++ b/src/main/java/team/chisel/block/BlockLeaf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java b/src/main/java/team/chisel/block/BlockMultiLayer.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java rename to src/main/java/team/chisel/block/BlockMultiLayer.java index 74dd0e3b1..3161dd68f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java +++ b/src/main/java/team/chisel/block/BlockMultiLayer.java @@ -1,7 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,10 +14,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; - public class BlockMultiLayer extends BlockMultiLayerBase implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java b/src/main/java/team/chisel/block/BlockMultiLayerBase.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java rename to src/main/java/team/chisel/block/BlockMultiLayerBase.java index 1ff637efa..45dd2a6e4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java +++ b/src/main/java/team/chisel/block/BlockMultiLayerBase.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.client.render.RendererMultiLayer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraftforge.client.ForgeHooksClient; -import com.cricketcraft.chisel.client.render.RendererMultiLayer; - public abstract class BlockMultiLayerBase extends Block { public Block base; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/team/chisel/block/BlockPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockPresent.java rename to src/main/java/team/chisel/block/BlockPresent.java index 57e2aa7b4..0a6653eae 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/team/chisel/block/BlockPresent.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,13 +24,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/team/chisel/block/BlockRoadLine.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java rename to src/main/java/team/chisel/block/BlockRoadLine.java index 5d0ffec99..09366bda6 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/team/chisel/block/BlockRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,10 +10,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java b/src/main/java/team/chisel/block/BlockSnakestone.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java rename to src/main/java/team/chisel/block/BlockSnakestone.java index 999971c5e..b2e25408e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/team/chisel/block/BlockSnakestone.java @@ -1,7 +1,8 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import team.chisel.client.render.RendererSnakeStone; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +14,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.render.RendererSnakeStone; - public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/team/chisel/block/BlockSnakestoneObsidian.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java rename to src/main/java/team/chisel/block/BlockSnakestoneObsidian.java index 8983fed76..a81cb56b1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/team/chisel/block/BlockSnakestoneObsidian.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; - public class BlockSnakestoneObsidian extends BlockSnakestone { public static IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java b/src/main/java/team/chisel/block/BlockWaterstone.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java rename to src/main/java/team/chisel/block/BlockWaterstone.java index 0af23f16d..c17d73c89 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java +++ b/src/main/java/team/chisel/block/BlockWaterstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/team/chisel/block/CarvableStairsMaker.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java rename to src/main/java/team/chisel/block/CarvableStairsMaker.java index fe39d3cd9..430062191 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/team/chisel/block/CarvableStairsMaker.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; +package team.chisel.block; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemCarvable; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemCarvable; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; public class CarvableStairsMaker { diff --git a/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java b/src/main/java/team/chisel/block/IStairsCreator.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java rename to src/main/java/team/chisel/block/IStairsCreator.java index 8d5d16412..160b9a356 100644 --- a/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java +++ b/src/main/java/team/chisel/block/IStairsCreator.java @@ -1,9 +1,9 @@ -package com.cricketcraft.chisel.block; - -import net.minecraft.block.Block; +package team.chisel.block; import com.cricketcraft.chisel.api.carving.CarvableHelper; +import net.minecraft.block.Block; + public interface IStairsCreator { public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java b/src/main/java/team/chisel/block/tileentity/IDoubleChest.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java rename to src/main/java/team/chisel/block/tileentity/IDoubleChest.java index 90ded7125..12083d262 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java +++ b/src/main/java/team/chisel/block/tileentity/IDoubleChest.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java rename to src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java index 36eabe85a..e279fecf1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,7 +1,16 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; + +import team.chisel.carving.Carving; +import team.chisel.client.GeneralChiselClient; +import team.chisel.init.ChiselItems; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageAutoChisel; +import team.chisel.network.message.MessageSlotUpdate; +import team.chisel.utils.General; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -13,16 +22,6 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; - -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; -import com.cricketcraft.chisel.network.message.MessageSlotUpdate; -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java b/src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java rename to src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java index e57284a3f..ec52c06fb 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java rename to src/main/java/team/chisel/block/tileentity/TileEntityPresent.java index 40ca0ff5b..09bce79e6 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java @@ -1,5 +1,8 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; +import team.chisel.init.ChiselBlocks; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessagePresentConnect; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -14,10 +17,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessagePresentConnect; - public class TileEntityPresent extends TileEntity implements IInventory, IDoubleChest { private TileEntityPresent connection = null; diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/team/chisel/carving/Carving.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/carving/Carving.java rename to src/main/java/team/chisel/carving/Carving.java index 6ed636e3f..d7cb498bc 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java +++ b/src/main/java/team/chisel/carving/Carving.java @@ -1,21 +1,21 @@ -package com.cricketcraft.chisel.carving; +package team.chisel.carving; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import team.chisel.Chisel; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + public class Carving implements ICarvingRegistry { GroupList groups = new GroupList(); diff --git a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java b/src/main/java/team/chisel/carving/GroupList.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/carving/GroupList.java rename to src/main/java/team/chisel/carving/GroupList.java index f4f9560d1..aede0369c 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java +++ b/src/main/java/team/chisel/carving/GroupList.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.carving; +package team.chisel.carving; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java b/src/main/java/team/chisel/client/GeneralChiselClient.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java rename to src/main/java/team/chisel/client/GeneralChiselClient.java index 56bda997d..bd54ea65e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/team/chisel/client/GeneralChiselClient.java @@ -1,7 +1,19 @@ -package com.cricketcraft.chisel.client; +package team.chisel.client; import java.util.Random; +import team.chisel.block.BlockGrimstone; +import team.chisel.block.BlockHolystone; +import team.chisel.block.BlockLavastone; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.carving.Carving; +import team.chisel.config.Configurations; +import team.chisel.entity.fx.EntityBallOMossFX; +import team.chisel.entity.fx.EntityGrimstoneFX; +import team.chisel.entity.fx.EntityHolystoneFX; +import team.chisel.entity.fx.EntitySnakestoneObsidianFX; +import team.chisel.utils.GeneralClient; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -12,19 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.block.BlockLavastone; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.fx.EntityBallOMossFX; -import com.cricketcraft.chisel.entity.fx.EntityGrimstoneFX; -import com.cricketcraft.chisel.entity.fx.EntityHolystoneFX; -import com.cricketcraft.chisel.entity.fx.EntitySnakestoneObsidianFX; -import com.cricketcraft.chisel.utils.GeneralClient; - public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java rename to src/main/java/team/chisel/client/gui/GuiAutoChisel.java index 6d20815f8..c18d778ee 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import java.util.List; @@ -11,8 +11,9 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.inventory.ContainerAutoChisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.inventory.ContainerAutoChisel; + import com.google.common.base.Strings; import com.google.common.collect.Lists; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java b/src/main/java/team/chisel/client/gui/GuiChisel.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java rename to src/main/java/team/chisel/client/gui/GuiChisel.java index 91fa00f35..4392e14bb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -13,14 +13,15 @@ import com.cricketcraft.chisel.api.IAdvancedChisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.chisel.inventory.SlotChiselInput; -import com.cricketcraft.chisel.item.chisel.ChiselMode; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageChiselMode; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.utils.GeneralClient; + +import team.chisel.inventory.ContainerChisel; +import team.chisel.inventory.InventoryChiselSelection; +import team.chisel.inventory.SlotChiselInput; +import team.chisel.item.chisel.ChiselMode; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageChiselMode; +import team.chisel.utils.General; +import team.chisel.utils.GeneralClient; public class GuiChisel extends GuiContainer { diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java similarity index 81% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java rename to src/main/java/team/chisel/client/gui/GuiChiselConfig.java index b29e10d75..818c12829 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; +import team.chisel.Chisel; +import team.chisel.config.Configurations; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig { diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java b/src/main/java/team/chisel/client/gui/GuiFactory.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java rename to src/main/java/team/chisel/client/gui/GuiFactory.java index cda1e6473..f5b2464cc 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/team/chisel/client/gui/GuiFactory.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import java.util.Set; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java b/src/main/java/team/chisel/client/gui/GuiPresent.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java rename to src/main/java/team/chisel/client/gui/GuiPresent.java index dea00f6d6..6b31b054a 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/team/chisel/client/gui/GuiPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.inventory.ContainerPresent; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.inventory.ContainerPresent; public class GuiPresent extends GuiContainer { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java rename to src/main/java/team/chisel/client/render/RenderBlocksEldritch.java index c8e82e0ca..44a48ac0c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java rename to src/main/java/team/chisel/client/render/RenderChiselSnowman.java index 700b176d4..9471f3ddb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java +++ b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.model.ModelSnowMan; @@ -14,8 +14,7 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; - +import team.chisel.entity.EntityChiselSnowman; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java b/src/main/java/team/chisel/client/render/RendererCTM.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java rename to src/main/java/team/chisel/client/render/RendererCTM.java index db0f9095c..79ce0d66a 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java +++ b/src/main/java/team/chisel/client/render/RendererCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.ctmlib.CTMRenderer; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java b/src/main/java/team/chisel/client/render/RendererCTMPane.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java rename to src/main/java/team/chisel/client/render/RendererCTMPane.java index bd3f9edf5..31e4be491 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java +++ b/src/main/java/team/chisel/client/render/RendererCTMPane.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java b/src/main/java/team/chisel/client/render/RendererEldritch.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java rename to src/main/java/team/chisel/client/render/RendererEldritch.java index d1638f5ec..38be12069 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java +++ b/src/main/java/team/chisel/client/render/RendererEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; +import team.chisel.Chisel; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java rename to src/main/java/team/chisel/client/render/RendererLayeredGlow.java index 88df45ebe..1da8f717f 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,10 +7,11 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvableGlow; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.GeneralClient; +import team.chisel.Chisel; +import team.chisel.block.BlockCarvableGlow; +import team.chisel.config.Configurations; +import team.chisel.utils.GeneralClient; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java b/src/main/java/team/chisel/client/render/RendererMultiLayer.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java rename to src/main/java/team/chisel/client/render/RendererMultiLayer.java index 415c9fd5b..acf6bbf79 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/team/chisel/client/render/RendererMultiLayer.java @@ -1,17 +1,16 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.block.BlockMultiLayerBase; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import com.cricketcraft.chisel.block.BlockMultiLayerBase; import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; - import static org.lwjgl.opengl.GL11.*; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java b/src/main/java/team/chisel/client/render/RendererRoadLine.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java rename to src/main/java/team/chisel/client/render/RendererRoadLine.java index 0227317c0..bd14d6399 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java +++ b/src/main/java/team/chisel/client/render/RendererRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.Chisel; +import team.chisel.block.BlockRoadLine; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -7,8 +9,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockRoadLine; import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java rename to src/main/java/team/chisel/client/render/RendererSimpleLayered.java index 2d7830654..f7524283b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java +++ b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,8 +6,9 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvableLayered; +import team.chisel.Chisel; +import team.chisel.block.BlockCarvableLayered; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java b/src/main/java/team/chisel/client/render/RendererSnakeStone.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java rename to src/main/java/team/chisel/client/render/RendererSnakeStone.java index 54939ff8f..a04c0c5a7 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java +++ b/src/main/java/team/chisel/client/render/RendererSnakeStone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestone; +import team.chisel.block.BlockSnakestone; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java b/src/main/java/team/chisel/client/render/RendererStairs.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java rename to src/main/java/team/chisel/client/render/RendererStairs.java index e835c47cb..c2c2a9aec 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java +++ b/src/main/java/team/chisel/client/render/RendererStairs.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockCarvableStairs; +import team.chisel.block.BlockCarvableStairs; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java rename to src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index 969411bd8..abf361c90 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java b/src/main/java/team/chisel/client/render/SubmapManagerBase.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java rename to src/main/java/team/chisel/client/render/SubmapManagerBase.java index 426c3d399..0d483f58c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java rename to src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java index 54e76af57..25a248f3d 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java rename to src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java index 3406a02dd..5d7218253 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java rename to src/main/java/team/chisel/client/render/SubmapManagerFakeController.java index fe5138a36..45388ded3 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java @@ -1,19 +1,18 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.Chisel; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.ctmlib.CTM; import com.cricketcraft.ctmlib.TextureSubmap; import com.google.common.base.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import static com.cricketcraft.ctmlib.Dir.*; public class SubmapManagerFakeController extends SubmapManagerBase { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java b/src/main/java/team/chisel/client/render/SubmapManagerLeaves.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java rename to src/main/java/team/chisel/client/render/SubmapManagerLeaves.java index 6a289c73a..91b4b2c53 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerLeaves.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java rename to src/main/java/team/chisel/client/render/SubmapManagerSlab.java index c258d7fdb..3351a9f81 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java rename to src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java index 48884c888..d5484ccbb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java rename to src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java index 3e5e4f473..0cdf0a90b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.item; +package team.chisel.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java rename to src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java index 8c4317c1b..f4a82a399 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.util.Random; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -22,13 +24,8 @@ import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.Vertex; import net.minecraftforge.client.model.obj.WavefrontObject; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; - import static org.lwjgl.opengl.GL11.*; public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java rename to src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java index 28e1c208c..f86b765f9 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java +++ b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.awt.Color; @@ -16,8 +16,7 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; - +import team.chisel.block.tileentity.TileEntityCarvableBeacon; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/team/chisel/client/render/tile/RenderPresent.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java rename to src/main/java/team/chisel/client/render/tile/RenderPresent.java index 3b7154b40..3bd0977a9 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/team/chisel/client/render/tile/RenderPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.util.HashMap; @@ -14,9 +14,10 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.init.ChiselBlocks; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.init.ChiselBlocks; + import com.google.common.collect.Maps; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/team/chisel/compat/Compatibility.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/compat/Compatibility.java rename to src/main/java/team/chisel/compat/Compatibility.java index 48ad6c284..2a83dae9d 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/team/chisel/compat/Compatibility.java @@ -1,23 +1,25 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.utils.RecipeUtil; import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.Level; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; +import team.chisel.utils.RecipeUtil; + +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.google.common.collect.Maps; import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; diff --git a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java b/src/main/java/team/chisel/compat/IMCHandler.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java rename to src/main/java/team/chisel/compat/IMCHandler.java index 499636865..1349b408e 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java +++ b/src/main/java/team/chisel/compat/IMCHandler.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; -import net.minecraft.block.Block; - -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.IMC; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.carving.Carving; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import net.minecraft.block.Block; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; public class IMCHandler { diff --git a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java b/src/main/java/team/chisel/compat/WailaCompat.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java rename to src/main/java/team/chisel/compat/WailaCompat.java index f33c2b03a..910889a7c 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java +++ b/src/main/java/team/chisel/compat/WailaCompat.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -13,8 +15,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; - public class WailaCompat implements IWailaDataProvider { private WailaCompat() { diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java b/src/main/java/team/chisel/compat/fmp/FMPCompat.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java rename to src/main/java/team/chisel/compat/fmp/FMPCompat.java index 2081d8d2c..a39af9e60 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java +++ b/src/main/java/team/chisel/compat/fmp/FMPCompat.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.world.World; import codechicken.lib.vec.BlockCoord; @@ -8,7 +9,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.TMultiPart; -import com.cricketcraft.chisel.init.ChiselBlocks; import com.google.common.collect.Lists; public class FMPCompat implements IPartFactory, IPartConverter { diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java rename to src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java index e744caa03..fb91cdd6c 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java +++ b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.block.BlockCarvableTorch; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -9,9 +10,6 @@ import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import codechicken.multipart.minecraft.TorchPart; - -import com.cricketcraft.chisel.block.BlockCarvableTorch; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java rename to src/main/java/team/chisel/compat/fmp/PartChiselTorch.java index 45072d9e7..4d89c25b5 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java +++ b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.minecraft.TorchPart; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class PartChiselTorch extends TorchPart { private int idx; diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java similarity index 85% rename from src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java rename to src/main/java/team/chisel/compat/nei/NEIChiselConfig.java index f67a892f6..88a1e1c07 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java +++ b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.compat.nei; +package team.chisel.compat.nei; +import team.chisel.Chisel; +import team.chisel.client.gui.GuiChisel; import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.gui.GuiChisel; - import cpw.mods.fml.common.registry.GameRegistry; public class NEIChiselConfig implements IConfigureNEI { diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java rename to src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java index 83a5124be..01e47b728 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java +++ b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.compat.nei; +package team.chisel.compat.nei; import java.awt.Point; import java.awt.Rectangle; @@ -11,17 +11,17 @@ import org.lwjgl.opengl.GL11; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + +import team.chisel.carving.Carving; +import team.chisel.client.gui.GuiChisel; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.gui.GuiChisel; - public class RecipeHandlerChisel extends TemplateRecipeHandler { private static final int SLOTS_PER_PAGE = 45; diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/team/chisel/config/Configurations.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/config/Configurations.java rename to src/main/java/team/chisel/config/Configurations.java index 3bc7b9fbe..0d21b44b6 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/team/chisel/config/Configurations.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.config; +package team.chisel.config; import java.util.Locale; @@ -7,8 +7,9 @@ import org.apache.commons.lang3.StringUtils; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Features; +import team.chisel.Chisel; +import team.chisel.Features; + import com.cricketcraft.ctmlib.CTM; public class Configurations { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java b/src/main/java/team/chisel/entity/EntityBallOMoss.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java rename to src/main/java/team/chisel/entity/EntityBallOMoss.java index 3aa727f42..5d4ae5a01 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/team/chisel/entity/EntityBallOMoss.java @@ -1,5 +1,9 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.init.ChiselBlocks; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,11 +11,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.utils.General; - public class EntityBallOMoss extends EntityThrowable { public EntityBallOMoss(World par1World) { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java b/src/main/java/team/chisel/entity/EntityChiselSnowman.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java rename to src/main/java/team/chisel/entity/EntityChiselSnowman.java index 9a4eb2ec3..799037de5 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java +++ b/src/main/java/team/chisel/entity/EntityChiselSnowman.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.world.World; diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/team/chisel/entity/EntityCloudInABottle.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java rename to src/main/java/team/chisel/entity/EntityCloudInABottle.java index 6dacbf43b..bbaef2e3c 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/team/chisel/entity/EntityCloudInABottle.java @@ -1,14 +1,13 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; import java.util.Random; +import team.chisel.init.ChiselBlocks; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java b/src/main/java/team/chisel/entity/EntitySmashingRock.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java rename to src/main/java/team/chisel/entity/EntitySmashingRock.java index 11828eed5..5a8976aaf 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/team/chisel/entity/EntitySmashingRock.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,8 +8,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.utils.General; - public class EntitySmashingRock extends EntityThrowable { public EntitySmashingRock(World par1World) { diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java rename to src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java index d4caf24ba..33291149c 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -7,10 +7,9 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.utils.General; - +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.init.ChiselItems; +import team.chisel.utils.General; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java rename to src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java index e44864b24..585980ee5 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; +import team.chisel.block.BlockGrimstone; +import team.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.utils.General; - public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java rename to src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java index 5bd79a616..d2d79c151 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; +import team.chisel.block.BlockHolystone; +import team.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.utils.General; - public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java rename to src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 99aa017bc..43bb7af5a 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -6,8 +6,8 @@ import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.utils.General; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.utils.General; public class EntitySnakestoneObsidianFX extends EntityFX { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java rename to src/main/java/team/chisel/init/ChiselBlocks.java index c9dbce6f4..98e86a581 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -1,10 +1,8 @@ -package com.cricketcraft.chisel.init; +package team.chisel.init; +import team.chisel.Chisel; +import team.chisel.block.*; import net.minecraft.block.Block; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.*; - import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java b/src/main/java/team/chisel/init/ChiselItems.java similarity index 61% rename from src/main/java/com/cricketcraft/chisel/init/ChiselItems.java rename to src/main/java/team/chisel/init/ChiselItems.java index 7ae2e22d2..1809e04d0 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java +++ b/src/main/java/team/chisel/init/ChiselItems.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.init; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.chisel.item.ItemUpgrade; -import com.cricketcraft.chisel.item.chisel.ItemChisel; +package team.chisel.init; +import team.chisel.Chisel; +import team.chisel.item.ItemBallOMoss; +import team.chisel.item.ItemCloudInABottle; +import team.chisel.item.ItemSmashingRock; +import team.chisel.item.ItemUpgrade; +import team.chisel.item.chisel.ItemChisel; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/team/chisel/init/ChiselTabs.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java rename to src/main/java/team/chisel/init/ChiselTabs.java index 24064a51d..1ae298364 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/team/chisel/init/ChiselTabs.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.init; +package team.chisel.init; +import team.chisel.Features; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import com.cricketcraft.chisel.Features; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java rename to src/main/java/team/chisel/inventory/ContainerAutoChisel.java index 6a6f409e0..91b906f6b 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageAutoChisel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -7,10 +10,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; - public class ContainerAutoChisel extends Container { public TileEntityAutoChisel autoChisel; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java b/src/main/java/team/chisel/inventory/ContainerChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java rename to src/main/java/team/chisel/inventory/ContainerChisel.java index 114b11cbf..2288f6b91 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerChisel.java @@ -1,5 +1,10 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import com.cricketcraft.chisel.api.carving.ICarvingRegistry; + +import team.chisel.carving.Carving; +import team.chisel.item.chisel.ItemChisel; +import team.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -7,11 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.utils.General; - public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java b/src/main/java/team/chisel/inventory/ContainerPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java rename to src/main/java/team/chisel/inventory/ContainerPresent.java index a39203be8..cb2008845 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/team/chisel/inventory/ContainerPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java rename to src/main/java/team/chisel/inventory/InventoryChiselSelection.java index bb5a9c094..a5c9c1154 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java @@ -1,7 +1,11 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; + +import team.chisel.item.chisel.ItemChisel; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -9,10 +13,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.utils.General; - public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java b/src/main/java/team/chisel/inventory/SlotChiselInput.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java rename to src/main/java/team/chisel/inventory/SlotChiselInput.java index 77e3ad4e7..39b742d1d 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/team/chisel/inventory/SlotChiselInput.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/team/chisel/inventory/SlotChiselPlayer.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java rename to src/main/java/team/chisel/inventory/SlotChiselPlayer.java index ae416653e..384bb7b09 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java +++ b/src/main/java/team/chisel/inventory/SlotChiselPlayer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/team/chisel/inventory/SlotChiselSelection.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java rename to src/main/java/team/chisel/inventory/SlotChiselSelection.java index e10132161..56c887453 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/team/chisel/inventory/SlotChiselSelection.java @@ -1,17 +1,17 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.Statistics; + +import team.chisel.carving.Carving; +import team.chisel.utils.General; +import team.chisel.utils.GeneralClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.Statistics; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.utils.GeneralClient; - public class SlotChiselSelection extends Slot { private final ContainerChisel container; diff --git a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java b/src/main/java/team/chisel/item/BaseItem.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/item/BaseItem.java rename to src/main/java/team/chisel/item/BaseItem.java index 8b870cb78..192ebd851 100644 --- a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java +++ b/src/main/java/team/chisel/item/BaseItem.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.Enumeration; import java.util.List; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java b/src/main/java/team/chisel/item/ItemBallOMoss.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java rename to src/main/java/team/chisel/item/ItemBallOMoss.java index 0446e3be1..1e105bbd3 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/team/chisel/item/ItemBallOMoss.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntityBallOMoss; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntityBallOMoss; - public class ItemBallOMoss extends BaseItem { public ItemBallOMoss() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java b/src/main/java/team/chisel/item/ItemBlockPresent.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java rename to src/main/java/team/chisel/item/ItemBlockPresent.java index 87213e2a4..45e20deb4 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java +++ b/src/main/java/team/chisel/item/ItemBlockPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import net.minecraft.block.Block; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java b/src/main/java/team/chisel/item/ItemCarvable.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java rename to src/main/java/team/chisel/item/ItemCarvable.java index 51ae041db..ee5aa126a 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java +++ b/src/main/java/team/chisel/item/ItemCarvable.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.config.Configurations; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -9,11 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.General; - public class ItemCarvable extends ItemBlock { public ItemCarvable(Block block) { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java b/src/main/java/team/chisel/item/ItemCarvablePumpkin.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java rename to src/main/java/team/chisel/item/ItemCarvablePumpkin.java index 6fe1beec0..c105f923f 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java +++ b/src/main/java/team/chisel/item/ItemCarvablePumpkin.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java b/src/main/java/team/chisel/item/ItemCarvableSlab.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java rename to src/main/java/team/chisel/item/ItemCarvableSlab.java index 668d45ed3..dbee69de6 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java +++ b/src/main/java/team/chisel/item/ItemCarvableSlab.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.block.BlockCarvableSlab; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.block.BlockCarvableSlab; - public class ItemCarvableSlab extends ItemCarvable { public ItemCarvableSlab(Block block) { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java b/src/main/java/team/chisel/item/ItemCloudInABottle.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java rename to src/main/java/team/chisel/item/ItemCloudInABottle.java index 729a54061..51f477fc3 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/team/chisel/item/ItemCloudInABottle.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntityCloudInABottle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; - public class ItemCloudInABottle extends BaseItem { public ItemCloudInABottle() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java b/src/main/java/team/chisel/item/ItemSmashingRock.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java rename to src/main/java/team/chisel/item/ItemSmashingRock.java index 1f75cdfdb..d726db82b 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/team/chisel/item/ItemSmashingRock.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntitySmashingRock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntitySmashingRock; - public class ItemSmashingRock extends BaseItem { public ItemSmashingRock() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java b/src/main/java/team/chisel/item/ItemUpgrade.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java rename to src/main/java/team/chisel/item/ItemUpgrade.java index 5cbafc12f..55dd320c6 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/team/chisel/item/ItemUpgrade.java @@ -1,16 +1,15 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.List; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel.Upgrade; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel.Upgrade; - public class ItemUpgrade extends BaseItem { public IIcon[] icons = new IIcon[4]; diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java rename to src/main/java/team/chisel/item/chisel/ChiselController.java index c0aa31d33..b4e586b4e 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -1,22 +1,21 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class ChiselController { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java b/src/main/java/team/chisel/item/chisel/ChiselMode.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java rename to src/main/java/team/chisel/item/chisel/ChiselMode.java index 47283f978..97686fc55 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java +++ b/src/main/java/team/chisel/item/chisel/ChiselMode.java @@ -1,5 +1,12 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.Statistics; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageChiselSound; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -8,13 +15,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.Statistics; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageChiselSound; - public enum ChiselMode implements IChiselMode { SINGLE { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/team/chisel/item/chisel/ItemChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java rename to src/main/java/team/chisel/item/chisel/ItemChisel.java index 9183c7ca9..2a5647609 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/team/chisel/item/chisel/ItemChisel.java @@ -1,8 +1,11 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; import java.util.List; import java.util.Locale; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; @@ -16,12 +19,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java b/src/main/java/team/chisel/network/ChiselGuiHandler.java similarity index 72% rename from src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java rename to src/main/java/team/chisel/network/ChiselGuiHandler.java index 002b357a6..da3999d1f 100644 --- a/src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java +++ b/src/main/java/team/chisel/network/ChiselGuiHandler.java @@ -1,19 +1,17 @@ -package com.cricketcraft.chisel.network; +package team.chisel.network; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.client.gui.GuiAutoChisel; +import team.chisel.client.gui.GuiChisel; +import team.chisel.client.gui.GuiPresent; +import team.chisel.inventory.ContainerAutoChisel; +import team.chisel.inventory.ContainerChisel; +import team.chisel.inventory.ContainerPresent; +import team.chisel.inventory.InventoryChiselSelection; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.gui.GuiAutoChisel; -import com.cricketcraft.chisel.client.gui.GuiChisel; -import com.cricketcraft.chisel.client.gui.GuiPresent; -import com.cricketcraft.chisel.inventory.ContainerAutoChisel; -import com.cricketcraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.chisel.inventory.InventoryChiselSelection; - import cpw.mods.fml.common.network.IGuiHandler; public class ChiselGuiHandler implements IGuiHandler { diff --git a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java b/src/main/java/team/chisel/network/PacketHandler.java similarity index 66% rename from src/main/java/com/cricketcraft/chisel/network/PacketHandler.java rename to src/main/java/team/chisel/network/PacketHandler.java index 290e2cd9f..b95ebe314 100644 --- a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java +++ b/src/main/java/team/chisel/network/PacketHandler.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.network; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; -import com.cricketcraft.chisel.network.message.MessageChiselMode; -import com.cricketcraft.chisel.network.message.MessageChiselSound; -import com.cricketcraft.chisel.network.message.MessagePresentConnect; -import com.cricketcraft.chisel.network.message.MessageSlotUpdate; +package team.chisel.network; +import team.chisel.Chisel; +import team.chisel.network.message.MessageAutoChisel; +import team.chisel.network.message.MessageChiselMode; +import team.chisel.network.message.MessageChiselSound; +import team.chisel.network.message.MessagePresentConnect; +import team.chisel.network.message.MessageSlotUpdate; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java b/src/main/java/team/chisel/network/message/MessageAutoChisel.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java rename to src/main/java/team/chisel/network/message/MessageAutoChisel.java index 0024c06c9..b75645617 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java +++ b/src/main/java/team/chisel/network/message/MessageAutoChisel.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java b/src/main/java/team/chisel/network/message/MessageChiselMode.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java rename to src/main/java/team/chisel/network/message/MessageChiselMode.java index e549b835d..fd2e1bc92 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java +++ b/src/main/java/team/chisel/network/message/MessageChiselMode.java @@ -1,14 +1,13 @@ -package com.cricketcraft.chisel.network.message; - -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; +package team.chisel.network.message; import com.cricketcraft.chisel.api.IAdvancedChisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.item.chisel.ChiselMode; -import com.cricketcraft.chisel.utils.General; +import team.chisel.item.chisel.ChiselMode; +import team.chisel.utils.General; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/team/chisel/network/message/MessageChiselSound.java similarity index 85% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java rename to src/main/java/team/chisel/network/message/MessageChiselSound.java index a910eda5c..1c2db9a72 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java +++ b/src/main/java/team/chisel/network/message/MessageChiselSound.java @@ -1,15 +1,14 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.item.chisel.ItemChisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java b/src/main/java/team/chisel/network/message/MessagePresentConnect.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java rename to src/main/java/team/chisel/network/message/MessagePresentConnect.java index 6f775f7ea..b266c28da 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java +++ b/src/main/java/team/chisel/network/message/MessagePresentConnect.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java rename to src/main/java/team/chisel/network/message/MessageSlotUpdate.java index 47a74d853..0f9cab224 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java +++ b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.Chisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java b/src/main/java/team/chisel/network/message/base/MessageCoords.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java rename to src/main/java/team/chisel/network/message/base/MessageCoords.java index 0bf50c3fd..ed2170b26 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java +++ b/src/main/java/team/chisel/network/message/base/MessageCoords.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message.base; +package team.chisel.network.message.base; +import team.chisel.Chisel; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java similarity index 63% rename from src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java rename to src/main/java/team/chisel/proxy/ClientProxy.java index 70950a781..450986a49 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/team/chisel/proxy/ClientProxy.java @@ -1,37 +1,35 @@ -package com.cricketcraft.chisel.proxy; +package team.chisel.proxy; +import team.chisel.block.BlockCarvableBeacon; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.client.render.RenderChiselSnowman; +import team.chisel.client.render.RendererCTM; +import team.chisel.client.render.RendererCTMPane; +import team.chisel.client.render.RendererEldritch; +import team.chisel.client.render.RendererLayeredGlow; +import team.chisel.client.render.RendererMultiLayer; +import team.chisel.client.render.RendererRoadLine; +import team.chisel.client.render.RendererSimpleLayered; +import team.chisel.client.render.RendererSnakeStone; +import team.chisel.client.render.RendererStairs; +import team.chisel.client.render.item.ItemChiselRenderer; +import team.chisel.client.render.tile.RenderAutoChisel; +import team.chisel.client.render.tile.RenderCarvableBeacon; +import team.chisel.client.render.tile.RenderPresent; +import team.chisel.entity.EntityBallOMoss; +import team.chisel.entity.EntityChiselSnowman; +import team.chisel.entity.EntityCloudInABottle; +import team.chisel.entity.EntitySmashingRock; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; - -import com.cricketcraft.chisel.block.BlockCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.render.RenderChiselSnowman; -import com.cricketcraft.chisel.client.render.RendererCTM; -import com.cricketcraft.chisel.client.render.RendererCTMPane; -import com.cricketcraft.chisel.client.render.RendererEldritch; -import com.cricketcraft.chisel.client.render.RendererLayeredGlow; -import com.cricketcraft.chisel.client.render.RendererMultiLayer; -import com.cricketcraft.chisel.client.render.RendererRoadLine; -import com.cricketcraft.chisel.client.render.RendererSimpleLayered; -import com.cricketcraft.chisel.client.render.RendererSnakeStone; -import com.cricketcraft.chisel.client.render.RendererStairs; -import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; -import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel; -import com.cricketcraft.chisel.client.render.tile.RenderCarvableBeacon; -import com.cricketcraft.chisel.client.render.tile.RenderPresent; -import com.cricketcraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java b/src/main/java/team/chisel/proxy/CommonProxy.java similarity index 71% rename from src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java rename to src/main/java/team/chisel/proxy/CommonProxy.java index d70045662..c50e8ce80 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/team/chisel/proxy/CommonProxy.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.proxy; +package team.chisel.proxy; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.block.tileentity.TileEntityPresent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { diff --git a/src/main/java/com/cricketcraft/chisel/utils/General.java b/src/main/java/team/chisel/utils/General.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/utils/General.java rename to src/main/java/team/chisel/utils/General.java index cf13cf818..5e5f405d2 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/General.java +++ b/src/main/java/team/chisel/utils/General.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import java.util.Random; +import com.cricketcraft.chisel.api.IAdvancedChisel; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.carving.Carving; +import team.chisel.item.chisel.ChiselMode; import joptsimple.internal.Strings; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -15,13 +22,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.IAdvancedChisel; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.chisel.ChiselMode; - public class General { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java b/src/main/java/team/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java rename to src/main/java/team/chisel/utils/GeneralClient.java index 7790c5f34..c83aceb43 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java +++ b/src/main/java/team/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java b/src/main/java/team/chisel/utils/RecipeUtil.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java rename to src/main/java/team/chisel/utils/RecipeUtil.java index 20187c61a..a0e55afb3 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java +++ b/src/main/java/team/chisel/utils/RecipeUtil.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java b/src/main/java/team/chisel/world/GeneratorChisel.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java rename to src/main/java/team/chisel/world/GeneratorChisel.java index 75e9b5e21..ad5de157c 100644 --- a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java +++ b/src/main/java/team/chisel/world/GeneratorChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.world; +package team.chisel.world; import java.util.Map; import java.util.Random; From 6b6c65983c3bd70988e0eb3d83fb270a6635f53a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 18 Aug 2015 21:27:00 -0400 Subject: [PATCH 45/57] Fix remaining references to old package and clean up mcmod.info --- src/main/java/team/chisel/Chisel.java | 8 ++++---- src/main/resources/mcmod.info | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/team/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java index 562e5663d..0e8401356 100644 --- a/src/main/java/team/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -52,12 +52,12 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; -@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "com.cricketcraft.chisel.client.gui.GuiFactory", dependencies = "after:EE3;after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime;after:TwilightForest") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "team.chisel.client.gui.GuiFactory", dependencies = "after:EE3;after:ForgeMultipart;after:Thaumcraft;after:appliedenergistics2;after:Railcraft;after:AWWayofTime;after:TwilightForest") public class Chisel { public static final String MOD_ID = "chisel"; public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); - public static final String MOD_NAME = "Chisel 2"; + public static final String MOD_NAME = "Chisel"; public static final String VERSION = "@VERSION@"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); @@ -79,7 +79,7 @@ public Chisel() { Carving.construct(); } - @SidedProxy(clientSide = "com.cricketcraft.chisel.proxy.ClientProxy", serverSide = "com.cricketcraft.chisel.proxy.CommonProxy") + @SidedProxy(clientSide = "team.chisel.proxy.ClientProxy", serverSide = "team.chisel.proxy.CommonProxy") public static CommonProxy proxy; @EventHandler @@ -158,7 +158,7 @@ public void init(FMLInitializationEvent event) { MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(instance); - FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.chisel.compat.WailaCompat.register"); + FMLInterModComms.sendMessage("Waila", "register", "team.chisel.compat.WailaCompat.register"); } private void addWorldgen(Features feature, Block block, double... data) { diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 537f24c05..5cb316e2b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,14 +1,14 @@ [ { "modid": "chisel", - "name": "Chisel 2", + "name": "Chisel", "description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.", "version": "${version}", "mcversion": "${mcversion}", "url": "http://www.minecraftforum.net/forums/thread/1294901", "updateUrl": "", - "authorList": [ "AUTOMATIC_MAIDEN", "Pokefenn", "Cricket", "tterrag" ], - "credits": "This mod uses a lot of textures from the Painterly pack: http://painterlypack.net/. Also one stone variation is designed to look like a block from Doku. Oh, and asie for porting the mod to 1.7.2. Oh wait and Drullkus for some wonderful art.", + "authorList": [ "tterrag", "Drullkus", "minecreatr" ], + "credits": "AUTOMATIC_MAIDEN for the original mod,\nasie for porting to 1.7.2,\nand Pokenfenn/Cricket for continuing it in 1.7.\nThis mod uses textures from the Painterly Pack: http://painterlypack.net/.", "logoFile": "/banner.jpg", "screenshots": [], "dependencies": [] From e777c4c902c3290860c07d62c049ddbbff09b672 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Tue, 18 Aug 2015 23:02:35 -0400 Subject: [PATCH 46/57] VariationInfoBase should be passed the TextureType on the client --- .../com/cricketcraft/chisel/api/carving/CarvableHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java index 5d6f695e7..6decc1e2c 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java @@ -114,7 +114,7 @@ private IVariationInfo getClientInfo(String modid, String texture, String descri } else { manager = type.createManagerFor(var, texture); } - return new VariationInfoBase(var, description, manager); + return new VariationInfoBase(var, description, manager, type); } private IVariationInfo getServerInfo(String modid, String texture, String description, int metadata, Block block, int blockMeta, ISubmapManager customManager, int order) { From 281c756adcde6c41ebf14d36c4eef54eece88960 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 19 Aug 2015 01:30:49 -0400 Subject: [PATCH 47/57] Fix antiblocks not being fullbright in inventory --- .../client/render/SubmapManagerAntiblock.java | 27 +++++++++++++++++++ .../java/team/chisel/proxy/ClientProxy.java | 2 ++ 2 files changed, 29 insertions(+) diff --git a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index abf361c90..2af640b34 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -1,11 +1,17 @@ package team.chisel.client.render; +import org.lwjgl.opengl.GL11; + +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import net.minecraftforge.client.IItemRenderer; +import com.cricketcraft.ctmlib.Drawing; import com.cricketcraft.ctmlib.RenderBlocksCTM; import com.cricketcraft.ctmlib.TextureSubmap; @@ -13,6 +19,27 @@ import cpw.mods.fml.relauncher.SideOnly; public class SubmapManagerAntiblock extends SubmapManagerBase { + + @SideOnly(Side.CLIENT) + public static class AntiblockItemRenderer implements IItemRenderer { + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) { + GL11.glDisable(GL11.GL_LIGHTING); + Drawing.drawBlock(ChiselBlocks.antiBlock, ChiselBlocks.antiBlock.getIcon(0, item.getItemDamage()), (RenderBlocks) data[0]); + GL11.glEnable(GL11.GL_LIGHTING); + } + } @SideOnly(Side.CLIENT) private static class RenderBlocksCTMFullbright extends RenderBlocksCTM { diff --git a/src/main/java/team/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java index 450986a49..7e9b13e89 100644 --- a/src/main/java/team/chisel/proxy/ClientProxy.java +++ b/src/main/java/team/chisel/proxy/ClientProxy.java @@ -14,6 +14,7 @@ import team.chisel.client.render.RendererSimpleLayered; import team.chisel.client.render.RendererSnakeStone; import team.chisel.client.render.RendererStairs; +import team.chisel.client.render.SubmapManagerAntiblock; import team.chisel.client.render.item.ItemChiselRenderer; import team.chisel.client.render.tile.RenderAutoChisel; import team.chisel.client.render.tile.RenderCarvableBeacon; @@ -75,6 +76,7 @@ public void init() { MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer); MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.antiBlock), new SubmapManagerAntiblock.AntiblockItemRenderer()); } @Override From f2a05278aa73915030371448e074454096ec5722 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 19 Aug 2015 01:40:13 -0400 Subject: [PATCH 48/57] Yeah that's not working. Disable antiblock item rendering for now. --- src/main/java/team/chisel/proxy/ClientProxy.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/team/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java index 7e9b13e89..76872b1bd 100644 --- a/src/main/java/team/chisel/proxy/ClientProxy.java +++ b/src/main/java/team/chisel/proxy/ClientProxy.java @@ -1,5 +1,11 @@ package team.chisel.proxy; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; import team.chisel.block.BlockCarvableBeacon; import team.chisel.block.tileentity.TileEntityAutoChisel; import team.chisel.block.tileentity.TileEntityCarvableBeacon; @@ -14,7 +20,6 @@ import team.chisel.client.render.RendererSimpleLayered; import team.chisel.client.render.RendererSnakeStone; import team.chisel.client.render.RendererStairs; -import team.chisel.client.render.SubmapManagerAntiblock; import team.chisel.client.render.item.ItemChiselRenderer; import team.chisel.client.render.tile.RenderAutoChisel; import team.chisel.client.render.tile.RenderCarvableBeacon; @@ -25,12 +30,6 @@ import team.chisel.entity.EntitySmashingRock; import team.chisel.init.ChiselBlocks; import team.chisel.init.ChiselItems; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -76,7 +75,7 @@ public void init() { MinecraftForgeClient.registerItemRenderer(ChiselItems.chisel, renderer); MinecraftForgeClient.registerItemRenderer(ChiselItems.diamondChisel, renderer); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.antiBlock), new SubmapManagerAntiblock.AntiblockItemRenderer()); +// MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ChiselBlocks.antiBlock), new SubmapManagerAntiblock.AntiblockItemRenderer()); } @Override From ac46ee1f456fb4ca7a1174b44a767a06d91010f0 Mon Sep 17 00:00:00 2001 From: Drullkus Date: Tue, 18 Aug 2015 20:37:13 -0700 Subject: [PATCH 49/57] Retextured two void variants --- src/main/java/team/chisel/Features.java | 4 ++-- .../textures/blocks/voidstone/VoidSturdy-ctm.png | Bin 0 -> 5130 bytes .../textures/blocks/voidstone/VoidSturdy.png | Bin 0 -> 3541 bytes .../textures/blocks/voidstone/voidBevel-ctm.png | Bin 0 -> 4284 bytes .../textures/blocks/voidstone/voidBevel.png | Bin 0 -> 3466 bytes 5 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel-ctm.png create mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 1d5e1142b..24bec8b90 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2751,9 +2751,9 @@ void addBlocks() { voidstone.carverHelper.addVariation("tile.voidstone.2.desc", 2, "voidstone/smooth", 2); voidstone.carverHelper.addVariation("tile.voidstone.3.desc", 3, "voidstone/skulls", 3); voidstone.carverHelper.addVariation("tile.voidstone.4.desc", 4, "voidstone/rune", 4); - voidstone.carverHelper.addVariation("tile.voidstone.5.desc", 5, "voidstone/metalborder", 5); + voidstone.carverHelper.addVariation("tile.voidstone.5.desc", 5, "voidstone/VoidSturdy", 5); voidstone.carverHelper.addVariation("tile.voidstone.6.desc", 6, "voidstone/eye", 6); - voidstone.carverHelper.addVariation("tile.voidstone.7.desc", 7, "voidstone/bevel", 7); + voidstone.carverHelper.addVariation("tile.voidstone.7.desc", 7, "voidstone/voidBevel", 7); voidstone.carverHelper.registerAll(voidstone, "voidstone"); Carving.chisel.registerOre("voidstone", "voidstone"); diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..7c5d1e6c3f1db83d9a38556216140335b5835fe7 GIT binary patch literal 5130 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png new file mode 100644 index 0000000000000000000000000000000000000000..d2f5c275cd55358ea9eb315470f60873f560856e GIT binary patch literal 3541 zcmV;`4Jz`9P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00093Nkl+ipfX^)8I98dU6O&Fjn#5cFu zU>@u9Rk{*P#x;h4h0$xU*y^zR%{}CTl4Eu9Wk~8YADDq5lJ-W+FS4OjAn3U<^sKs7pOFu1{w+yah`Dh!v^-qqLQHg z?h6Phr9~a}ENwdV38aRK)Q}l!f+Wj{qcJH383nsLyZD|*Q?66!IrUsYiAx+}kQ)zFm@K~{t zWQi=zc;XESMM(5Vk3CMgxW2};K1u9HsO>tg=OK%nwWAKINxFJSB_bu~ENxm(TXT_f=xA67<}lDu zxX%HqAR)MZfvqH_n=eq+CC>L}ST11y?gLB$KKkSar3|TB;t8Los$=>VOJDoQzjKJ| zxNLoShqzusn34auM-^o_j5)_7qD+K+g;ajFw0xc`uf0SP z#VCbDHm7rJ4{7!@mgv&HG|Tg^tf7`Ntytk`L*dZs^Vh$Bqqfm$x7wVHOborv;mAZw zC0f*&phJrqBqd2JXDDn6xgv}Op5r1&kzZz+@YJQcy-)wJM;L_kx3&rVrvf_+nHVcb zn~$&^8xe+--~NLi1{gF@EkabKz+bO{?GjZ9?sFM6tB*y=i!5S~eGcBJP>Ptu_Sjx? zNaK{NETTTkB)wlA5t9*q4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel-ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..9fc328ea4b7d36c1c6e1a373bc88c01d225834aa GIT binary patch literal 4284 zcmV;t5JT^YP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z000H&NklOO59R(h~_2~>8@VdoSzjY61GRAc4@a*1qpJJiM_2oe(!p$?v7 zoghudX1;~fk|sogC@vZLbwQ+9>uZ~6?3ivSAqMP*?GaL>>}*l{Ioo!F!`U8nsu2+a z29-cAT_h^C5q!HKXiLxancGOhqFAE9E9TltkIbmFKv-ai=s-5;kW*?yaC4rfN7T~L zQA>;wtAZwB9BNt-ChdqsAd?LWasVoYtaY3ZJ8OLrJY@?(B0(J*C2^kfINuVQ8c7hM zM~D>aKol2qx&}y=B+4Y6lE=g_WdLL`ql~a`ch`C}5KM(8hlv&1r$aOi`*KK;CyLx~ znx-_-qdjMbSDIc0v%=`l~0e^PML*DTBk|(TDL9 z{vJN$4SSPo<~0`P1kDtKQT-lr`tFSanD%PAE$uE_a@>qBH^PkdSi<}*Xt z43P9_t@q-X8H2Y+n31CEa=xx7CT>BnQ%IJ=_tyGu^C~kPvM@Cx=IFYduj`4itH}HY zMKJV2Tl`tncE8Ow;L;SzUv>a?1?6uQrRi3ol&;Ewch!Q^w^`x_UN`H z_MNZ&n1NSHU-0_Do7@}z1*4H`2j611f5c2ns{8@9Hk2W!l9sm=g3hq9`110=@sd=DfRmp&j&Jy9C2>}+BG{Nz1If}-5^zlTFe2`&=>A` zioEFm=RJ@j_JgPQDC;hRCdVX4OTj2~s5zv-u)s4`4>D!$CbSC2c}p2Qt$0wDei|2i z)m&e>2mbW*UG5z2Exmm2`j65g))ZDah+~K~Ng`wBjKTyJMWZl}iF4XTBlPV6YfAdk zAy1C8_%rW;vwFMS1OFxGXYGk~{>*#etlmD1pD+(2zHPtBgq9Q8M@2EM}K?}4-W zGw*?LMlZj)c|VQ2M`TSw5YMdGXXFBvo8i@9@HpS&jl*p&&c4BuZi9&>-aJMVL`gjN z?;rh=zlPf@d*Tl}@ABS$SbF=r(a*_FGF)s?sW|S8nYs#6Mvw)Fq2v3Erx_>NuQ{%I z3~PDzxV8jj>Hqm;m-OnhoL`DvhMF;x$a&6F`F%pD`DybJA5MO?^lDOgcF)}mZzpUm z%H?hk0+IOA?(h1@ksIRav#=E}`|%h44gdb{c)kaod;9UzyR=fF61Y(HIkXXflt5;j z6vu$#N1g{drZPS9W}7zqh&>YBw!_sgZ_!ADNT6(cOi482Ki>oGW3Je3Lh{65Uf2VX eyZ_kbUjqO)n2u=!emm^|0000KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0008DNklj^dvSohiW|fTk_=T+uF8PBZ+yo6**$_yMDYkfmNJS2|GK9bg_r_{L@pkT;8Tx*1=N8= zqHPfM*wi4ANWaS{#nVVe-m@%qOPc}$#FPlGrEf-f8=`@6 zIG{*5nL3gRdud3)0Ea~c-dddS>5JPG(c=lo@x|xVzNK;&uaVj=kW8?6uF9Cg4zc8j zS_WpypVOateC-KGi??}mb&M;z5)&<&Rn)FzodViA`nHGQXk1H?4p`CQDe+iH7Oy$) zr0d9g%kibNRflOauJtB(DF`uPTYqf=(`93j}a4@HX~*(5#|b}WRbrH sgs=*n$(qIv>9zZG*(v8J-A?&$0Dl`?8ZxT0H~;_u07*qoM6N<$f|6%`LI3~& literal 0 HcmV?d00001 From c312432d6fcb1061e76ee5c83308e1cbd115b52c Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 19 Aug 2015 20:41:15 -0400 Subject: [PATCH 50/57] Fix antiblocks not working without smooth lighting on --- .../client/render/SubmapManagerAntiblock.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index 2af640b34..027383a17 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -46,15 +46,30 @@ private static class RenderBlocksCTMFullbright extends RenderBlocksCTM { @Override protected void fillLightmap(int bottomLeft, int bottomRight, int topRight, int topLeft) { + ao(); int maxLight = 0xF000F0; super.fillLightmap(maxLight, maxLight, maxLight, maxLight); } @Override protected void fillColormap(float bottomLeft, float bottomRight, float topRight, float topLeft, float[][] map) { + ao(); int color = 0xFFFFFF; super.fillColormap(color, color, color, color, map); } + + @Override + public boolean renderStandardBlock(Block block, int x, int y, int z) { + boolean ret = super.renderStandardBlock(block, x, y, z); + this.enableAO = false; + return ret; + } + + private void ao() { + if (this.inWorld) { + this.enableAO = true; + } + } }; @SideOnly(Side.CLIENT) From 3800fe4665de090122bfcaa4bfb2af32f1cae949 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 20 Aug 2015 00:06:04 -0400 Subject: [PATCH 51/57] Chisel2 -> Chisel in buildscript --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 55e935c64..39935b3dd 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUI version = "${mod_version}.${buildnumber}" group = "com.cricketcraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = dev ? "Chisel2_DEV" : "Chisel2" +archivesBaseName = dev ? "Chisel_DEV" : "Chisel" minecraft { version = "${minecraft_version}-${forge_version}" @@ -185,7 +185,7 @@ curse { projectId = project.projectId changelog = System.getenv("CHANGELOG").equals("none") ? getChangelogText() : System.getenv("CHANGELOG") releaseType = 'release' - displayName = "Chisel 2 - ${mod_version}" + displayName = "Chisel - ${mod_version}" additionalArtifact deobfJar, sourcesJar, apiJar } From 5d19dfc050486849fe707d97d3c8fa8c1bdbc2fd Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Aug 2015 16:49:03 -0400 Subject: [PATCH 52/57] endstone -> endStone (bad @Drullkus) --- src/main/java/team/chisel/Features.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 24bec8b90..30affe34f 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -717,8 +717,8 @@ void addBlocks() { end_Stone.carverHelper.addVariation("tile.end_Stone.9.desc", 9, "endstone/EnderFrame", new SubmapManagerCombinedCTM(9, "endstone/EnderFrame", TextureType.V9)); end_Stone.carverHelper.addVariation("tile.end_Stone.10.desc", 10, "endstone/arcaneEndStone"); end_Stone.carverHelper.addVariation("tile.end_Stone.11.desc", 11, "endstone/framedEndStone"); - end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endstoneOrnate"); - end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endstoneLargeTile"); + end_Stone.carverHelper.addVariation("tile.end_Stone.12.desc", 12, "endstone/endStoneOrnate"); + end_Stone.carverHelper.addVariation("tile.end_Stone.13.desc", 13, "endstone/endStoneLargeTile"); end_Stone.carverHelper.registerAll(end_Stone, "end_Stone"); Carving.chisel.registerOre("end_Stone", "end_Stone"); } From 8fa572868083b2cf7f4f7c9aaf6676847cd31178 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Aug 2015 21:56:48 -0400 Subject: [PATCH 53/57] Fix maven path/name --- build.gradle | 2 +- settings.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 39935b3dd..7768e20a2 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ ext.buildnumber = 0 project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : project.ext.gitHash version = "${mod_version}.${buildnumber}" -group = "com.cricketcraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +group = "team.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = dev ? "Chisel_DEV" : "Chisel" minecraft { diff --git a/settings.gradle b/settings.gradle index 1b1691796..c76d7f7d0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'Chisel2' \ No newline at end of file +rootProject.name = 'Chisel' \ No newline at end of file From afed73f2225b741850ac7b9b0badd3c68156a0b9 Mon Sep 17 00:00:00 2001 From: minecreatr Date: Sat, 22 Aug 2015 19:42:53 -0700 Subject: [PATCH 54/57] Update Version/Update Project ID --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6eac38f80..48b5e47cf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=2.5.0 +mod_version=CT2.5.0 minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 @@ -9,4 +9,4 @@ nei_version=1.0.5.111 waila_version=1.5.10 fmp_version=1.2.0.344 -projectId=225236 +projectId=235279 From 6f146bbb3ca68a412f2c3a12151753013123fd6a Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Aug 2015 23:03:09 -0400 Subject: [PATCH 55/57] Update changelog --- changelog | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/changelog b/changelog index a04a8276e..9742debe2 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,29 @@ +CT2.5.0: +New +- Lots of new endstone variants +- Purpur blocks +- New technical blocks (piping, battery, and more) + +Changes +- Under new management! Name of the project has been changed to "Chisel" +- Now includes CTMLib 1.2.0-10 +- Greatly improve the look of energized voidstone +- Retexture 2 of the voidstone variants (bevel and metalborder) +- Removed special player rendering +- Fixed EMC registrations so that they are actually dynamic +- Lavastone and Waterstone now use the still texture, not flowing + +Fixes +- Fix "The Turkey Bug" +- Fix crash when an unchiselable item made its way into the autochisel +- Fix VariationInfos always returning CUSTOM for their texture type +- Fix antiblocks not working when smooth lighting is off +- Fix Botania compat +- Fix pick block on bookshelves + +API +- Add IConnectable for allowing other blocks to determine if chisel blocks will connect to them + 2.4.1: New - New UberWavy futura block From 19266b11ab083722a36c619f425481275a9e1a12 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Aug 2015 23:12:14 -0400 Subject: [PATCH 56/57] Port new voidstone textures over to animated --- .../blocks/voidstone/animated/bevel.png | Bin 4356 -> 4356 bytes .../voidstone/animated/metalborder-ctm.png | Bin 7484 -> 7444 bytes .../blocks/voidstone/animated/metalborder.png | Bin 1186 -> 4356 bytes .../textures/blocks/voidstone/bevel-ctm.png | Bin 5289 -> 7444 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel.png index e33d9773834ff3bf753e15ca6cc02f40fdbb38a9..c6560a7a08e9903f989b535d7d136248d116ee00 100644 GIT binary patch delta 1099 zcmYjQ&5ImG9DViG(=)v@+nZTuS(jjTU4-D8T>LudVKpl2!ILKsBK`{juOlHKg8mtT z7e$adrSeSNa<& zKL6gu&prn9*1@IycVAu;sUBJJ+lL|CJp2}kjj?y~0&b_jKuM47lb3KO9U_wnipCL2 zSs`%^6ru(s;ADmy$KOGGzW-&o@$dKiC$XM40Re;nY-Z0uaB#2n5DVSUQART?w<_0! zC0e0p`0M@=q!SV*D0Ipg0S&m2U^DM>VGC1Ja@@kIZ9YO1L6bV5(o?it0(b|#(4HGL zu{D0Z`#TcV!-Om)28f}M!}c+imfGf6m>JHU-9{l}O3gX#xs6xBs@7|RU0lF}vww<# z7-EVAk!FyTD80bK2dv2!_MdnwTpwJ6Ri1JTnR!J%LgIn{^c`xYMc$IZBj$oWmPPso zT8b-K1j~j~1!OQ#o^O7lSw}S7P)dZjp)d|}R76?AJMUq2g{J7h2#s?SIz%=R9PK2Y zLV=k2bNcESLTWcCCq_gz-wzV2zKsMeR;wVnK`!%kIhB$W6t#6a#U{ z)d(_TVw_%+DSd5o98E9XvVNg-+@W!YPDkK^YmQ)E+90rs_8y zrBkqg#BX4NnwS|M+ToXMF`o8YkmtwgY1WFuMHS&pqYJ|}w9Z3S6z=ATi)A#dJakWc zWlRI~KZ(O4Q%I^+T5}hr60mjNXG}F#Oowy?2p&nZi_$J&1%)U@Z--D5w$RMvaC#0! zFQ4u0;l-_2!o)ZfCZo}ciY<(7lzx9E%?x zTtk1(pY(;vlw^okA!uk(o5A@N0qQT&koBw;5OM{-KaHX7AB>gW*1 eJV)ed3j=S@WwlrzJBe4EB^y{>Tu}* delta 1035 zcmYjQOHUI~7(KVW^g*9Osl1e=1fwzWfzh~;2&pD)T)AQAA29CNHZlAGegcVWV_Xnd zEHuWjkOYDn)FvW60=7b1TS}+X>-p{sg>Q0a?tJ%r=YHqRorT;&?!{`nkjexmCSHDj z2I!I5{Pe@yXH;76J8JI!yxA^&frK$7G?lS)jcXV|1{E|AF$XxnN1Ja~fIgfs-h4zF+?SFw)AYjCmegA9WBi3q}|<2Q7}>~yOY?%=YU z;QMuaWt~J3Yf!w{pnX?}lI$;wz0gfr^TXf`HW!!13X_<|dn_O45$Miv!%lDEu8QK4 zO5&ypVbqQcuBeO13!kd>du@d=YVloy9C~e{NOL5b6mc9PO>qPY1Sx9F_`37o@yQ{mBnGYk7XSmst)b41a)#( zxr2kxcn!J*6xeXEEC-WEgCA`iL-<9eI=xn`?4z7yXc#sA6oH}Y1O_l>!KZJ=D(Kka z(|MU^qFGd1ZJX8&$Hg9hfRmV!snmNXXA2uAYyNEW@FcaezPuWr{Far>?7av1=QEF< F{s(16&d&e< diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/metalborder-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/metalborder-ctm.png index 25f68e25cd05e42d7146159f183d98e2a82f23d3..9286b23658baa303e1d41be7ff7c45cc255860e7 100644 GIT binary patch delta 4249 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 Qh!?)`?dSjW?00|mKNn=!m;e9( delta 4290 zcmbVP-HRP(9e&=KcRtU|?C#l*X0wUiv`J~x=AxLk5X7RXN`**~iUlv)q6K@=79`Ni z0rAcoMMb>xFA%hMB8cFPkbtyHBHP%cBzChOXFtxIGvDvLKJRR{wpMGA!)8v-%)IaK z^5XBG z7y)?b)#qQheDRIfUVG*B%lt2J@dvNGeEF5{t-kr{dUK_UjFVc z?!5RNVD`~xpZU`BF9c$B_U4{=GJX+u)L_MSaC_f{mE<_495mJxffr)hjL|h3u{(ph zD>35_k>)zbj`A^Qjqz^uj-E^=SloXaB65VDH0Fv0J44)tShLpw4LF^IZ%I7nJdF4A z4gK)9R*+>GWNm4gGEGpF46O^%Ito)!!q*x>5MV8S7en<35Zvp4#SW}r?>pcRB4qJ?-vN~?Xr>6; zKI}rHxf43fu&oW-8*q2&DU3};oC2<3Fk37#|fq6%Az)tN$R1OBLdS-8;bs0lDh20UmA|eXY3U~Dm1OwJe;-JzP zRU^c4jKN?4^EuWoB5E7#sa>|OVS5!ENDO7d2G_V--$7Py!DGrrQS=?OT+4&d9ibXv zE*wC!8^V?-n-aDqP!o{{-56=eFsDrh;g8X%5|JChA{wJ8LKucfh)%)q4Pa{4r*7;1 zIl=Lqb`zq|L8m%+uEfX`xUQkuLCaRGskTtM3j5s_Iwl=-9zx59)mRu>5zwY=RoxNS z98Z|g;S$rv2>|0>kT;+Hnhb`ast<`ywhX4iEUIU z@CElNTyNLmvOb=a2&V%~2q>FFCpEbOHg=s&T>AQ@9*I`YUQhVfDh?ULt5pptH~>tb ztt*any2+^+3b(rrJSxv{lqGi)*mQQ`*$Ze1 zahJOvFh!T29Zu--@-jQAxtrwToV<>$tH^s57mBGJZzpvXE6aUmS;4irt%SKqX)5e=gV zV7{+}$9p~?eWE4W$gLPAb13)ru~{D=HVjVeWqOZntPnH-YZ)`$NnZ!qO<80%V%7_Y zLhjTge1RX4cC5ICmJn5xDnnI8F=b(VVw)pc2RMTz@`2!eg)h1na9v&}UI-@sS@8hY zevQPJ*ef#fa6CHIGtzpNLq?}@%%>)n_cSqdvBeJhVT=pT6Ogk3Zr)vIU1dMP zOG`_Tv0^bh1z!YEETT(ha@};uLC7H_S%kRlxQb1}jL1Ya`@CeaP+pBY#RudAAE!>8 z!u0A^uZ^FkiTMX5TTLD&&7V7Ww&xPLcKnaMykELx##690yGTo-&G40BjPvKu_funV zn=#Lh7;bsr#P4Sh;L4RNJ*F3nr!i%n^Z{ouTE;^6@BUy6pZsvf_=9Gne}~Y8Jd*dd zwY45lN|FBzXB*ZuyBglVb?a7-8l$MD=jOioZuI?Vf&bSZh{y1x7V`;AFkZ z6fNwAdl*Cmz5Vx%eht~gp-9w9FYA7lQqS(``$_9K{${_|>$~pAxHL;E@))dwCL$iw z3#?%G-qpOb7Qg*Tf6(mwH-8`sS|_sxt$?Py9m;z8QHQl*jXvS94#ik2U0D;1tRsEbaL8%1)b~*{!kGFl zsF6orV3YhCl1+TF^U-gg_I}k6$yJMkN&VsTmJw1xiB65Ke^z}z@&bt)!ly@UsCn~p zhQKDZe40O?-SIpJb4w>a^b>XxE?~w=Y6X2y|Ng9#km?y(%kBBB;SVKeD{AUz15 zq`&8H25n#fA?%^aP4N)r!f`#Ks_hS# zs!=@VRrCi9>*!F`3c@?4qH#@j&S*?dotRl#Kt{hbpedKZOv+;)4S+8^?R!!Si)K|# zc`Y>$Aezx=$F+IS)`83WVWTTm=$5CaK^^Lob0>AOH_&J9dypln^%M5vdX~EyKV@ps zG6O~A&5|z-+#XoIzmF(z2TaA&_ot&}y%Y_#Ts|{*s6a{78ze9X-)H4`23TBN#9ME@ z1>;10<~$e7-jgo{G05=L(`WnhLOwr_^*;j%+(I0;N%v=$jdz{Srev-v`3ai=RjbHuluUG%_r>h2y&wk|_&-~`gFa7YJ`ULKP diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/metalborder.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/metalborder.png index 0a6e3bf2167e83622b56801fe41184424f3b5e0c..ce481588de2d96dbeb469b46dcfd6462dbdc497a 100644 GIT binary patch literal 4356 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

rSIiFlg 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 E0AakPAOHXW delta 5258 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 QH~;_u07*qoM6N<$f}m3UiU0rr From ad70e12acfeaa321a6e1ca454f0801812be03b58 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Sat, 22 Aug 2015 23:19:07 -0400 Subject: [PATCH 57/57] Fix mistake in last commit, rename variations back to their old names --- src/main/java/team/chisel/Features.java | 4 ++-- .../blocks/voidstone/VoidSturdy-ctm.png | Bin 5130 -> 0 bytes .../textures/blocks/voidstone/VoidSturdy.png | Bin 3541 -> 0 bytes .../blocks/voidstone/animated/bevel-ctm.png | Bin 7444 -> 7444 bytes .../textures/blocks/voidstone/bevel-ctm.png | Bin 7444 -> 7444 bytes .../textures/blocks/voidstone/bevel.png | Bin 3249 -> 3466 bytes .../blocks/voidstone/metalborder-ctm.png | Bin 5155 -> 5130 bytes .../textures/blocks/voidstone/metalborder.png | Bin 3438 -> 3541 bytes .../blocks/voidstone/voidBevel-ctm.png | Bin 4284 -> 0 bytes .../textures/blocks/voidstone/voidBevel.png | Bin 3466 -> 0 bytes 10 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel-ctm.png delete mode 100644 src/main/resources/assets/chisel/textures/blocks/voidstone/voidBevel.png diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 30affe34f..e10d778c1 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -2751,9 +2751,9 @@ void addBlocks() { voidstone.carverHelper.addVariation("tile.voidstone.2.desc", 2, "voidstone/smooth", 2); voidstone.carverHelper.addVariation("tile.voidstone.3.desc", 3, "voidstone/skulls", 3); voidstone.carverHelper.addVariation("tile.voidstone.4.desc", 4, "voidstone/rune", 4); - voidstone.carverHelper.addVariation("tile.voidstone.5.desc", 5, "voidstone/VoidSturdy", 5); + voidstone.carverHelper.addVariation("tile.voidstone.5.desc", 5, "voidstone/metalborder", 5); voidstone.carverHelper.addVariation("tile.voidstone.6.desc", 6, "voidstone/eye", 6); - voidstone.carverHelper.addVariation("tile.voidstone.7.desc", 7, "voidstone/voidBevel", 7); + voidstone.carverHelper.addVariation("tile.voidstone.7.desc", 7, "voidstone/bevel", 7); voidstone.carverHelper.registerAll(voidstone, "voidstone"); Carving.chisel.registerOre("voidstone", "voidstone"); diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy-ctm.png deleted file mode 100644 index 7c5d1e6c3f1db83d9a38556216140335b5835fe7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5130 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/VoidSturdy.png deleted file mode 100644 index d2f5c275cd55358ea9eb315470f60873f560856e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3541 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/animated/bevel-ctm.png index 2ea57fcff0f620b2346449a60c98aead1237f023..7292fe2147a5d251f5da80a6da0c0b20568f2ff3 100644 GIT binary patch delta 4212 zcmbtXO>ZPu6+Q30s_N>l{u7i)6tHMIa;;i47w84<+~k ztg-?j0Si#XH&TSeWEW{buwsNJOk&bAnatRZ+aLX1Rj=NAoNC8yyWO_&pqAx!yYH#@ z?!D*Sb6>yl`i(#Qtr~|*susTbh41|YXnyv^7ry+BZy8JSRZV2IkvRr`n zdMH6d*$}JgT>uUX-U6}|2;kup)j4d~ZREK_phCQ~{9SkZ!A+Em58V>DckKglJU%`E zcx5?uZ*Tq)R%E#U;TpV5rHJejI>_N;fIQ7m_bS-Q`%qqq&v)qC1gZoy^c=dj3zvB) z^8?8fDI`dwMkWpVa-H$!SbTgK01VQ?An}H1mv3EwHy(~#c_XT--x0aDK)^SY>*2(SiT)vLici>N%0 zR1cZ)D%yiJq%MUJf@e~YJaS1?cpAx*3Fv$TBXiXJI)NH(2K0#mu_7bq}wT{HcvjD(`F)HD;e6~A(*O>vUGOUX>!jj{U!mjHh<0*JG zp2m_N%!#PO7an+KR?T5c?_!PpOE{GC00W*jk-?$(cs9UtXP!^y&76Ve6XbhY3z{`I zPD7gm(Ysh6t5$*GmSJi}&Q4<4IChr{F@!3XI5N!#>!Lk52-4dgobu z>CtsWq%R2!`GNfp{%zjDbKZ5Vs83;}b|3>uWFHq~6OpR%eaNIKRKz0xS3;xs@oTu3 z-Nv=emoV}(b|fQst-bj8WPpDy-oo9vRjlk>#pTX5HX1o!(DkkS7A}$R2-(|*_@1x= zr|CtM4?YfO?@3p9a9{lZC}`Lp)=jB+*XcyC&by(u>dRHmOu)meoPAaw3Zl z1Y;I}cJp{*#9lBJ?6QPp^T~X#lJBI%se18YWH1~kL|KEUc!2n@V9Wy0g3_xL+j|SD zBO%Y?`&oL?^Qlf=f6UZS$F*aEF%3}3u8=rQHcUz?4N15&_vq6pEP56#F6#1TuWWsk_61alJJ-sl6UT_vE51R?^%<51s$=a06 z9PmnU&dhd?2*xacMnW<1n`ma11S%9Mub#^HmVS7uUSvU^SL!3qNrWh`9TSXc0H1Y^H0u(CkE8`uEV3sHj_0%8uSQ8U{j`;X1q5wkRo~0{0wnXkJAjoN&djd zVm@%*?az0|S!Y}{p=;Mq`MxsYyCC0X;t$%lgoI45^(LWThC5bYTs0B0^onv=%(} z;{%lcKYtJx24R}-=QSAK#2=i%_mlM^-o-4wPYcG$0DJMOQN4s3v)i$4`T^h~$JM}e z=@G#WV2R1NfbK&TUXULKd==dr7hjO1>X!cKu>khtm8u08iXoo&K97pLfSzn)NRoiA zw5qD~gY;1JY?5xJA}_-EhMs}_U*^-_&+ee(NY`@%9K@@Ixu@vF9PV+hnUuVzh0}EK zA@kyi09xggxka9e%;1A^ol^g4oI5lI38#yY>f8W_;~&Ex(Et9g3&kvdFujnR+aJW| zStw@tgXwtj`|I~yx3YyG3pp?~2H`q7taaiKsJ@CFsOjWuc&@#Gr9u2T%5+A}k650E zY!3Dd>9-H?*4D4^PjgEg2*z=}_{;Je?#*@jCkh9klY?r&}bLP|d z@kAqPp+Z^L(d`F_cY@zyJE@_W7Oh!yE0+wm={~?mk6Lh7_7;juwt^<@`+)LREF_6u zhvC}uqwHP0)BE)#UMl+A@q91t%xN<}iY9ixaNm}%y?r3wTL>!Jj_13kp%`(#9|bt- z4~m6iA~+u}B>VngKi+$9c>EWtY8QLn&K8 z9=yv5?>OJfc>1Y%WL)zE0SbT6=jR#AxxY}f@`t$0^}kq1EREEGKd`v_ehVw#`oY`3 W`0-DF!zbazuYLW6-+kqkAO08Jw4wI^ delta 4212 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/bevel.png index c3a66727de1b0166567de7d21998fed61fd46f8d..5cd67db6935bbfe28a8d4bf4cade0787fe703b16 100644 GIT binary patch delta 3465 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 diff --git a/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder-ctm.png b/src/main/resources/assets/chisel/textures/blocks/voidstone/metalborder-ctm.png index 6f98469724ef24c38ebddedef5f8b074e482caa7..7c5d1e6c3f1db83d9a38556216140335b5835fe7 100644 GIT binary patch delta 5124 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