From 834beb5ac8d3df3d8732319cbb77a05500aba523 Mon Sep 17 00:00:00 2001 From: serenibyss <10861407+serenibyss@users.noreply.github.com> Date: Fri, 18 Aug 2023 03:10:44 -0500 Subject: [PATCH] humongous spotless apply to make CI happy --- .../cricketcraft/chisel/api/ICarvable.java | 6 +- .../cricketcraft/chisel/api/Statistics.java | 4 +- .../chisel/api/carving/CarvableHelper.java | 43 +- .../chisel/api/carving/IChiselMode.java | 2 +- .../chisel/api/carving/IVariationInfo.java | 4 +- .../chisel/api/carving/VariationInfoBase.java | 4 +- .../chisel/api/carving/package-info.java | 1 + .../chisel/api/rendering/TextureType.java | 11 +- .../chisel/api/rendering/package-info.java | 1 + .../java/team/chisel/BlockNameConversion.java | 23 +- src/main/java/team/chisel/Chisel.java | 76 +- .../java/team/chisel/ChiselCrashCallable.java | 2 +- src/main/java/team/chisel/Features.java | 2199 +++++++++-------- .../team/chisel/block/BlockAutoChisel.java | 2 +- .../java/team/chisel/block/BlockCarvable.java | 7 +- .../chisel/block/BlockCarvableBeacon.java | 8 +- .../team/chisel/block/BlockCarvableGlass.java | 6 +- .../team/chisel/block/BlockCarvableGlow.java | 4 +- .../chisel/block/BlockCarvableIceStairs.java | 4 +- .../chisel/block/BlockCarvableLayered.java | 2 +- .../block/BlockCarvablePackedIceStairs.java | 4 +- .../team/chisel/block/BlockCarvablePane.java | 3 +- .../chisel/block/BlockCarvablePumpkin.java | 32 +- .../team/chisel/block/BlockCarvableSand.java | 5 +- .../team/chisel/block/BlockCarvableSlab.java | 2 +- .../chisel/block/BlockCarvableStairs.java | 6 +- .../team/chisel/block/BlockCarvableTorch.java | 5 +- .../java/team/chisel/block/BlockCloud.java | 2 +- .../java/team/chisel/block/BlockConcrete.java | 16 +- .../java/team/chisel/block/BlockPresent.java | 33 +- .../java/team/chisel/block/BlockRoadLine.java | 7 +- .../team/chisel/block/BlockSnakestone.java | 21 +- .../chisel/block/CarvableStairsMaker.java | 23 +- .../tileentity/TileEntityAutoChisel.java | 50 +- .../block/tileentity/TileEntityPresent.java | 12 +- .../java/team/chisel/carving/Carving.java | 4 +- .../java/team/chisel/carving/GroupList.java | 26 +- .../chisel/client/GeneralChiselClient.java | 111 +- .../team/chisel/client/gui/GuiAutoChisel.java | 22 +- .../team/chisel/client/gui/GuiChisel.java | 48 +- .../chisel/client/gui/GuiChiselConfig.java | 16 +- .../team/chisel/client/gui/GuiPresent.java | 3 +- .../team/chisel/client/gui/GuiScrollbar.java | 7 +- .../gui/widgets/GuiButtonChiselMode.java | 27 +- .../client/render/RenderBlocksEldritch.java | 42 +- .../client/render/RenderChiselSnowman.java | 6 +- .../chisel/client/render/RendererCTM.java | 4 +- .../chisel/client/render/RendererCTMPane.java | 20 +- .../client/render/RendererEldritch.java | 6 +- .../client/render/RendererLayeredGlow.java | 6 +- .../client/render/RendererMultiLayer.java | 6 +- .../client/render/RendererRoadLine.java | 18 +- .../client/render/RendererSimpleLayered.java | 6 +- .../client/render/RendererSnakeStone.java | 6 +- .../chisel/client/render/RendererStairs.java | 6 +- .../client/render/SubmapManagerAntiblock.java | 10 +- .../client/render/SubmapManagerBase.java | 2 +- .../render/SubmapManagerCarpetFloor.java | 4 +- .../render/SubmapManagerCombinedCTM.java | 31 +- .../render/SubmapManagerFakeController.java | 13 +- .../client/render/SubmapManagerSlab.java | 4 +- .../render/SubmapManagerSpecialMaterial.java | 7 +- .../client/render/SubmapManagerVoidstone.java | 21 +- .../render/item/ItemChiselRenderer.java | 22 +- .../client/render/tile/RenderAutoChisel.java | 41 +- .../render/tile/RenderCarvableBeacon.java | 4 +- .../client/render/tile/RenderPresent.java | 17 +- .../team/chisel/compat/Compatibility.java | 9 +- .../java/team/chisel/compat/IMCHandler.java | 16 +- .../java/team/chisel/compat/WailaCompat.java | 22 +- .../team/chisel/compat/fmp/FMPCompat.java | 6 +- .../compat/fmp/ItemBlockChiselTorchPart.java | 18 +- .../chisel/compat/fmp/PartChiselTorch.java | 2 +- .../chisel/compat/nei/NEIChiselConfig.java | 4 +- .../compat/nei/RecipeHandlerChisel.java | 23 +- .../team/chisel/config/Configurations.java | 284 ++- .../chisel/entity/EntityCloudInABottle.java | 14 +- .../chisel/entity/fx/EntityBallOMossFX.java | 6 +- .../chisel/entity/fx/EntityGrimstoneFX.java | 2 +- .../chisel/entity/fx/EntityHolystoneFX.java | 2 +- .../entity/fx/EntitySnakestoneObsidianFX.java | 4 +- .../java/team/chisel/init/ChiselBlocks.java | 2 +- .../java/team/chisel/init/ChiselItems.java | 2 +- src/main/java/team/chisel/init/TabsInit.java | 4 +- .../chisel/inventory/ContainerAutoChisel.java | 17 +- .../chisel/inventory/ContainerChisel.java | 30 +- .../chisel/inventory/ContainerPresent.java | 3 +- .../inventory/InventoryChiselSelection.java | 12 +- .../chisel/inventory/SlotChiselInput.java | 4 +- .../chisel/inventory/SlotChiselSelection.java | 28 +- .../java/team/chisel/item/ItemBallOMoss.java | 2 +- .../java/team/chisel/item/ItemCarvable.java | 9 +- .../team/chisel/item/ItemCarvableSlab.java | 20 +- .../team/chisel/item/ItemCloudInABottle.java | 2 +- .../team/chisel/item/ItemSmashingRock.java | 2 +- .../java/team/chisel/item/ItemUpgrade.java | 5 +- .../chisel/item/chisel/ChiselController.java | 17 +- .../team/chisel/item/chisel/ChiselMode.java | 23 +- .../team/chisel/item/chisel/ItemChisel.java | 56 +- .../team/chisel/network/ChiselGuiHandler.java | 6 +- .../team/chisel/network/PacketHandler.java | 4 +- .../network/message/MessageAutoChisel.java | 6 +- .../network/message/MessageChiselMode.java | 5 +- .../network/message/MessageChiselSound.java | 9 +- .../message/MessagePresentConnect.java | 6 +- .../network/message/MessageScrollUpdate.java | 2 +- .../network/message/MessageSlotUpdate.java | 7 +- .../network/message/base/MessageCoords.java | 2 +- .../java/team/chisel/proxy/ClientProxy.java | 15 +- .../java/team/chisel/proxy/CommonProxy.java | 2 +- src/main/java/team/chisel/utils/General.java | 41 +- .../java/team/chisel/utils/GeneralClient.java | 18 +- .../java/team/chisel/utils/RecipeUtil.java | 7 +- .../team/chisel/world/GeneratorChisel.java | 3 +- 114 files changed, 2121 insertions(+), 1858 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java index 05651daa..860623a7 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java +++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java @@ -2,12 +2,12 @@ package com.cricketcraft.chisel.api; import net.minecraft.world.IBlockAccess; -import team.chisel.ctmlib.ICTMBlock; -import team.chisel.ctmlib.ISubmapManager; - import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import team.chisel.ctmlib.ICTMBlock; +import team.chisel.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. diff --git a/src/main/java/com/cricketcraft/chisel/api/Statistics.java b/src/main/java/com/cricketcraft/chisel/api/Statistics.java index c17318ce..91093063 100644 --- a/src/main/java/com/cricketcraft/chisel/api/Statistics.java +++ b/src/main/java/com/cricketcraft/chisel/api/Statistics.java @@ -7,8 +7,8 @@ import net.minecraft.util.ChatComponentTranslation; public class Statistics { public static StatBase blocksChiseled = (new StatBasic( - "stat.blockChiseled", - new ChatComponentTranslation("stat.blockChiseled", new Object[0]))); + "stat.blockChiseled", + new ChatComponentTranslation("stat.blockChiseled", new Object[0]))); public static void init() { blocksChiseled.initIndependentStat(); 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 8324da5c..56614217 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvableHelper.java @@ -15,8 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.oredict.OreDictionary; -import team.chisel.ctmlib.ISubmapManager; - import com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.FMPIMC; import com.cricketcraft.chisel.api.rendering.TextureType; @@ -25,6 +23,7 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.ISubmapManager; public class CarvableHelper { @@ -73,7 +72,7 @@ public class CarvableHelper { } public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material, - String modid) { + String modid) { addVariation(description, metadata, null, bb, blockMeta, modid); } @@ -82,7 +81,7 @@ public class CarvableHelper { } public void addVariation(String description, int metadata, String texture, Block block, int blockMeta, - String modid) { + String modid) { addVariation(description, metadata, texture, block, blockMeta, modid, null, metadata); } @@ -91,12 +90,13 @@ public class CarvableHelper { } public void addVariation(String description, int metadata, String texture, Block block, int blockMeta, String modid, - ISubmapManager customManager, int order) { + ISubmapManager customManager, int order) { if (infoList.size() >= 16) return; - IVariationInfo info = FMLCommonHandler.instance().getSide().isClient() - ? getClientInfo(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); @@ -104,12 +104,12 @@ public class CarvableHelper { } private IVariationInfo getClientInfo(String modid, String texture, String description, int metadata, Block block, - int blockMeta, ISubmapManager customManager, int order) { + int blockMeta, ISubmapManager customManager, int order) { ICarvingVariation var = CarvingUtils.getDefaultVariationFor(getBlock(), metadata, order); TextureType type = TextureType.getTypeFor(this, modid, texture); 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)); + String.format("Could not find texture %s, and no custom texture manager was provided.", texture)); } ISubmapManager manager; @@ -124,7 +124,7 @@ public class CarvableHelper { } private IVariationInfo getServerInfo(String modid, String texture, String description, int metadata, Block block, - int blockMeta, ISubmapManager customManager, int order) { + int blockMeta, ISubmapManager customManager, int order) { ICarvingVariation var = CarvingUtils.getDefaultVariationFor(getBlock(), metadata, order); return new VariationInfoBase(var, description, null); } @@ -184,15 +184,20 @@ public class CarvableHelper { public void registerVariation(String name, IVariationInfo info) { - Block block = info.getVariation().getBlock(); + Block block = info.getVariation() + .getBlock(); if (block.renderAsNormalBlock() || block.isOpaqueCube() || block.isNormalCube()) { - FMPIMC.registerFMP(block, info.getVariation().getBlockMeta()); + FMPIMC.registerFMP( + block, + info.getVariation() + .getBlockMeta()); } if (forbidChiseling) return; - CarvingUtils.getChiselRegistry().addVariation(name, info.getVariation()); + CarvingUtils.getChiselRegistry() + .addVariation(name, info.getVariation()); } @SideOnly(Side.CLIENT) @@ -204,7 +209,12 @@ public class CarvableHelper { public void registerSubBlocks(Block block, CreativeTabs tabs, List list) { for (IVariationInfo info : infoList) { - list.add(new ItemStack(block, 1, info.getVariation().getItemMeta())); + list.add( + new ItemStack( + block, + 1, + info.getVariation() + .getItemMeta())); } } @@ -214,8 +224,9 @@ public class CarvableHelper { @SideOnly(Side.CLIENT) public IIcon getMissingIcon() { - return ((TextureMap) Minecraft.getMinecraft().getTextureManager().getTexture(TextureMap.locationBlocksTexture)) - .getAtlasSprite("missingno"); + return ((TextureMap) Minecraft.getMinecraft() + .getTextureManager() + .getTexture(TextureMap.locationBlocksTexture)).getAtlasSprite("missingno"); } public Block getBlock() { diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/IChiselMode.java b/src/main/java/com/cricketcraft/chisel/api/carving/IChiselMode.java index 71e15a18..bef517fd 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/IChiselMode.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/IChiselMode.java @@ -10,7 +10,7 @@ public interface IChiselMode { * NOTE: This method is responsible for increasing the "Blocks Chiseled" statistic found in the Statistics class. */ void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, - ICarvingVariation variation); + ICarvingVariation variation); /** * Implemented implicitly by enums. If your IChiselMode is not an enum constant, this needs to be implemented 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 03c4c3cb..2fdaf726 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/IVariationInfo.java @@ -1,9 +1,9 @@ package com.cricketcraft.chisel.api.carving; -import team.chisel.ctmlib.ISubmapManager; - import com.cricketcraft.chisel.api.rendering.TextureType; +import team.chisel.ctmlib.ISubmapManager; + 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 adaa5071..c1f8c458 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/VariationInfoBase.java @@ -8,10 +8,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.ctmlib.ISubmapManager; - import com.cricketcraft.chisel.api.rendering.TextureType; +import team.chisel.ctmlib.ISubmapManager; + public class VariationInfoBase implements IVariationInfo { private ICarvingVariation variation; diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/package-info.java b/src/main/java/com/cricketcraft/chisel/api/carving/package-info.java index 177c7f2c..a83bab53 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/package-info.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/package-info.java @@ -2,4 +2,5 @@ package com.cricketcraft.chisel.api.carving; import com.cricketcraft.chisel.api.ChiselAPIProps; + import cpw.mods.fml.common.API; 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 b2211e70..1465a8c5 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -15,17 +15,16 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Triple; -import team.chisel.ctmlib.CTM; -import team.chisel.ctmlib.ISubmapManager; -import team.chisel.ctmlib.RenderBlocksCTM; -import team.chisel.ctmlib.RenderBlocksColumn; -import team.chisel.ctmlib.TextureSubmap; - import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.CTM; +import team.chisel.ctmlib.ISubmapManager; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.RenderBlocksColumn; +import team.chisel.ctmlib.TextureSubmap; /** * Handles all default {@link ISubmapManager} behavior diff --git a/src/main/java/com/cricketcraft/chisel/api/rendering/package-info.java b/src/main/java/com/cricketcraft/chisel/api/rendering/package-info.java index 0993cb88..6b8e3b1f 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/package-info.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/package-info.java @@ -2,4 +2,5 @@ package com.cricketcraft.chisel.api.rendering; import com.cricketcraft.chisel.api.ChiselAPIProps; + import cpw.mods.fml.common.API; diff --git a/src/main/java/team/chisel/BlockNameConversion.java b/src/main/java/team/chisel/BlockNameConversion.java index a6a4a80f..fc4a268d 100644 --- a/src/main/java/team/chisel/BlockNameConversion.java +++ b/src/main/java/team/chisel/BlockNameConversion.java @@ -5,9 +5,9 @@ import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.Item; -import team.chisel.utils.General; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; +import team.chisel.utils.General; public class BlockNameConversion { @@ -30,7 +30,8 @@ public class BlockNameConversion { return newname; case 2: // rename "marbleSlab" -> "marble_slab", "redstone" -> // "redstone_block" - newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase(); + newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2") + .toLowerCase(); if (newname.startsWith("block_")) { newname = newname.replaceFirst("block_([a-z_]+)", "$1_block"); @@ -39,7 +40,9 @@ public class BlockNameConversion { } return newname; case 3: // rename "wood-dark-oak" -> "dark_oak_planks" - newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replace('-', '_'); + newname = oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2") + .toLowerCase() + .replace('-', '_'); if (newname.contains("wood_")) { newname = newname.replaceFirst("wood_([a-z_]+)", "$1_planks"); } @@ -48,7 +51,9 @@ public class BlockNameConversion { // "dirt" -> "dirt"). // This can be dangerous in cases like "carpet" (a block) -> // "carpet" (NO block) - return oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2").toLowerCase().replaceFirst("block_", ""); + return oldname.replaceAll("([a-z]+)([A-Z])", "$1_$2") + .toLowerCase() + .replaceFirst("block_", ""); default: throw new IndexOutOfBoundsException("conversion got invalid parameter step=" + step); } @@ -86,11 +91,12 @@ public class BlockNameConversion { } public static Item findItem(String oldname) { - FMLLog.getLogger().trace("[Chisel 2] findItem() START " + oldname); + FMLLog.getLogger() + .trace("[Chisel 2] findItem() START " + oldname); Item item = null; for (int i = 0; i < NameConversions.MAX && item == null; i++) { FMLLog.getLogger() - .trace("[Chisel 2] findItem() Checking for " + NameConversions.conversion(oldname, i)); + .trace("[Chisel 2] findItem() Checking for " + NameConversions.conversion(oldname, i)); item = GameRegistry.findItem(Chisel.MOD_ID, NameConversions.conversion(oldname, i)); } @@ -98,11 +104,12 @@ public class BlockNameConversion { } public static Block findBlock(String oldname) { - FMLLog.getLogger().trace("[Chisel 2] findBlock() START: " + oldname); + FMLLog.getLogger() + .trace("[Chisel 2] findBlock() START: " + oldname); Block block = null; for (int i = 0; i < NameConversions.MAX && block == null; i++) { FMLLog.getLogger() - .trace("[Chisel 2] findBlock() Checking for " + NameConversions.conversion(oldname, i)); + .trace("[Chisel 2] findBlock() Checking for " + NameConversions.conversion(oldname, i)); block = GameRegistry.findBlock(Chisel.MOD_ID, NameConversions.conversion(oldname, i)); } diff --git a/src/main/java/team/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java index a9bfd787..dc64772b 100644 --- a/src/main/java/team/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -10,23 +10,6 @@ import net.minecraftforge.common.config.Configuration; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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.TabsInit; -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 com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.Statistics; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -52,27 +35,43 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.Type; +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.TabsInit; +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; @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") + 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); + "dig.stone", + MOD_ID + ":step.templeblock", + 1.0f, + 1.0f); public static final String MOD_NAME = "Chisel"; public static final String VERSION = "GRADLETOKEN_VERSION"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType( - "holystone", - 1.0f, - 1.0f); + "holystone", + 1.0f, + 1.0f); public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f); public static boolean multipartLoaded = false; public static boolean gtnhLoaded = false; @@ -117,23 +116,28 @@ public class Chisel { if (block != null) { m.remap(block); - FMLLog.getLogger().info("Remapping block " + m.name + " to " + General.getName(block)); - } else FMLLog.getLogger().warn("Block " + m.name + " could not get remapped."); + FMLLog.getLogger() + .info("Remapping block " + m.name + " to " + General.getName(block)); + } else FMLLog.getLogger() + .warn("Block " + m.name + " could not get remapped."); } else if (m.type == Type.ITEM) { final Item item = BlockNameConversion.findItem(m.name); if (item != null) { m.remap(item); - FMLLog.getLogger().info("Remapping item " + m.name + " to " + General.getName(item)); + FMLLog.getLogger() + .info("Remapping item " + m.name + " to " + General.getName(item)); - } else FMLLog.getLogger().warn("Item " + m.name + " could not get remapped."); + } else FMLLog.getLogger() + .warn("Item " + m.name + " could not get remapped."); } } } @EventHandler public void preInit(FMLPreInitializationEvent event) { - FMLCommonHandler.instance().registerCrashCallable(new ChiselCrashCallable()); + FMLCommonHandler.instance() + .registerCrashCallable(new ChiselCrashCallable()); File configFile = event.getSuggestedConfigurationFile(); Configurations.configExists = configFile.exists(); @@ -172,7 +176,9 @@ public class Chisel { proxy.init(); MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(instance); + FMLCommonHandler.instance() + .bus() + .register(instance); FMLInterModComms.sendMessage("Waila", "register", "team.chisel.compat.WailaCompat.register"); } diff --git a/src/main/java/team/chisel/ChiselCrashCallable.java b/src/main/java/team/chisel/ChiselCrashCallable.java index 805d9e26..06e56b7f 100644 --- a/src/main/java/team/chisel/ChiselCrashCallable.java +++ b/src/main/java/team/chisel/ChiselCrashCallable.java @@ -7,7 +7,7 @@ public class ChiselCrashCallable implements ICrashCallable { @Override public String call() throws Exception { return "Errors like \"[FML]: Unable to lookup ...\" are NOT the cause of this crash. " - + "You can safely ignore these errors. And update forge while you're at it."; + + "You can safely ignore these errors. And update forge while you're at it."; } @Override diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index 97e645ed..349bd726 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -19,6 +19,17 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import com.cricketcraft.chisel.api.ChiselTabs; +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.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 team.chisel.block.*; import team.chisel.carving.Carving; import team.chisel.client.render.*; @@ -40,18 +51,6 @@ import team.chisel.item.ItemSmashingRock; import team.chisel.item.ItemUpgrade; import team.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.api.ChiselTabs; -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.google.common.collect.Lists; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; - public enum Features { AE_CERTUS_QUARTZ("appliedenergistics2") { @@ -62,20 +61,20 @@ public enum Features { @Override void addBlocks() { Carving.chisel.addVariation( - "AECertusQuartz", - GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), - 0, - 0); + "AECertusQuartz", + GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartz"), + 0, + 0); Carving.chisel.addVariation( - "AECertusQuartz", - GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), - 0, - 1); + "AECertusQuartz", + GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzPillar"), + 0, + 1); Carving.chisel.addVariation( - "AECertusQuartz", - GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), - 0, - 2); + "AECertusQuartz", + GameRegistry.findBlock("appliedenergistics2", "tile.BlockQuartzChiseled"), + 0, + 2); Carving.chisel.registerOre("AECertusQuartz", "AECertusQuartz"); } @@ -93,21 +92,12 @@ public enum Features { @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 + .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"); } }, @@ -117,8 +107,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable aluminum = (BlockCarvable) new BlockBeaconBase(Material.iron) - .setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) - .setResistance(10F); + .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); aluminum.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/aluminum/thermal", 22); @@ -146,7 +138,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable amber = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + .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"); @@ -159,11 +152,12 @@ public enum Features { @Override void addBlocks() { BlockCarvable andesite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F) - .setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .setResistance(10.0F) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks); andesite.carverHelper.addVariation( - Configurations.imTooGoodForDescriptions ? "" : "tile.andesite.0.desc", - 0, - "andesite/andesite"); + 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"); @@ -188,7 +182,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable antiBlock = (BlockCarvable) new BlockCarvableAntiBlock() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); if (!Configurations.allowChiselCrossColors) { antiBlock.carverHelper.forbidChiseling = true; @@ -196,9 +190,9 @@ public enum Features { for (int i = 0; i < 16; i++) { antiBlock.carverHelper.addVariation( - "tile.antiBlock." + ItemDye.field_150921_b[i] + ".desc", - i, - new SubmapManagerAntiblock(ItemDye.field_150921_b[i])); + "tile.antiBlock." + ItemDye.field_150921_b[i] + ".desc", + i, + new SubmapManagerAntiblock(ItemDye.field_150921_b[i])); } antiBlock.carverHelper.registerAll(antiBlock, "antiBlock"); @@ -209,26 +203,26 @@ public enum Features { void addRecipes() { if (meta == 0) { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.antiBlock, 8, 15), - "SSS", - "SGS", - "SSS", - 'S', - "stone", - 'G', - "dustGlowstone")); + 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))); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.antiBlock, 8, meta), + "BBB", + "BdB", + "BBB", + 'd', + dyeOres[meta], + 'B', + new ItemStack(ChiselBlocks.antiBlock, 1, OreDictionary.WILDCARD_VALUE))); } @Override @@ -242,7 +236,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable arcane = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + .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"); @@ -267,17 +262,18 @@ public enum Features { @Override void addBlocks() { Block autoChisel = new BlockAutoChisel().setBlockTextureName(Chisel.MOD_ID + ":autoChisel/autoChisel") - .setCreativeTab(ChiselTabs.tabChisel).setBlockName("chisel.autoChisel"); + .setCreativeTab(ChiselTabs.tabChisel) + .setBlockName("chisel.autoChisel"); GameRegistry.registerBlock(autoChisel, "autoChisel"); } @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.autoChisel, 1), - new Object[] { "XXX", " Y ", "YYY", Character.valueOf('X'), Blocks.stone_slab, - Character.valueOf('Y'), "ingotIron" })); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.autoChisel, 1), + new Object[] { "XXX", " Y ", "YYY", Character.valueOf('X'), Blocks.stone_slab, + Character.valueOf('Y'), "ingotIron" })); } }, @@ -292,20 +288,20 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.upgrade, 1, 0), - new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', - Items.redstone, 'U', Items.sugar })); + new ShapedOreRecipe( + new ItemStack(ChiselItems.upgrade, 1, 0), + new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', Items.redstone, 'U', + Items.sugar })); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.upgrade, 1, 1), - new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', - Items.redstone, 'U', Blocks.hopper })); + new ShapedOreRecipe( + new ItemStack(ChiselItems.upgrade, 1, 1), + new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', Items.redstone, 'U', + Blocks.hopper })); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.upgrade, 1, 2), - new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', - Items.redstone, 'U', Blocks.crafting_table })); + new ShapedOreRecipe( + new ItemStack(ChiselItems.upgrade, 1, 2), + new Object[] { "IEI", "EUE", "RRR", 'I', "ingotIron", 'E', Items.emerald, 'R', Items.redstone, 'U', + Blocks.crafting_table })); } }, @@ -314,7 +310,7 @@ public enum Features { @Override void addItems() { ItemBallOMoss ballomoss = (ItemBallOMoss) new ItemBallOMoss().setTextureName("Chisel:ballomoss") - .setCreativeTab(ChiselTabs.tabChisel); + .setCreativeTab(ChiselTabs.tabChisel); EntityRegistry.registerModEntity(EntityBallOMoss.class, "BallOMoss", 2, Chisel.instance, 40, 1, true); GameRegistry.registerItem(ballomoss, "ballomoss"); } @@ -322,14 +318,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselItems.ballomoss, 1), - "XYX", - "YXY", - "XYX", - 'X', - Blocks.vine, - 'Y', - Items.stick); + new ItemStack(ChiselItems.ballomoss, 1), + "XYX", + "YXY", + "XYX", + 'X', + Blocks.vine, + 'Y', + Items.stick); } }, @@ -338,14 +334,11 @@ public enum Features { @Override void addBlocks() { BlockCarvableBeacon beacon = (BlockCarvableBeacon) new BlockCarvableBeacon() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); Carving.chisel.addVariation("beacon", Blocks.beacon, 0, 0); for (int meta = 0; meta < 16; meta++) { - beacon.carverHelper.addVariation( - "tile.beacon." + ItemDye.field_150923_a[meta] + ".desc", - meta, - "beacon", - (meta + 1)); + beacon.carverHelper + .addVariation("tile.beacon." + ItemDye.field_150923_a[meta] + ".desc", meta, "beacon", (meta + 1)); } beacon.carverHelper.registerAll(beacon, "beacon"); Carving.chisel.registerOre("beacon", "beacon"); @@ -357,12 +350,10 @@ public enum Features { @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); + .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"); @@ -379,9 +370,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable bloodBrick = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabModdedChiselBlocks) + .setStepSound(Block.soundTypeStone); Carving.chisel - .addVariation("bloodBrick", GameRegistry.findBlock("AWWayofTime", "largeBloodStoneBrick"), 0, 0); + .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"); @@ -393,7 +385,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable bookshelf = (BlockCarvable) new BlockCarvableBookshelf().setHardness(1.5F) - .setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setStepSound(Block.soundTypeWood); + .setCreativeTab(ChiselTabs.tabWoodChiselBlocks) + .setStepSound(Block.soundTypeWood); Carving.chisel.addVariation("bookshelf", Blocks.bookshelf, 0, 0); bookshelf.carverHelper.addVariation("tile.bookshelf.1.desc", 1, "bookshelf/rainbow"); bookshelf.carverHelper.addVariation("tile.bookshelf.2.desc", 2, "bookshelf/necromancer-novice"); @@ -415,7 +408,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable brickCustom = (BlockCarvable) new BlockCarvable(Material.rock) - .setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .setStepSound(Block.soundTypeStone) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks); Carving.chisel.addVariation("brickCustom", Blocks.brick_block, 0, 0); brickCustom.carverHelper.addVariation("tile.brickCustom.1.desc", 1, "brickCustom/large"); brickCustom.carverHelper.addVariation("tile.brickCustom.2.desc", 2, "brickCustom/mortarless"); @@ -434,7 +428,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable bronze = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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); bronze.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/bronze/thermal", 22); @@ -451,8 +447,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable carpet_block = (BlockCarvable) new BlockCarvable(Material.cloth) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeCloth); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeCloth); carpet_block.carverHelper.addVariation("tile.carpet_block.0.desc", 0, "carpet/white"); carpet_block.carverHelper.addVariation("tile.carpet_block.1.desc", 1, "carpet/orange"); @@ -480,14 +478,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.carpet_block, 8, meta), - "YYY", - "YXY", - "YYY", - 'X', - new ItemStack(Items.string, 1), - 'Y', - new ItemStack(Blocks.wool, 1, meta)); + new ItemStack(ChiselBlocks.carpet_block, 8, meta), + "YYY", + "YXY", + "YYY", + 'X', + new ItemStack(Items.string, 1), + 'Y', + new ItemStack(Blocks.wool, 1, meta)); } @Override @@ -501,8 +499,11 @@ public enum Features { @Override void addBlocks() { BlockCarvableCarpet carpet = (BlockCarvableCarpet) new BlockCarvableCarpet(Material.cloth) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.1F) - .setStepSound(Block.soundTypeCloth).setLightOpacity(0).setStepSound(Block.soundTypeCloth); + .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")); @@ -540,10 +541,10 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.carpet, 3, meta), - "XX", - 'X', - new ItemStack(ChiselBlocks.carpet_block, 1, meta)); + new ItemStack(ChiselBlocks.carpet, 3, meta), + "XX", + 'X', + new ItemStack(ChiselBlocks.carpet_block, 1, meta)); } @Override @@ -557,13 +558,13 @@ public enum Features { @Override void addItems() { ItemChisel chisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.IRON) - .setCreativeTab(ChiselTabs.tabChisel); + .setCreativeTab(ChiselTabs.tabChisel); ItemChisel diamondChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.DIAMOND) - .setCreativeTab(ChiselTabs.tabChisel); + .setCreativeTab(ChiselTabs.tabChisel); ItemChisel obsidianChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.OBSIDIAN) - .setCreativeTab(ChiselTabs.tabChisel); + .setCreativeTab(ChiselTabs.tabChisel); ItemChisel netherStarChisel = (ItemChisel) new ItemChisel(ItemChisel.ChiselType.NETHERSTAR) - .setCreativeTab(ChiselTabs.tabChisel); + .setCreativeTab(ChiselTabs.tabChisel); GameRegistry.registerItem(chisel, "chisel"); GameRegistry.registerItem(diamondChisel, "diamondChisel"); GameRegistry.registerItem(obsidianChisel, "obsidianChisel"); @@ -574,83 +575,83 @@ public enum Features { void addRecipes() { if (Configurations.chiselRecipe) { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.chisel), - " YY", - " YY", - "X ", - 'X', - "stickWood", - 'Y', - "ingotIron")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.chisel), + " YY", + " YY", + "X ", + 'X', + "stickWood", + 'Y', + "ingotIron")); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.diamondChisel), - " YY", - " YY", - "x ", - 'x', - "stickWood", - 'Y', - "gemDiamond")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.diamondChisel), + " YY", + " YY", + "x ", + 'x', + "stickWood", + 'Y', + "gemDiamond")); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.obsidianChisel), - " YY", - " YY", - "x ", - 'x', - "stickWood", - 'Y', - Blocks.obsidian)); + new ShapedOreRecipe( + new ItemStack(ChiselItems.obsidianChisel), + " YY", + " YY", + "x ", + 'x', + "stickWood", + 'Y', + Blocks.obsidian)); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.netherStarChisel), - " YY", - " YY", - "x ", - 'x', - "stickWood", - 'Y', - "netherStar")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.netherStarChisel), + " YY", + " YY", + "x ", + 'x', + "stickWood", + 'Y', + "netherStar")); } else { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.chisel), - " Y", - "X ", - 'X', - "stickWood", - 'Y', - "ingotIron")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.chisel), + " Y", + "X ", + 'X', + "stickWood", + 'Y', + "ingotIron")); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.diamondChisel), - " Y", - "X ", - 'X', - "stickWood", - 'Y', - "gemDiamond")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.diamondChisel), + " Y", + "X ", + 'X', + "stickWood", + 'Y', + "gemDiamond")); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.obsidianChisel), - " Y", - "X ", - 'X', - "stickWood", - 'Y', - Blocks.obsidian)); + new ShapedOreRecipe( + new ItemStack(ChiselItems.obsidianChisel), + " Y", + "X ", + 'X', + "stickWood", + 'Y', + Blocks.obsidian)); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselItems.netherStarChisel), - " YY", - " YY", - "x ", - 'x', - "stickWood", - 'Y', - "netherStar")); + new ShapedOreRecipe( + new ItemStack(ChiselItems.netherStarChisel), + " YY", + " YY", + "x ", + 'x', + "stickWood", + 'Y', + "netherStar")); } } }, @@ -660,8 +661,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable cloud = (BlockCloud) new BlockCloud().setHardness(0.2F) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightOpacity(3) - .setStepSound(Block.soundTypeCloth); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setLightOpacity(3) + .setStepSound(Block.soundTypeCloth); cloud.carverHelper.addVariation("tile.cloud.0.desc", 0, "cloud/cloud"); cloud.carverHelper.addVariation("tile.cloud.1.desc", 1, "cloud/large"); cloud.carverHelper.addVariation("tile.cloud.2.desc", 2, "cloud/small"); @@ -675,23 +677,24 @@ public enum Features { @Override void addItems() { ItemCloudInABottle itemCloudInABottle = (ItemCloudInABottle) new ItemCloudInABottle() - .setTextureName("Chisel:cloudinabottle-x").setCreativeTab(ChiselTabs.tabChisel); + .setTextureName("Chisel:cloudinabottle-x") + .setCreativeTab(ChiselTabs.tabChisel); EntityRegistry - .registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true); + .registerModEntity(EntityCloudInABottle.class, "CloudInABottle", 1, Chisel.instance, 40, 1, true); GameRegistry.registerItem(itemCloudInABottle, "cloudinabottle"); } @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselItems.cloudinabottle, 1), - "X X", - "XYX", - " X ", - 'X', - Blocks.glass, - 'Y', - Items.quartz); + new ItemStack(ChiselItems.cloudinabottle, 1), + "X X", + "XYX", + " X ", + 'X', + Blocks.glass, + 'Y', + Items.quartz); } }, @@ -700,35 +703,37 @@ public enum Features { @Override void addBlocks() { BlockCarvable cobblestone = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("cobblestone", Blocks.cobblestone, 0, 0); cobblestone.carverHelper - .addVariation("tile.cobblestone.0.desc", 1, "cobblestone/terrain-cobb-brickaligned"); + .addVariation("tile.cobblestone.0.desc", 1, "cobblestone/terrain-cobb-brickaligned"); cobblestone.carverHelper - .addVariation("tile.cobblestone.1.desc", 2, "cobblestone/terrain-cob-detailedbrick"); + .addVariation("tile.cobblestone.1.desc", 2, "cobblestone/terrain-cob-detailedbrick"); cobblestone.carverHelper.addVariation("tile.cobblestone.2.desc", 3, "cobblestone/terrain-cob-smallbrick"); cobblestone.carverHelper - .addVariation("tile.cobblestone.3.desc", 4, "cobblestone/terrain-cobblargetiledark"); + .addVariation("tile.cobblestone.3.desc", 4, "cobblestone/terrain-cobblargetiledark"); cobblestone.carverHelper.addVariation("tile.cobblestone.4.desc", 5, "cobblestone/terrain-cobbsmalltile"); cobblestone.carverHelper.addVariation("tile.cobblestone.5.desc", 6, "cobblestone/terrain-cob-french"); cobblestone.carverHelper.addVariation("tile.cobblestone.6.desc", 7, "cobblestone/terrain-cob-french2"); cobblestone.carverHelper - .addVariation("tile.cobblestone.7.desc", 8, "cobblestone/terrain-cobmoss-creepdungeon"); + .addVariation("tile.cobblestone.7.desc", 8, "cobblestone/terrain-cobmoss-creepdungeon"); cobblestone.carverHelper - .addVariation("tile.cobblestone.8.desc", 9, "cobblestone/terrain-mossysmalltiledark"); + .addVariation("tile.cobblestone.8.desc", 9, "cobblestone/terrain-mossysmalltiledark"); cobblestone.carverHelper - .addVariation("tile.cobblestone.9.desc", 10, "cobblestone/terrain-pistonback-dungeontile"); + .addVariation("tile.cobblestone.9.desc", 10, "cobblestone/terrain-pistonback-dungeontile"); cobblestone.carverHelper - .addVariation("tile.cobblestone.10.desc", 11, "cobblestone/terrain-pistonback-darkcreeper"); + .addVariation("tile.cobblestone.10.desc", 11, "cobblestone/terrain-pistonback-darkcreeper"); cobblestone.carverHelper - .addVariation("tile.cobblestone.11.desc", 12, "cobblestone/terrain-pistonback-darkdent"); + .addVariation("tile.cobblestone.11.desc", 12, "cobblestone/terrain-pistonback-darkdent"); cobblestone.carverHelper - .addVariation("tile.cobblestone.12.desc", 13, "cobblestone/terrain-pistonback-darkemboss"); + .addVariation("tile.cobblestone.12.desc", 13, "cobblestone/terrain-pistonback-darkemboss"); cobblestone.carverHelper - .addVariation("tile.cobblestone.13.desc", 14, "cobblestone/terrain-pistonback-darkmarker"); + .addVariation("tile.cobblestone.13.desc", 14, "cobblestone/terrain-pistonback-darkmarker"); cobblestone.carverHelper - .addVariation("tile.cobblestone.14.desc", 15, "cobblestone/terrain-pistonback-darkpanel"); + .addVariation("tile.cobblestone.14.desc", 15, "cobblestone/terrain-pistonback-darkpanel"); cobblestone.carverHelper.registerAll(cobblestone, "cobblestone"); Carving.chisel.registerOre("cobblestone", "cobblestone"); } @@ -740,39 +745,41 @@ public enum Features { void addBlocks() { BlockCarvable mossy_cobblestone = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("mossy_cobblestone", Blocks.mossy_cobblestone, 0, 0); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.1.desc", 1, "cobblestonemossy/terrain-cobb-brickaligned"); + .addVariation("tile.stoneMoss.1.desc", 1, "cobblestonemossy/terrain-cobb-brickaligned"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.2.desc", 2, "cobblestonemossy/terrain-cob-detailedbrick"); + .addVariation("tile.stoneMoss.2.desc", 2, "cobblestonemossy/terrain-cob-detailedbrick"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.3.desc", 3, "cobblestonemossy/terrain-cob-smallbrick"); + .addVariation("tile.stoneMoss.3.desc", 3, "cobblestonemossy/terrain-cob-smallbrick"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.4.desc", 4, "cobblestonemossy/terrain-cobblargetiledark"); + .addVariation("tile.stoneMoss.4.desc", 4, "cobblestonemossy/terrain-cobblargetiledark"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.5.desc", 5, "cobblestonemossy/terrain-cobbsmalltile"); + .addVariation("tile.stoneMoss.5.desc", 5, "cobblestonemossy/terrain-cobbsmalltile"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.6.desc", 6, "cobblestonemossy/terrain-cob-french"); + .addVariation("tile.stoneMoss.6.desc", 6, "cobblestonemossy/terrain-cob-french"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.7.desc", 7, "cobblestonemossy/terrain-cob-french2"); + .addVariation("tile.stoneMoss.7.desc", 7, "cobblestonemossy/terrain-cob-french2"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.8.desc", 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); + .addVariation("tile.stoneMoss.8.desc", 8, "cobblestonemossy/terrain-cobmoss-creepdungeon"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.9.desc", 9, "cobblestonemossy/terrain-mossysmalltiledark"); + .addVariation("tile.stoneMoss.9.desc", 9, "cobblestonemossy/terrain-mossysmalltiledark"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.10.desc", 10, "cobblestonemossy/terrain-pistonback-dungeontile"); + .addVariation("tile.stoneMoss.10.desc", 10, "cobblestonemossy/terrain-pistonback-dungeontile"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.11.desc", 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); + .addVariation("tile.stoneMoss.11.desc", 11, "cobblestonemossy/terrain-pistonback-darkcreeper"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.12.desc", 12, "cobblestonemossy/terrain-pistonback-darkdent"); + .addVariation("tile.stoneMoss.12.desc", 12, "cobblestonemossy/terrain-pistonback-darkdent"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.13.desc", 13, "cobblestonemossy/terrain-pistonback-darkemboss"); + .addVariation("tile.stoneMoss.13.desc", 13, "cobblestonemossy/terrain-pistonback-darkemboss"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.14.desc", 14, "cobblestonemossy/terrain-pistonback-darkmarker"); + .addVariation("tile.stoneMoss.14.desc", 14, "cobblestonemossy/terrain-pistonback-darkmarker"); mossy_cobblestone.carverHelper - .addVariation("tile.stoneMoss.15.desc", 15, "cobblestonemossy/terrain-pistonback-darkpanel"); + .addVariation("tile.stoneMoss.15.desc", 15, "cobblestonemossy/terrain-pistonback-darkpanel"); mossy_cobblestone.carverHelper.registerAll(mossy_cobblestone, "mossy_cobblestone"); Carving.chisel.registerOre("mossy_cobblestone", "mossy_cobblestone"); } @@ -783,7 +790,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable concrete = (BlockConcrete) new BlockConcrete().setStepSound(Block.soundTypeStone) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(0.5F); concrete.carverHelper.addVariation("tile.concrete.0.desc", 0, "concrete/default"); concrete.carverHelper.addVariation("tile.concrete.1.desc", 1, "concrete/block"); concrete.carverHelper.addVariation("tile.concrete.2.desc", 2, "concrete/doubleslab"); @@ -803,15 +811,16 @@ public enum Features { @Override void addRecipes() { Block concreteRecipeBlock = Block.getBlockFromName( - Configurations.config.get( - "tweaks", - "concrete recipe block", - "gravel", - "Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)") - .getString()); + Configurations.config.get( + "tweaks", + "concrete recipe block", + "gravel", + "Unlocalized name of the block that, when burned, will produce concrete (examples: lightgem, stone)") + .getString()); if (concreteRecipeBlock == null) concreteRecipeBlock = Blocks.gravel; - FurnaceRecipes.smelting().func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.concrete), 0.1F); + FurnaceRecipes.smelting() + .func_151393_a(concreteRecipeBlock, new ItemStack(ChiselBlocks.concrete), 0.1F); } }, @@ -820,7 +829,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable copper = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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); copper.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/copper/thermal", 22); @@ -837,8 +848,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable cubit = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(0.8F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); for (int i = 0; i < 16; i++) { cubit.carverHelper.addVariation("tile.cubit." + i + ".desc", i, "cubit/" + i); @@ -850,14 +863,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(cubit, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Blocks.wool, 1, 15)); + new ItemStack(cubit, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Blocks.wool, 1, 15)); } }, @@ -867,8 +880,10 @@ public enum Features { void addBlocks() { BlockCarvable diamond_block = (BlockBeaconBase) new BlockBeaconBase() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5F).setResistance(10F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(5F) + .setResistance(10F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("diamond_block", Blocks.diamond_block, 0, 0); diamond_block.carverHelper.addVariation("tile.diamond.1.desc", 1, "diamond/terrain-diamond-embossed"); diamond_block.carverHelper.addVariation("tile.diamond.2.desc", 2, "diamond/terrain-diamond-gem"); @@ -892,12 +907,13 @@ public enum Features { @Override void addBlocks() { BlockCarvable diorite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F) - .setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .setResistance(10.0F) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks); diorite.carverHelper.addVariation( - Configurations.imTooGoodForDescriptions ? "" : "tile.diorite.0.desc", - 0, - "diorite/diorite"); + 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"); @@ -912,7 +928,7 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe(new ItemStack(diorite, 2), "cq", "qc", 'c', "cobblestone", 'q', "gemQuartz")); + new ShapedOreRecipe(new ItemStack(diorite, 2), "cq", "qc", 'c', "cobblestone", 'q', "gemQuartz")); } }, @@ -921,8 +937,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable dirt = (BlockCarvable) new BlockCarvable(Material.ground) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F) - .setStepSound(Block.soundTypeGravel).setBlockName("dirt.default"); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setStepSound(Block.soundTypeGravel) + .setBlockName("dirt.default"); Carving.chisel.addVariation("dirt", Blocks.dirt, 0, -1); // dirt.carverHelper.addVariation("Dirt", 0, Blocks.dirt); @@ -954,8 +972,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable emerald_block = (BlockBeaconBase) new BlockBeaconBase() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("emerald_block", Blocks.emerald_block, 0, 0); emerald_block.carverHelper.addVariation("tile.emerald.1.desc", 1, "emerald/panel"); emerald_block.carverHelper.addVariation("tile.emerald.2.desc", 2, "emerald/panelclassic"); @@ -978,7 +998,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable end_Stone = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F) - .setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .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"); @@ -1006,8 +1027,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable factoryblock = (BlockCarvable) new BlockCarvable(Material.iron) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Chisel.soundMetalFootstep); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Chisel.soundMetalFootstep); factoryblock.carverHelper.addVariation("tile.factory.0.desc", 0, "factory/dots"); factoryblock.carverHelper.addVariation("tile.factory.1.desc", 1, "factory/rust2"); @@ -1029,8 +1052,10 @@ public enum Features { Carving.chisel.registerOre("factoryblock", "factoryblock"); BlockCarvable factoryblock2 = (BlockCarvable) new BlockCarvable(Material.iron) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Chisel.soundMetalFootstep); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Chisel.soundMetalFootstep); factoryblock2.carverHelper.addVariation("tile.factory2.0.desc", 0, "factory/iceiceice", 20); factoryblock2.carverHelper.addVariation("tile.factory2.1.desc", 1, "factory/vent", 21); factoryblock2.carverHelper.addVariation("tile.factory2.2.desc", 2, "factory/tilemosaic", 22); @@ -1042,9 +1067,9 @@ public enum Features { @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) }); + 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) }); } }, @@ -1053,7 +1078,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable fantasyblock = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); fantasyblock.carverHelper.addVariation("tile.fantasyblock.0.desc", 0, "fantasy/brick"); fantasyblock.carverHelper.addVariation("tile.fantasyblock.1.desc", 1, "fantasy/brick-faded"); @@ -1075,7 +1102,9 @@ public enum Features { Carving.chisel.registerOre("fantasyblock", "fantasy"); BlockCarvable fantasyblock2 = (BlockCarvable) new BlockCarvable() - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.0.desc", 0, "fantasy2/brick"); fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.1.desc", 1, "fantasy2/brick-faded"); fantasyblock2.carverHelper.addVariation("tile.fantasyblock2.2.desc", 2, "fantasy2/brick-wear"); @@ -1100,24 +1129,24 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.fantasyblock, 8, 0), + new ItemStack(ChiselBlocks.fantasyblock, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.gold_nugget, 1)); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.fantasyblock2, 8, 0), "***", "*X*", "***", '*', - new ItemStack(Blocks.stone, 1), + new ItemStack(ChiselBlocks.fantasyblock, 1), 'X', - new ItemStack(Items.gold_nugget, 1)); - GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.fantasyblock2, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(ChiselBlocks.fantasyblock, 1), - 'X', - "dyeWhite")); + "dyeWhite")); } }, @@ -1126,35 +1155,39 @@ public enum Features { @Override void addBlocks() { BlockCarvable futura = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); futura.carverHelper.addVariation("tile.futura.0.desc", 0, "futura/WIP/screenMetallicWIP"); futura.carverHelper.addVariation("tile.futura.1.desc", 1, "futura/WIP/screenCyanWIP"); futura.carverHelper.addVariation( - "tile.futura.2.desc", - 2, - "futura/WIP/controller", - new SubmapManagerFakeController(2, "futura/WIP/controller")); + "tile.futura.2.desc", + 2, + "futura/WIP/controller", + new SubmapManagerFakeController(2, "futura/WIP/controller")); futura.carverHelper.addVariation("tile.futura.3.desc", 3, "futura/WIP/wavyWIP"); futura.carverHelper.addVariation( - "tile.futura.4.desc", - 4, - "futura/WIP/controller", - new SubmapManagerFakeController(4, "futura/WIP/controllerPurple")); + "tile.futura.4.desc", + 4, + "futura/WIP/controller", + new SubmapManagerFakeController(4, "futura/WIP/controllerPurple")); futura.carverHelper.addVariation( - "tile.futura.5.desc", - 5, - "futura/WIP/controller", - new SubmapManagerFakeController(5, "futura/WIP/uberWavy")); + "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); + .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)); + "tile.futuraCircuit." + ItemDye.field_150921_b[i] + ".desc", + i, + "futura/circuitPlate", + (i + 20)); } circuits.carverHelper.registerBlock(circuits, "futuraCircuit"); @@ -1165,17 +1198,17 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.futura, 8, 0), - "SBS", - "BGB", - "SBS", - 'S', - "stone", - 'G', - "dustRedstone", - 'B', - new ItemStack(Blocks.stonebrick, 1))); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.futura, 8, 0), + "SBS", + "BGB", + "SBS", + 'S', + "stone", + 'G', + "dustRedstone", + 'B', + new ItemStack(Blocks.stonebrick, 1))); } }, @@ -1184,8 +1217,9 @@ public enum Features { @Override void addBlocks() { BlockCarvableGlass glass = (BlockCarvableGlass) new BlockCarvableGlass() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.3F) + .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass", Blocks.glass, 0, 0); glass.carverHelper.addVariation("tile.glass.1.desc", 1, "glass/terrain-glassbubble"); glass.carverHelper.addVariation("tile.glass.2.desc", 2, "glass/terrain-glass-chinese"); @@ -1206,8 +1240,9 @@ public enum Features { Carving.chisel.registerOre("glass", "glass"); BlockCarvableGlass glass2 = (BlockCarvableGlass) new BlockCarvableGlass() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) - .setStepSound(Block.soundTypeGlass); + .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"); @@ -1219,8 +1254,9 @@ public enum Features { @Override void addBlocks() { BlockCarvablePane glass_pane = (BlockCarvablePane) new BlockCarvablePane(Material.glass, false) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.3F) + .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glass_pane", Blocks.glass_pane, 0, 0); glass_pane.carverHelper.addVariation("tile.glass_pane.1.desc", 1, "glasspane/terrain-glassbubble"); glass_pane.carverHelper.addVariation("tile.glass_pane.2.desc", 2, "glasspane/terrain-glassnoborder"); @@ -1240,43 +1276,49 @@ public enum Features { @Override void addBlocks() { stainedGlassForestry = new BlockCarvableGlass(); - stainedGlassForestry.setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass) - .setBlockName("Stained Glass"); + stainedGlassForestry.setStained(true) + .setHardness(0.3F) + .setStepSound(Block.soundTypeGlass) + .setBlockName("Stained Glass"); stainedGlassForestry.carverHelper.registerBlock(stainedGlassForestry, "stained_glass_forestry"); for (int i = 0; i < 16; i++) { - final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "").toLowerCase(); + final String blockName = "stained_glass_" + sGNames[i].replaceAll(" ", "") + .toLowerCase(); String oreName = "stainedGlass" + sGNames[i].replaceAll(" ", ""); - String texName = "glassdyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; + String texName = "glassdyed/" + sGNames[i].toLowerCase() + .replaceAll(" ", "") + "-"; int glassPrefix = (i & 3) << 2; int glassId = i >> 2; Carving.chisel.addVariation(blockName, Blocks.stained_glass, i, 0); if (glassPrefix == 0) { stainedGlass[glassId] = (BlockCarvableGlass) new BlockCarvableGlass().setStained(true) - .setHardness(0.3F).setStepSound(Block.soundTypeGlass).setBlockName("Stained Glass"); + .setHardness(0.3F) + .setStepSound(Block.soundTypeGlass) + .setBlockName("Stained Glass"); stainedGlass[glassId].carverHelper.registerBlock(stainedGlass[glassId], blockName); } stainedGlass[glassId].carverHelper - .addVariation(featureColors[i] + ".bubble.desc", glassPrefix, texName + "bubble"); + .addVariation(featureColors[i] + ".bubble.desc", glassPrefix, texName + "bubble"); stainedGlass[glassId].carverHelper - .addVariation(featureColors[i] + ".glass.desc", glassPrefix + 1, texName + "panel"); + .addVariation(featureColors[i] + ".glass.desc", glassPrefix + 1, texName + "panel"); stainedGlass[glassId].carverHelper - .addVariation(featureColors[i] + ".glass.fancy.desc", glassPrefix + 2, texName + "panel-fancy"); - stainedGlass[glassId].carverHelper.addVariation( - featureColors[i] + ".glass.noborder.desc", - glassPrefix + 3, - texName + "transparent"); + .addVariation(featureColors[i] + ".glass.fancy.desc", glassPrefix + 2, texName + "panel-fancy"); + stainedGlass[glassId].carverHelper + .addVariation(featureColors[i] + ".glass.noborder.desc", glassPrefix + 3, texName + "transparent"); OreDictionary.registerOre(oreName, new ItemStack(Blocks.stained_glass, 1, i)); Carving.chisel.registerOre(blockName, oreName); for (IVariationInfo info : stainedGlass[glassId].carverHelper.infoList) { - if (info.getVariation().getBlockMeta() < glassPrefix - || info.getVariation().getBlockMeta() >= glassPrefix + 4) + if (info.getVariation() + .getBlockMeta() < glassPrefix + || info.getVariation() + .getBlockMeta() >= glassPrefix + 4) continue; stainedGlass[glassId].carverHelper.registerVariation(blockName, info); } stainedGlassForestry.carverHelper - .addVariation(featureColors[i] + ".glass.forestry.desc", i, texName + "forestry"); + .addVariation(featureColors[i] + ".glass.forestry.desc", i, texName + "forestry"); IVariationInfo info = stainedGlassForestry.carverHelper.infoList.get(i); stainedGlassForestry.carverHelper.registerVariation(blockName, info); } @@ -1288,43 +1330,48 @@ public enum Features { @Override void addBlocks() { for (int i = 0; i < 16; i++) { - final String blockName = "stained_glass_pane_" + sGNames[i].replaceAll(" ", "").toLowerCase(); + final String blockName = "stained_glass_pane_" + sGNames[i].replaceAll(" ", "") + .toLowerCase(); String oreName = "stainedGlassPane" + sGNames[i].replaceAll(" ", ""); - String texName = "glasspanedyed/" + sGNames[i].toLowerCase().replaceAll(" ", "") + "-"; + String texName = "glasspanedyed/" + sGNames[i].toLowerCase() + .replaceAll(" ", "") + "-"; Carving.chisel.addVariation(blockName, Blocks.stained_glass_pane, i, 0); int glassPrefix = (i & 1) << 3; int glassId = i >> 1; if (glassPrefix == 0) { stainedGlassPane[glassId] = (BlockCarvablePane) new BlockCarvablePane(Material.glass, true) - .setStained(true).setHardness(0.3F).setStepSound(Block.soundTypeGlass) - .setBlockName("Stained Glass Pane").setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setStained(true) + .setHardness(0.3F) + .setStepSound(Block.soundTypeGlass) + .setBlockName("Stained Glass Pane") + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); stainedGlassPane[glassId].carverHelper.registerBlock(stainedGlassPane[glassId], blockName); } stainedGlassPane[glassId].carverHelper - .addVariation(featureColors[i] + ".pane.bubble.desc", glassPrefix, texName + "bubble"); + .addVariation(featureColors[i] + ".pane.bubble.desc", glassPrefix, texName + "bubble"); stainedGlassPane[glassId].carverHelper - .addVariation(featureColors[i] + ".pane.glass.desc", glassPrefix + 1, texName + "panel"); + .addVariation(featureColors[i] + ".pane.glass.desc", glassPrefix + 1, texName + "panel"); stainedGlassPane[glassId].carverHelper.addVariation( - featureColors[i] + ".pane.glass.fancy.desc", - glassPrefix + 2, - texName + "panel-fancy"); + featureColors[i] + ".pane.glass.fancy.desc", + glassPrefix + 2, + texName + "panel-fancy"); stainedGlassPane[glassId].carverHelper.addVariation( - featureColors[i] + ".pane.glass.noborder.desc", - glassPrefix + 3, - texName + "transparent"); + featureColors[i] + ".pane.glass.noborder.desc", + glassPrefix + 3, + texName + "transparent"); + stainedGlassPane[glassId].carverHelper + .addVariation(featureColors[i] + ".pane.glass.quadrant.desc", glassPrefix + 4, texName + "quad"); stainedGlassPane[glassId].carverHelper.addVariation( - featureColors[i] + ".pane.glass.quadrant.desc", - glassPrefix + 4, - texName + "quad"); - stainedGlassPane[glassId].carverHelper.addVariation( - featureColors[i] + ".pane.glass.fancyquadrant.desc", - glassPrefix + 5, - texName + "quad-fancy"); + featureColors[i] + ".pane.glass.fancyquadrant.desc", + glassPrefix + 5, + texName + "quad-fancy"); OreDictionary.registerOre(oreName, new ItemStack(Blocks.stained_glass_pane, 1, i)); Carving.chisel.registerOre(blockName, oreName); for (IVariationInfo info : stainedGlassPane[glassId].carverHelper.infoList) { - if (info.getVariation().getBlockMeta() < glassPrefix - || info.getVariation().getBlockMeta() >= glassPrefix + 8) + if (info.getVariation() + .getBlockMeta() < glassPrefix + || info.getVariation() + .getBlockMeta() >= glassPrefix + 8) continue; stainedGlassPane[glassId].carverHelper.registerVariation(blockName, info); } @@ -1337,7 +1384,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable glotek = (BlockCarvable) new BlockCarvableGlowie(Material.rock) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); if (!Configurations.allowChiselCrossColors) { glotek.carverHelper.forbidChiseling = true; @@ -1345,11 +1392,11 @@ public enum Features { for (int i = 0; i < 16; i++) { glotek.carverHelper.addVariation( - "tile.glotek." + i + ".desc", - i, - new SubmapManagerSpecialMaterial( - String.valueOf(i), - SubmapManagerSpecialMaterial.MaterialType.GLOTEK)); + "tile.glotek." + i + ".desc", + i, + new SubmapManagerSpecialMaterial( + String.valueOf(i), + SubmapManagerSpecialMaterial.MaterialType.GLOTEK)); } glotek.carverHelper.registerAll(glotek, "glotek"); @@ -1359,14 +1406,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.glotek, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(neonite, 1), - 'X', - new ItemStack(Items.glowstone_dust, 1)); + new ItemStack(ChiselBlocks.glotek, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(neonite, 1), + 'X', + new ItemStack(Items.glowstone_dust, 1)); } }, @@ -1375,8 +1422,10 @@ public enum Features { @Override void addBlocks() { BlockCarvableGlowstone glowstone = (BlockCarvableGlowstone) new BlockCarvableGlowstone() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F).setLightLevel(1.0F) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.3F) + .setLightLevel(1.0F) + .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("glowstone", Blocks.glowstone, 0, 0); glowstone.carverHelper.addVariation("tile.lightstone.1.desc", 1, "lightstone/terrain-sulphur-cobble"); glowstone.carverHelper.addVariation("tile.lightstone.2.desc", 2, "lightstone/terrain-sulphur-corroded"); @@ -1387,7 +1436,7 @@ public enum Features { glowstone.carverHelper.addVariation("tile.lightstone.7.desc", 7, "lightstone/terrain-sulphur-shale"); glowstone.carverHelper.addVariation("tile.lightstone.8.desc", 8, "lightstone/terrain-sulphur-tile"); glowstone.carverHelper - .addVariation("tile.lightstone.9.desc", 9, "lightstone/terrain-sulphur-weavelanternlight"); + .addVariation("tile.lightstone.9.desc", 9, "lightstone/terrain-sulphur-weavelanternlight"); glowstone.carverHelper.addVariation("tile.lightstone.10.desc", 10, "lightstone/a1-glowstone-cobble"); glowstone.carverHelper.addVariation("tile.lightstone.11.desc", 11, "lightstone/a1-glowstone-growth"); glowstone.carverHelper.addVariation("tile.lightstone.12.desc", 12, "lightstone/a1-glowstone-layers"); @@ -1404,8 +1453,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable gold_block = (BlockBeaconBase) new BlockBeaconBase() - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(3F).setResistance(10F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(3F) + .setResistance(10F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("gold_block", Blocks.gold_block, 0, 0); gold_block.carverHelper.addVariation("tile.gold.1.desc", 1, "gold/terrain-gold-largeingot"); gold_block.carverHelper.addVariation("tile.gold.2.desc", 2, "gold/terrain-gold-smallingot"); @@ -1423,7 +1474,9 @@ public enum Features { 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); + .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); @@ -1443,12 +1496,13 @@ public enum Features { @Override void addBlocks() { BlockCarvable granite = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F) - .setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .setResistance(10.0F) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks); granite.carverHelper.addVariation( - Configurations.imTooGoodForDescriptions ? "" : "tile.granite.0.desc", - 0, - "granite/granite"); + 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"); @@ -1473,7 +1527,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable grimstone = (BlockGrimstone) new BlockGrimstone(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); grimstone.carverHelper.addVariation("tile.grimstone.0.desc", 0, "grimstone/grimstone"); grimstone.carverHelper.addVariation("tile.grimstone.1.desc", 1, "grimstone/smooth"); grimstone.carverHelper.addVariation("tile.grimstone.2.desc", 2, "grimstone/hate"); @@ -1496,14 +1552,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.grimstone, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.coal, 1)); + new ItemStack(ChiselBlocks.grimstone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.coal, 1)); } }, @@ -1512,24 +1568,26 @@ public enum Features { @Override void addBlocks() { BlockCarvable hexPlating = (BlockCarvable) new BlockCarvableGlow("animations/archetype2") - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2).setResistance(12); + .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 + .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); + .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)); + "tile.hexPlating." + ItemDye.field_150921_b[i] + ".desc", + i, + "hexPlating/hexNew", + (i + 20)); } hexLargePlating.carverHelper.registerBlock(hexLargePlating, "hexLargePlating"); @@ -1540,15 +1598,15 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.hexPlating, 8, 0), - "XXX", - "XYX", - "XXX", - 'X', - "stone", - 'Y', - "blockCoal")); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.hexPlating, 8, 0), + "XXX", + "XYX", + "XXX", + 'X', + "stone", + 'Y', + "blockCoal")); } }, @@ -1557,8 +1615,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable holystone = (BlockHolystone) new BlockHolystone(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Chisel.soundHolystoneFootstep); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Chisel.soundHolystoneFootstep); holystone.carverHelper.addVariation("tile.holystone.0.desc", 0, "holystone/holystone"); holystone.carverHelper.addVariation("tile.holystone.1.desc", 1, "holystone/smooth"); holystone.carverHelper.addVariation("tile.holystone.2.desc", 2, "holystone/love"); @@ -1581,14 +1641,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.holystone, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.feather, 1)); + new ItemStack(ChiselBlocks.holystone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.feather, 1)); } }, @@ -1597,13 +1657,16 @@ public enum Features { @Override void addBlocks() { BlockCarvable hempcrete = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.8F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(0.8F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); for (int i = 0; i < 16; i++) hempcrete.carverHelper.addVariation( - "tile.hempcrete." + i + ".desc", - i, - "hempCrete/concrete/" + sGNames[i].replaceAll(" ", "").toLowerCase()); + "tile.hempcrete." + i + ".desc", + i, + "hempCrete/concrete/" + sGNames[i].replaceAll(" ", "") + .toLowerCase()); hempcrete.carverHelper.registerAll(hempcrete, "hempcrete"); } @@ -1613,14 +1676,14 @@ public enum Features { for (int i = 0; i < 16; i++) { GameRegistry.addSmelting( - new ItemStack(ChiselBlocks.hempcretesand, 1, i), - new ItemStack(ChiselBlocks.hempcrete, 1, i), - 20F); + new ItemStack(ChiselBlocks.hempcretesand, 1, i), + new ItemStack(ChiselBlocks.hempcrete, 1, i), + 20F); GameRegistry.addSmelting( - new ItemStack(ChiselBlocks.hempcretesand, 1, i), - new ItemStack(ChiselBlocks.hempcrete, 1, i), - 0.1F); + new ItemStack(ChiselBlocks.hempcretesand, 1, i), + new ItemStack(ChiselBlocks.hempcrete, 1, i), + 0.1F); } } } @@ -1631,14 +1694,17 @@ public enum Features { @Override void addBlocks() { BlockCarvableSand hempcretesand = (BlockCarvableSand) new BlockCarvableSand() - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.5F).setResistance(0.5F) - .setStepSound(Block.soundTypeSand); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(0.5F) + .setResistance(0.5F) + .setStepSound(Block.soundTypeSand); for (int i = 0; i < 16; i++) { hempcretesand.carverHelper.addVariation( - "tile.hempcretesand." + i + ".desc", - i, - "hempCrete/sand/" + sGNames[i].replaceAll(" ", "").toLowerCase()); + "tile.hempcretesand." + i + ".desc", + i, + "hempCrete/sand/" + sGNames[i].replaceAll(" ", "") + .toLowerCase()); } hempcretesand.carverHelper.registerAll(hempcretesand, "hempcretesand"); @@ -1649,14 +1715,14 @@ public enum Features { void addRecipes() { if (!Loader.isModLoaded("dreamcraft")) { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.hempcretesand, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.sand, 1), - 'X', - new ItemStack(Blocks.tallgrass, 1, 2)); + new ItemStack(ChiselBlocks.hempcretesand, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.sand, 1), + 'X', + new ItemStack(Blocks.tallgrass, 1, 2)); } } }, @@ -1666,8 +1732,10 @@ public enum Features { @Override void addBlocks() { BlockCarvableIce ice = (BlockCarvableIce) new BlockCarvableIce() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setLightOpacity(3) + .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("ice", Blocks.ice, 0, 0); ice.carverHelper.addVariation("tile.ice.1.desc", 1, "ice/a1-ice-light"); ice.carverHelper.addVariation("tile.ice.2.desc", 2, "ice/a1-stonecobble-icecobble"); @@ -1691,11 +1759,11 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.ice, 4, 1), - "XX", - "XX", - 'X', - new ItemStack(ChiselBlocks.ice_pillar, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.ice, 4, 1), + "XX", + "XX", + 'X', + new ItemStack(ChiselBlocks.ice_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -1704,8 +1772,10 @@ public enum Features { @Override void addBlocks() { BlockCarvableIce ice_pillar = (BlockCarvableIce) new BlockCarvableIce() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setLightOpacity(3) + .setStepSound(Block.soundTypeGlass); ice_pillar.carverHelper.addVariation("tile.icePillar.0.desc", 0, "icepillar/plainplain"); ice_pillar.carverHelper.addVariation("tile.icePillar.1.desc", 1, "icepillar/plaingreek"); @@ -1720,12 +1790,12 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.ice_pillar, 6, 0), - "XX", - "XX", - "XX", - 'X', - new ItemStack(ChiselBlocks.ice, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.ice_pillar, 6, 0), + "XX", + "XX", + "XX", + 'X', + new ItemStack(ChiselBlocks.ice, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -1767,8 +1837,9 @@ public enum Features { @Override void addBlocks() { BlockCarvablePane iron_bars = (BlockCarvablePane) new BlockCarvablePane(Material.iron, true) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.3F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.3F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_bars", Blocks.iron_bars, 0, 0); iron_bars.carverHelper.addVariation("tile.iron_bars.1.desc", 1, "ironpane/fenceIron"); iron_bars.carverHelper.addVariation("tile.iron_bars.2.desc", 2, "ironpane/barbedwire"); @@ -1790,8 +1861,10 @@ public enum Features { void addBlocks() { BlockCarvable iron_block = (BlockBeaconBase) new BlockBeaconBase() - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(5F).setResistance(10F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(5F) + .setResistance(10F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("iron_block", Blocks.iron_block, 0, 0); iron_block.carverHelper.addVariation("tile.iron.1.desc", 1, "iron/terrain-iron-largeingot"); iron_block.carverHelper.addVariation("tile.iron.2.desc", 2, "iron/terrain-iron-smallingot"); @@ -1810,7 +1883,9 @@ public enum Features { 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); + .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); @@ -1831,13 +1906,16 @@ public enum Features { void addBlocks() { for (int metadata = 0; metadata < 16; metadata++) { jackolantern[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("litpumpkin") - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setLightLevel(1.0f); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1.0F) + .setBlockName("litpumpkin") + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setLightLevel(1.0f); jackolantern[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_on"); GameRegistry.registerBlock( - jackolantern[metadata], - ItemCarvablePumpkin.class, - ("jackolantern" + (metadata + 1))); + jackolantern[metadata], + ItemCarvablePumpkin.class, + ("jackolantern" + (metadata + 1))); Carving.chisel.addVariation("jackolantern", jackolantern[metadata], 0, (metadata + 1)); } Carving.chisel.addVariation("jackolantern", Blocks.lit_pumpkin, 0, 0); @@ -1850,8 +1928,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable laboratoryblock = (BlockCarvable) new BlockCarvable(Material.iron) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Chisel.soundMetalFootstep); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Chisel.soundMetalFootstep); laboratoryblock.carverHelper.addVariation("tile.laboratory.0.desc", 0, "laboratory/wallpanel"); laboratoryblock.carverHelper.addVariation("tile.laboratory.1.desc", 1, "laboratory/dottedpanel"); @@ -1876,14 +1956,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.laboratoryblock, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.quartz, 1)); + new ItemStack(ChiselBlocks.laboratoryblock, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.quartz, 1)); } }, @@ -1892,8 +1972,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable lapis_block = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(3F).setResistance(5F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(3F) + .setResistance(5F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("lapis_block", Blocks.lapis_block, 0, 0); lapis_block.carverHelper.addVariation("tile.lapis.1.desc", 1, "lapis/terrain-lapisblock-chunky"); lapis_block.carverHelper.addVariation("tile.lapis.2.desc", 2, "lapis/terrain-lapisblock-panel"); @@ -1914,7 +1996,9 @@ public enum Features { @Override void addBlocks() { BlockLavastone lavastone = (BlockLavastone) new BlockLavastone(Material.rock, "lava_still") - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); lavastone.carverHelper.addVariation("tile.lavastone.0.desc", 0, "lavastone/cobble"); lavastone.carverHelper.addVariation("tile.lavastone.1.desc", 1, "lavastone/black"); lavastone.carverHelper.addVariation("tile.lavastone.2.desc", 2, "lavastone/tiles"); @@ -1931,14 +2015,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.lavastone, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.lava_bucket, 1)); + new ItemStack(ChiselBlocks.lavastone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.lava_bucket, 1)); } }, @@ -1947,7 +2031,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable lead = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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"); lead.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/lead/thermal"); @@ -1964,8 +2050,9 @@ public enum Features { @Override void addBlocks() { BlockLeaf leaves = (BlockLeaf) new BlockLeaf(Material.leaves) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.2F) - .setStepSound(Block.soundTypeGrass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.2F) + .setStepSound(Block.soundTypeGrass); Carving.chisel.addGroup(new SimpleCarvingGroup("leaves") { @Override @@ -1996,9 +2083,9 @@ public enum Features { leaves.carverHelper.addVariation("tile.leaves.9.desc", 9, new SubmapManagerLeaves("leaves/red_roses")); leaves.carverHelper.addVariation("tile.leaves.10.desc", 10, new SubmapManagerLeaves("leaves/roses")); leaves.carverHelper - .addVariation("tile.leaves.11.desc", 11, new SubmapManagerLeaves("leaves/christmasBalls")); + .addVariation("tile.leaves.11.desc", 11, new SubmapManagerLeaves("leaves/christmasBalls")); leaves.carverHelper - .addVariation("tile.leaves.12.desc", 12, new SubmapManagerLeaves("leaves/christmasLights")); + .addVariation("tile.leaves.12.desc", 12, new SubmapManagerLeaves("leaves/christmasLights")); leaves.carverHelper.registerAll(leaves, "leaves"); Carving.chisel.registerOre("leaves", "leaves"); @@ -2010,69 +2097,73 @@ public enum Features { @Override void addBlocks() { BlockCarvable limestone = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); limestone.carverHelper.addVariation("tile.limestone.0.desc", 0, "limestone"); limestone.carverHelper.addVariation("tile.limestone.1.desc", 1, "limestone/terrain-cobbsmalltilelight"); limestone.carverHelper.addVariation("tile.limestone.2.desc", 2, "limestone/terrain-cob-frenchlight"); limestone.carverHelper.addVariation("tile.limestone.3.desc", 3, "limestone/terrain-cob-french2light"); limestone.carverHelper - .addVariation("tile.limestone.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); + .addVariation("tile.limestone.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); limestone.carverHelper.addVariation("tile.limestone.5.desc", 5, "limestone/terrain-cob-smallbricklight"); limestone.carverHelper.addVariation("tile.limestone.6.desc", 6, "limestone/terrain-mossysmalltilelight"); limestone.carverHelper.addVariation("tile.limestone.7.desc", 7, "limestone/terrain-pistonback-dungeon"); limestone.carverHelper - .addVariation("tile.limestone.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); + .addVariation("tile.limestone.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); limestone.carverHelper.addVariation("tile.limestone.9.desc", 9, "limestone/terrain-pistonback-dungeonvent"); limestone.carverHelper - .addVariation("tile.limestone.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); + .addVariation("tile.limestone.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); limestone.carverHelper.addVariation("tile.limestone.11.desc", 11, "limestone/terrain-pistonback-lightdent"); limestone.carverHelper - .addVariation("tile.limestone.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); + .addVariation("tile.limestone.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); limestone.carverHelper.addVariation("tile.limestone.13.desc", 13, "limestone/terrain-pistonback-lightfour"); limestone.carverHelper - .addVariation("tile.limestone.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); + .addVariation("tile.limestone.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); limestone.carverHelper - .addVariation("tile.limestone.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); + .addVariation("tile.limestone.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); limestone.carverHelper.registerAll(limestone, "limestone"); OreDictionary.registerOre("limestone", limestone); Carving.chisel.registerOre("limestone", "limestone"); BlockCarvableSlab limestone_slab = (BlockCarvableSlab) new BlockCarvableSlab(limestone) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); limestone_slab.carverHelper.addVariation("tile.limestoneSlab.0.desc", 0, "limestone"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.1.desc", 1, "limestone/terrain-cobbsmalltilelight"); + .addVariation("tile.limestoneSlab.1.desc", 1, "limestone/terrain-cobbsmalltilelight"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.2.desc", 2, "limestone/terrain-cob-frenchlight"); + .addVariation("tile.limestoneSlab.2.desc", 2, "limestone/terrain-cob-frenchlight"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.3.desc", 3, "limestone/terrain-cob-french2light"); + .addVariation("tile.limestoneSlab.3.desc", 3, "limestone/terrain-cob-french2light"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); + .addVariation("tile.limestoneSlab.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.5.desc", 5, "limestone/terrain-cob-smallbricklight"); + .addVariation("tile.limestoneSlab.5.desc", 5, "limestone/terrain-cob-smallbricklight"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.6.desc", 6, "limestone/terrain-mossysmalltilelight"); + .addVariation("tile.limestoneSlab.6.desc", 6, "limestone/terrain-mossysmalltilelight"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.7.desc", 7, "limestone/terrain-pistonback-dungeon"); + .addVariation("tile.limestoneSlab.7.desc", 7, "limestone/terrain-pistonback-dungeon"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); + .addVariation("tile.limestoneSlab.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.9.desc", 9, "limestone/terrain-pistonback-dungeonvent"); + .addVariation("tile.limestoneSlab.9.desc", 9, "limestone/terrain-pistonback-dungeonvent"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); + .addVariation("tile.limestoneSlab.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.11.desc", 11, "limestone/terrain-pistonback-lightdent"); + .addVariation("tile.limestoneSlab.11.desc", 11, "limestone/terrain-pistonback-lightdent"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); + .addVariation("tile.limestoneSlab.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.13.desc", 13, "limestone/terrain-pistonback-lightfour"); + .addVariation("tile.limestoneSlab.13.desc", 13, "limestone/terrain-pistonback-lightfour"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); + .addVariation("tile.limestoneSlab.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); limestone_slab.carverHelper - .addVariation("tile.limestoneSlab.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); + .addVariation("tile.limestoneSlab.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); limestone_slab.carverHelper.registerAll(limestone_slab, "limestone_slab", ItemCarvableSlab.class); registerSlabTop(limestone_slab, limestone_slab.top); Carving.chisel.registerOre("limestone_slab", "limestone_slab"); @@ -2081,35 +2172,35 @@ public enum Features { makerLimestoneStairs.carverHelper.addVariation("tile.limestoneStairs.0.desc", 0, "limestone"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.1.desc", 1, "limestone/terrain-cobbsmalltilelight"); + .addVariation("tile.limestoneStairs.1.desc", 1, "limestone/terrain-cobbsmalltilelight"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.2.desc", 2, "limestone/terrain-cob-frenchlight"); + .addVariation("tile.limestoneStairs.2.desc", 2, "limestone/terrain-cob-frenchlight"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.3.desc", 3, "limestone/terrain-cob-french2light"); + .addVariation("tile.limestoneStairs.3.desc", 3, "limestone/terrain-cob-french2light"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); + .addVariation("tile.limestoneStairs.4.desc", 4, "limestone/terrain-cobmoss-creepdungeonlight"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.5.desc", 5, "limestone/terrain-cob-smallbricklight"); + .addVariation("tile.limestoneStairs.5.desc", 5, "limestone/terrain-cob-smallbricklight"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.6.desc", 6, "limestone/terrain-mossysmalltilelight"); + .addVariation("tile.limestoneStairs.6.desc", 6, "limestone/terrain-mossysmalltilelight"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.7.desc", 7, "limestone/terrain-pistonback-dungeon"); + .addVariation("tile.limestoneStairs.7.desc", 7, "limestone/terrain-pistonback-dungeon"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); + .addVariation("tile.limestoneStairs.8.desc", 8, "limestone/terrain-pistonback-dungeonornate"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.9.desc", 9, "limestone/terrain-pistonback-dungeonvent"); + .addVariation("tile.limestoneStairs.9.desc", 9, "limestone/terrain-pistonback-dungeonvent"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); + .addVariation("tile.limestoneStairs.10.desc", 10, "limestone/terrain-pistonback-lightcreeper"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.11.desc", 11, "limestone/terrain-pistonback-lightdent"); + .addVariation("tile.limestoneStairs.11.desc", 11, "limestone/terrain-pistonback-lightdent"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); + .addVariation("tile.limestoneStairs.12.desc", 12, "limestone/terrain-pistonback-lightemboss"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.13.desc", 13, "limestone/terrain-pistonback-lightfour"); + .addVariation("tile.limestoneStairs.13.desc", 13, "limestone/terrain-pistonback-lightfour"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); + .addVariation("tile.limestoneStairs.14.desc", 14, "limestone/terrain-pistonback-lightmarker"); makerLimestoneStairs.carverHelper - .addVariation("tile.limestoneStairs.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); + .addVariation("tile.limestoneStairs.15.desc", 15, "limestone/terrain-pistonback-lightpanel"); makerLimestoneStairs.create("limestone_stairs", ChiselBlocks.limestoneStairs); Carving.chisel.registerOre("limestone_stairs", "limestone_stairs"); } @@ -2117,10 +2208,10 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.limestone_slab, 6, 0), - "***", - '*', - new ItemStack(ChiselBlocks.limestone, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.limestone_slab, 6, 0), + "***", + '*', + new ItemStack(ChiselBlocks.limestone, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -2129,8 +2220,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable marble = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); marble.carverHelper.addVariation("tile.marble.0.desc", 0, "marble"); marble.carverHelper.addVariation("tile.marble.1.desc", 1, "marble/a1-stoneornamental-marblebrick"); @@ -2154,35 +2247,35 @@ public enum Features { Carving.chisel.registerOre("marble", "marble"); BlockCarvableSlab marble_slab = (BlockCarvableSlab) new BlockCarvableSlab(marble).setHardness(2.0F) - .setResistance(10F); + .setResistance(10F); marble_slab.carverHelper.addVariation("tile.marbleSlab.0.desc", 0, "marble"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.1.desc", 1, "marbleslab/a1-stoneornamental-marblebrick"); + .addVariation("tile.marbleSlab.1.desc", 1, "marbleslab/a1-stoneornamental-marblebrick"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.2.desc", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + .addVariation("tile.marbleSlab.2.desc", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.3.desc", 3, "marbleslab/a1-stoneornamental-marbleornate"); + .addVariation("tile.marbleSlab.3.desc", 3, "marbleslab/a1-stoneornamental-marbleornate"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.4.desc", 4, "marbleslab/a1-stoneornamental-marblepanel"); + .addVariation("tile.marbleSlab.4.desc", 4, "marbleslab/a1-stoneornamental-marblepanel"); marble_slab.carverHelper.addVariation("tile.marbleSlab.5.desc", 5, "marbleslab/terrain-pistonback-marble"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.6.desc", 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + .addVariation("tile.marbleSlab.6.desc", 6, "marbleslab/terrain-pistonback-marblecreeperdark"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.7.desc", 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + .addVariation("tile.marbleSlab.7.desc", 7, "marbleslab/terrain-pistonback-marblecreeperlight"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.8.desc", 8, "marbleslab/a1-stoneornamental-marblecarved"); + .addVariation("tile.marbleSlab.8.desc", 8, "marbleslab/a1-stoneornamental-marblecarved"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.9.desc", 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + .addVariation("tile.marbleSlab.9.desc", 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.10.desc", 10, "marbleslab/terrain-pistonback-marbledent"); + .addVariation("tile.marbleSlab.10.desc", 10, "marbleslab/terrain-pistonback-marbledent"); marble_slab.carverHelper - .addVariation("tile.marbleSlab.11.desc", 11, "marbleslab/terrain-pistonback-marbledent-small"); + .addVariation("tile.marbleSlab.11.desc", 11, "marbleslab/terrain-pistonback-marbledent-small"); marble_slab.carverHelper.addVariation("tile.marbleSlab.12.desc", 12, "marbleslab/marble-bricks"); marble_slab.carverHelper.addVariation( - "tile.marbleSlab.13.desc", - 13, - new SubmapManagerSlab("marbleslab/marble-arranged-bricks")); + "tile.marbleSlab.13.desc", + 13, + new SubmapManagerSlab("marbleslab/marble-arranged-bricks")); marble_slab.carverHelper.addVariation("tile.marbleSlab.14.desc", 14, "marbleslab/marble-fancy-bricks"); marble_slab.carverHelper.addVariation("tile.marbleSlab.15.desc", 15, "marbleslab/marble-blocks"); marble_slab.carverHelper.registerAll(marble_slab, "marble_slab", ItemCarvableSlab.class); @@ -2193,32 +2286,32 @@ public enum Features { makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.0.desc", 0, "marble"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.6.desc", 1, "marbleslab/a1-stoneornamental-marblebrick"); + .addVariation("tile.marbleStairs.6.desc", 1, "marbleslab/a1-stoneornamental-marblebrick"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.2.desc", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); + .addVariation("tile.marbleStairs.2.desc", 2, "marbleslab/a1-stoneornamental-marbleclassicpanel"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.3.desc", 3, "marbleslab/a1-stoneornamental-marbleornate"); + .addVariation("tile.marbleStairs.3.desc", 3, "marbleslab/a1-stoneornamental-marbleornate"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.4.desc", 4, "marbleslab/a1-stoneornamental-marblepanel"); + .addVariation("tile.marbleStairs.4.desc", 4, "marbleslab/a1-stoneornamental-marblepanel"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.5.desc", 5, "marbleslab/terrain-pistonback-marble"); + .addVariation("tile.marbleStairs.5.desc", 5, "marbleslab/terrain-pistonback-marble"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.6.desc", 6, "marbleslab/terrain-pistonback-marblecreeperdark"); + .addVariation("tile.marbleStairs.6.desc", 6, "marbleslab/terrain-pistonback-marblecreeperdark"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.7.desc", 7, "marbleslab/terrain-pistonback-marblecreeperlight"); + .addVariation("tile.marbleStairs.7.desc", 7, "marbleslab/terrain-pistonback-marblecreeperlight"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.8.desc", 8, "marbleslab/a1-stoneornamental-marblecarved"); + .addVariation("tile.marbleStairs.8.desc", 8, "marbleslab/a1-stoneornamental-marblecarved"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.9.desc", 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); + .addVariation("tile.marbleStairs.9.desc", 9, "marbleslab/a1-stoneornamental-marblecarvedradial"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.10.desc", 10, "marbleslab/terrain-pistonback-marbledent"); + .addVariation("tile.marbleStairs.10.desc", 10, "marbleslab/terrain-pistonback-marbledent"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.11.desc", 11, "marbleslab/terrain-pistonback-marbledent-small"); + .addVariation("tile.marbleStairs.11.desc", 11, "marbleslab/terrain-pistonback-marbledent-small"); makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.12.desc", 12, "marbleslab/marble-bricks"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.13.desc", 13, "marbleslab/marble-arranged-bricks"); + .addVariation("tile.marbleStairs.13.desc", 13, "marbleslab/marble-arranged-bricks"); makerMarbleStairs.carverHelper - .addVariation("tile.marbleStairs.14.desc", 14, "marbleslab/marble-fancy-bricks"); + .addVariation("tile.marbleStairs.14.desc", 14, "marbleslab/marble-fancy-bricks"); makerMarbleStairs.carverHelper.addVariation("tile.marbleStairs.15.desc", 15, "marbleslab/marble-blocks"); makerMarbleStairs.create("marble_stairs", ChiselBlocks.marbleStairs); } @@ -2226,16 +2319,16 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.marble_slab, 6, 0), - "***", - '*', - new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.marble_slab, 6, 0), + "***", + '*', + new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.marble, 4), - "XX", - "XX", - 'X', - new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.marble, 4), + "XX", + "XX", + 'X', + new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -2247,55 +2340,53 @@ public enum Features { BlockCarvable marble_pillar; if (Configurations.oldPillars) { marble_pillar = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); marble_pillar.carverHelper.addVariation("tile.marblePillarOld.0.desc", 0, "marblepillarold/column"); marble_pillar.carverHelper.addVariation("tile.marblePillarOld.1.desc", 1, "marblepillarold/capstone"); marble_pillar.carverHelper.addVariation("tile.marblePillarOld.2.desc", 2, "marblepillarold/base"); marble_pillar.carverHelper.addVariation("tile.marblePillarOld.3.desc", 3, "marblepillarold/small"); marble_pillar.carverHelper - .addVariation("tile.marblePillarOld.4.desc", 4, "marblepillarold/pillar-carved"); - marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.5.desc", - 5, - "marblepillarold/a1-stoneornamental-marblegreek"); + .addVariation("tile.marblePillarOld.4.desc", 4, "marblepillarold/pillar-carved"); marble_pillar.carverHelper - .addVariation("tile.marblePillarOld.6.desc", 6, "marblepillarold/a1-stonepillar-greek"); + .addVariation("tile.marblePillarOld.5.desc", 5, "marblepillarold/a1-stoneornamental-marblegreek"); marble_pillar.carverHelper - .addVariation("tile.marblePillarOld.7.desc", 7, "marblepillarold/a1-stonepillar-plain"); + .addVariation("tile.marblePillarOld.6.desc", 6, "marblepillarold/a1-stonepillar-greek"); marble_pillar.carverHelper - .addVariation("tile.marblePillarOld.8.desc", 8, "marblepillarold/a1-stonepillar-greektopplain"); + .addVariation("tile.marblePillarOld.7.desc", 7, "marblepillarold/a1-stonepillar-plain"); marble_pillar.carverHelper - .addVariation("tile.marblePillarOld.9.desc", 9, "marblepillarold/a1-stonepillar-plaintopplain"); + .addVariation("tile.marblePillarOld.8.desc", 8, "marblepillarold/a1-stonepillar-greektopplain"); + marble_pillar.carverHelper + .addVariation("tile.marblePillarOld.9.desc", 9, "marblepillarold/a1-stonepillar-plaintopplain"); marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.10.desc", - 10, - "marblepillarold/a1-stonepillar-greekbottomplain"); + "tile.marblePillarOld.10.desc", + 10, + "marblepillarold/a1-stonepillar-greekbottomplain"); marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.11.desc", - 11, - "marblepillarold/a1-stonepillar-plainbottomplain"); + "tile.marblePillarOld.11.desc", + 11, + "marblepillarold/a1-stonepillar-plainbottomplain"); + marble_pillar.carverHelper + .addVariation("tile.marblePillarOld.12.desc", 12, "marblepillarold/a1-stonepillar-greektopgreek"); + marble_pillar.carverHelper + .addVariation("tile.marblePillarOld.13.desc", 13, "marblepillarold/a1-stonepillar-plaintopgreek"); marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.12.desc", - 12, - "marblepillarold/a1-stonepillar-greektopgreek"); + "tile.marblePillarOld.14.desc", + 14, + "marblepillarold/a1-stonepillar-greekbottomgreek"); marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.13.desc", - 13, - "marblepillarold/a1-stonepillar-plaintopgreek"); - marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.14.desc", - 14, - "marblepillarold/a1-stonepillar-greekbottomgreek"); - marble_pillar.carverHelper.addVariation( - "tile.marblePillarOld.15.desc", - 15, - "marblepillarold/a1-stonepillar-plainbottomgreek"); + "tile.marblePillarOld.15.desc", + 15, + "marblepillarold/a1-stonepillar-plainbottomgreek"); } else { marble_pillar = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); marble_pillar.carverHelper.addVariation("tile.marblePillar.0.desc", 0, "marblepillar/pillar"); marble_pillar.carverHelper.addVariation("tile.marblePillar.1.desc", 1, "marblepillar/default"); @@ -2317,113 +2408,115 @@ public enum Features { marble_pillar.carverHelper.registerAll(marble_pillar, "marble_pillar"); BlockCarvableSlab marble_pillar_slab = (BlockCarvableSlab) new BlockCarvableSlab(marble_pillar) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10F) + .setStepSound(Block.soundTypeStone); if (Configurations.oldPillars) { marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.0.desc", 0, "marblepillarslabold/column"); + .addVariation("tile.marblePillarSlabOld.0.desc", 0, "marblepillarslabold/column"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.1.desc", 1, "marblepillarslabold/capstone"); + .addVariation("tile.marblePillarSlabOld.1.desc", 1, "marblepillarslabold/capstone"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.2.desc", 2, "marblepillarslabold/base"); + .addVariation("tile.marblePillarSlabOld.2.desc", 2, "marblepillarslabold/base"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.3.desc", 3, "marblepillarslabold/small"); + .addVariation("tile.marblePillarSlabOld.3.desc", 3, "marblepillarslabold/small"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.4.desc", 4, "marblepillarslabold/pillar-carved"); + .addVariation("tile.marblePillarSlabOld.4.desc", 4, "marblepillarslabold/pillar-carved"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.5.desc", - 5, - "marblepillarslabold/a1-stoneornamental-marblegreek"); + "tile.marblePillarSlabOld.5.desc", + 5, + "marblepillarslabold/a1-stoneornamental-marblegreek"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.6.desc", 6, "marblepillarslabold/a1-stonepillar-greek"); + .addVariation("tile.marblePillarSlabOld.6.desc", 6, "marblepillarslabold/a1-stonepillar-greek"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlabOld.7.desc", 7, "marblepillarslabold/a1-stonepillar-plain"); + .addVariation("tile.marblePillarSlabOld.7.desc", 7, "marblepillarslabold/a1-stonepillar-plain"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.8.desc", - 8, - "marblepillarslabold/a1-stonepillar-greektopplain"); + "tile.marblePillarSlabOld.8.desc", + 8, + "marblepillarslabold/a1-stonepillar-greektopplain"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.9.desc", - 9, - "marblepillarslabold/a1-stonepillar-plaintopplain"); + "tile.marblePillarSlabOld.9.desc", + 9, + "marblepillarslabold/a1-stonepillar-plaintopplain"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.10.desc", - 10, - "marblepillarslabold/a1-stonepillar-greekbottomplain"); + "tile.marblePillarSlabOld.10.desc", + 10, + "marblepillarslabold/a1-stonepillar-greekbottomplain"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.11.desc", - 11, - "marblepillarslabold/a1-stonepillar-plainbottomplain"); + "tile.marblePillarSlabOld.11.desc", + 11, + "marblepillarslabold/a1-stonepillar-plainbottomplain"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.12.desc", - 12, - "marblepillarslabold/a1-stonepillar-greektopgreek"); + "tile.marblePillarSlabOld.12.desc", + 12, + "marblepillarslabold/a1-stonepillar-greektopgreek"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.13.desc", - 13, - "marblepillarslabold/a1-stonepillar-plaintopgreek"); + "tile.marblePillarSlabOld.13.desc", + 13, + "marblepillarslabold/a1-stonepillar-plaintopgreek"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.14.desc", - 14, - "marblepillarslabold/a1-stonepillar-greekbottomgreek"); + "tile.marblePillarSlabOld.14.desc", + 14, + "marblepillarslabold/a1-stonepillar-greekbottomgreek"); marble_pillar_slab.carverHelper.addVariation( - "tile.marblePillarSlabOld.15.desc", - 15, - "marblepillarslabold/a1-stonepillar-plainbottomgreek"); + "tile.marblePillarSlabOld.15.desc", + 15, + "marblepillarslabold/a1-stonepillar-plainbottomgreek"); } else { marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.0.desc", 0, "marblepillarslab/pillar"); + .addVariation("tile.marblePillarSlab.0.desc", 0, "marblepillarslab/pillar"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.1.desc", 1, "marblepillarslab/default"); + .addVariation("tile.marblePillarSlab.1.desc", 1, "marblepillarslab/default"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.2.desc", 2, "marblepillarslab/simple"); + .addVariation("tile.marblePillarSlab.2.desc", 2, "marblepillarslab/simple"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.3.desc", 3, "marblepillarslab/convex"); + .addVariation("tile.marblePillarSlab.3.desc", 3, "marblepillarslab/convex"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.4.desc", 4, "marblepillarslab/rough"); + .addVariation("tile.marblePillarSlab.4.desc", 4, "marblepillarslab/rough"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.5.desc", 5, "marblepillarslab/greekdecor"); + .addVariation("tile.marblePillarSlab.5.desc", 5, "marblepillarslab/greekdecor"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.6.desc", 6, "marblepillarslab/greekgreek"); + .addVariation("tile.marblePillarSlab.6.desc", 6, "marblepillarslab/greekgreek"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.7.desc", 7, "marblepillarslab/greekplain"); + .addVariation("tile.marblePillarSlab.7.desc", 7, "marblepillarslab/greekplain"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.8.desc", 8, "marblepillarslab/plaindecor"); + .addVariation("tile.marblePillarSlab.8.desc", 8, "marblepillarslab/plaindecor"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.9.desc", 9, "marblepillarslab/plaingreek"); + .addVariation("tile.marblePillarSlab.9.desc", 9, "marblepillarslab/plaingreek"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.10.desc", 10, "marblepillarslab/plainplain"); + .addVariation("tile.marblePillarSlab.10.desc", 10, "marblepillarslab/plainplain"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.11.desc", 11, "marblepillarslab/widedecor"); + .addVariation("tile.marblePillarSlab.11.desc", 11, "marblepillarslab/widedecor"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.12.desc", 12, "marblepillarslab/widegreek"); + .addVariation("tile.marblePillarSlab.12.desc", 12, "marblepillarslab/widegreek"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.13.desc", 13, "marblepillarslab/wideplain"); + .addVariation("tile.marblePillarSlab.13.desc", 13, "marblepillarslab/wideplain"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.14.desc", 14, "marblepillarslab/carved"); + .addVariation("tile.marblePillarSlab.14.desc", 14, "marblepillarslab/carved"); marble_pillar_slab.carverHelper - .addVariation("tile.marblePillarSlab.15.desc", 15, "marblepillarslab/ornamental"); + .addVariation("tile.marblePillarSlab.15.desc", 15, "marblepillarslab/ornamental"); } marble_pillar_slab.carverHelper - .registerAll(marble_pillar_slab, "marble_pillar_slab", ItemCarvableSlab.class); + .registerAll(marble_pillar_slab, "marble_pillar_slab", ItemCarvableSlab.class); registerSlabTop(marble_pillar_slab, marble_pillar_slab.top); } @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.marble_pillar, 6), - "XX", - "XX", - "XX", - 'X', - new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.marble_pillar, 6), + "XX", + "XX", + "XX", + 'X', + new ItemStack(ChiselBlocks.marble, 1, OreDictionary.WILDCARD_VALUE)); GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.marble_pillar_slab, 6, 0), - "***", - '*', - new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.marble_pillar_slab, 6, 0), + "***", + '*', + new ItemStack(ChiselBlocks.marble_pillar, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -2432,7 +2525,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable imperial = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + .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"); @@ -2441,7 +2536,9 @@ public enum Features { imperial.carverHelper.registerBlock(imperial, "nation"); BlockCarvable rebel = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + .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); @@ -2458,10 +2555,9 @@ public enum Features { @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 })); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.rebel, 32, 0), + new Object[] { "xyx", "yzy", "xyx", 'x', "stone", 'y', Items.iron_ingot, 'z', Items.gold_nugget })); } }, @@ -2470,7 +2566,7 @@ public enum Features { @Override void addBlocks() { BlockCarvable neonite = (BlockCarvable) new BlockCarvableGlowie(Material.rock) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); if (!Configurations.allowChiselCrossColors) { neonite.carverHelper.forbidChiseling = true; @@ -2478,11 +2574,11 @@ public enum Features { for (int i = 0; i < 16; i++) { neonite.carverHelper.addVariation( - "tile.neonite." + i + ".desc", - i, - new SubmapManagerSpecialMaterial( - String.valueOf(i), - SubmapManagerSpecialMaterial.MaterialType.NEONITE)); + "tile.neonite." + i + ".desc", + i, + new SubmapManagerSpecialMaterial( + String.valueOf(i), + SubmapManagerSpecialMaterial.MaterialType.NEONITE)); } @@ -2493,14 +2589,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(neonite, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Items.emerald, 1), - 'X', - new ItemStack(Items.glowstone_dust, 1)); + new ItemStack(neonite, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Items.emerald, 1), + 'X', + new ItemStack(Items.glowstone_dust, 1)); } }, @@ -2509,36 +2605,38 @@ public enum Features { @Override void addBlocks() { BlockCarvable nether_brick = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("nether_brick", Blocks.nether_brick, 0, 0); // netherBrick.carverHelper.addVariation("Nether brick", 0, // Blocks.nether_brick); nether_brick.carverHelper.addVariation("tile.netherBrick.1.desc", 1, "netherbrick/a1-netherbrick-brinstar"); nether_brick.carverHelper - .addVariation("tile.netherBrick.2.desc", 2, "netherbrick/a1-netherbrick-classicspatter"); + .addVariation("tile.netherBrick.2.desc", 2, "netherbrick/a1-netherbrick-classicspatter"); nether_brick.carverHelper.addVariation("tile.netherBrick.3.desc", 3, "netherbrick/a1-netherbrick-guts"); nether_brick.carverHelper.addVariation("tile.netherBrick.4.desc", 4, "netherbrick/a1-netherbrick-gutsdark"); nether_brick.carverHelper - .addVariation("tile.netherBrick.5.desc", 5, "netherbrick/a1-netherbrick-gutssmall"); + .addVariation("tile.netherBrick.5.desc", 5, "netherbrick/a1-netherbrick-gutssmall"); nether_brick.carverHelper - .addVariation("tile.netherBrick.6.desc", 6, "netherbrick/a1-netherbrick-lavabrinstar"); + .addVariation("tile.netherBrick.6.desc", 6, "netherbrick/a1-netherbrick-lavabrinstar"); nether_brick.carverHelper - .addVariation("tile.netherBrick.7.desc", 7, "netherbrick/a1-netherbrick-lavabrown"); + .addVariation("tile.netherBrick.7.desc", 7, "netherbrick/a1-netherbrick-lavabrown"); nether_brick.carverHelper - .addVariation("tile.netherBrick.8.desc", 8, "netherbrick/a1-netherbrick-lavaobsidian"); + .addVariation("tile.netherBrick.8.desc", 8, "netherbrick/a1-netherbrick-lavaobsidian"); nether_brick.carverHelper - .addVariation("tile.netherBrick.9.desc", 9, "netherbrick/a1-netherbrick-lavastonedark"); + .addVariation("tile.netherBrick.9.desc", 9, "netherbrick/a1-netherbrick-lavastonedark"); nether_brick.carverHelper.addVariation("tile.netherBrick.10.desc", 10, "netherbrick/a1-netherbrick-meat"); nether_brick.carverHelper - .addVariation("tile.netherBrick.11.desc", 11, "netherbrick/a1-netherbrick-meatred"); + .addVariation("tile.netherBrick.11.desc", 11, "netherbrick/a1-netherbrick-meatred"); nether_brick.carverHelper - .addVariation("tile.netherBrick.12.desc", 12, "netherbrick/a1-netherbrick-meatredsmall"); + .addVariation("tile.netherBrick.12.desc", 12, "netherbrick/a1-netherbrick-meatredsmall"); nether_brick.carverHelper - .addVariation("tile.netherBrick.13.desc", 13, "netherbrick/a1-netherbrick-meatsmall"); + .addVariation("tile.netherBrick.13.desc", 13, "netherbrick/a1-netherbrick-meatsmall"); nether_brick.carverHelper.addVariation("tile.netherBrick.14.desc", 14, "netherbrick/a1-netherbrick-red"); nether_brick.carverHelper - .addVariation("tile.netherBrick.15.desc", 15, "netherbrick/a1-netherbrick-redsmall"); + .addVariation("tile.netherBrick.15.desc", 15, "netherbrick/a1-netherbrick-redsmall"); nether_brick.carverHelper.registerAll(nether_brick, "nether_brick"); Carving.chisel.registerOre("nether_brick", "nether_brick"); } @@ -2556,7 +2654,9 @@ public enum Features { return side == ForgeDirection.UP; } - }.setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(0.4F).setStepSound(Block.soundTypeStone); + }.setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(0.4F) + .setStepSound(Block.soundTypeStone); Carving.chisel.addVariation("netherrack", Blocks.netherrack, 0, 0); netherrack.carverHelper.addVariation("tile.hellrock.1.desc", 1, "netherrack/a1-netherrack-bloodgravel"); netherrack.carverHelper.addVariation("tile.hellrock.2.desc", 2, "netherrack/a1-netherrack-bloodrock"); @@ -2583,8 +2683,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable nucrete = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); nucrete.carverHelper.addVariation("tile.nucrete.0.desc", 0, "nucrete/darkbreezeblock"); nucrete.carverHelper.addVariation("tile.nucrete.1.desc", 1, "nucrete/darkpanel"); @@ -2609,16 +2711,16 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(nucrete, 8, 0), - "XYX", - "*X*", - "XYX", - '*', - new ItemStack(Blocks.sand, 1), - 'X', - new ItemStack(Blocks.gravel, 1), - 'Y', - new ItemStack(Items.clay_ball, 1)); + new ItemStack(nucrete, 8, 0), + "XYX", + "*X*", + "XYX", + '*', + new ItemStack(Blocks.sand, 1), + 'X', + new ItemStack(Blocks.gravel, 1), + 'Y', + new ItemStack(Items.clay_ball, 1)); } }, @@ -2627,8 +2729,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable obsidian = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(50.0F).setResistance(2000.0F) - .setStepSound(Block.soundTypeStone); + .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"); @@ -2658,8 +2762,10 @@ public enum Features { @Override void addBlocks() { BlockCarvablePackedIce packedice = (BlockCarvablePackedIce) new BlockCarvablePackedIce() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) - .setStepSound(Block.soundTypeGlass); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setLightOpacity(3) + .setStepSound(Block.soundTypeGlass); Carving.chisel.addVariation("packedice", Blocks.packed_ice, 0, 0); packedice.carverHelper.addVariation("tile.packedice.1.desc", 1, "ice/a1-ice-light"); packedice.carverHelper.addVariation("tile.packedice.2.desc", 2, "ice/a1-stonecobble-icecobble"); @@ -2683,12 +2789,12 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.packedice_pillar, 6, 0), - "XX", - "XX", - "XX", - 'X', - new ItemStack(ChiselBlocks.packedice, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.packedice_pillar, 6, 0), + "XX", + "XX", + "XX", + 'X', + new ItemStack(ChiselBlocks.packedice, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -2697,8 +2803,10 @@ public enum Features { @Override void addBlocks() { BlockCarvablePackedIce packedice_pillar = (BlockCarvablePackedIce) new BlockCarvablePackedIce() - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setLightOpacity(3) - .setStepSound(Block.soundTypeGlass); + .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"); @@ -2720,22 +2828,22 @@ public enum Features { makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.0.desc", 0, Blocks.packed_ice); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.1.desc", 1, "ice/a1-ice-light"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); + .addVariation("tile.packedice_stairs.2.desc", 2, "ice/a1-stonecobble-icecobble"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.3.desc", 3, "ice/a1-netherbrick-ice"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); + .addVariation("tile.packedice_stairs.4.desc", 4, "ice/a1-stonecobble-icebrick"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); + .addVariation("tile.packedice_stairs.5.desc", 5, "ice/a1-stonecobble-icebricksmall"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); + .addVariation("tile.packedice_stairs.6.desc", 6, "ice/a1-stonecobble-icedungeon"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.7.desc", 7, "ice/a1-stonecobble-icefour"); + .addVariation("tile.packedice_stairs.7.desc", 7, "ice/a1-stonecobble-icefour"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); + .addVariation("tile.packedice_stairs.8.desc", 8, "ice/a1-stonecobble-icefrench"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.9.desc", 9, "ice/sunkentiles"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.10.desc", 10, "ice/tiles"); makerPackedIceStairs.carverHelper - .addVariation("tile.packedice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); + .addVariation("tile.packedice_stairs.11.desc", 11, "ice/a1-stonecobble-icepanel"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.12.desc", 12, "ice/a1-stoneslab-ice"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.13.desc", 13, "ice/zelda"); makerPackedIceStairs.carverHelper.addVariation("tile.packedice_stairs.14.desc", 14, "ice/bismuth"); @@ -2756,7 +2864,9 @@ public enum Features { @Override void addBlocks() { BlockCarvablePane paperwall = (BlockCarvablePane) new BlockCarvablePane(Material.ground, true) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setResistance(0.5F); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setResistance(0.5F); paperwall.carverHelper.addVariation("tile.paperwall.0.desc", 0, "paper/box"); paperwall.carverHelper.addVariation("tile.paperwall.1.desc", 1, "paper/throughMiddle"); @@ -2772,7 +2882,9 @@ public enum Features { Carving.chisel.registerOre("paperwall", "paperwall"); BlockCarvable paperwall_block = (BlockCarvable) new BlockCarvable(Material.ground) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.5F).setResistance(0.5F); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.5F) + .setResistance(0.5F); paperwall_block.carverHelper.addVariation("tile.paperwall.0.desc", 0, "paper/box"); paperwall_block.carverHelper.addVariation("tile.paperwall.1.desc", 1, "paper/throughMiddle"); @@ -2791,22 +2903,22 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.paperwall, 8), - "ppp", - "psp", - "ppp", - ('p'), - Items.paper, - ('s'), - "stickWood")); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.paperwall, 8), + "ppp", + "psp", + "ppp", + ('p'), + Items.paper, + ('s'), + "stickWood")); GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.paperwall_block, 4), - "pp", - "pp", - ('p'), - ChiselBlocks.paperwall)); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.paperwall_block, 4), + "pp", + "pp", + ('p'), + ChiselBlocks.paperwall)); } }, @@ -2815,7 +2927,9 @@ public enum Features { @Override void addBlocks() { BlockPresent present = (BlockPresent) new BlockPresent().setCreativeTab(ChiselTabs.tabOtherChiselBlocks) - .setHardness(2.0F).setResistance(10.0F).setBlockName("chisel.present"); + .setHardness(2.0F) + .setResistance(10.0F) + .setBlockName("chisel.present"); for (int i = 0; i < 16; i++) { present.carverHelper.addVariation("tile.chisel.present.desc", i, "planks_oak", "minecraft"); } @@ -2826,10 +2940,10 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapelessOreRecipe( - new ItemStack(ChiselBlocks.present, 1, meta), - new ItemStack(Blocks.chest, 1), - dyeOres[meta])); + new ShapelessOreRecipe( + new ItemStack(ChiselBlocks.present, 1, meta), + new ItemStack(Blocks.chest, 1), + dyeOres[meta])); } @Override @@ -2844,8 +2958,10 @@ public enum Features { void addBlocks() { for (int metadata = 0; metadata < 16; metadata++) { pumpkin[metadata] = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(1.0F).setBlockName("pumpkin") - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(1.0F) + .setBlockName("pumpkin") + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks); pumpkin[metadata].setInformation("pumpkin/pumpkin_face_" + (metadata + 1) + "_off"); GameRegistry.registerBlock(pumpkin[metadata], ItemCarvablePumpkin.class, "pumpkin" + (metadata + 1)); Carving.chisel.addVariation("pumpkin", pumpkin[metadata], 0, (metadata + 1)); @@ -2857,9 +2973,9 @@ public enum Features { @Override void addRecipes() { GameRegistry.addShapelessRecipe( - new ItemStack(ChiselBlocks.jackolantern[meta]), - new ItemStack(ChiselBlocks.pumpkin[meta], 1), - new ItemStack(Item.getItemFromBlock(Blocks.torch), 1)); + new ItemStack(ChiselBlocks.jackolantern[meta]), + new ItemStack(ChiselBlocks.pumpkin[meta], 1), + new ItemStack(Item.getItemFromBlock(Blocks.torch), 1)); } @Override @@ -2873,7 +2989,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable purpur = (BlockCarvable) new BlockCarvable(Material.rock).setHardness(2.0F) - .setResistance(10.0F).setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .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"); @@ -2893,9 +3010,9 @@ public enum Features { @Override void addRecipes() { GameRegistry.addShapelessRecipe( - new ItemStack(ChiselBlocks.purpur), - new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), - new ItemStack(Items.dye, 1, 5)); + new ItemStack(ChiselBlocks.purpur), + new ItemStack(Item.getItemFromBlock(Blocks.end_stone), 1), + new ItemStack(Items.dye, 1, 5)); } }, @@ -3052,8 +3169,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable redstone_block = (BlockCarvablePowered) (new BlockCarvablePowered(Material.iron)) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeMetal); Carving.chisel.addVariation("redstone_block", Blocks.redstone_block, 0, 0); redstone_block.carverHelper.addVariation("tile.redstone_block.1.desc", 1, "redstone/smooth"); redstone_block.carverHelper.addVariation("tile.redstone_block.2.desc", 2, "redstone/block"); @@ -3069,9 +3188,9 @@ public enum Features { redstone_block.carverHelper.addVariation("tile.redstone_block.12.desc", 12, "redstone/circuit"); redstone_block.carverHelper.addVariation("tile.redstone_block.13.desc", 13, "redstone/supaplex"); redstone_block.carverHelper - .addVariation("tile.redstone_block.14.desc", 14, "redstone/a1-blockredstone-skullred"); + .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"); + .addVariation("tile.redstone_block.15.desc", 15, "redstone/a1-blockredstone-redstonezelda"); redstone_block.carverHelper.registerAll(redstone_block, "redstone_block"); Carving.chisel.registerOre("redstone_block", "redstone"); @@ -3083,7 +3202,9 @@ public enum Features { @Override void addBlocks() { BlockRoadLine road_line = (BlockRoadLine) new BlockRoadLine().setStepSound(Block.soundTypeStone) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(0.01F).setBlockName("roadLine"); + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(0.01F) + .setBlockName("roadLine"); road_line.carverHelper.addVariation("tile.roadLine.0.desc", 0, "line-marking/white-center"); road_line.carverHelper.addVariation("tile.roadLine.1.desc", 1, "line-marking/double-white-center"); road_line.carverHelper.addVariation("tile.roadLine.2.desc", 2, "line-marking/yellow-center"); @@ -3096,15 +3217,15 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.road_line, 8, 0), - "wrw", - "wrw", - "wrw", - ('w'), - "dyeWhite", - ('r'), - Items.redstone)); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.road_line, 8, 0), + "wrw", + "wrw", + "wrw", + ('w'), + "dyeWhite", + ('r'), + Items.redstone)); } }, @@ -3113,17 +3234,18 @@ public enum Features { @Override void addBlocks() { BlockCarvable sandstone = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone) - .setHardness(0.8F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setStepSound(Block.soundTypeStone) + .setHardness(0.8F); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 0, -5); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 1, -4); Carving.chisel.addVariation("sandstone", Blocks.sandstone, 2, -3); sandstone.carverHelper - .addVariation("tile.sandstone.0.desc", 0, "sandstone/terrain-sandstone-smoothglyph", 16); + .addVariation("tile.sandstone.0.desc", 0, "sandstone/terrain-sandstone-smoothglyph", 16); sandstone.carverHelper - .addVariation("tile.sandstone.1.desc", 1, "sandstone/terrain-sandstone-solidcobble", 17); + .addVariation("tile.sandstone.1.desc", 1, "sandstone/terrain-sandstone-solidcobble", 17); sandstone.carverHelper - .addVariation("tile.sandstone.2.desc", 2, "sandstone/a0-sandstonepreview-boxcreeper", 18); + .addVariation("tile.sandstone.2.desc", 2, "sandstone/a0-sandstonepreview-boxcreeper", 18); sandstone.carverHelper.addVariation("tile.sandstone.3.desc", 3, "sandstone/faded"); sandstone.carverHelper.addVariation("tile.sandstone.4.desc", 4, "sandstone/column"); sandstone.carverHelper.addVariation("tile.sandstone.5.desc", 5, "sandstone/capstone"); @@ -3140,50 +3262,52 @@ public enum Features { sandstone.carverHelper.registerAll(sandstone, "sandstone"); BlockCarvable sandstone2 = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone) - .setHardness(0.8F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setStepSound(Block.soundTypeStone) + .setHardness(0.8F); sandstone2.carverHelper - .addVariation("tile.sandstone.16.desc", 0, "sandstone2/terrain-sandstone-brickflat", 19); + .addVariation("tile.sandstone.16.desc", 0, "sandstone2/terrain-sandstone-brickflat", 19); sandstone2.carverHelper - .addVariation("tile.sandstone.17.desc", 1, "sandstone2/a0-sandstonepreview-smoothflat", 20); + .addVariation("tile.sandstone.17.desc", 1, "sandstone2/a0-sandstonepreview-smoothflat", 20); sandstone2.carverHelper.registerBlock(sandstone2, "sandstone2"); sandstone2.carverHelper.registerVariations("sandstone"); BlockCarvable sandstone_scribbles = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone) - .setHardness(0.8F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setStepSound(Block.soundTypeStone) + .setHardness(0.8F); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 0, "sandstone-scribbles/scribbles-0", 36); + .addVariation("tile.sandstoneScribbles.desc", 0, "sandstone-scribbles/scribbles-0", 36); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 1, "sandstone-scribbles/scribbles-1", 37); + .addVariation("tile.sandstoneScribbles.desc", 1, "sandstone-scribbles/scribbles-1", 37); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 2, "sandstone-scribbles/scribbles-2", 38); + .addVariation("tile.sandstoneScribbles.desc", 2, "sandstone-scribbles/scribbles-2", 38); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 3, "sandstone-scribbles/scribbles-3", 39); + .addVariation("tile.sandstoneScribbles.desc", 3, "sandstone-scribbles/scribbles-3", 39); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 4, "sandstone-scribbles/scribbles-4", 40); + .addVariation("tile.sandstoneScribbles.desc", 4, "sandstone-scribbles/scribbles-4", 40); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 5, "sandstone-scribbles/scribbles-5", 41); + .addVariation("tile.sandstoneScribbles.desc", 5, "sandstone-scribbles/scribbles-5", 41); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 6, "sandstone-scribbles/scribbles-6", 42); + .addVariation("tile.sandstoneScribbles.desc", 6, "sandstone-scribbles/scribbles-6", 42); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 7, "sandstone-scribbles/scribbles-7", 43); + .addVariation("tile.sandstoneScribbles.desc", 7, "sandstone-scribbles/scribbles-7", 43); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 8, "sandstone-scribbles/scribbles-8", 44); + .addVariation("tile.sandstoneScribbles.desc", 8, "sandstone-scribbles/scribbles-8", 44); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 9, "sandstone-scribbles/scribbles-9", 45); + .addVariation("tile.sandstoneScribbles.desc", 9, "sandstone-scribbles/scribbles-9", 45); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 10, "sandstone-scribbles/scribbles-10", 46); + .addVariation("tile.sandstoneScribbles.desc", 10, "sandstone-scribbles/scribbles-10", 46); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 11, "sandstone-scribbles/scribbles-11", 47); + .addVariation("tile.sandstoneScribbles.desc", 11, "sandstone-scribbles/scribbles-11", 47); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 12, "sandstone-scribbles/scribbles-12", 48); + .addVariation("tile.sandstoneScribbles.desc", 12, "sandstone-scribbles/scribbles-12", 48); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 13, "sandstone-scribbles/scribbles-13", 49); + .addVariation("tile.sandstoneScribbles.desc", 13, "sandstone-scribbles/scribbles-13", 49); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 14, "sandstone-scribbles/scribbles-14", 50); + .addVariation("tile.sandstoneScribbles.desc", 14, "sandstone-scribbles/scribbles-14", 50); sandstone_scribbles.carverHelper - .addVariation("tile.sandstoneScribbles.desc", 15, "sandstone-scribbles/scribbles-15", 51); + .addVariation("tile.sandstoneScribbles.desc", 15, "sandstone-scribbles/scribbles-15", 51); sandstone_scribbles.carverHelper.registerBlock(sandstone_scribbles, "sandstone_scribbles"); sandstone_scribbles.carverHelper.registerVariations("sandstone"); @@ -3196,22 +3320,22 @@ public enum Features { // The following recipe is due to bugs with Chisel 1.5.1 to // 1.5.6a GameRegistry.addRecipe( - new ItemStack(Blocks.sandstone, 1, 0), - "X", - 'X', - new ItemStack(ChiselBlocks.sandstone, 1, 0)); + new ItemStack(Blocks.sandstone, 1, 0), + "X", + 'X', + new ItemStack(ChiselBlocks.sandstone, 1, 0)); // The following recipe is due to bug with Chisel 1.5.6b GameRegistry.addRecipe( - new ItemStack(Blocks.sandstone, 1, 1), - "X", - 'X', - new ItemStack(ChiselBlocks.sandstone, 1, 1)); - } - GameRegistry.addRecipe( new ItemStack(Blocks.sandstone, 1, 1), "X", 'X', - new ItemStack(ChiselBlocks.sandstone_scribbles, 1, OreDictionary.WILDCARD_VALUE)); + new ItemStack(ChiselBlocks.sandstone, 1, 1)); + } + GameRegistry.addRecipe( + new ItemStack(Blocks.sandstone, 1, 1), + "X", + 'X', + new ItemStack(ChiselBlocks.sandstone_scribbles, 1, OreDictionary.WILDCARD_VALUE)); } }, @@ -3220,7 +3344,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable silver = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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); silver.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/silver/thermal", 22); @@ -3237,7 +3363,8 @@ public enum Features { @Override void addItems() { ItemSmashingRock smashingrock = (ItemSmashingRock) new ItemSmashingRock() - .setTextureName("Chisel:smashingrock").setCreativeTab(ChiselTabs.tabChisel); + .setTextureName("Chisel:smashingrock") + .setCreativeTab(ChiselTabs.tabChisel); EntityRegistry.registerModEntity(EntitySmashingRock.class, "SmashingRock", 3, Chisel.instance, 40, 1, true); GameRegistry.registerItem(smashingrock, "smashingrock"); } @@ -3245,9 +3372,9 @@ public enum Features { @Override void addRecipes() { GameRegistry.addShapelessRecipe( - new ItemStack(ChiselItems.smashingrock, 16), - new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), - new ItemStack(Items.stone_shovel) }); + new ItemStack(ChiselItems.smashingrock, 16), + new Object[] { new ItemStack(Items.stone_pickaxe), new ItemStack(Items.glass_bottle, 1), + new ItemStack(Items.stone_shovel) }); } }, @@ -3256,7 +3383,8 @@ public enum Features { @Override void addBlocks() { BlockSnakestone sand_snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/sandsnake/") - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setBlockName("chisel.snakestoneSand"); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setBlockName("chisel.snakestoneSand"); GameRegistry.registerBlock(sand_snakestone, ItemCarvable.class, "sand_snakestone"); // TODO- eat me! // LanguageRegistry.addName(new ItemStack(sandSnakestone, 1, 1), @@ -3274,7 +3402,8 @@ public enum Features { @Override void addBlocks() { BlockSnakestone stone_snakestone = (BlockSnakestone) new BlockSnakestone("Chisel:snakestone/snake/") - .setBlockName("chisel.snakestoneStone").setCreativeTab(ChiselTabs.tabStoneChiselBlocks); + .setBlockName("chisel.snakestoneStone") + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks); GameRegistry.registerBlock(stone_snakestone, ItemCarvable.class, "stone_snakestone"); // LanguageRegistry.addName(new ItemStack(snakestone, 1, 1), // "Stone snake block head"); @@ -3291,8 +3420,9 @@ public enum Features { @Override void addBlocks() { BlockSnakestoneObsidian obsidian_snakestone = (BlockSnakestoneObsidian) new BlockSnakestoneObsidian( - "Chisel:snakestone/obsidian/").setBlockName("chisel.obsidianSnakestone").setHardness(50.0F) - .setResistance(2000.0F); + "Chisel:snakestone/obsidian/").setBlockName("chisel.obsidianSnakestone") + .setHardness(50.0F) + .setResistance(2000.0F); GameRegistry.registerBlock(obsidian_snakestone, ItemCarvable.class, "obsidian_snakestone"); Carving.chisel.addVariation("obsidian", obsidian_snakestone, 1, 100); Carving.chisel.addVariation("obsidian", obsidian_snakestone, 13, 101); @@ -3306,7 +3436,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable steel = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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); steel.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/steel/thermal", 22); @@ -3323,8 +3455,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable stonebricksmooth = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(1.5F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(1.5F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); if (Configurations.allowSmoothStone) { Carving.chisel.addVariation("stonebricksmooth", Blocks.stone, 0, -1); } @@ -3337,13 +3471,13 @@ public enum Features { } stonebricksmooth.carverHelper - .addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain", 16); + .addVariation("tile.stonebricksmooth.0.desc", 0, "stonebrick2/masonBricksPlain", 16); stonebricksmooth.carverHelper - .addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic", 17); + .addVariation("tile.stonebricksmooth.1.desc", 1, "stonebrick2/masonBricksFelsic", 17); stonebricksmooth.carverHelper - .addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic", 18); + .addVariation("tile.stonebricksmooth.2.desc", 2, "stonebrick2/masonBricksMafic", 18); stonebricksmooth.carverHelper - .addVariation("tile.stonebricksmooth.3.desc", 3, "stonebrick2/masonBricksMixed", 19); + .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"); @@ -3369,8 +3503,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable svelstone = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeStone); for (int i = 0; i < 16; i++) { svelstone.carverHelper.addVariation("tile.sveltstone." + i + ".desc", i, "sveltstone/" + i); @@ -3382,14 +3518,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(sveltstone, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(ChiselBlocks.andesite, 1)); + new ItemStack(sveltstone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(ChiselBlocks.andesite, 1)); } }, @@ -3398,7 +3534,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable tallow = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeSnow); + .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"); @@ -3412,7 +3549,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable technical = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10F); technical.carverHelper.addVariation("tile.technical.0.desc", 0, "technical/scaffold"); technical.carverHelper.addVariation("tile.technical.1.desc", 1, "technical/cautiontape"); technical.carverHelper.addVariation("tile.technical.2.desc", 2, "technical/industrialrelic"); @@ -3432,7 +3571,7 @@ public enum Features { technical.carverHelper.registerAll(technical, "technical"); BlockCarvableGlass technical2 = (BlockCarvableGlass) new BlockCarvableGlass().setHardness(2.0F) - .setResistance(10F); + .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); @@ -3441,32 +3580,36 @@ public enum Features { technical2.carverHelper.registerVariations("technical"); BlockCarvable technicalLarge = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F).setResistance(10F); + .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); + .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"/* - * , new SubmapManagerCombinedCTM(4, - * "technical/new/test/ExhaustPlating", TextureType.R4) - */); + "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"); technical4.carverHelper.addVariation( - "tile.technical4.7.desc", - 7, - "technical/new/concrete/concreteBlocks", - new SubmapManagerCombinedCTM(9, "technical/new/concrete/concreteBlocks", TextureType.R9)); + "tile.technical4.7.desc", + 7, + "technical/new/concrete/concreteBlocks", + new SubmapManagerCombinedCTM(9, "technical/new/concrete/concreteBlocks", TextureType.R9)); // The animation is malfunctioning. :( // technical4.carverHelper.addVariation("tile.technical4.7.desc", 7, "technical/new/TapeDrive"); technical4.carverHelper.registerBlock(technical4, "technical4"); @@ -3478,9 +3621,9 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.technical, Configurations.factoryBlockAmount, 0), - new Object[] { "xyx", "yxy", "xyx", 'x', "stone", 'y', Items.iron_ingot })); + 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', @@ -3494,8 +3637,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) - .setStepSound(Chisel.soundTempleFootstep); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setResistance(10F) + .setStepSound(Chisel.soundTempleFootstep); templeblock.carverHelper.addVariation("tile.templeblock.0.desc", 0, "temple/cobble"); templeblock.carverHelper.addVariation("tile.templeblock.1.desc", 1, "temple/ornate"); @@ -3520,15 +3664,15 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.templeblock, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - dyeOres[4])); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.templeblock, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + dyeOres[4])); } }, @@ -3537,32 +3681,33 @@ public enum Features { @Override void addBlocks() { BlockCarvable mossy_templeblock = (BlockCarvable) new BlockEldritch().setHardness(2.0F) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setResistance(10F) - .setStepSound(Chisel.soundTempleFootstep); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setResistance(10F) + .setStepSound(Chisel.soundTempleFootstep); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.0.desc", 0, "templemossy/cobble"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.1.desc", 1, "templemossy/ornate"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.2.desc", 2, "templemossy/plate"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.3.desc", 3, "templemossy/plate-cracked"); + .addVariation("tile.mossy_templeblock.3.desc", 3, "templemossy/plate-cracked"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.4.desc", 4, "templemossy/bricks"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.5.desc", 5, "templemossy/bricks-large"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.6.desc", 6, "templemossy/bricks-weared"); + .addVariation("tile.mossy_templeblock.6.desc", 6, "templemossy/bricks-weared"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.7.desc", 7, "templemossy/bricks-disarray"); + .addVariation("tile.mossy_templeblock.7.desc", 7, "templemossy/bricks-disarray"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.8.desc", 8, "templemossy/column"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.9.desc", 9, "templemossy/stand"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.10.desc", 10, "templemossy/stand-mosaic"); + .addVariation("tile.mossy_templeblock.10.desc", 10, "templemossy/stand-mosaic"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.11.desc", 11, "templemossy/stand-creeper"); + .addVariation("tile.mossy_templeblock.11.desc", 11, "templemossy/stand-creeper"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.12.desc", 12, "templemossy/tiles"); mossy_templeblock.carverHelper.addVariation("tile.mossy_templeblock.13.desc", 13, "templemossy/smalltiles"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.14.desc", 14, "templemossy/tiles-light"); + .addVariation("tile.mossy_templeblock.14.desc", 14, "templemossy/tiles-light"); mossy_templeblock.carverHelper - .addVariation("tile.mossy_templeblock.15.desc", 15, "templemossy/smalltiles-light"); + .addVariation("tile.mossy_templeblock.15.desc", 15, "templemossy/smalltiles-light"); mossy_templeblock.carverHelper.registerAll(mossy_templeblock, "mossy_templeblock"); Carving.chisel.registerOre("mossy_templeblock", "mossy_templeblock"); } @@ -3575,7 +3720,9 @@ public enum Features { @Override void addBlocks() { BlockCarvable tin = (BlockCarvable) new BlockBeaconBase(Material.iron).setStepSound(Block.soundTypeMetal) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F).setResistance(10F); + .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); tin.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/tin/thermal", 22); @@ -3597,21 +3744,21 @@ public enum Features { @Override void addBlocks() { Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 0, 0); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 1, 1); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 2, 2); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 3, 3); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 4, 4); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 5, 5); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 6, 6); Carving.chisel - .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); + .addVariation("TFMazestone", GameRegistry.findBlock("TwilightForest", "tile.TFMazestone"), 7, 7); Carving.chisel.registerOre("TFMazestone", "TFMazestone"); } }, @@ -3621,13 +3768,13 @@ public enum Features { @Override void addBlocks() { Carving.chisel - .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); + .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 0, 0); Carving.chisel - .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); + .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 1, 1); Carving.chisel - .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); + .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 2, 2); Carving.chisel - .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 3, 3); + .addVariation("TFTowerStone", GameRegistry.findBlock("TwilightForest", "tile.TFTowerStone"), 3, 3); Carving.chisel.registerOre("TFTowerStone", "TFTowerStone"); } }, @@ -3637,11 +3784,11 @@ public enum Features { @Override void addBlocks() { Carving.chisel - .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); + .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 0, 0); Carving.chisel - .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); + .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 1, 1); Carving.chisel - .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); + .addVariation("TFUnderBrick", GameRegistry.findBlock("TwilightForest", "tile.TFUnderBrick"), 2, 2); Carving.chisel.registerOre("TFUnderBrick", "TFUnderBrick"); } }, @@ -3651,7 +3798,8 @@ public enum Features { @Override void addBlocks() { BlockCarvable thaumium = (BlockCarvable) new BlockCarvable(Material.iron) - .setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setStepSound(Block.soundTypeMetal); + .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); @@ -3692,8 +3840,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable tyrian = (BlockCarvable) new BlockCarvable(Material.iron) - .setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(5.0F).setResistance(10.0F) - .setStepSound(Block.soundTypeMetal); + .setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F) + .setStepSound(Block.soundTypeMetal); tyrian.carverHelper.addVariation("tile.tyrian.0.desc", 0, "tyrian/shining"); tyrian.carverHelper.addVariation("tile.tyrian.1.desc", 1, "tyrian/tyrian"); @@ -3719,14 +3869,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.tyrian, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.iron_ingot, 1)); + new ItemStack(ChiselBlocks.tyrian, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.iron_ingot, 1)); } }, @@ -3735,8 +3885,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable uranium = (BlockCarvable) new BlockBeaconBase(Material.iron) - .setStepSound(Block.soundTypeMetal).setCreativeTab(ChiselTabs.tabModdedChiselBlocks).setHardness(5F) - .setResistance(10F); + .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); uranium.carverHelper.addVariation("tile.metalOre.2.desc", 2, "metals/uranium/thermal", 22); @@ -3753,8 +3905,10 @@ public enum Features { @Override void addBlocks() { BlockCarvable valentines = (BlockCarvable) new BlockCarvable(Material.wood) - .setStepSound(Block.soundTypeStone).setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F) - .setResistance(10F); + .setStepSound(Block.soundTypeStone) + .setCreativeTab(ChiselTabs.tabOtherChiselBlocks) + .setHardness(2F) + .setResistance(10F); valentines.carverHelper.addVariation("tile.valentines.0.desc", 0, "valentines/1"); valentines.carverHelper.addVariation("tile.valentines.1.desc", 1, "valentines/companion"); valentines.carverHelper.addVariation("tile.valentines.2.desc", 2, "valentines/2"); @@ -3772,15 +3926,15 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.valentines, 8, 0), - "***", - "*X*", - "***", - '*', - "stone", - 'X', - new ItemStack(Items.dye, 1, 9))); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.valentines, 8, 0), + "***", + "*X*", + "***", + '*', + "stone", + 'X', + new ItemStack(Items.dye, 1, 9))); } }, @@ -3789,8 +3943,11 @@ public enum Features { @Override void addBlocks() { BlockCarvable voidstone = (BlockCarvable) new BlockCarvable() - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setStepSound(Block.soundTypeStone) + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(5.0F) + .setResistance(10.0F); voidstone.carverHelper.addVariation("tile.voidstone.0.desc", 0, "voidstone/raw", 0); voidstone.carverHelper.addVariation("tile.voidstone.1.desc", 1, "voidstone/quarters", 1); voidstone.carverHelper.addVariation("tile.voidstone.2.desc", 2, "voidstone/smooth", 2); @@ -3804,44 +3961,41 @@ public enum Features { Carving.chisel.registerOre("voidstone", "voidstone"); BlockCarvable voidstone2 = (BlockCarvable) new BlockCarvable().setStepSound(Block.soundTypeStone) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + .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)); - voidstone2.carverHelper.addVariation( - "tile.voidstone.3.desc", - 3, - new SubmapManagerVoidstone("voidstone/animated/skulls", 3)); + .addVariation("tile.voidstone.0.desc", 0, new SubmapManagerVoidstone("voidstone/animated/raw", 0)); voidstone2.carverHelper - .addVariation("tile.voidstone.4.desc", 4, new SubmapManagerVoidstone("voidstone/animated/rune", 4)); - voidstone2.carverHelper.addVariation( - "tile.voidstone.5.desc", - 5, - new SubmapManagerVoidstone("voidstone/animated/metalborder", 5)); + .addVariation("tile.voidstone.1.desc", 1, new SubmapManagerVoidstone("voidstone/animated/quarters", 1)); voidstone2.carverHelper - .addVariation("tile.voidstone.6.desc", 6, new SubmapManagerVoidstone("voidstone/animated/eye", 6)); + .addVariation("tile.voidstone.2.desc", 2, new SubmapManagerVoidstone("voidstone/animated/smooth", 2)); + voidstone2.carverHelper + .addVariation("tile.voidstone.3.desc", 3, new SubmapManagerVoidstone("voidstone/animated/skulls", 3)); + voidstone2.carverHelper + .addVariation("tile.voidstone.4.desc", 4, new SubmapManagerVoidstone("voidstone/animated/rune", 4)); voidstone2.carverHelper.addVariation( - "tile.voidstone.7.desc", - 7, - new SubmapManagerVoidstone("voidstone/animated/bevel", 7)); + "tile.voidstone.5.desc", + 5, + new SubmapManagerVoidstone("voidstone/animated/metalborder", 5)); + voidstone2.carverHelper + .addVariation("tile.voidstone.6.desc", 6, new SubmapManagerVoidstone("voidstone/animated/eye", 6)); + voidstone2.carverHelper + .addVariation("tile.voidstone.7.desc", 7, new SubmapManagerVoidstone("voidstone/animated/bevel", 7)); voidstone2.carverHelper.registerAll(voidstone2, "voidstone2"); Carving.chisel.registerOre("voidstone2", "voidstone2"); BlockCarvable voidstonerunic = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(5.0F).setResistance(10.0F); + .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(" ", "")); + "tile.voidstoneRunic." + sGNames[i].replaceAll(" ", "") + .toLowerCase() + ".desc", + i, + "voidstone/runes/rune" + sGNames[i].replaceAll(" ", "")); voidstonerunic.carverHelper.registerAll(voidstonerunic, "voidstoneRunic"); voidstonerunic.carverHelper.registerVariations("voidstone"); @@ -3851,13 +4005,13 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.voidstone, 8, 0), - new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', - new ItemStack(Items.ender_pearl, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); + new ItemStack(ChiselBlocks.voidstone, 8, 0), + new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', + new ItemStack(Items.ender_pearl, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.voidstone2, 8, 0), - new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', - new ItemStack(Items.ender_eye, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); + new ItemStack(ChiselBlocks.voidstone2, 8, 0), + new Object[] { "oxo", "xyx", "oxo", 'x', new ItemStack(Blocks.stone, 1), 'y', + new ItemStack(Items.ender_eye, 1), 'o', new ItemStack(Blocks.obsidian, 1) }); } }, @@ -3866,13 +4020,14 @@ public enum Features { @Override void addBlocks() { BlockCarvable voidstonePillar = (BlockCarvable) new BlockCarvable(Material.rock) - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setStepSound(Block.soundTypeStone); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setStepSound(Block.soundTypeStone); voidstonePillar.carverHelper.addVariation("tile.voidstonePillar.0.desc", 0, "voidstone/pillar"); voidstonePillar.carverHelper.registerAll(voidstonePillar, "voidstonePillar"); Carving.chisel.registerOre("voidstonePillar", "voidstonePillar"); BlockCarvable voidstonePillar2 = (BlockCarvable) new BlockCarvable(Material.rock) - .setStepSound(Block.soundTypeStone); + .setStepSound(Block.soundTypeStone); voidstonePillar2.carverHelper.addVariation("tile.voidstonePillar2.0.desc", 0, "voidstone/animated/pillar"); voidstonePillar2.carverHelper.registerAll(voidstonePillar2, "voidstonePillar2"); Carving.chisel.registerOre("voidstonePillar2", "voidstonePillar2"); @@ -3881,17 +4036,17 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.voidstonePillar, 4, 0), - "xx", - "xx", - 'x', - new ItemStack(ChiselBlocks.voidstone, 1)); + new ItemStack(ChiselBlocks.voidstonePillar, 4, 0), + "xx", + "xx", + 'x', + new ItemStack(ChiselBlocks.voidstone, 1)); GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.voidstonePillar2, 4, 0), - "xx", - "xx", - 'x', - new ItemStack(ChiselBlocks.voidstone2, 1)); + new ItemStack(ChiselBlocks.voidstonePillar2, 4, 0), + "xx", + "xx", + 'x', + new ItemStack(ChiselBlocks.voidstone2, 1)); } }, @@ -3900,9 +4055,10 @@ public enum Features { @Override void addBlocks() { BlockCarvableLayered warningSign = (BlockCarvableLayered) new BlockCarvableLayered( - Material.iron, - "warning/base").setCreativeTab(ChiselTabs.tabMetalChiselBlocks).setHardness(2.0F) - .setResistance(10.0F); + Material.iron, + "warning/base").setCreativeTab(ChiselTabs.tabMetalChiselBlocks) + .setHardness(2.0F) + .setResistance(10.0F); warningSign.carverHelper.addVariation("tile.warningSign.0.desc", 0, "warning/rad"); warningSign.carverHelper.addVariation("tile.warningSign.1.desc", 1, "warning/bio"); warningSign.carverHelper.addVariation("tile.warningSign.2.desc", 2, "warning/fire"); @@ -3925,9 +4081,9 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ShapedOreRecipe( - new ItemStack(ChiselBlocks.warningSign, 4, 0), - new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign })); + new ShapedOreRecipe( + new ItemStack(ChiselBlocks.warningSign, 4, 0), + new Object[] { "xxx", "xyx", "xxx", 'x', "stone", 'y', Items.sign })); } }, @@ -3936,7 +4092,9 @@ public enum Features { @Override void addBlocks() { BlockWaterstone waterstone = (BlockWaterstone) new BlockWaterstone(Material.rock, "water_still") - .setCreativeTab(ChiselTabs.tabStoneChiselBlocks).setHardness(2.0F).setResistance(10.0F); + .setCreativeTab(ChiselTabs.tabStoneChiselBlocks) + .setHardness(2.0F) + .setResistance(10.0F); waterstone.carverHelper.addVariation("tile.waterstone.0.desc", 0, "waterstone/cobble"); waterstone.carverHelper.addVariation("tile.waterstone.1.desc", 1, "waterstone/black"); waterstone.carverHelper.addVariation("tile.waterstone.2.desc", 2, "waterstone/tiles"); @@ -3952,14 +4110,14 @@ public enum Features { @Override void addRecipes() { GameRegistry.addRecipe( - new ItemStack(ChiselBlocks.waterstone, 8, 0), - "***", - "*X*", - "***", - '*', - new ItemStack(Blocks.stone, 1), - 'X', - new ItemStack(Items.water_bucket, 1)); + new ItemStack(ChiselBlocks.waterstone, 8, 0), + "***", + "*X*", + "***", + '*', + new ItemStack(Blocks.stone, 1), + 'X', + new ItemStack(Items.water_bucket, 1)); } }, @@ -3973,8 +4131,10 @@ public enum Features { final String name = n.replace('-', '_') + "_planks"; planks[i] = (BlockCarvable) (new BlockCarvable(Material.wood)) - .setCreativeTab(ChiselTabs.tabWoodChiselBlocks).setHardness(2.0F).setResistance(5.0F) - .setStepSound(Block.soundTypeWood); + .setCreativeTab(ChiselTabs.tabWoodChiselBlocks) + .setHardness(2.0F) + .setResistance(5.0F) + .setStepSound(Block.soundTypeWood); planks[i].carverHelper.addVariation("tile." + n + ".planks.1.desc", 1, "planks-" + n + "/clean"); planks[i].carverHelper.addVariation("tile." + n + ".planks.2.desc", 2, "planks-" + n + "/short"); @@ -3983,16 +4143,16 @@ public enum Features { planks[i].carverHelper.addVariation("tile." + n + ".planks.9.desc", 9, "planks-" + n + "/double"); planks[i].carverHelper.addVariation("tile." + n + ".planks.10.desc", 10, "planks-" + n + "/crate"); planks[i].carverHelper - .addVariation("tile." + n + ".planks.11.desc", 11, "planks-" + n + "/crate-fancy"); + .addVariation("tile." + n + ".planks.11.desc", 11, "planks-" + n + "/crate-fancy"); planks[i].carverHelper.addVariation("tile." + n + ".planks.13.desc", 13, "planks-" + n + "/large"); planks[i].carverHelper.addVariation("tile." + n + ".planks.3.desc", 3, "planks-" + n + "/vertical"); planks[i].carverHelper - .addVariation("tile." + n + ".planks.4.desc", 4, "planks-" + n + "/vertical-uneven"); + .addVariation("tile." + n + ".planks.4.desc", 4, "planks-" + n + "/vertical-uneven"); planks[i].carverHelper.addVariation("tile." + n + ".planks.5.desc", 5, "planks-" + n + "/parquet"); planks[i].carverHelper.addVariation("tile." + n + ".planks.7.desc", 7, "planks-" + n + "/blinds"); planks[i].carverHelper.addVariation("tile." + n + ".planks.12.desc", 12, "planks-" + n + "/crateex"); planks[i].carverHelper - .addVariation("tile." + n + ".planks.14.desc", 14, "planks-" + n + "/chaotic-hor"); + .addVariation("tile." + n + ".planks.14.desc", 14, "planks-" + n + "/chaotic-hor"); planks[i].carverHelper.addVariation("tile." + n + ".planks.15.desc", 15, "planks-" + n + "/chaotic"); planks[i].carverHelper.registerAll(planks[i], name); Carving.chisel.addVariation(name, Blocks.planks, i, 0); @@ -4009,12 +4169,15 @@ public enum Features { @Override void addBlocks() { BlockCarvable woolen_clay = (BlockCarvable) new BlockCarvable(Material.clay) - .setCreativeTab(ChiselTabs.tabOtherChiselBlocks).setHardness(2F).setResistance(10F); + .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()); + "tile.woolenClay." + i + ".desc", + i, + "woolenClay/" + sGNames[i].replaceAll(" ", "") + .toLowerCase()); woolen_clay.carverHelper.registerAll(woolen_clay, "woolen_clay"); Carving.chisel.registerOre("woolen_clay", "woolen_clay"); @@ -4023,15 +4186,15 @@ public enum Features { @Override void addRecipes() { OreDictionary.registerOre( - "stainedClay" + sGNames[meta].replaceAll(" ", ""), - new ItemStack(Blocks.stained_hardened_clay, 1, meta)); + "stainedClay" + sGNames[meta].replaceAll(" ", ""), + new ItemStack(Blocks.stained_hardened_clay, 1, meta)); OreDictionary - .registerOre("blockWool" + sGNames[meta].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, meta)); + .registerOre("blockWool" + sGNames[meta].replaceAll(" ", ""), new ItemStack(Blocks.wool, 1, meta)); GameRegistry.addRecipe( - new ShapelessOreRecipe( - new ItemStack(ChiselBlocks.woolen_clay, 2, meta), - new Object[] { "blockWool" + sGNames[meta].replaceAll(" ", ""), - "stainedClay" + sGNames[meta].replaceAll(" ", "") })); + new ShapelessOreRecipe( + new ItemStack(ChiselBlocks.woolen_clay, 2, meta), + new Object[] { "blockWool" + sGNames[meta].replaceAll(" ", ""), + "stainedClay" + sGNames[meta].replaceAll(" ", "") })); } @Override @@ -4041,8 +4204,8 @@ public enum Features { }; private static final String[] dyeOres = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", - "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", - "dyeOrange", "dyeWhite" }; + "dyeCyan", "dyeLightGray", "dyeGray", "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", + "dyeOrange", "dyeWhite" }; private static int meta = 0; @@ -4108,14 +4271,14 @@ public enum Features { private static void logDisabled(Features f) { if (!f.hasParentFeature() && f.parent != null) { Chisel.logger.info( - "Skipping feature {} as its parent feature {} was disabled.", - Configurations.featureName(f), - Configurations.featureName(f.parent)); + "Skipping feature {} as its parent feature {} was disabled.", + Configurations.featureName(f), + Configurations.featureName(f.parent)); } else if (!f.hasRequiredMod() && f.getRequiredMod() != null) { Chisel.logger.info( - "Skipping feature {} as its required mod {} was missing.", - Configurations.featureName(f), - f.getRequiredMod()); + "Skipping feature {} as its required mod {} was missing.", + Configurations.featureName(f), + f.getRequiredMod()); } else { Chisel.logger.info("Skipping feature {} as it was disabled in the config.", Configurations.featureName(f)); } diff --git a/src/main/java/team/chisel/block/BlockAutoChisel.java b/src/main/java/team/chisel/block/BlockAutoChisel.java index c501ee29..c3cb7117 100644 --- a/src/main/java/team/chisel/block/BlockAutoChisel.java +++ b/src/main/java/team/chisel/block/BlockAutoChisel.java @@ -36,7 +36,7 @@ public class BlockAutoChisel extends BlockContainer { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int metadata, float x1, - float y1, float z1) { + float y1, float z1) { TileEntity tile = world.getTileEntity(x, y, z); if (world.isRemote) return true; diff --git a/src/main/java/team/chisel/block/BlockCarvable.java b/src/main/java/team/chisel/block/BlockCarvable.java index 7d6e062f..e302e6b5 100644 --- a/src/main/java/team/chisel/block/BlockCarvable.java +++ b/src/main/java/team/chisel/block/BlockCarvable.java @@ -11,9 +11,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.Chisel; -import team.chisel.config.Configurations; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -22,6 +19,8 @@ import com.cricketcraft.chisel.api.rendering.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.config.Configurations; public class BlockCarvable extends Block implements ICarvable { @@ -145,7 +144,7 @@ public class BlockCarvable extends Block implements ICarvable { * @param frequency default 1.0f */ public SoundType(String soundNameBreak, String soundNameStep, String soundNamePlace, float volume, - float frequency) { + float frequency) { super(soundNameStep, volume, frequency); this.soundNameStep = soundNameStep; this.soundNameBreak = soundNameBreak; diff --git a/src/main/java/team/chisel/block/BlockCarvableBeacon.java b/src/main/java/team/chisel/block/BlockCarvableBeacon.java index 61e58101..9a980c26 100644 --- a/src/main/java/team/chisel/block/BlockCarvableBeacon.java +++ b/src/main/java/team/chisel/block/BlockCarvableBeacon.java @@ -13,14 +13,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.block.tileentity.TileEntityCarvableBeacon; -import team.chisel.init.ChiselBlocks; - import com.cricketcraft.chisel.api.ChiselTabs; 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.ChiselBlocks; + public class BlockCarvableBeacon extends BlockBeacon implements ICarvable { public static int renderId; @@ -42,7 +42,7 @@ public class BlockCarvableBeacon extends BlockBeacon implements ICarvable { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int par5, float hitX, - float hitY, float hitZ) { + float hitY, float hitZ) { if (world.isRemote) { return true; } else { diff --git a/src/main/java/team/chisel/block/BlockCarvableGlass.java b/src/main/java/team/chisel/block/BlockCarvableGlass.java index 253fb9ef..c3c001ac 100644 --- a/src/main/java/team/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlass.java @@ -12,8 +12,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.ctmlib.CTM; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -22,6 +20,7 @@ import com.cricketcraft.chisel.api.rendering.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.CTM; public class BlockCarvableGlass extends BlockGlass implements ICarvable { @@ -63,7 +62,8 @@ public class BlockCarvableGlass extends BlockGlass implements ICarvable { @Override public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - ForgeDirection face = ForgeDirection.getOrientation(side).getOpposite(); + ForgeDirection face = ForgeDirection.getOrientation(side) + .getOpposite(); int meX = x + face.offsetX; int meY = y + face.offsetY; int meZ = z + face.offsetZ; diff --git a/src/main/java/team/chisel/block/BlockCarvableGlow.java b/src/main/java/team/chisel/block/BlockCarvableGlow.java index e6c3e0f9..a0c8e489 100644 --- a/src/main/java/team/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlow.java @@ -4,10 +4,10 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import team.chisel.Chisel; -import team.chisel.client.render.SubmapManagerBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.client.render.SubmapManagerBase; public class BlockCarvableGlow extends BlockCarvableColor { diff --git a/src/main/java/team/chisel/block/BlockCarvableIceStairs.java b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java index 2920ec4d..da43341d 100644 --- a/src/main/java/team/chisel/block/BlockCarvableIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java @@ -6,10 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import team.chisel.init.ChiselBlocks; - import com.cricketcraft.chisel.api.carving.CarvableHelper; +import team.chisel.init.ChiselBlocks; + public class BlockCarvableIceStairs extends BlockCarvableStairs { public BlockCarvableIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/team/chisel/block/BlockCarvableLayered.java b/src/main/java/team/chisel/block/BlockCarvableLayered.java index b070524e..75d7e5ec 100644 --- a/src/main/java/team/chisel/block/BlockCarvableLayered.java +++ b/src/main/java/team/chisel/block/BlockCarvableLayered.java @@ -4,9 +4,9 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import team.chisel.Chisel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; public class BlockCarvableLayered extends BlockCarvable { diff --git a/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java index 4768662d..3380bd14 100644 --- a/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java @@ -6,10 +6,10 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import team.chisel.init.ChiselBlocks; - import com.cricketcraft.chisel.api.carving.CarvableHelper; +import team.chisel.init.ChiselBlocks; + public class BlockCarvablePackedIceStairs extends BlockCarvableStairs { public BlockCarvablePackedIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/team/chisel/block/BlockCarvablePane.java b/src/main/java/team/chisel/block/BlockCarvablePane.java index ea8b5e20..3ec1dcfa 100644 --- a/src/main/java/team/chisel/block/BlockCarvablePane.java +++ b/src/main/java/team/chisel/block/BlockCarvablePane.java @@ -10,8 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.client.render.RendererCTMPane; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -19,6 +17,7 @@ import com.cricketcraft.chisel.api.carving.IVariationInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.client.render.RendererCTMPane; public class BlockCarvablePane extends BlockPane implements ICarvable { diff --git a/src/main/java/team/chisel/block/BlockCarvablePumpkin.java b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java index 7f832fda..1cfd461f 100644 --- a/src/main/java/team/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java @@ -10,15 +10,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.Chisel; -import team.chisel.entity.EntityChiselSnowman; - import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.entity.EntityChiselSnowman; public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable { @@ -58,20 +57,20 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable { // 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); + "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; + && 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; + && world.getBlock(x, y - 1, z + 1) == Blocks.iron_block; if (flag || flag1) { world.setBlock(x, y, z, Blocks.air, 0, 2); @@ -110,11 +109,10 @@ public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable { @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { return side == 1 ? top - : (side == 0 ? top - : (meta == 2 && side == 2 ? face - : (meta == 3 && side == 5 ? face - : (meta == 0 && side == 3 ? face - : (meta == 1 && side == 4 ? face : this.blockIcon))))); + : (side == 0 ? top + : (meta == 2 && side == 2 ? face + : (meta == 3 && side == 5 ? face + : (meta == 0 && side == 3 ? face : (meta == 1 && side == 4 ? face : this.blockIcon))))); } @Override diff --git a/src/main/java/team/chisel/block/BlockCarvableSand.java b/src/main/java/team/chisel/block/BlockCarvableSand.java index c3bebd4b..029ae9dc 100644 --- a/src/main/java/team/chisel/block/BlockCarvableSand.java +++ b/src/main/java/team/chisel/block/BlockCarvableSand.java @@ -10,8 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.Chisel; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -20,6 +18,7 @@ import com.cricketcraft.chisel.api.rendering.ClientUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; public class BlockCarvableSand extends BlockSand implements ICarvable { @@ -133,7 +132,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { * @param frequency default 1.0f */ public SoundType(String soundNameBreak, String soundNameStep, String soundNamePlace, float volume, - float frequency) { + float frequency) { super(soundNameStep, volume, frequency); this.soundNameStep = soundNameStep; this.soundNameBreak = soundNameBreak; diff --git a/src/main/java/team/chisel/block/BlockCarvableSlab.java b/src/main/java/team/chisel/block/BlockCarvableSlab.java index 1105e93a..eb8c0f68 100644 --- a/src/main/java/team/chisel/block/BlockCarvableSlab.java +++ b/src/main/java/team/chisel/block/BlockCarvableSlab.java @@ -75,7 +75,7 @@ public class BlockCarvableSlab extends BlockCarvable { @SuppressWarnings("rawtypes") @Override public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, - List par6List, Entity par7Entity) { + List par6List, Entity par7Entity) { setBlockBoundsBasedOnState(par1World, par2, par3, par4); super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity); } diff --git a/src/main/java/team/chisel/block/BlockCarvableStairs.java b/src/main/java/team/chisel/block/BlockCarvableStairs.java index 41b04c13..fd8f7cff 100644 --- a/src/main/java/team/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableStairs.java @@ -14,12 +14,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.client.render.RendererStairs; - 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; + public class BlockCarvableStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; @@ -62,7 +62,7 @@ public class BlockCarvableStairs extends BlockStairs implements ICarvable { @Override public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, - ItemStack par6ItemStack) { + ItemStack par6ItemStack) { int meta = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; // 0->2 2->3 3->0 1->1 diff --git a/src/main/java/team/chisel/block/BlockCarvableTorch.java b/src/main/java/team/chisel/block/BlockCarvableTorch.java index afdcad32..009d6e13 100644 --- a/src/main/java/team/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/team/chisel/block/BlockCarvableTorch.java @@ -7,8 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.Chisel; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; @@ -16,6 +14,7 @@ import com.cricketcraft.chisel.api.carving.IVariationInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; public class BlockCarvableTorch extends BlockTorch implements ICarvable { @@ -57,7 +56,7 @@ public class BlockCarvableTorch extends BlockTorch implements ICarvable { @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_) { + Random p_149734_5_) { if (emitsParticles) { int l = p_149734_1_.getBlockMetadata(p_149734_2_, p_149734_3_, p_149734_4_); double d0 = p_149734_2_ + 0.5F; diff --git a/src/main/java/team/chisel/block/BlockCloud.java b/src/main/java/team/chisel/block/BlockCloud.java index 086cfb16..c2bd5197 100644 --- a/src/main/java/team/chisel/block/BlockCloud.java +++ b/src/main/java/team/chisel/block/BlockCloud.java @@ -10,9 +10,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.config.Configurations; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.config.Configurations; public class BlockCloud extends BlockCarvable { diff --git a/src/main/java/team/chisel/block/BlockConcrete.java b/src/main/java/team/chisel/block/BlockConcrete.java index 85b852da..42e9857e 100644 --- a/src/main/java/team/chisel/block/BlockConcrete.java +++ b/src/main/java/team/chisel/block/BlockConcrete.java @@ -7,19 +7,21 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovementInput; import net.minecraft.util.MovementInputFromOptions; -import team.chisel.config.Configurations; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.config.Configurations; public class BlockConcrete extends BlockCarvable { public BlockConcrete() { super(); - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } @SideOnly(Side.CLIENT) @@ -29,16 +31,16 @@ public class BlockConcrete extends BlockCarvable { @SideOnly(Side.CLIENT) public void speedupPlayer(PlayerTickEvent event) { if (event.phase == Phase.START && event.side.isClient() - && event.player.onGround - && event.player instanceof EntityPlayerSP) { + && event.player.onGround + && event.player instanceof EntityPlayerSP) { if (manualInputCheck == null) { manualInputCheck = new MovementInputFromOptions(Minecraft.getMinecraft().gameSettings); } EntityPlayerSP player = (EntityPlayerSP) event.player; Block below = player.worldObj.getBlock( - MathHelper.floor_double(player.posX), - MathHelper.floor_double(player.posY) - 2, - MathHelper.floor_double(player.posZ)); + MathHelper.floor_double(player.posX), + MathHelper.floor_double(player.posY) - 2, + MathHelper.floor_double(player.posZ)); if (below == this) { manualInputCheck.updatePlayerMoveState(); if (manualInputCheck.moveForward != 0 || manualInputCheck.moveStrafe != 0) { diff --git a/src/main/java/team/chisel/block/BlockPresent.java b/src/main/java/team/chisel/block/BlockPresent.java index 9f98f7b5..aaaeca2d 100644 --- a/src/main/java/team/chisel/block/BlockPresent.java +++ b/src/main/java/team/chisel/block/BlockPresent.java @@ -19,15 +19,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.Chisel; -import team.chisel.block.tileentity.TileEntityPresent; - import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityPresent; public class BlockPresent extends Block implements ICarvable { @@ -110,7 +109,7 @@ public class BlockPresent extends Block implements ICarvable { @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int hitX, float hitY, - float hitZ, float p_149727_9_) { + float hitZ, float p_149727_9_) { if (!world.isSideSolid(x, y + 1, z, ForgeDirection.DOWN)) { if (!world.isRemote) { player.openGui(Chisel.instance, 2, world, x, y, z); @@ -143,22 +142,22 @@ public class BlockPresent extends Block implements ICarvable { ForgeDirection dir = me.getConnectionDir(); // warning: magic below! Do not change this conditional if (dir == ForgeDirection.EAST || (me.isParent() && dir == ForgeDirection.SOUTH) - || (!me.isParent() && dir == ForgeDirection.SOUTH)) { + || (!me.isParent() && dir == ForgeDirection.SOUTH)) { return AxisAlignedBB.getBoundingBox( - x + minX, - y + minY, - z + minZ, - x + maxX + dir.offsetX, - y + maxY, - z + maxZ + dir.offsetZ); + x + minX, + y + minY, + z + minZ, + x + maxX + dir.offsetX, + y + maxY, + z + maxZ + dir.offsetZ); } else { return AxisAlignedBB.getBoundingBox( - x + dir.offsetX + minX, - y + minY, - z + dir.offsetZ + minZ, - x + maxX, - y + maxY, - z + maxZ); + x + dir.offsetX + minX, + y + minY, + z + dir.offsetZ + minZ, + x + maxX, + y + maxY, + z + maxZ); } } return AxisAlignedBB.getBoundingBox(x + minX, y + minY, z + minZ, x + maxX, y + maxY, z + maxZ); diff --git a/src/main/java/team/chisel/block/BlockRoadLine.java b/src/main/java/team/chisel/block/BlockRoadLine.java index 68fd1987..f8b9eb91 100644 --- a/src/main/java/team/chisel/block/BlockRoadLine.java +++ b/src/main/java/team/chisel/block/BlockRoadLine.java @@ -9,10 +9,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import team.chisel.Chisel; -import team.chisel.config.Configurations; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.config.Configurations; public class BlockRoadLine extends BlockCarvable { @@ -53,7 +53,8 @@ public class BlockRoadLine extends BlockCarvable { @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) - || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); + || par1World.getBlock(par2, par3 - 1, par4) + .equals(Blocks.glowstone); } @Override diff --git a/src/main/java/team/chisel/block/BlockSnakestone.java b/src/main/java/team/chisel/block/BlockSnakestone.java index 22f34eef..c8736fd8 100644 --- a/src/main/java/team/chisel/block/BlockSnakestone.java +++ b/src/main/java/team/chisel/block/BlockSnakestone.java @@ -134,7 +134,8 @@ public class BlockSnakestone extends Block { break; } - if (!world.getBlock(x, y, z).equals(this)) continue; + if (!world.getBlock(x, y, z) + .equals(this)) continue; boolean match = false; int px1 = x, px2 = x; @@ -250,17 +251,23 @@ public class BlockSnakestone extends Block { public boolean connectedTo(World par1World, int x, int y, int z, int direction) { switch (direction) { case 0: - return par1World.getBlock(x, y, z - 1).equals(this); + return par1World.getBlock(x, y, z - 1) + .equals(this); case 1: - return par1World.getBlock(x, y, z + 1).equals(this); + return par1World.getBlock(x, y, z + 1) + .equals(this); case 2: - return par1World.getBlock(x - 1, y, z).equals(this); + return par1World.getBlock(x - 1, y, z) + .equals(this); case 3: - return par1World.getBlock(x + 1, y, z).equals(this); + return par1World.getBlock(x + 1, y, z) + .equals(this); case 4: - return par1World.getBlock(x, y - 1, z).equals(this); + return par1World.getBlock(x, y - 1, z) + .equals(this); case 5: - return par1World.getBlock(x, y + 1, z).equals(this); + return par1World.getBlock(x, y + 1, z) + .equals(this); } return false; diff --git a/src/main/java/team/chisel/block/CarvableStairsMaker.java b/src/main/java/team/chisel/block/CarvableStairsMaker.java index 94f1ef69..e030c335 100644 --- a/src/main/java/team/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/team/chisel/block/CarvableStairsMaker.java @@ -3,13 +3,13 @@ package team.chisel.block; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import team.chisel.carving.Carving; -import team.chisel.item.ItemCarvable; - import com.cricketcraft.chisel.api.ChiselTabs; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.CarvingUtils; + import cpw.mods.fml.common.registry.GameRegistry; +import team.chisel.carving.Carving; +import team.chisel.item.ItemCarvable; public class CarvableStairsMaker { @@ -29,20 +29,21 @@ public class CarvableStairsMaker { for (int i = 0; i < blocks.length; i++) { String n = name + "." + i; blocks[i] = creator == null ? new BlockCarvableStairs(blockBase, i * 2, carverHelper) - : creator.create(blockBase, i * 2, carverHelper); + : creator.create(blockBase, i * 2, carverHelper); - blocks[i].setBlockName("chisel." + n).setCreativeTab(ChiselTabs.tabStairChiselBlocks); + blocks[i].setBlockName("chisel." + n) + .setCreativeTab(ChiselTabs.tabStairChiselBlocks); GameRegistry.registerBlock(blocks[i], ItemCarvable.class, n); for (int meta = 0; meta < 2 && i * 2 + meta < carverHelper.infoList.size(); meta++) { Carving.chisel.addVariation(name, CarvingUtils.getDefaultVariationFor(blocks[i], meta * 8, i)); GameRegistry.addRecipe( - new ItemStack(blocks[i], 4, meta * 8), - "* ", - "** ", - "***", - '*', - new ItemStack(blockBase, 1, i * 2 + meta)); + new ItemStack(blocks[i], 4, meta * 8), + "* ", + "** ", + "***", + '*', + new ItemStack(blockBase, 1, i * 2 + meta)); } } } diff --git a/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java index 65fbf653..f1b76adc 100644 --- a/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java @@ -15,6 +15,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; +import com.cricketcraft.chisel.api.IChiselItem; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import team.chisel.Features; import team.chisel.carving.Carving; import team.chisel.client.GeneralChiselClient; @@ -24,11 +28,6 @@ import team.chisel.network.message.MessageAutoChisel; import team.chisel.network.message.MessageSlotUpdate; import team.chisel.utils.General; -import com.cricketcraft.chisel.api.IChiselItem; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - public class TileEntityAutoChisel extends TileEntity implements ISidedInventory { public enum Upgrade { @@ -40,15 +39,19 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory public String getUnlocalizedName() { if (Features.AUTO_CHISEL_UPGRADES.enabled()) { - return "item.upgrade_" + this.name().toLowerCase(); + return "item.upgrade_" + this.name() + .toLowerCase(); } return "chisel.autochisel.upgrade.disabled"; } public String getLocalizedName() { - String ret = StatCollector.translateToLocal("autochisel.slot." + this.name().toLowerCase() + ".tooltip"); + String ret = StatCollector.translateToLocal( + "autochisel.slot." + this.name() + .toLowerCase() + ".tooltip"); if (!Features.AUTO_CHISEL_UPGRADES.enabled()) { - ret = EnumChatFormatting.RED.toString().concat(ret); + ret = EnumChatFormatting.RED.toString() + .concat(ret); } return ret; } @@ -227,12 +230,12 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory } return ((IChiselItem) inventory[CHISEL].getItem()) - .canChisel(worldObj, inventory[CHISEL], General.getVariation(getTarget())); + .canChisel(worldObj, inventory[CHISEL], General.getVariation(getTarget())); } private boolean hasChisel() { return inventory[CHISEL] != null && inventory[CHISEL].getItem() instanceof IChiselItem - && inventory[CHISEL].stackSize >= 1; + && inventory[CHISEL].stackSize >= 1; } /** Calls IChiselItem#onChisel() and sends the chisel packet for sound/animation */ @@ -240,7 +243,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory if (!worldObj.isRemote) { boolean breakChisel = false; if (((IChiselItem) inventory[CHISEL].getItem()) - .onChisel(worldObj, inventory[CHISEL], General.getVariation(target))) { + .onChisel(worldObj, inventory[CHISEL], General.getVariation(target))) { inventory[CHISEL].setItemDamage(inventory[CHISEL].getItemDamage() + 1); if (inventory[CHISEL].getItemDamage() >= inventory[CHISEL].getMaxDamage()) { setInventorySlotContents(CHISEL, null); @@ -248,18 +251,18 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory } } PacketHandler.INSTANCE.sendToDimension( - new MessageAutoChisel(this, chiseled, true, breakChisel), - worldObj.provider.dimensionId); + new MessageAutoChisel(this, chiseled, true, breakChisel), + worldObj.provider.dimensionId); } else { if (breakChisel) { worldObj.playSound( - xCoord + 0.5, - yCoord + 0.5, - zCoord + 0.5, - "random.break", - 0.8F, - 0.8F + worldObj.rand.nextFloat() * 0.4F, - false); + xCoord + 0.5, + yCoord + 0.5, + zCoord + 0.5, + "random.break", + 0.8F, + 0.8F + worldObj.rand.nextFloat() * 0.4F, + false); } GeneralChiselClient.spawnAutoChiselFX(this, lastBase != null ? lastBase : inventory[BASE]); chiseling = false; @@ -331,7 +334,7 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory private void slotChanged(int slot) { PacketHandler.INSTANCE - .sendToDimension(new MessageSlotUpdate(this, slot, inventory[slot]), worldObj.provider.dimensionId); + .sendToDimension(new MessageSlotUpdate(this, slot, inventory[slot]), worldObj.provider.dimensionId); markDirty(); } @@ -369,14 +372,15 @@ public class TileEntityAutoChisel extends TileEntity implements ISidedInventory switch (slot) { case BASE: case TARGET: - return !Carving.chisel.getItemsForChiseling(itemStack).isEmpty(); + return !Carving.chisel.getItemsForChiseling(itemStack) + .isEmpty(); case OUTPUT: return false; case CHISEL: return itemStack.getItem() instanceof IChiselItem; default: return Features.AUTO_CHISEL_UPGRADES.enabled() && itemStack.getItem() == ChiselItems.upgrade - && Upgrade.values()[slot - MIN_UPGRADE].ordinal() == itemStack.getItemDamage(); + && Upgrade.values()[slot - MIN_UPGRADE].ordinal() == itemStack.getItemDamage(); } } diff --git a/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java index e798d729..06af0c72 100644 --- a/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java @@ -47,8 +47,8 @@ public class TileEntityPresent extends TileEntity implements IInventory, IDouble 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) { + && (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(); @@ -57,7 +57,7 @@ public class TileEntityPresent extends TileEntity implements IInventory, IDouble isParent = !present.isParent; markDirty(); PacketHandler.INSTANCE - .sendToDimension(new MessagePresentConnect(this, dir, true), worldObj.provider.dimensionId); + .sendToDimension(new MessagePresentConnect(this, dir, true), worldObj.provider.dimensionId); return true; } return false; @@ -87,8 +87,8 @@ public class TileEntityPresent extends TileEntity implements IInventory, IDouble this.connection = null; this.markDirty(); PacketHandler.INSTANCE.sendToDimension( - new MessagePresentConnect(this, ForgeDirection.UNKNOWN, false, preserveDir), - worldObj.provider.dimensionId); + new MessagePresentConnect(this, ForgeDirection.UNKNOWN, false, preserveDir), + worldObj.provider.dimensionId); } } @@ -197,7 +197,7 @@ public class TileEntityPresent extends TileEntity implements IInventory, IDouble @Override public boolean shouldRefresh(Block oldBlock, Block newBlock, int oldMeta, int newMeta, World world, int x, int y, - int z) { + int z) { // prevent losing TE data when in-world chiseling return oldBlock != newBlock; } diff --git a/src/main/java/team/chisel/carving/Carving.java b/src/main/java/team/chisel/carving/Carving.java index 5df23731..6b7f2eda 100644 --- a/src/main/java/team/chisel/carving/Carving.java +++ b/src/main/java/team/chisel/carving/Carving.java @@ -7,13 +7,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import team.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; + public class Carving implements ICarvingRegistry { GroupList groups = new GroupList(); diff --git a/src/main/java/team/chisel/carving/GroupList.java b/src/main/java/team/chisel/carving/GroupList.java index e1df6720..21d18a30 100644 --- a/src/main/java/team/chisel/carving/GroupList.java +++ b/src/main/java/team/chisel/carving/GroupList.java @@ -30,7 +30,7 @@ public class GroupList implements Set { if (obj instanceof ICarvingVariation) { ICarvingVariation v2 = (ICarvingVariation) obj; return v.getBlock() == v2.getBlock() - && (v.getBlockMeta() == v2.getBlockMeta() || v.getItemMeta() == v2.getItemMeta()); + && (v.getBlockMeta() == v2.getBlockMeta() || v.getItemMeta() == v2.getItemMeta()); } else if (obj instanceof VariationWrapper) { return equals(((VariationWrapper) obj).v); } @@ -39,7 +39,8 @@ public class GroupList implements Set { @Override public int hashCode() { - return v.getBlock().hashCode(); + return v.getBlock() + .hashCode(); } } @@ -100,17 +101,20 @@ public class GroupList implements Set { @Override public Iterator iterator() { - return groups.values().iterator(); + return groups.values() + .iterator(); } @Override public Object[] toArray() { - return groups.values().toArray(); + return groups.values() + .toArray(); } @Override public T[] toArray(T[] arr) { - return groups.values().toArray(arr); + return groups.values() + .toArray(arr); } @Override @@ -134,7 +138,9 @@ public class GroupList implements Set { if (o instanceof ICarvingGroup) { List toRemove = Lists.newArrayList(); for (VariationWrapper v : lookup.keySet()) { - if (lookup.get(v).getName().equals(((ICarvingGroup) o).getName())) { + if (lookup.get(v) + .getName() + .equals(((ICarvingGroup) o).getName())) { toRemove.add(v); } } @@ -228,9 +234,11 @@ public class GroupList implements Set { } List toRemove = Lists.newArrayList(); for (VariationWrapper v : lookup.keySet()) { - if ((g == null || lookup.get(v).getName().equals(g.getName())) - && v.equals(new VariationWrapper(new VariationKey(block, metadata)))) { - lookup.get(v).removeVariation(v.v); + if ((g == null || lookup.get(v) + .getName() + .equals(g.getName())) && v.equals(new VariationWrapper(new VariationKey(block, metadata)))) { + lookup.get(v) + .removeVariation(v.v); toRemove.add(v); } } diff --git a/src/main/java/team/chisel/client/GeneralChiselClient.java b/src/main/java/team/chisel/client/GeneralChiselClient.java index d5625957..bcb8b952 100644 --- a/src/main/java/team/chisel/client/GeneralChiselClient.java +++ b/src/main/java/team/chisel/client/GeneralChiselClient.java @@ -30,19 +30,18 @@ public class GeneralChiselClient { public static void spawnLavastoneFX(World world, BlockLavastone block, int x, int y, int z) { if (Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0 - || Minecraft.getMinecraft().gameSettings.particleSetting != 0) - return; + || Minecraft.getMinecraft().gameSettings.particleSetting != 0) return; float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) - + f - + block.getBlockBoundsMinX(); + + f + + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) - + f - + block.getBlockBoundsMinY(); + + f + + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) - + f - + block.getBlockBoundsMinZ(); + + f + + block.getBlockBoundsMinZ(); switch (rand.nextInt(6)) { case 0: @@ -71,7 +70,8 @@ public class GeneralChiselClient { break; } - if (world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z) + .isOpaqueCube()) return; EntityLavaFX res = new EntityLavaFX(world, x1, y1, z1); double multiplier = 0.45; @@ -84,19 +84,18 @@ public class GeneralChiselClient { public static void spawnHolystoneFX(World world, BlockHolystone block, int x, int y, int z) { if (Configurations.particlesTickrate != 0 && tick++ % Configurations.particlesTickrate != 0 - || Minecraft.getMinecraft().gameSettings.particleSetting != 0) - return; + || Minecraft.getMinecraft().gameSettings.particleSetting != 0) return; float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) - + f - + block.getBlockBoundsMinX(); + + f + + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) - + f - + block.getBlockBoundsMinY(); + + f + + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) - + f - + block.getBlockBoundsMinZ(); + + f + + block.getBlockBoundsMinZ(); switch (rand.nextInt(6)) { case 0: @@ -125,7 +124,8 @@ public class GeneralChiselClient { break; } - if (world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z) + .isOpaqueCube()) return; EntityHolystoneFX res = new EntityHolystoneFX(world, block, x1, y1, z1); Minecraft.getMinecraft().effectRenderer.addEffect(res); @@ -136,14 +136,14 @@ public class GeneralChiselClient { float f = 0.15F; double x1 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) - + f - + block.getBlockBoundsMinX(); + + f + + block.getBlockBoundsMinX(); double y1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) - + f - + block.getBlockBoundsMinY(); + + f + + block.getBlockBoundsMinY(); double z1 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) - + f - + block.getBlockBoundsMinZ(); + + f + + block.getBlockBoundsMinZ(); switch (rand.nextInt(6)) { case 0: @@ -172,7 +172,8 @@ public class GeneralChiselClient { break; } - if (world.getBlock(x, y, z).isOpaqueCube()) return; + if (world.getBlock(x, y, z) + .isOpaqueCube()) return; EntityGrimstoneFX res = new EntityGrimstoneFX(world, block, x1, y1, z1); Minecraft.getMinecraft().effectRenderer.addEffect(res); @@ -180,7 +181,7 @@ public class GeneralChiselClient { public static void spawnSnakestoneObsidianFX(World world, BlockSnakestoneObsidian block, int x, int y, int z) { if (Configurations.particlesTickrate != 0 || tick++ % Configurations.particlesTickrate != 0 - || Minecraft.getMinecraft().gameSettings.particleSetting != 0) { + || Minecraft.getMinecraft().gameSettings.particleSetting != 0) { EntitySnakestoneObsidianFX res = new EntitySnakestoneObsidianFX(world, block, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(res); } @@ -188,7 +189,7 @@ public class GeneralChiselClient { public static void spawnBallOMossFX(World world, double x, double y, double z) { if (Configurations.particlesTickrate == 0 || tick++ % Configurations.particlesTickrate == 0 - || Minecraft.getMinecraft().gameSettings.particleSetting != 0) { + || Minecraft.getMinecraft().gameSettings.particleSetting != 0) { EntityBallOMossFX res = new EntityBallOMossFX(world, x, y, z); Minecraft.getMinecraft().effectRenderer.addEffect(res); } @@ -202,14 +203,14 @@ public class GeneralChiselClient { float f = 0.1F; double d0 = x + rand.nextDouble() * (block.getBlockBoundsMaxX() - block.getBlockBoundsMinX() - f * 2.0F) - + f - + block.getBlockBoundsMinX(); + + f + + block.getBlockBoundsMinX(); double d1 = y + rand.nextDouble() * (block.getBlockBoundsMaxY() - block.getBlockBoundsMinY() - f * 2.0F) - + f - + block.getBlockBoundsMinY(); + + f + + block.getBlockBoundsMinY(); double d2 = z + rand.nextDouble() * (block.getBlockBoundsMaxZ() - block.getBlockBoundsMinZ() - f * 2.0F) - + f - + block.getBlockBoundsMinZ(); + + f + + block.getBlockBoundsMinZ(); switch (side) { case 0: @@ -233,16 +234,16 @@ public class GeneralChiselClient { } EntityDiggingFX res = new EntityDiggingFX( - world, - d0, - d1, - d2, - 0.0D, - 0.0D, - 0.0D, - block, - world.getBlockMetadata(x, y, z), - side); + world, + d0, + d1, + d2, + 0.0D, + 0.0D, + 0.0D, + block, + world.getBlockMetadata(x, y, z), + side); res.motionX = d0 - (x + 0.5); res.motionY = d1 - (y + 0.5); res.motionZ = d2 - (z + 0.5); @@ -271,19 +272,19 @@ public class GeneralChiselClient { if (base != null && Minecraft.getMinecraft().gameSettings.particleSetting == 0) { for (int i = 0; i < 10; i++) { EntityDiggingFX particle = new EntityDiggingFX( - te.getWorldObj(), - te.xCoord + 0.5, - te.yCoord + 0.95, - te.zCoord + 0.5, - 0, - 0, - 0, - Block.getBlockFromItem(base.getItem()), - base.getItemDamage()); + te.getWorldObj(), + te.xCoord + 0.5, + te.yCoord + 0.95, + te.zCoord + 0.5, + 0, + 0, + 0, + Block.getBlockFromItem(base.getItem()), + base.getItemDamage()); particle.setVelocity( - (te.getWorldObj().rand.nextDouble() / 4) - 0.125, - te.getWorldObj().rand.nextDouble() / 8, - (te.getWorldObj().rand.nextDouble() / 4) - 0.125); + (te.getWorldObj().rand.nextDouble() / 4) - 0.125, + te.getWorldObj().rand.nextDouble() / 8, + (te.getWorldObj().rand.nextDouble() / 4) - 0.125); Minecraft.getMinecraft().effectRenderer.addEffect(particle); } String sound = Carving.chisel.getVariationSound(base.getItem(), base.getItemDamage()); diff --git a/src/main/java/team/chisel/client/gui/GuiAutoChisel.java b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java index 4264463e..09afdf72 100644 --- a/src/main/java/team/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java @@ -10,12 +10,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import team.chisel.block.tileentity.TileEntityAutoChisel; -import team.chisel.inventory.ContainerAutoChisel; - import com.google.common.base.Strings; import com.google.common.collect.Lists; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.inventory.ContainerAutoChisel; + public class GuiAutoChisel extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/autochisel-gui.png"); @@ -55,8 +55,8 @@ public class GuiAutoChisel extends GuiContainer { private boolean mouseInside(Slot slot, int x, int y) { return x >= slot.xDisplayPosition && x <= slot.xDisplayPosition + 16 - && y >= slot.yDisplayPosition - && y <= slot.yDisplayPosition + 16; + && y >= slot.yDisplayPosition + && y <= slot.yDisplayPosition + 16; } @Override @@ -81,11 +81,11 @@ public class GuiAutoChisel extends GuiContainer { public static void drawSlotOverlay(GuiContainer gui, int x, int y, Slot slot, int u, int v, int padding) { padding /= 2; gui.drawTexturedModalRect( - x + (slot.xDisplayPosition - padding), - y + (slot.yDisplayPosition - padding), - u, - v, - 18 + padding, - 18 + padding); + x + (slot.xDisplayPosition - padding), + y + (slot.yDisplayPosition - padding), + u, + v, + 18 + padding, + 18 + padding); } } diff --git a/src/main/java/team/chisel/client/gui/GuiChisel.java b/src/main/java/team/chisel/client/gui/GuiChisel.java index 10d57f87..0ac5c267 100644 --- a/src/main/java/team/chisel/client/gui/GuiChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiChisel.java @@ -14,6 +14,12 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import com.cricketcraft.chisel.api.IAdvancedChisel; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import team.chisel.client.gui.widgets.GuiButtonChiselMode; import team.chisel.inventory.ContainerChisel; import team.chisel.inventory.InventoryChiselSelection; @@ -23,19 +29,12 @@ import team.chisel.network.PacketHandler; import team.chisel.network.message.MessageChiselMode; import team.chisel.utils.General; -import com.cricketcraft.chisel.api.IAdvancedChisel; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.carving.IChiselMode; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - @SideOnly(Side.CLIENT) public class GuiChisel extends GuiContainer { public static final ResourceLocation TEXTURE_RESOURCE_LOCATION = new ResourceLocation( - MOD_ID, - "textures/chisel2GuiScroll.png"); + MOD_ID, + "textures/chisel2GuiScroll.png"); public static final int TEXTURE_WIDTH = 266; public static final int TEXTURE_HEIGHT = 250; public static final int GUI_WIDTH = 266; @@ -91,7 +90,7 @@ public class GuiChisel extends GuiContainer { private boolean showMode() { return container.chisel != null && container.chisel.getItem() instanceof IChiselItem - && ((IChiselItem) container.chisel.getItem()).hasModes(container.chisel); + && ((IChiselItem) container.chisel.getItem()).hasModes(container.chisel); } @Override @@ -100,15 +99,15 @@ public class GuiChisel extends GuiContainer { final String titleText = I18n.format(container.inventory.getInventoryName() + ".title"); fontRendererObj - .drawSplitString(titleText, 50 - fontRendererObj.getStringWidth(titleText) / 2, 60, 40, 0x404040); + .drawSplitString(titleText, 50 - fontRendererObj.getStringWidth(titleText) / 2, 60, 40, 0x404040); if (showMode()) { final String modeText = I18n.format(container.inventory.getInventoryName() + ".mode"); fontRendererObj.drawString( - modeText, - 12 + (GuiButtonChiselMode.BUTTON_WIDTH - fontRendererObj.getStringWidth(modeText)) / 2, - 122, - 0x404040); + modeText, + 12 + (GuiButtonChiselMode.BUTTON_WIDTH - fontRendererObj.getStringWidth(modeText)) / 2, + 122, + 0x404040); } scrollBar.draw(this); @@ -119,21 +118,22 @@ public class GuiChisel extends GuiContainer { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_LIGHTING); - mc.getTextureManager().bindTexture(TEXTURE_RESOURCE_LOCATION); + mc.getTextureManager() + .bindTexture(TEXTURE_RESOURCE_LOCATION); // drawModalRectWithCustomSizedTexture: x, y, u, v, width, height, textureWidth, textureHeight func_146110_a(guiLeft, guiTop, 0, 0, xSize, ySize, TEXTURE_WIDTH, TEXTURE_HEIGHT); Slot main = (Slot) container.inventorySlots.get(InventoryChiselSelection.normalSlots); if (main.getStack() == null) { func_146110_a( - guiLeft + 8, - guiTop + 8, - 0, - GUI_HEIGHT, - CHISEL_INPUT_SIZE, - CHISEL_INPUT_SIZE, - TEXTURE_WIDTH, - TEXTURE_HEIGHT); + guiLeft + 8, + guiTop + 8, + 0, + GUI_HEIGHT, + CHISEL_INPUT_SIZE, + CHISEL_INPUT_SIZE, + TEXTURE_WIDTH, + TEXTURE_HEIGHT); } } diff --git a/src/main/java/team/chisel/client/gui/GuiChiselConfig.java b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java index c6ac72ee..67f1d771 100644 --- a/src/main/java/team/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java @@ -5,20 +5,20 @@ import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.client.config.GuiConfig; import team.chisel.Chisel; import team.chisel.config.Configurations; -import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig { public GuiChiselConfig(GuiScreen parent) { super( - parent, - new ConfigElement(Configurations.config.getCategory(Configuration.CATEGORY_GENERAL)) - .getChildElements(), - Chisel.MOD_ID, - false, - false, - GuiConfig.getAbridgedConfigPath(Configurations.config.toString())); + parent, + new ConfigElement(Configurations.config.getCategory(Configuration.CATEGORY_GENERAL)) + .getChildElements(), + Chisel.MOD_ID, + false, + false, + GuiConfig.getAbridgedConfigPath(Configurations.config.toString())); } } diff --git a/src/main/java/team/chisel/client/gui/GuiPresent.java b/src/main/java/team/chisel/client/gui/GuiPresent.java index 56dd394d..8195e714 100644 --- a/src/main/java/team/chisel/client/gui/GuiPresent.java +++ b/src/main/java/team/chisel/client/gui/GuiPresent.java @@ -23,7 +23,8 @@ public class GuiPresent extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(gui); + this.mc.getTextureManager() + .bindTexture(gui); int x = (this.width - this.xSize) / 2; int y = (this.height - this.ySize) / 2; this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.rows * 18 + 17); diff --git a/src/main/java/team/chisel/client/gui/GuiScrollbar.java b/src/main/java/team/chisel/client/gui/GuiScrollbar.java index fe4fc668..c1aa0691 100644 --- a/src/main/java/team/chisel/client/gui/GuiScrollbar.java +++ b/src/main/java/team/chisel/client/gui/GuiScrollbar.java @@ -11,8 +11,8 @@ import team.chisel.network.message.MessageScrollUpdate; public class GuiScrollbar { public static final ResourceLocation TEXTURE_RESOURCE_LOCATION = new ResourceLocation( - "minecraft", - "textures/gui/container/creative_inventory/tabs.png"); + "minecraft", + "textures/gui/container/creative_inventory/tabs.png"); private int displayX = 0; private int displayY = 0; @@ -28,7 +28,8 @@ public class GuiScrollbar { public void draw(GuiChisel g) { // chisel2GuiScroll scroll button texture coordinates work strange (maybe because of alignment) so taking // vanilla one - g.mc.getTextureManager().bindTexture(TEXTURE_RESOURCE_LOCATION); + g.mc.getTextureManager() + .bindTexture(TEXTURE_RESOURCE_LOCATION); GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); if (getMaxScroll() == 0) { diff --git a/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java b/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java index 11622dec..bc106e25 100644 --- a/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java +++ b/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java @@ -7,10 +7,10 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; -import team.chisel.client.gui.GuiChisel; -import team.chisel.item.chisel.ChiselMode; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.client.gui.GuiChisel; +import team.chisel.item.chisel.ChiselMode; @SideOnly(Side.CLIENT) public class GuiButtonChiselMode extends GuiButton { @@ -42,12 +42,13 @@ public class GuiButtonChiselMode extends GuiButton { @Override public void drawButton(final Minecraft mc, final int mouseX, final int mouseY) { if (this.visible) { - mc.getTextureManager().bindTexture(TEXTURE_RESOURCE_LOCATION); + mc.getTextureManager() + .bindTexture(TEXTURE_RESOURCE_LOCATION); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); // Mouse Hover State this.field_146123_n = mouseX >= this.xPosition && mouseY >= this.yPosition - && mouseX < this.xPosition + this.width - && mouseY < this.yPosition + this.height; + && mouseX < this.xPosition + this.width + && mouseY < this.yPosition + this.height; drawButtonBackgroundLayer(); drawButtonForegroundLayer(); } @@ -57,14 +58,14 @@ public class GuiButtonChiselMode extends GuiButton { final float u = BUTTON_BACKGROUND_U + (this.field_146123_n ? BUTTON_WIDTH : 0); // drawModalRectWithCustomSizedTexture: x, y, u, v, width, height, textureWidth, textureHeight func_146110_a( - this.xPosition, - this.yPosition, - u, - BUTTON_BACKGROUND_V, - this.width, - this.height, - TEXTURE_WIDTH, - TEXTURE_HEIGHT); + this.xPosition, + this.yPosition, + u, + BUTTON_BACKGROUND_V, + this.width, + this.height, + TEXTURE_WIDTH, + TEXTURE_HEIGHT); } private void drawButtonForegroundLayer() { diff --git a/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java index 3bd8ed0e..ae9178a5 100644 --- a/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java @@ -12,27 +12,27 @@ public class RenderBlocksEldritch extends RenderBlocks { } static double displacementMap[] = { +0.1165, -0.0352, -0.1208, +0.0906, -0.0295, +0.0302, -0.0973, +0.0548, -0.1077, - +0.0662, -0.0932, -0.0925, -0.1161, +0.0073, -0.1084, +0.1136, +0.0307, +0.0316, -0.1066, -0.0237, +0.0614, - -0.0864, +0.0837, +0.1218, +0.0502, -0.0529, -0.0942, +0.1209, -0.0418, +0.1035, +0.0066, -0.0255, +0.0830, - -0.0361, +0.0965, +0.0646, +0.1124, +0.0890, -0.0037, +0.0467, +0.1025, +0.1161, +0.0014, +0.0365, +0.0755, - -0.0025, +0.0739, +0.0656, +0.0571, -0.0813, -0.0062, -0.0904, -0.0005, +0.0612, -0.0227, +0.0138, -0.0899, - -0.0019, -0.1047, +0.1191, -0.1197, -0.1123, +0.0999, +0.0638, +0.0865, +0.0029, -0.0084, +0.1132, -0.0433, - +0.0115, +0.0850, +0.0439, +0.0748, +0.0460, -0.0441, +0.0839, +0.0162, -0.0229, +0.0774, -0.0647, -0.0636, - -0.0709, -0.0719, -0.0194, +0.1070, -0.0466, -0.1200, -0.0996, -0.0298, -0.1035, -0.0006, +0.0530, -0.0939, - -0.1210, +0.0176, +0.0924, +0.0343, -0.0777, +0.1050, -0.0729, -0.0062, -0.1107, -0.0434, -0.0042, +0.0232, - +0.0269, +0.0709, -0.0388, +0.0342, +0.0240, -0.0192, +0.0491, +0.0017, -0.1240, +0.0687, -0.1160, +0.1123, - -0.0332, -0.0260, +0.0476, -0.0049, -0.0893, -0.0243, -0.0371, -0.0230, +0.0656, +0.1080, +0.0781, -0.0648, - +0.0082, -0.1086, -0.0451, -0.0594, -0.1155, -0.0623, -0.0152, +0.0131, -0.0754, +0.0607, +0.0876, -0.0657, - +0.0366, -0.0981, +0.1164, -0.0623, +0.0181, -0.0475, +0.0722, -0.0293, +0.0486, -0.0195, +0.1041, +0.1011, - +0.0042, -0.0045, -0.1031, +0.0110, +0.0058, +0.0083, -0.0782, -0.1003, -0.0082, -0.0304, -0.0971, -0.0097, - -0.0208, -0.1059, -0.0239, -0.0385, +0.0505, +0.0537, -0.1098, -0.0022, -0.0165, -0.0027, -0.0208, +0.0305, - +0.0592, +0.0301, +0.0055, +0.1138, -0.0338, -0.0901, +0.1015, +0.0061, +0.0861, -0.1057, -0.0889, -0.0972, - +0.0783, -0.1052, -0.0932, -0.1103, +0.0497, +0.1222, -0.0146, +0.0632, -0.0240, -0.0193, +0.0676, -0.1128, - -0.0886, +0.0926, +0.0538, -0.0175, -0.0966, -0.0369, +0.1124, -0.0820, -0.1013, -0.0836, -0.0981, -0.0502, - +0.0573, +0.0616, -0.0458, +0.0294, +0.0108, -0.0782, +0.0692, +0.0234, -0.0178, -0.0171, -0.0505, -0.0313, - +0.0538, +0.0462, -0.0758, +0.0556, -0.0023, -0.1086, -0.0100, -0.0897, -0.0409, -0.1161, +0.0212, +0.1229, - -0.0945, +0.0341, +0.1238, +0.0893, -0.1189, -0.1098, -0.0125, +0.1137, -0.0202, +0.0239, -0.0408, +0.0920, - +0.0777, -0.0085, -0.0572, -0.0293, -0.0131, +0.0272, +0.0991, }; + +0.0662, -0.0932, -0.0925, -0.1161, +0.0073, -0.1084, +0.1136, +0.0307, +0.0316, -0.1066, -0.0237, +0.0614, + -0.0864, +0.0837, +0.1218, +0.0502, -0.0529, -0.0942, +0.1209, -0.0418, +0.1035, +0.0066, -0.0255, +0.0830, + -0.0361, +0.0965, +0.0646, +0.1124, +0.0890, -0.0037, +0.0467, +0.1025, +0.1161, +0.0014, +0.0365, +0.0755, + -0.0025, +0.0739, +0.0656, +0.0571, -0.0813, -0.0062, -0.0904, -0.0005, +0.0612, -0.0227, +0.0138, -0.0899, + -0.0019, -0.1047, +0.1191, -0.1197, -0.1123, +0.0999, +0.0638, +0.0865, +0.0029, -0.0084, +0.1132, -0.0433, + +0.0115, +0.0850, +0.0439, +0.0748, +0.0460, -0.0441, +0.0839, +0.0162, -0.0229, +0.0774, -0.0647, -0.0636, + -0.0709, -0.0719, -0.0194, +0.1070, -0.0466, -0.1200, -0.0996, -0.0298, -0.1035, -0.0006, +0.0530, -0.0939, + -0.1210, +0.0176, +0.0924, +0.0343, -0.0777, +0.1050, -0.0729, -0.0062, -0.1107, -0.0434, -0.0042, +0.0232, + +0.0269, +0.0709, -0.0388, +0.0342, +0.0240, -0.0192, +0.0491, +0.0017, -0.1240, +0.0687, -0.1160, +0.1123, + -0.0332, -0.0260, +0.0476, -0.0049, -0.0893, -0.0243, -0.0371, -0.0230, +0.0656, +0.1080, +0.0781, -0.0648, + +0.0082, -0.1086, -0.0451, -0.0594, -0.1155, -0.0623, -0.0152, +0.0131, -0.0754, +0.0607, +0.0876, -0.0657, + +0.0366, -0.0981, +0.1164, -0.0623, +0.0181, -0.0475, +0.0722, -0.0293, +0.0486, -0.0195, +0.1041, +0.1011, + +0.0042, -0.0045, -0.1031, +0.0110, +0.0058, +0.0083, -0.0782, -0.1003, -0.0082, -0.0304, -0.0971, -0.0097, + -0.0208, -0.1059, -0.0239, -0.0385, +0.0505, +0.0537, -0.1098, -0.0022, -0.0165, -0.0027, -0.0208, +0.0305, + +0.0592, +0.0301, +0.0055, +0.1138, -0.0338, -0.0901, +0.1015, +0.0061, +0.0861, -0.1057, -0.0889, -0.0972, + +0.0783, -0.1052, -0.0932, -0.1103, +0.0497, +0.1222, -0.0146, +0.0632, -0.0240, -0.0193, +0.0676, -0.1128, + -0.0886, +0.0926, +0.0538, -0.0175, -0.0966, -0.0369, +0.1124, -0.0820, -0.1013, -0.0836, -0.0981, -0.0502, + +0.0573, +0.0616, -0.0458, +0.0294, +0.0108, -0.0782, +0.0692, +0.0234, -0.0178, -0.0171, -0.0505, -0.0313, + +0.0538, +0.0462, -0.0758, +0.0556, -0.0023, -0.1086, -0.0100, -0.0897, -0.0409, -0.1161, +0.0212, +0.1229, + -0.0945, +0.0341, +0.1238, +0.0893, -0.1189, -0.1098, -0.0125, +0.1137, -0.0202, +0.0239, -0.0408, +0.0920, + +0.0777, -0.0085, -0.0572, -0.0293, -0.0131, +0.0272, +0.0991, }; static int dmap1 = displacementMap.length * 1 / 6; static int dmap2 = displacementMap.length * 2 / 6; diff --git a/src/main/java/team/chisel/client/render/RenderChiselSnowman.java b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java index f1c4badf..9028c3c7 100644 --- a/src/main/java/team/chisel/client/render/RenderChiselSnowman.java +++ b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java @@ -54,9 +54,11 @@ public class RenderChiselSnowman extends RenderLiving { IItemRenderer customRenderer = MinecraftForgeClient.getItemRenderer(itemStack, EQUIPPED); boolean is3D = (customRenderer != null - && customRenderer.shouldUseRenderHelper(EQUIPPED, itemStack, BLOCK_3D)); + && customRenderer.shouldUseRenderHelper(EQUIPPED, itemStack, BLOCK_3D)); - if (is3D || RenderBlocks.renderItemIn3d(Block.getBlockFromItem(itemStack.getItem()).getRenderType())) { + 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); diff --git a/src/main/java/team/chisel/client/render/RendererCTM.java b/src/main/java/team/chisel/client/render/RendererCTM.java index 0cc6c7f5..0b620b5b 100644 --- a/src/main/java/team/chisel/client/render/RendererCTM.java +++ b/src/main/java/team/chisel/client/render/RendererCTM.java @@ -1,9 +1,9 @@ package team.chisel.client.render; -import team.chisel.ctmlib.CTMRenderer; - import com.cricketcraft.chisel.api.rendering.ClientUtils; + import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.ctmlib.CTMRenderer; public class RendererCTM extends CTMRenderer { diff --git a/src/main/java/team/chisel/client/render/RendererCTMPane.java b/src/main/java/team/chisel/client/render/RendererCTMPane.java index 5fc44815..06c401c2 100644 --- a/src/main/java/team/chisel/client/render/RendererCTMPane.java +++ b/src/main/java/team/chisel/client/render/RendererCTMPane.java @@ -10,9 +10,9 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.ctmlib.Drawing; public class RendererCTMPane implements ISimpleBlockRenderingHandler { @@ -200,7 +200,7 @@ public class RendererCTMPane implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { BlockPane block = (BlockPane) b; Tessellator tessellator = Tessellator.instance; @@ -230,12 +230,12 @@ public class RendererCTMPane implements ISimpleBlockRenderingHandler { if (renderer.hasOverrideBlockTexture()) { paneRenderer.set( - x, - y, - z, - renderer.overrideBlockTexture, - renderer.overrideBlockTexture, - renderer.overrideBlockTexture); + x, + y, + z, + renderer.overrideBlockTexture, + renderer.overrideBlockTexture, + renderer.overrideBlockTexture); } else { paneRenderer.set(x, y, z, iconPane, iconTop, iconSide); } @@ -259,8 +259,8 @@ public class RendererCTMPane implements ISimpleBlockRenderingHandler { boolean isolatedTop = !connectsTopNorth && !connectsTopSouth && !connectsTopWest && !connectsTopEast; boolean isolatedBottom = !connectsBottomNorth && !connectsBottomSouth - && !connectsBottomWest - && !connectsBottomEast; + && !connectsBottomWest + && !connectsBottomEast; if (!connectsNorth && !connectsSouth && !connectsWest && !connectsEast) { connectsNorth = connectsSouth = connectsWest = connectsEast = true; diff --git a/src/main/java/team/chisel/client/render/RendererEldritch.java b/src/main/java/team/chisel/client/render/RendererEldritch.java index 72843a26..03676ad3 100644 --- a/src/main/java/team/chisel/client/render/RendererEldritch.java +++ b/src/main/java/team/chisel/client/render/RendererEldritch.java @@ -6,10 +6,10 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import team.chisel.Chisel; -import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.Chisel; +import team.chisel.ctmlib.Drawing; public class RendererEldritch implements ISimpleBlockRenderingHandler { @@ -28,7 +28,7 @@ public class RendererEldritch implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks rendererOld) { + RenderBlocks rendererOld) { // tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, // y, z)); diff --git a/src/main/java/team/chisel/client/render/RendererLayeredGlow.java b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java index eb61e276..e42f8bc0 100644 --- a/src/main/java/team/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java @@ -7,13 +7,13 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import team.chisel.Chisel; import team.chisel.block.BlockCarvableGlow; import team.chisel.config.Configurations; import team.chisel.ctmlib.Drawing; import team.chisel.utils.GeneralClient; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class RendererLayeredGlow implements ISimpleBlockRenderingHandler { @@ -35,7 +35,7 @@ public class RendererLayeredGlow implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { Tessellator.instance.setColorOpaque_I(Configurations.configColors[world.getBlockMetadata(x, y, z)]); Tessellator.instance.setBrightness(0xF000F0); Drawing.renderAllFaces(renderer, block, x, y, z, ((BlockCarvableGlow) block).getGlowTexture()); diff --git a/src/main/java/team/chisel/client/render/RendererMultiLayer.java b/src/main/java/team/chisel/client/render/RendererMultiLayer.java index f27bf89f..918f5216 100644 --- a/src/main/java/team/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/team/chisel/client/render/RendererMultiLayer.java @@ -8,10 +8,10 @@ import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import team.chisel.block.BlockMultiLayerBase; -import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.block.BlockMultiLayerBase; +import team.chisel.ctmlib.Drawing; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { @@ -48,7 +48,7 @@ public class RendererMultiLayer implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block blck, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { if (blck == null || !(blck instanceof BlockMultiLayerBase)) return false; BlockMultiLayerBase block = (BlockMultiLayerBase) blck; diff --git a/src/main/java/team/chisel/client/render/RendererRoadLine.java b/src/main/java/team/chisel/client/render/RendererRoadLine.java index 120225ed..8dd3ecff 100644 --- a/src/main/java/team/chisel/client/render/RendererRoadLine.java +++ b/src/main/java/team/chisel/client/render/RendererRoadLine.java @@ -7,11 +7,11 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import team.chisel.Chisel; import team.chisel.block.BlockRoadLine; import team.chisel.ctmlib.Drawing; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class RendererRoadLine implements ISimpleBlockRenderingHandler { @@ -36,7 +36,7 @@ public class RendererRoadLine implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { int meta = world.getBlockMetadata(x, y, z); BlockRoadLine block = (BlockRoadLine) b; Tessellator tessellator = Tessellator.instance; @@ -59,10 +59,14 @@ public class RendererRoadLine implements ISimpleBlockRenderingHandler { } tessellator.setColorOpaque_F(f * f1, f * f2, f * f3); - boolean N = world.getBlock(x, y, z - 1).equals(block) && world.getBlockMetadata(x, y, z - 1) == meta; - boolean S = world.getBlock(x, y, z + 1).equals(block) && world.getBlockMetadata(x, y, z + 1) == meta; - boolean W = world.getBlock(x - 1, y, z).equals(block) && world.getBlockMetadata(x - 1, y, z) == meta; - boolean E = world.getBlock(x + 1, y, z).equals(block) && world.getBlockMetadata(x + 1, y, z) == meta; + boolean N = world.getBlock(x, y, z - 1) + .equals(block) && world.getBlockMetadata(x, y, z - 1) == meta; + boolean S = world.getBlock(x, y, z + 1) + .equals(block) && world.getBlockMetadata(x, y, z + 1) == meta; + boolean W = world.getBlock(x - 1, y, z) + .equals(block) && world.getBlockMetadata(x - 1, y, z) == meta; + boolean E = world.getBlock(x + 1, y, z) + .equals(block) && world.getBlockMetadata(x + 1, y, z) == meta; if (!N && !S && !W && !E) { renderer.renderStandardBlock(block, x, y, z); diff --git a/src/main/java/team/chisel/client/render/RendererSimpleLayered.java b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java index 8a3989e3..8c0185ed 100644 --- a/src/main/java/team/chisel/client/render/RendererSimpleLayered.java +++ b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java @@ -6,11 +6,11 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; import team.chisel.Chisel; import team.chisel.block.BlockCarvableLayered; import team.chisel.ctmlib.Drawing; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; public class RendererSimpleLayered implements ISimpleBlockRenderingHandler { @@ -30,7 +30,7 @@ public class RendererSimpleLayered implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { renderer.setOverrideBlockTexture(((BlockCarvableLayered) block).getBaseTex()); renderer.renderStandardBlock(block, x, y, z); renderer.clearOverrideBlockTexture(); diff --git a/src/main/java/team/chisel/client/render/RendererSnakeStone.java b/src/main/java/team/chisel/client/render/RendererSnakeStone.java index 583eaa96..bbad78b6 100644 --- a/src/main/java/team/chisel/client/render/RendererSnakeStone.java +++ b/src/main/java/team/chisel/client/render/RendererSnakeStone.java @@ -6,10 +6,10 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import team.chisel.block.BlockSnakestone; -import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.block.BlockSnakestone; +import team.chisel.ctmlib.Drawing; public class RendererSnakeStone implements ISimpleBlockRenderingHandler { @@ -30,7 +30,7 @@ public class RendererSnakeStone implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { int meta = world.getBlockMetadata(x, y, z); setRenderRotate(renderer, (BlockSnakestone) block, meta); diff --git a/src/main/java/team/chisel/client/render/RendererStairs.java b/src/main/java/team/chisel/client/render/RendererStairs.java index 73ba4861..97747c87 100644 --- a/src/main/java/team/chisel/client/render/RendererStairs.java +++ b/src/main/java/team/chisel/client/render/RendererStairs.java @@ -6,10 +6,10 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import team.chisel.block.BlockCarvableStairs; -import team.chisel.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.block.BlockCarvableStairs; +import team.chisel.ctmlib.Drawing; public class RendererStairs implements ISimpleBlockRenderingHandler { @@ -30,7 +30,7 @@ public class RendererStairs implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block blck, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { if (blck == null || !(blck instanceof BlockCarvableStairs)) return false; BlockCarvableStairs block = (BlockCarvableStairs) blck; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index eb9ca91d..da8e9f47 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -10,12 +10,12 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import team.chisel.ctmlib.Drawing; import team.chisel.ctmlib.RenderBlocksCTM; import team.chisel.ctmlib.TextureSubmap; import team.chisel.init.ChiselBlocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SubmapManagerAntiblock extends SubmapManagerBase { @@ -36,9 +36,9 @@ public class SubmapManagerAntiblock extends SubmapManagerBase { 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]); + ChiselBlocks.antiBlock, + ChiselBlocks.antiBlock.getIcon(0, item.getItemDamage()), + (RenderBlocks) data[0]); GL11.glEnable(GL11.GL_LIGHTING); } } diff --git a/src/main/java/team/chisel/client/render/SubmapManagerBase.java b/src/main/java/team/chisel/client/render/SubmapManagerBase.java index 9e9bad4b..b5a0c990 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerBase.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerBase.java @@ -6,9 +6,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.ctmlib.ISubmapManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.ISubmapManager; public abstract class SubmapManagerBase implements ISubmapManager { diff --git a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java index 7b5b1d57..2ef0c7d6 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java @@ -6,10 +6,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.ctmlib.RenderBlocksCTM; -import team.chisel.ctmlib.TextureSubmap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerCarpetFloor extends SubmapManagerBase { diff --git a/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java index 3c3850a1..88860c89 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java @@ -10,15 +10,14 @@ import net.minecraftforge.common.util.ForgeDirection; import org.apache.commons.lang3.tuple.Triple; -import team.chisel.ctmlib.RenderBlocksCTM; -import team.chisel.ctmlib.TextureSubmap; - import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.rendering.TextureType; import com.cricketcraft.chisel.api.rendering.TextureType.AbstractSubmapManager; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerCombinedCTM extends SubmapManagerBase { @@ -67,14 +66,14 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase { 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()); + .getVIcon(rType, SubmapManagerCombinedCTM.this.submap, ix, iy, iz, side.ordinal()); submapSmall = (TextureSubmap) TextureType - .getVIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); + .getVIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); } else { submap = (TextureSubmap) TextureType - .getRIcon(rType, SubmapManagerCombinedCTM.this.submap, ix, iy, iz, side.ordinal()); + .getRIcon(rType, SubmapManagerCombinedCTM.this.submap, ix, iy, iz, side.ordinal()); submapSmall = (TextureSubmap) TextureType - .getRIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); + .getRIcon(rType, SubmapManagerCombinedCTM.this.smallSubmap, ix, iy, iz, side.ordinal()); } } } @@ -111,13 +110,18 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase { 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!"; + || rType == TextureType.R4 + || rType == TextureType.V4 + || rType == TextureType.V9 : "Not a valid random type!"; this.meta = meta; this.texturePath = texturePath; - this.size = Integer.parseInt(rType.name().substring(1, rType.name().length())); // >.> + this.size = Integer.parseInt( + rType.name() + .substring( + 1, + rType.name() + .length())); // >.> this.rType = rType; } @@ -146,14 +150,15 @@ public class SubmapManagerCombinedCTM extends SubmapManagerBase { 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 + "-" + i); + .createManagerFor(CarvingUtils.getDefaultVariationFor(block, meta, 0), texturePath + "-" + i); manager.registerIcons(modName, block, register); Object cached = manager.getCachedObject(); Triple triple = (Triple) cached; submaps[i % wh][i / wh] = triple.getMiddle(); submapsSmall[i % wh][i / wh] = triple.getRight(); if (i == 0) { - defaultIcon = triple.getRight().getBaseIcon(); + defaultIcon = triple.getRight() + .getBaseIcon(); } } submap = new Submap(base, wh, submaps); diff --git a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java index 7a56b76a..cec3fa77 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java @@ -7,15 +7,14 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.Chisel; -import team.chisel.ctmlib.CTM; -import team.chisel.ctmlib.TextureSubmap; -import team.chisel.init.ChiselBlocks; - import com.google.common.base.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.Chisel; +import team.chisel.ctmlib.CTM; +import team.chisel.ctmlib.TextureSubmap; +import team.chisel.init.ChiselBlocks; public class SubmapManagerFakeController extends SubmapManagerBase { @@ -63,8 +62,8 @@ public class SubmapManagerFakeController extends SubmapManagerBase { 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."); + "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/team/chisel/client/render/SubmapManagerSlab.java b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java index 4ee38cdd..913d9780 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java @@ -7,11 +7,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import team.chisel.ctmlib.ISubmapManager; import team.chisel.ctmlib.RenderBlocksCTM; import team.chisel.ctmlib.TextureSubmap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class SubmapManagerSlab implements ISubmapManager { diff --git a/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java b/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java index 4fbf8482..bacb4d1d 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSpecialMaterial.java @@ -6,10 +6,10 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import team.chisel.ctmlib.RenderBlocksCTM; -import team.chisel.ctmlib.TextureSubmap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerSpecialMaterial extends SubmapManagerBase { @@ -67,7 +67,8 @@ public class SubmapManagerSpecialMaterial extends SubmapManagerBase { @Override @SideOnly(Side.CLIENT) public void registerIcons(String modName, Block block, IIconRegister register) { - String materialName = materialType.name().toLowerCase(); + String materialName = materialType.name() + .toLowerCase(); submap = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color + "-ctm"), 4, 4); submapSmall = new TextureSubmap(register.registerIcon(modName + ":" + materialName + "/" + color), 2, 2); } diff --git a/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java index f8997319..dc6d493e 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java @@ -8,15 +8,14 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.ctmlib.ISubmapManager; -import team.chisel.ctmlib.RenderBlocksCTM; -import team.chisel.ctmlib.TextureSubmap; - import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.rendering.TextureType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.ctmlib.ISubmapManager; +import team.chisel.ctmlib.RenderBlocksCTM; +import team.chisel.ctmlib.TextureSubmap; public class SubmapManagerVoidstone extends SubmapManagerBase { @@ -87,12 +86,12 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { private IIcon getBase(double x, double y, double z, int side) { return TextureType.getVIcon( - TextureType.V4, - base, - MathHelper.floor_double(x), - MathHelper.floor_double(y), - MathHelper.floor_double(z), - side); + TextureType.V4, + base, + MathHelper.floor_double(x), + MathHelper.floor_double(y), + MathHelper.floor_double(z), + side); } private String texture; @@ -116,7 +115,7 @@ public class SubmapManagerVoidstone extends SubmapManagerBase { @Override public void registerIcons(String modName, Block block, IIconRegister register) { overlay = TextureType.getTypeFor(null, modName, texture) - .createManagerFor(CarvingUtils.getDefaultVariationFor(block, meta, 0), texture); + .createManagerFor(CarvingUtils.getDefaultVariationFor(block, meta, 0), texture); overlay.registerIcons(modName, block, register); base = new TextureSubmap(register.registerIcon(modName + ":" + "animations/hadesX32"), 2, 2); } diff --git a/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java index 05a5aa40..129f2c4e 100644 --- a/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java @@ -30,27 +30,27 @@ public class ItemChiselRenderer implements IItemRenderer { // Fixes potential render bug with blocks that draw this item renderItem.zLevel = 10f; renderItem.renderItemIntoGUI( - Minecraft.getMinecraft().fontRenderer, - Minecraft.getMinecraft().renderEngine, - stack, - 0, - 0); + Minecraft.getMinecraft().fontRenderer, + Minecraft.getMinecraft().renderEngine, + stack, + 0, + 0); if (stack.stackTagCompound != null) { ItemStack chiselTarget = ItemStack - .loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("chiselTarget")); + .loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("chiselTarget")); if (chiselTarget != null) { GL11.glScalef(0.65f, 0.65f, 0.65f); GL11.glTranslatef(-8f, -8f, 0.0f); renderItem.renderItemIntoGUI( - Minecraft.getMinecraft().fontRenderer, - Minecraft.getMinecraft().renderEngine, - chiselTarget, - 8, - 8); + Minecraft.getMinecraft().fontRenderer, + Minecraft.getMinecraft().renderEngine, + chiselTarget, + 8, + 8); } } GL11.glPopMatrix(); diff --git a/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java index 0f5b23fc..7eeebcc7 100644 --- a/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java @@ -25,18 +25,18 @@ import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.Vertex; import net.minecraftforge.client.model.obj.WavefrontObject; -import team.chisel.Chisel; -import team.chisel.block.tileentity.TileEntityAutoChisel; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { private static final WavefrontObject model = new WavefrontObject( - new ResourceLocation(Chisel.MOD_ID, "models/autoChisel/autoChisel.obj")); + new ResourceLocation(Chisel.MOD_ID, "models/autoChisel/autoChisel.obj")); private static final ResourceLocation texture = new ResourceLocation( - Chisel.MOD_ID, - "textures/blocks/autoChisel/autoChisel.png"); + Chisel.MOD_ID, + "textures/blocks/autoChisel/autoChisel.png"); @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { @@ -46,7 +46,7 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp @Override public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { return helper == ItemRendererHelper.INVENTORY_BLOCK || helper == ItemRendererHelper.ENTITY_BOBBING - || helper == ItemRendererHelper.ENTITY_ROTATION; + || helper == ItemRendererHelper.ENTITY_ROTATION; } @Override @@ -85,7 +85,7 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { Tessellator tes = Tessellator.instance; IIcon icon = renderer.hasOverrideBlockTexture() ? renderer.overrideBlockTexture : block.getIcon(0, 0); tes.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); @@ -100,18 +100,18 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp TextureCoordinate t = f.textureCoordinates[i]; if (!renderer.hasOverrideBlockTexture()) { tes.addVertexWithUV( - vert.x, - vert.y, - vert.z, - icon.getInterpolatedU(t.u * 16), - icon.getInterpolatedV(t.v * 16)); + vert.x, + vert.y, + vert.z, + icon.getInterpolatedU(t.u * 16), + icon.getInterpolatedV(t.v * 16)); } else { tes.addVertexWithUV( - vert.x, - vert.y, - vert.z, - icon.getInterpolatedU((t.u * 64) % 16), - icon.getInterpolatedV((t.v * 64) % 16)); + vert.x, + vert.y, + vert.z, + icon.getInterpolatedU((t.u * 64) % 16), + icon.getInterpolatedV((t.v * 64) % 16)); } } } @@ -159,7 +159,8 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp float max = 0.35f; - if (!Minecraft.getMinecraft().isGamePaused()) { + if (!Minecraft.getMinecraft() + .isGamePaused()) { autoChisel.xRot += (rand.nextFloat() * max) - (max / 2); autoChisel.yRot += (rand.nextFloat() * max) - (max / 2); autoChisel.zRot += (rand.nextFloat() * max) - (max / 2); @@ -195,8 +196,8 @@ public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimp glPushMatrix(); glTranslated(x + 0.7, y + 1.01, z + 0.5); float rot = autoChisel.chiselRot == 0 ? 0 - : autoChisel.chiseling ? autoChisel.chiselRot + (TileEntityAutoChisel.rotAmnt * scale) - : autoChisel.chiselRot - (TileEntityAutoChisel.rotAmnt * scale); + : autoChisel.chiseling ? autoChisel.chiselRot + (TileEntityAutoChisel.rotAmnt * scale) + : autoChisel.chiselRot - (TileEntityAutoChisel.rotAmnt * scale); glRotatef(rot, 0, 0, 1); glTranslated(-0.12, 0, 0); glScalef(0.9f, 0.9f, 0.9f); diff --git a/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java index 8c3925c9..cb2d9131 100644 --- a/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java +++ b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java @@ -18,9 +18,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import team.chisel.block.tileentity.TileEntityCarvableBeacon; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; +import team.chisel.block.tileentity.TileEntityCarvableBeacon; public class RenderCarvableBeacon extends TileEntityBeaconRenderer implements ISimpleBlockRenderingHandler { @@ -151,7 +151,7 @@ public class RenderCarvableBeacon extends TileEntityBeaconRenderer implements IS @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, - RenderBlocks renderer) { + RenderBlocks renderer) { float f = 0.1875F; boolean breaking = renderer.hasOverrideBlockTexture(); if (!breaking) { diff --git a/src/main/java/team/chisel/client/render/tile/RenderPresent.java b/src/main/java/team/chisel/client/render/tile/RenderPresent.java index 8296e71c..31fd45ac 100644 --- a/src/main/java/team/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/team/chisel/client/render/tile/RenderPresent.java @@ -14,13 +14,13 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.google.common.collect.Maps; + +import cpw.mods.fml.client.FMLClientHandler; 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; - public class RenderPresent extends TileEntitySpecialRenderer implements IItemRenderer { private ModelChest smallChest = new ModelChest(); @@ -77,8 +77,8 @@ public class RenderPresent extends TileEntitySpecialRenderer implements IItemRen } private void bindTexture(TileEntityPresent present) { - int idx = present.getWorldObj().getBlockMetadata(present.xCoord, present.yCoord, present.zCoord) - + (present.isConnected() ? 0 : 16); + int idx = present.getWorldObj() + .getBlockMetadata(present.xCoord, present.yCoord, present.zCoord) + (present.isConnected() ? 0 : 16); ResourceLocation rl = textureCache.get(idx); if (rl == null) { String res = ChiselBlocks.present.getModelTexture(idx % 16); @@ -106,10 +106,11 @@ public class RenderPresent extends TileEntitySpecialRenderer implements IItemRen @Override public void renderItem(ItemRenderType type, ItemStack item, Object... data) { - FMLClientHandler.instance().getClient().renderEngine.bindTexture( + FMLClientHandler.instance() + .getClient().renderEngine.bindTexture( new ResourceLocation( - Chisel.MOD_ID, - ChiselBlocks.present.getModelTexture(item.getItemDamage()) + ".png")); + Chisel.MOD_ID, + ChiselBlocks.present.getModelTexture(item.getItemDamage()) + ".png")); switch (type) { case ENTITY: renderBlock(0.0F, 1.0F, 0.0F); diff --git a/src/main/java/team/chisel/compat/Compatibility.java b/src/main/java/team/chisel/compat/Compatibility.java index a0be2aab..bbb7d9e7 100644 --- a/src/main/java/team/chisel/compat/Compatibility.java +++ b/src/main/java/team/chisel/compat/Compatibility.java @@ -8,20 +8,19 @@ import java.util.Map; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import team.chisel.carving.Carving; -import team.chisel.client.gui.GuiChisel; -import team.chisel.utils.RecipeUtil; -import codechicken.nei.api.GuiInfo; - 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.RecipeRegistryProxy; +import codechicken.nei.api.GuiInfo; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; +import team.chisel.carving.Carving; +import team.chisel.client.gui.GuiChisel; +import team.chisel.utils.RecipeUtil; public class Compatibility { diff --git a/src/main/java/team/chisel/compat/IMCHandler.java b/src/main/java/team/chisel/compat/IMCHandler.java index d9d87225..63034141 100644 --- a/src/main/java/team/chisel/compat/IMCHandler.java +++ b/src/main/java/team/chisel/compat/IMCHandler.java @@ -2,12 +2,12 @@ package team.chisel.compat; import net.minecraft.block.Block; -import team.chisel.Chisel; -import team.chisel.carving.Carving; - import com.cricketcraft.chisel.api.IMC; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; + import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; +import team.chisel.Chisel; +import team.chisel.carving.Carving; public class IMCHandler { @@ -48,11 +48,11 @@ public class IMCHandler { } } catch (Exception e) { Chisel.logger.error( - "Could not handle data {} for IMC type {}. This was sent from mod {}.\n" - + "!! This is a bug in that mod !!\nSwallowing error and continuing...", - value, - type.name(), - message.getSender()); + "Could not handle data {} for IMC type {}. This was sent from mod {}.\n" + + "!! This is a bug in that mod !!\nSwallowing error and continuing...", + value, + type.name(), + message.getSender()); e.printStackTrace(); } } diff --git a/src/main/java/team/chisel/compat/WailaCompat.java b/src/main/java/team/chisel/compat/WailaCompat.java index 6262b40b..38ba7f5e 100644 --- a/src/main/java/team/chisel/compat/WailaCompat.java +++ b/src/main/java/team/chisel/compat/WailaCompat.java @@ -2,11 +2,6 @@ package team.chisel.compat; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaRegistrar; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +11,11 @@ import net.minecraft.world.World; import com.cricketcraft.chisel.api.ICarvable; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; + public class WailaCompat implements IWailaDataProvider { private WailaCompat() {} @@ -27,31 +27,31 @@ public class WailaCompat implements IWailaDataProvider { @Override public List getWailaHead(ItemStack stack, List strings, IWailaDataAccessor accessor, - IWailaConfigHandler configHandler) { + IWailaConfigHandler configHandler) { return strings; } @Override public List getWailaBody(ItemStack stack, List strings, IWailaDataAccessor accessor, - IWailaConfigHandler configHandler) { + IWailaConfigHandler configHandler) { if (accessor.getBlock() instanceof ICarvable) { ICarvable block = (ICarvable) accessor.getBlock(); MovingObjectPosition pos = accessor.getPosition(); strings.add( - block.getManager(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getMetadata()) - .getDescription()); + block.getManager(accessor.getWorld(), pos.blockX, pos.blockY, pos.blockZ, accessor.getMetadata()) + .getDescription()); } return strings; } @Override public List getWailaTail(ItemStack stack, List strings, IWailaDataAccessor accessor, - IWailaConfigHandler configHandler) { + IWailaConfigHandler configHandler) { return strings; } public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, - int y, int z) { + int y, int z) { return tag; } diff --git a/src/main/java/team/chisel/compat/fmp/FMPCompat.java b/src/main/java/team/chisel/compat/fmp/FMPCompat.java index d8da29e1..bb99bbc5 100644 --- a/src/main/java/team/chisel/compat/fmp/FMPCompat.java +++ b/src/main/java/team/chisel/compat/fmp/FMPCompat.java @@ -3,14 +3,14 @@ package team.chisel.compat.fmp; import net.minecraft.block.Block; import net.minecraft.world.World; -import team.chisel.init.ChiselBlocks; +import com.google.common.collect.Lists; + import codechicken.lib.vec.BlockCoord; import codechicken.multipart.MultiPartRegistry; import codechicken.multipart.MultiPartRegistry.IPartConverter; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.TMultiPart; - -import com.google.common.collect.Lists; +import team.chisel.init.ChiselBlocks; public class FMPCompat implements IPartFactory, IPartConverter { diff --git a/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java index 70a9e603..2a4dce8e 100644 --- a/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java +++ b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java @@ -6,13 +6,13 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import team.chisel.block.BlockCarvableTorch; import codechicken.lib.vec.BlockCoord; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import codechicken.multipart.minecraft.TorchPart; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import team.chisel.block.BlockCarvableTorch; public class ItemBlockChiselTorchPart extends ItemBlock { @@ -28,7 +28,7 @@ public class ItemBlockChiselTorchPart extends ItemBlock { @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)); + || (super.func_150936_a(world, x, y, z, side, player, stack)); } public TMultiPart createMultiPart(World world, BlockCoord pos, ItemStack item, int side) { @@ -55,7 +55,7 @@ public class ItemBlockChiselTorchPart extends ItemBlock { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, - float hitX, float hitY, float hitZ) { + float hitX, float hitY, float hitZ) { Block block = world.getBlock(x, y, z); BlockCoord pos = new BlockCoord(x, y, z); if (!block.isReplaceable(world, x, y, z)) { @@ -63,12 +63,12 @@ public class ItemBlockChiselTorchPart extends ItemBlock { } if (placePart(world, pos, stack, side, !world.isRemote)) { world.playSoundEffect( - pos.x + 0.5F, - pos.y + 0.5F, - pos.z + 0.5F, - field_150939_a.stepSound.func_150496_b(), - (block.stepSound.getVolume() + 1.0F) / 2.0F, - block.stepSound.getPitch() * 0.8F); + pos.x + 0.5F, + pos.y + 0.5F, + pos.z + 0.5F, + field_150939_a.stepSound.func_150496_b(), + (block.stepSound.getVolume() + 1.0F) / 2.0F, + block.stepSound.getPitch() * 0.8F); stack.stackSize -= 1; return true; } diff --git a/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java index 70a62499..bd9202a8 100644 --- a/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java +++ b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java @@ -3,10 +3,10 @@ package team.chisel.compat.fmp; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; -import team.chisel.init.ChiselBlocks; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.minecraft.TorchPart; +import team.chisel.init.ChiselBlocks; public class PartChiselTorch extends TorchPart { diff --git a/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java index 6592bf15..0dd44f8b 100644 --- a/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java +++ b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java @@ -2,11 +2,11 @@ package team.chisel.compat.nei; import net.minecraft.item.ItemStack; -import team.chisel.Chisel; -import team.chisel.client.gui.GuiChisel; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import cpw.mods.fml.common.registry.GameRegistry; +import team.chisel.Chisel; +import team.chisel.client.gui.GuiChisel; public class NEIChiselConfig implements IConfigureNEI { diff --git a/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java index d71bb936..687d4c82 100644 --- a/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java +++ b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java @@ -11,16 +11,16 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; -import team.chisel.carving.Carving; -import team.chisel.client.gui.GuiChisel; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + 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 team.chisel.carving.Carving; +import team.chisel.client.gui.GuiChisel; public class RecipeHandlerChisel extends TemplateRecipeHandler { @@ -109,10 +109,10 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler { @Override public void loadTransferRects() { this.transferRects.add( - new TemplateRecipeHandler.RecipeTransferRect( - new Rectangle(75, 22, 15, 13), - "chisel2.chisel", - new Object[0])); + new TemplateRecipeHandler.RecipeTransferRect( + new Rectangle(75, 22, 15, 13), + "chisel2.chisel", + new Object[0])); } @Override @@ -120,7 +120,8 @@ public class RecipeHandlerChisel extends TemplateRecipeHandler { if (outputId.equals("chisel2.chisel")) { for (String name : Carving.chisel.getSortedGroupNames()) { ICarvingGroup g = Carving.chisel.getGroup(name); - if (!g.getVariations().isEmpty()) { + if (!g.getVariations() + .isEmpty()) { addCached(getVariationStacks(g)); } } diff --git a/src/main/java/team/chisel/config/Configurations.java b/src/main/java/team/chisel/config/Configurations.java index 7530d71f..469fba91 100644 --- a/src/main/java/team/chisel/config/Configurations.java +++ b/src/main/java/team/chisel/config/Configurations.java @@ -73,217 +73,241 @@ public class Configurations { /* general */ category = "general"; concreteVelocityMult = config - .get( - category, - "concreteVelocityMult", - 1.35, - "The factor that concrete increases your velocity. Default is 1.35, set to 1 for no change.") - .getDouble(); - fullBlockConcrete = config.get( + .get( + category, + "concreteVelocityMult", + 1.35, + "The factor that concrete increases your velocity. Default is 1.35, set to 1 for no change.") + .getDouble(); + fullBlockConcrete = config + .get( category, "fullBlockConcrete", false, "Should concrete be a full block. This will also unavoidably disable speed increase if set to true.") - .getBoolean(false); - ghostCloud = config.get(category, "doesCloudRenderLikeGhost", true).getBoolean(true); - factoryBlockAmount = config.get(category, "amountYouGetFromFactoryBlockCrafting", 32).getInt(32); - allowMossy = config.get( + .getBoolean(false); + ghostCloud = config.get(category, "doesCloudRenderLikeGhost", true) + .getBoolean(true); + factoryBlockAmount = config.get(category, "amountYouGetFromFactoryBlockCrafting", 32) + .getInt(32); + allowMossy = config + .get( category, "allowBrickToMossyInChisel", true, - "If true, you can chisel stone brick to mossy stone brick.").getBoolean(true); - allowSmoothStone = config.get(category, "allowSmoothStoneToStoneBricksAndBack", true).getBoolean(true); + "If true, you can chisel stone brick to mossy stone brick.") + .getBoolean(true); + allowSmoothStone = config.get(category, "allowSmoothStoneToStoneBricksAndBack", true) + .getBoolean(true); chiselRecipe = config - .get(category, "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel") - .getBoolean(false); - enableFMP = config.get(category, "enableFMP", true, "Do you want to enable FMP").getBoolean(true); - chiselStoneToCobbleBricks = config.get( + .get(category, "chiselAlternateRecipe", false, "Use alternative crafting recipe for the chisel") + .getBoolean(false); + enableFMP = config.get(category, "enableFMP", true, "Do you want to enable FMP") + .getBoolean(true); + chiselStoneToCobbleBricks = config + .get( category, "chiselStoneToCobbleBricks", true, - "Chisel stone to cobblestone and bricks by left clicking.").getBoolean(false); + "Chisel stone to cobblestone and bricks by left clicking.") + .getBoolean(false); chiselBackToVanillaLeaves = config.get( - category, - "chiselBackToVanillaLeaves", - false, - "If this is true, you can chisel from the chisel leaves back to vanilla ones. If it is false, you cannot.") - .getBoolean(false); + category, + "chiselBackToVanillaLeaves", + false, + "If this is true, you can chisel from the chisel leaves back to vanilla ones. If it is false, you cannot.") + .getBoolean(false); canMobsSpawnOnTheChiselBlocks = config - .get(category, "canMobsSpawnOnTheChiselBlocks", false, "Can mobs Spawn on the Chisel Blocks") - .getBoolean(); + .get(category, "canMobsSpawnOnTheChiselBlocks", false, "Can mobs Spawn on the Chisel Blocks") + .getBoolean(); /* worldgen */ category = "worldgen"; marbleAmount = config - .get(category, "marbleAmount", 7, "Amount of marble to generate in the world; use 0 for none") - .getInt(7); + .get(category, "marbleAmount", 7, "Amount of marble to generate in the world; use 0 for none") + .getInt(7); limestoneAmount = config - .get(category, "limestoneAmount", 8, "Amount of limestone to generate in the world; use 0 for none") - .getInt(8); + .get(category, "limestoneAmount", 8, "Amount of limestone to generate in the world; use 0 for none") + .getInt(8); graniteAmount = config - .get(category, "graniteAmount", 8, "Amount of granite to generate in the world; use 0 for none.") - .getInt(8); + .get(category, "graniteAmount", 8, "Amount of granite to generate in the world; use 0 for none.") + .getInt(8); dioriteAmount = config - .get(category, "dioriteAmount", 8, "Amount of diorite to generate in the world; use 0 for none.") - .getInt(8); + .get(category, "dioriteAmount", 8, "Amount of diorite to generate in the world; use 0 for none.") + .getInt(8); andesiteAmount = config - .get(category, "andesiteAmount", 8, "Amount of andesite to generate in the world; use 0 for none.") - .getInt(8); + .get(category, "andesiteAmount", 8, "Amount of andesite to generate in the world; use 0 for none.") + .getInt(8); /* client */ category = "client"; particlesTickrate = config - .get(category, "particleTickrate", 1, "Particle tick rate. Greater value = less particles.").getInt(1); - oldPillars = config.get(category, "pillarOldGraphics", false, "Use old pillar textures").getBoolean(false); - disableCTM = !config.get(category, "connectedTextures", true, "Enable connected textures").getBoolean(true); + .get(category, "particleTickrate", 1, "Particle tick rate. Greater value = less particles.") + .getInt(1); + oldPillars = config.get(category, "pillarOldGraphics", false, "Use old pillar textures") + .getBoolean(false); + disableCTM = !config.get(category, "connectedTextures", true, "Enable connected textures") + .getBoolean(true); CTM.disableObscuredFaceCheckConfig = connectInsideCTM = config - .get( - category, - "connectInsideCTM", - false, - "Choose whether the inside corner is disconnected on a CTM block - http://imgur.com/eUywLZ4") - .getBoolean(false); - blockDescriptions = config.get( + .get( + category, + "connectInsideCTM", + false, + "Choose whether the inside corner is disconnected on a CTM block - http://imgur.com/eUywLZ4") + .getBoolean(false); + blockDescriptions = config + .get( category, "tooltipsUseBlockDescriptions", true, "Make variations of blocks have the same name, and use the description in tooltip to distinguish them.") - .getBoolean(true); - imTooGoodForDescriptions = config.get( + .getBoolean(true); + imTooGoodForDescriptions = config + .get( category, "imTooGoodForBlockDescriptions", false, - "For those people who just hate block descriptions on the world gen!").getBoolean(); + "For those people who just hate block descriptions on the world gen!") + .getBoolean(); /* chisel */ category = "chisel"; - allowChiselDamage = config.get( + allowChiselDamage = config + .get( category, "allowChiselDamage", true, - "Should the chisel be damageable and take damage when it chisels something.").getBoolean(); + "Should the chisel be damageable and take damage when it chisels something.") + .getBoolean(); ironChiselMaxDamage = config.getInt( - "ironChiselMaxDamage", - category, - 500, - 1, - Short.MAX_VALUE, - "The max damage of the standard iron chisel."); + "ironChiselMaxDamage", + category, + 500, + 1, + Short.MAX_VALUE, + "The max damage of the standard iron chisel."); diamondChiselMaxDamage = config.getInt( - "diamondChiselMaxDamage", - category, - 5000, - 1, - Short.MAX_VALUE, - "The max damage of the diamond chisel."); + "diamondChiselMaxDamage", + category, + 5000, + 1, + Short.MAX_VALUE, + "The max damage of the diamond chisel."); obsidianChiselMaxDamage = config.getInt( - "obsidianChiselMaxDamage", - category, - 2500, - 1, - Short.MAX_VALUE, - "The max damage of the obsidian chisel."); + "obsidianChiselMaxDamage", + category, + 2500, + 1, + Short.MAX_VALUE, + "The max damage of the obsidian chisel."); netherStarChiselMaxDamage = config.getInt( - "netherStarChiselMaxDamage", - category, - 32767, - 1, - Short.MAX_VALUE, - "The max damage of the nether star chisel."); + "netherStarChiselMaxDamage", + category, + 32767, + 1, + Short.MAX_VALUE, + "The max damage of the nether star chisel."); ironChiselCanLeftClick = config - .get( - category, - "ironChiselCanLeftClick", - true, - "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.") - .getBoolean(); + .get( + category, + "ironChiselCanLeftClick", + true, + "If this is true, the iron chisel can left click chisel blocks. If false, it cannot.") + .getBoolean(); ironChiselHasModes = config - .get( - category, - "ironChiselHasModes", - false, - "If this is true, the iron chisel can change its chisel mode just as the diamond chisel can.") - .getBoolean(); - allowChiselCrossColors = config.get( + .get( + category, + "ironChiselHasModes", + false, + "If this is true, the iron chisel can change its chisel mode just as the diamond chisel can.") + .getBoolean(); + allowChiselCrossColors = config + .get( category, "allowChiselCrossColors", true, - "Should someone be able to chisel something into a different color.").getBoolean(); + "Should someone be able to chisel something into a different color.") + .getBoolean(); ironChiselAttackDamage = config.get( - category, - "ironChiselAttackDamage", - 2, - "The extra attack damage points (in half hearts) that the iron chisel inflicts when it is used to attack an entity.") - .getInt(); + category, + "ironChiselAttackDamage", + 2, + "The extra attack damage points (in half hearts) that the iron chisel inflicts when it is used to attack an entity.") + .getInt(); diamondChiselAttackDamage = config.get( - category, - "diamondChiselAttackDamage", - 2, - "The extra attack damage points (in half hearts) that the diamond chisel inflicts when it is used to attack an entity.") - .getInt(); + category, + "diamondChiselAttackDamage", + 2, + "The extra attack damage points (in half hearts) that the diamond chisel inflicts when it is used to attack an entity.") + .getInt(); obsidianChiselAttackDamage = config.get( - category, - "obsidianChiselAttackDamage", - 4, - "The extra attack damage points (in half hearts) that the obsidian chisel inflicts when it is used to attack an entity.") - .getInt(); + category, + "obsidianChiselAttackDamage", + 4, + "The extra attack damage points (in half hearts) that the obsidian chisel inflicts when it is used to attack an entity.") + .getInt(); netherStarChiselAttackDamage = config.get( - category, - "netherStarChiselAttackDamage", - 6, - "The extra attack damage points (in half hearts) that the nether star chisel inflicts when it is used to attack an entity.") - .getInt(); + category, + "netherStarChiselAttackDamage", + 6, + "The extra attack damage points (in half hearts) that the nether star chisel inflicts when it is used to attack an entity.") + .getInt(); /* block */ category = "block"; - useRoadLineTool = config.get( + useRoadLineTool = config + .get( category, "useRoadLineTool", false, "Should the road line require a tool to break (If false, road lines can be broken in Adventure)") - .getBoolean(); + .getBoolean(); getRoadLineTool = config - .get( - category, - "getRoadLineTool", - "pickaxe", - "The tool that is able to break roadLines (requires useRoadLineTool to be true to take effect)") - .getString(); - roadLineToolLevel = config.get( + .get( category, - "roadLineToolLevel", - 0, - "The lowest harvest level of the tool able to break the road lines (requires useRoadLineTool to be true to take effect) (0 = Wood/Gold, 1 = Stone, 2 = Iron, 3 = Diamond) Default: 0") - .getInt(); + "getRoadLineTool", + "pickaxe", + "The tool that is able to break roadLines (requires useRoadLineTool to be true to take effect)") + .getString(); + roadLineToolLevel = config.get( + category, + "roadLineToolLevel", + 0, + "The lowest harvest level of the tool able to break the road lines (requires useRoadLineTool to be true to take effect) (0 = Wood/Gold, 1 = Stone, 2 = Iron, 3 = Diamond) Default: 0") + .getInt(); /* hexColors */ category = "hexColors"; for (int i = 0; i < ItemDye.field_150923_a.length; i++) { // tterrag... don't kill me over this formatting. - String temp = config.get( + String temp = config + .get( category, "hex" + ItemDye.field_150923_a[i], "#" + Integer.toHexString(ItemDye.field_150922_c[i]), Character.toUpperCase(ItemDye.field_150923_a[i].charAt(0)) + ItemDye.field_150923_a[i].substring(1) - + " color for hex block overlay #RRGGBB") - .getString(); + + " color for hex block overlay #RRGGBB") + .getString(); // Or this try { configColors[i] = Integer.decode(temp); } catch (NumberFormatException e) { Chisel.logger.warn( - "Configuration error, " + temp - + " was not recognized as a color. Using default: #" - + Integer.toHexString(ItemDye.field_150922_c[i])); + "Configuration error, " + temp + + " was not recognized as a color. Using default: #" + + Integer.toHexString(ItemDye.field_150922_c[i])); configColors[i] = ItemDye.field_150922_c[i]; } } /* features */ for (Features feature : Features.values()) { - features.put(featureName(feature), config.get("features", featureName(feature), true).getBoolean(true)); + features.put( + featureName(feature), + config.get("features", featureName(feature), true) + .getBoolean(true)); } if (config.hasChanged()) { @@ -300,7 +324,9 @@ public class Configurations { * Makes the old camelCase names from the new CONSTANT_CASE names */ public static String featureName(Features feature) { - String[] words = feature.name().toLowerCase(Locale.ENGLISH).split("_"); + String[] words = feature.name() + .toLowerCase(Locale.ENGLISH) + .split("_"); if (words.length == 1) { return words[0]; } diff --git a/src/main/java/team/chisel/entity/EntityCloudInABottle.java b/src/main/java/team/chisel/entity/EntityCloudInABottle.java index 665d369e..7f643949 100644 --- a/src/main/java/team/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/team/chisel/entity/EntityCloudInABottle.java @@ -56,12 +56,8 @@ public class EntityCloudInABottle extends EntityThrowable { generate(worldObj, rand, x, y, z, 40); - worldObj.playAuxSFX( - 2002, - (int) Math.round(this.posX), - (int) Math.round(this.posY), - (int) Math.round(this.posZ), - 2); + worldObj + .playAuxSFX(2002, (int) Math.round(this.posX), (int) Math.round(this.posY), (int) Math.round(this.posZ), 2); setDead(); } @@ -96,9 +92,9 @@ public class EntityCloudInABottle extends EntityThrowable { for (int j2 = x; j2 < x + random.nextInt(4) + 1; j2++) { for (int k2 = y; k2 < y + random.nextInt(1) + 2; k2++) { for (int l2 = z; l2 < z + random.nextInt(4) + 1; l2++) { - if (world.getBlock(j2, k2, l2).isAir(world, j2, k2, l2) - && Math.abs(j2 - x) + Math.abs(k2 - y) + Math.abs(l2 - z) - < 4 * 1 + random.nextInt(2)) { + if (world.getBlock(j2, k2, l2) + .isAir(world, j2, k2, l2) + && Math.abs(j2 - x) + Math.abs(k2 - y) + Math.abs(l2 - z) < 4 * 1 + random.nextInt(2)) { world.setBlock(j2, k2, l2, ChiselBlocks.cloud); count++; } diff --git a/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java index 1601fcc5..a9a6e534 100644 --- a/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java @@ -7,11 +7,11 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; 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; public class EntityBallOMossFX extends EntityFX { @@ -114,7 +114,7 @@ public class EntityBallOMossFX extends EntityFX { @Override public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, - float rotYZ, float rotXY) { + float rotYZ, float rotXY) { GL11.glDepthMask(false); GL11.glEnable(3042); GL11.glBlendFunc(770, 771); diff --git a/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java index c396832d..2926cc0e 100644 --- a/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java @@ -38,7 +38,7 @@ public class EntityGrimstoneFX extends EntityFX { @Override public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, - float rotYZ, float rotXY) { + float rotYZ, float rotXY) { particleScale = 0.25f + initialScale * (float) Math.sin((particleAge + angleOffset) / 180.f); if (particleAge < fadetime) particleAlpha = particleAge / fadetime; diff --git a/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java index e61d814d..cfc546be 100644 --- a/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java @@ -38,7 +38,7 @@ public class EntityHolystoneFX extends EntityFX { @Override public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, - float rotYZ, float rotXY) { + float rotYZ, float rotXY) { particleScale = 0.25f + initialScale * (float) Math.sin((particleAge + angleOffset) / 180.f); if (particleAge < fadetime) particleAlpha = particleAge / fadetime; diff --git a/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 8f40d3d0..a58defd2 100644 --- a/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -61,7 +61,7 @@ public class EntitySnakestoneObsidianFX extends EntityFX { noClip = true; setParticleIcon( - BlockSnakestoneObsidian.particles[General.rand.nextInt(BlockSnakestoneObsidian.particles.length)]); + BlockSnakestoneObsidian.particles[General.rand.nextInt(BlockSnakestoneObsidian.particles.length)]); } @Override @@ -71,7 +71,7 @@ public class EntitySnakestoneObsidianFX extends EntityFX { @Override public void renderParticle(Tessellator tessellator, float partialTick, float rotX, float rotXZ, float rotZ, - float rotYZ, float rotXY) { + float rotYZ, float rotXY) { GL11.glDepthMask(false); GL11.glEnable(3042); GL11.glBlendFunc(770, 771); diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index c0cc50ad..f2f0620a 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -2,9 +2,9 @@ package team.chisel.init; import net.minecraft.block.Block; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import team.chisel.Chisel; import team.chisel.block.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) public final class ChiselBlocks { diff --git a/src/main/java/team/chisel/init/ChiselItems.java b/src/main/java/team/chisel/init/ChiselItems.java index e5d692d2..ed24e731 100644 --- a/src/main/java/team/chisel/init/ChiselItems.java +++ b/src/main/java/team/chisel/init/ChiselItems.java @@ -1,12 +1,12 @@ package team.chisel.init; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; 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) public final class ChiselItems { diff --git a/src/main/java/team/chisel/init/TabsInit.java b/src/main/java/team/chisel/init/TabsInit.java index 38503093..17f3a58c 100644 --- a/src/main/java/team/chisel/init/TabsInit.java +++ b/src/main/java/team/chisel/init/TabsInit.java @@ -4,10 +4,10 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import team.chisel.Features; - import com.cricketcraft.chisel.api.ChiselTabs; +import team.chisel.Features; + public class TabsInit { private static boolean atLeastOneModIsLoaded = false; diff --git a/src/main/java/team/chisel/inventory/ContainerAutoChisel.java b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java index 348501e5..f0a63135 100644 --- a/src/main/java/team/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java @@ -103,12 +103,12 @@ public class ContainerAutoChisel extends Container { ItemStack ret = super.slotClick(slotId, p_75144_2_, p_75144_3_, player); if (!player.worldObj.isRemote && slot.slotNumber == TileEntityAutoChisel.BASE - && !ItemStack.areItemStacksEqual(stack, slot.getStack())) { + && !ItemStack.areItemStacksEqual(stack, slot.getStack())) { int chiseled = stack == null ? 0 - : slot.getStack() == null ? stack.stackSize : stack.stackSize - slot.getStack().stackSize; + : slot.getStack() == null ? stack.stackSize : stack.stackSize - slot.getStack().stackSize; PacketHandler.INSTANCE.sendToDimension( - new MessageAutoChisel(autoChisel, chiseled, false, false), - player.worldObj.provider.dimensionId); + new MessageAutoChisel(autoChisel, chiseled, false, false), + player.worldObj.provider.dimensionId); } return ret; @@ -137,15 +137,14 @@ public class ContainerAutoChisel extends Container { if (par1ItemStack.isStackable()) { while (par1ItemStack.stackSize > 0 - && (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex)) { + && (!reversOrder && checkIndex < toIndex || reversOrder && checkIndex >= fromIndex)) { slot = (Slot) this.inventorySlots.get(checkIndex); itemstack1 = slot.getStack(); if (itemstack1 != null && itemstack1.getItem() == par1ItemStack.getItem() - && (!par1ItemStack.getHasSubtypes() - || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) - && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) - && slot.isItemValid(par1ItemStack)) { + && (!par1ItemStack.getHasSubtypes() || par1ItemStack.getItemDamage() == itemstack1.getItemDamage()) + && ItemStack.areItemStackTagsEqual(par1ItemStack, itemstack1) + && slot.isItemValid(par1ItemStack)) { int mergedSize = itemstack1.stackSize + par1ItemStack.stackSize; int maxStackSize = Math.min(par1ItemStack.getMaxStackSize(), slot.getSlotStackLimit()); diff --git a/src/main/java/team/chisel/inventory/ContainerChisel.java b/src/main/java/team/chisel/inventory/ContainerChisel.java index 368e85ec..47562700 100644 --- a/src/main/java/team/chisel/inventory/ContainerChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerChisel.java @@ -7,12 +7,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.api.carving.ICarvingRegistry; + import team.chisel.carving.Carving; import team.chisel.item.chisel.ItemChisel; import team.chisel.utils.General; -import com.cricketcraft.chisel.api.carving.ICarvingRegistry; - public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; @@ -33,13 +33,7 @@ public class ContainerChisel extends Container { // selection slots for (int i = 0; i < InventoryChiselSelection.normalSlots; i++) { addSlotToContainer( - new SlotChiselSelection( - this, - inventory, - inventory, - i, - left + ((i % 10) * 18), - top + ((i / 10) * 18))); + new SlotChiselSelection(this, inventory, inventory, i, left + ((i % 10) * 18), top + ((i / 10) * 18))); } // main slot @@ -103,10 +97,10 @@ public class ContainerChisel extends Container { if (slotIdx > InventoryChiselSelection.normalSlots) { if (!this.mergeItemStack( - itemstack1, - InventoryChiselSelection.normalSlots, - InventoryChiselSelection.normalSlots + 1, - false)) { + itemstack1, + InventoryChiselSelection.normalSlots, + InventoryChiselSelection.normalSlots + 1, + false)) { return null; } } else { @@ -116,10 +110,10 @@ public class ContainerChisel extends Container { entity.inventory.setItemStack(null); if (!this.mergeItemStack( - itemstack1, - InventoryChiselSelection.normalSlots + 1, - InventoryChiselSelection.normalSlots + 1 + 36, - false)) { + itemstack1, + InventoryChiselSelection.normalSlots + 1, + InventoryChiselSelection.normalSlots + 1 + 36, + false)) { entity.inventory.setItemStack(itemstack1); return null; } @@ -154,7 +148,7 @@ public class ContainerChisel extends Container { @Override protected boolean mergeItemStack(ItemStack par1ItemStack, int fromIndex, int toIndex, boolean reversOrder) { return ((Slot) this.inventorySlots.get(reversOrder ? toIndex - 1 : fromIndex)).isItemValid(par1ItemStack) - && super.mergeItemStack(par1ItemStack, fromIndex, toIndex, reversOrder); + && super.mergeItemStack(par1ItemStack, fromIndex, toIndex, reversOrder); } public void onChiselSlotChanged() { diff --git a/src/main/java/team/chisel/inventory/ContainerPresent.java b/src/main/java/team/chisel/inventory/ContainerPresent.java index 67acbe0d..e6837c69 100644 --- a/src/main/java/team/chisel/inventory/ContainerPresent.java +++ b/src/main/java/team/chisel/inventory/ContainerPresent.java @@ -78,7 +78,8 @@ public class ContainerPresent extends Container { public void detectAndSendChanges() { TileEntityPresent te = (TileEntityPresent) lower; if (te != null && te.hasWorldObj() && !te.getWorldObj().isRemote) { - if (te.getWorldObj().getTileEntity(te.xCoord, te.yCoord, te.zCoord) != te) isContainerValid = false; + if (te.getWorldObj() + .getTileEntity(te.xCoord, te.yCoord, te.zCoord) != te) isContainerValid = false; } super.detectAndSendChanges(); } diff --git a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java index 7a0d5387..add98095 100644 --- a/src/main/java/team/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java @@ -9,11 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; +import com.cricketcraft.chisel.api.IChiselItem; + import team.chisel.item.chisel.ItemChisel; import team.chisel.utils.General; -import com.cricketcraft.chisel.api.IChiselItem; - public class InventoryChiselSelection implements IInventory { ItemStack chisel; @@ -135,15 +135,17 @@ public class InventoryChiselSelection implements IInventory { if (Block.getBlockFromItem(item) == null) return; if (!((IChiselItem) chisel.getItem()) - .canChisel(container.playerInventory.player.worldObj, chisel, General.getVariation(chiseledItem))) - return; + .canChisel(container.playerInventory.player.worldObj, chisel, General.getVariation(chiseledItem))) return; List list = container.carving.getItemsForChiseling(chiseledItem); maxScroll = list.size(); int activeVariations = 0; while (activeVariations < normalSlots && activeVariations + currentScroll < list.size()) { if (Block.blockRegistry.getNameForObject( - Block.getBlockFromItem(list.get(activeVariations + currentScroll).getItem())) != null) { + Block.getBlockFromItem( + list.get(activeVariations + currentScroll) + .getItem())) + != null) { inventory[activeVariations] = list.get(activeVariations + currentScroll); activeVariations++; } diff --git a/src/main/java/team/chisel/inventory/SlotChiselInput.java b/src/main/java/team/chisel/inventory/SlotChiselInput.java index 872657ec..62df03e1 100644 --- a/src/main/java/team/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/team/chisel/inventory/SlotChiselInput.java @@ -14,8 +14,8 @@ public class SlotChiselInput extends Slot { @Override public boolean isItemValid(ItemStack itemstack) { - return !container.finished && !container.carving.getItemsForChiseling(itemstack).isEmpty() - && super.isItemValid(itemstack); + return !container.finished && !container.carving.getItemsForChiseling(itemstack) + .isEmpty() && super.isItemValid(itemstack); } @Override diff --git a/src/main/java/team/chisel/inventory/SlotChiselSelection.java b/src/main/java/team/chisel/inventory/SlotChiselSelection.java index 542d7f53..1d0d673e 100644 --- a/src/main/java/team/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/team/chisel/inventory/SlotChiselSelection.java @@ -6,20 +6,20 @@ 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 team.chisel.carving.Carving; import team.chisel.utils.General; import team.chisel.utils.GeneralClient; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.Statistics; - public class SlotChiselSelection extends Slot { private final ContainerChisel container; private final InventoryChiselSelection selInventory; public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, - int j, int k) { + int j, int k) { super(iinventory, i, j, k); this.container = container; @@ -53,17 +53,17 @@ public class SlotChiselSelection extends Slot { if (selInventory.inventory[InventoryChiselSelection.normalSlots] == null) return; player.inventory.setItemStack( - new ItemStack( - itemstack.getItem(), - selInventory.inventory[InventoryChiselSelection.normalSlots].stackSize, - itemstack.getItemDamage())); + new ItemStack( + itemstack.getItem(), + selInventory.inventory[InventoryChiselSelection.normalSlots].stackSize, + itemstack.getItemDamage())); selInventory.setInventorySlotContents(InventoryChiselSelection.normalSlots, null); } selInventory.updateItems(); if (((IChiselItem) container.chisel.getItem()) - .onChisel(player.worldObj, container.chisel, General.getVariation(crafted))) { + .onChisel(player.worldObj, container.chisel, General.getVariation(crafted))) { container.chisel.damageItem(1, player); if (container.chisel.stackSize <= 0) { player.inventory.mainInventory[player.inventory.currentItem] = null; @@ -73,11 +73,11 @@ public class SlotChiselSelection extends Slot { if (player.worldObj.isRemote) { String sound = Carving.chisel.getVariationSound(crafted.getItem(), crafted.getItemDamage()); GeneralClient.playChiselSound( - player.worldObj, - MathHelper.floor_double(player.posX), - MathHelper.floor_double(player.posY), - MathHelper.floor_double(player.posZ), - sound); + player.worldObj, + MathHelper.floor_double(player.posX), + MathHelper.floor_double(player.posY), + MathHelper.floor_double(player.posZ), + sound); } else { container.playerInventory.player.addStat(Statistics.blocksChiseled, crafted.stackSize); } diff --git a/src/main/java/team/chisel/item/ItemBallOMoss.java b/src/main/java/team/chisel/item/ItemBallOMoss.java index bbf1defa..665f3702 100644 --- a/src/main/java/team/chisel/item/ItemBallOMoss.java +++ b/src/main/java/team/chisel/item/ItemBallOMoss.java @@ -20,7 +20,7 @@ public class ItemBallOMoss extends BaseItem { } if (par2World.isRemote) par2World - .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if (!par2World.isRemote) { par2World.spawnEntityInWorld(new EntityBallOMoss(par2World, par3EntityPlayer)); diff --git a/src/main/java/team/chisel/item/ItemCarvable.java b/src/main/java/team/chisel/item/ItemCarvable.java index b3836f74..3976155e 100644 --- a/src/main/java/team/chisel/item/ItemCarvable.java +++ b/src/main/java/team/chisel/item/ItemCarvable.java @@ -10,12 +10,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; -import team.chisel.config.Configurations; -import team.chisel.utils.General; - import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import team.chisel.config.Configurations; +import team.chisel.utils.General; + public class ItemCarvable extends ItemBlock { public ItemCarvable(Block block) { @@ -31,7 +31,8 @@ public class ItemCarvable extends ItemBlock { @Override public IIcon getIconFromDamage(int damage) { - return Block.getBlockFromItem(this).getIcon(2, damage); + return Block.getBlockFromItem(this) + .getIcon(2, damage); } @SuppressWarnings({ "unchecked", "rawtypes" }) diff --git a/src/main/java/team/chisel/item/ItemCarvableSlab.java b/src/main/java/team/chisel/item/ItemCarvableSlab.java index 12c82e7f..a14c2cad 100644 --- a/src/main/java/team/chisel/item/ItemCarvableSlab.java +++ b/src/main/java/team/chisel/item/ItemCarvableSlab.java @@ -21,7 +21,7 @@ public class ItemCarvableSlab extends ItemCarvable { @Override public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hx, - float hy, float hz) { + float hy, float hz) { BlockCarvableSlab block = (BlockCarvableSlab) Block.getBlockFromItem(this); int meta = stack.getItemDamage(); @@ -38,8 +38,8 @@ public class ItemCarvableSlab extends ItemCarvable { boolean metaEquals = world.getBlockMetadata(x2, y2, z2) == meta; // if the metadata at the place target matches, and the block there matches either the top of bottom slab, try // to fill in the rest of the block - if (metaEquals && ((at == block.top && (hy <= 0.5D || hy == 1.0D)) - || (at == block.bottom && (hy > 0.5D || hy == 0)))) { + if (metaEquals + && ((at == block.top && (hy <= 0.5D || hy == 1.0D)) || (at == block.bottom && (hy > 0.5D || hy == 0)))) { place(stack, world, x2, y2, z2, block.master, meta); return true; } @@ -47,7 +47,7 @@ public class ItemCarvableSlab extends ItemCarvable { // else if the block clicked on is a top or bottom slab of this type, try to fill in that block if possible boolean clickedMetaEquals = world.getBlockMetadata(x, y, z) == meta; if (clickedMetaEquals && ((clicked == block.bottom && dir == ForgeDirection.UP) - || (clicked == block.top && dir == ForgeDirection.DOWN))) { + || (clicked == block.top && dir == ForgeDirection.DOWN))) { place(stack, world, x, y, z, block.master, meta); return true; } @@ -71,11 +71,11 @@ public class ItemCarvableSlab extends ItemCarvable { world.setBlock(x, y, z, toPlace, metadata, 2); stack.stackSize -= 1; world.playSoundEffect( - x + 0.5f, - y + 0.5f, - z + 0.5f, - this.field_150939_a.stepSound.func_150496_b(), - (this.field_150939_a.stepSound.getVolume() + 1.0F) / 2.0F, - this.field_150939_a.stepSound.getPitch() * 0.8F); + x + 0.5f, + y + 0.5f, + z + 0.5f, + this.field_150939_a.stepSound.func_150496_b(), + (this.field_150939_a.stepSound.getVolume() + 1.0F) / 2.0F, + this.field_150939_a.stepSound.getPitch() * 0.8F); } } diff --git a/src/main/java/team/chisel/item/ItemCloudInABottle.java b/src/main/java/team/chisel/item/ItemCloudInABottle.java index 8d930fe8..7fbfe8ac 100644 --- a/src/main/java/team/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/team/chisel/item/ItemCloudInABottle.java @@ -20,7 +20,7 @@ public class ItemCloudInABottle extends BaseItem { } if (par2World.isRemote) par2World - .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if (!par2World.isRemote) { par2World.spawnEntityInWorld(new EntityCloudInABottle(par2World, par3EntityPlayer)); diff --git a/src/main/java/team/chisel/item/ItemSmashingRock.java b/src/main/java/team/chisel/item/ItemSmashingRock.java index 3ef3970e..35203b7b 100644 --- a/src/main/java/team/chisel/item/ItemSmashingRock.java +++ b/src/main/java/team/chisel/item/ItemSmashingRock.java @@ -20,7 +20,7 @@ public class ItemSmashingRock extends BaseItem { } if (par2World.isRemote) par2World - .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); + .playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if (!par2World.isRemote) { par2World.spawnEntityInWorld(new EntitySmashingRock(par2World, par3EntityPlayer)); diff --git a/src/main/java/team/chisel/item/ItemUpgrade.java b/src/main/java/team/chisel/item/ItemUpgrade.java index a4d70819..ce720393 100644 --- a/src/main/java/team/chisel/item/ItemUpgrade.java +++ b/src/main/java/team/chisel/item/ItemUpgrade.java @@ -33,7 +33,10 @@ public class ItemUpgrade extends BaseItem { public void registerIcons(IIconRegister reg) { Upgrade[] upgrades = Upgrade.values(); for (int i = 0; i < upgrades.length; i++) { - this.icons[i] = reg.registerIcon(Chisel.MOD_ID + ":upgrade_" + upgrades[i].name().toLowerCase()); + this.icons[i] = reg.registerIcon( + Chisel.MOD_ID + ":upgrade_" + + upgrades[i].name() + .toLowerCase()); } } diff --git a/src/main/java/team/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java index 2486d006..aa2e0b41 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -13,10 +13,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.oredict.OreDictionary; -import team.chisel.Chisel; -import team.chisel.carving.Carving; -import team.chisel.utils.General; - import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; @@ -27,6 +23,9 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.utils.General; public final class ChiselController { @@ -60,7 +59,9 @@ public final class ChiselController { public void preInit() { MinecraftForge.EVENT_BUS.register(this); - FMLCommonHandler.instance().bus().register(this); + FMLCommonHandler.instance() + .bus() + .register(this); } @SubscribeEvent @@ -98,8 +99,7 @@ public final class ChiselController { List list = group.getVariations(); - main: - for (ItemStack stack : OreDictionary.getOres(group.getOreName())) { + main: for (ItemStack stack : OreDictionary.getOres(group.getOreName())) { ICarvingVariation v = General.getVariation(stack); for (ICarvingVariation check : list) { if (check.getBlock() == v.getBlock() && check.getBlockMeta() == v.getBlockMeta()) { @@ -144,7 +144,8 @@ public final class ChiselController { // This still shows the block being broken, but it's better than nothing @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { - ItemStack stack = event.getPlayer().getCurrentEquippedItem(); + ItemStack stack = event.getPlayer() + .getCurrentEquippedItem(); if (event.getPlayer().capabilities.isCreativeMode && stack != null && stack.getItem() instanceof IChiselItem) { event.setCanceled(true); } diff --git a/src/main/java/team/chisel/item/chisel/ChiselMode.java b/src/main/java/team/chisel/item/chisel/ChiselMode.java index 922bb1ea..aee41ba5 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselMode.java +++ b/src/main/java/team/chisel/item/chisel/ChiselMode.java @@ -8,21 +8,21 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.network.PacketHandler; -import team.chisel.network.message.MessageChiselSound; - 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; + public enum ChiselMode implements IChiselMode { SINGLE { @Override public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, - ICarvingVariation variation) { + ICarvingVariation variation) { setVariation(player, world, x, y, z, world.getBlock(x, y, z), world.getBlockMetadata(x, y, z), variation); } }, @@ -30,7 +30,7 @@ public enum ChiselMode implements IChiselMode { @Override public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, - ICarvingVariation variation) { + ICarvingVariation variation) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); for (int dx = -1; dx <= 1; dx++) { @@ -50,7 +50,7 @@ public enum ChiselMode implements IChiselMode { @Override public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, - ICarvingVariation variation) { + ICarvingVariation variation) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int facing = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; @@ -71,7 +71,7 @@ public enum ChiselMode implements IChiselMode { @Override public void chiselAll(EntityPlayer player, World world, int x, int y, int z, ForgeDirection side, - ICarvingVariation variation) { + ICarvingVariation variation) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); int facing = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3; @@ -97,7 +97,7 @@ public enum ChiselMode implements IChiselMode { * Assumes that the player is holding a chisel */ private static void setVariation(EntityPlayer player, World world, int x, int y, int z, Block origBlock, - int origMeta, ICarvingVariation v) { + int origMeta, ICarvingVariation v) { Block block = world.getBlock(x, y, z); int meta = world.getBlockMetadata(x, y, z); ItemStack held = player.getCurrentEquippedItem(); @@ -116,9 +116,10 @@ public enum ChiselMode implements IChiselMode { } player.addStat(Statistics.blocksChiseled, 1); boolean breakChisel = false; - if (((IChiselItem) player.getCurrentEquippedItem().getItem()) - .onChisel(world, player.getCurrentEquippedItem(), v)) { - player.getCurrentEquippedItem().damageItem(1, player); + if (((IChiselItem) player.getCurrentEquippedItem() + .getItem()).onChisel(world, player.getCurrentEquippedItem(), v)) { + player.getCurrentEquippedItem() + .damageItem(1, player); if (player.getCurrentEquippedItem().stackSize <= 0) { player.inventory.mainInventory[player.inventory.currentItem] = null; breakChisel = true; diff --git a/src/main/java/team/chisel/item/chisel/ItemChisel.java b/src/main/java/team/chisel/item/chisel/ItemChisel.java index 42c5063f..24e96931 100644 --- a/src/main/java/team/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/team/chisel/item/chisel/ItemChisel.java @@ -16,16 +16,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import team.chisel.Chisel; -import team.chisel.carving.Carving; -import team.chisel.config.Configurations; - import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.config.Configurations; + public class ItemChisel extends Item implements IChiselItem { public enum ChiselType { @@ -52,11 +52,21 @@ public class ItemChisel extends Item implements IChiselItem { super(); this.type = type; setMaxStackSize(1); - setTextureName(Chisel.MOD_ID + ":chisel_" + type.name().toLowerCase(Locale.ENGLISH)); + setTextureName( + Chisel.MOD_ID + ":chisel_" + + type.name() + .toLowerCase(Locale.ENGLISH)); if (type == ChiselType.NETHERSTAR && Chisel.gtnhLoaded) { - setUnlocalizedName(Chisel.MOD_ID + ".chisel_" + type.name().toLowerCase() + ".gtnh"); + setUnlocalizedName( + Chisel.MOD_ID + ".chisel_" + + type.name() + .toLowerCase() + + ".gtnh"); } else { - setUnlocalizedName(Chisel.MOD_ID + ".chisel_" + type.name().toLowerCase()); + setUnlocalizedName( + Chisel.MOD_ID + ".chisel_" + + type.name() + .toLowerCase()); } MinecraftForge.EVENT_BUS.register(this); } @@ -76,13 +86,17 @@ public class ItemChisel extends Item implements IChiselItem { public boolean getIsRepairable(ItemStack damagedItem, ItemStack repairMaterial) { switch (type) { case DIAMOND: - return repairMaterial.getItem().equals(Items.diamond); + return repairMaterial.getItem() + .equals(Items.diamond); case IRON: - return repairMaterial.getItem().equals(Items.iron_ingot); + return repairMaterial.getItem() + .equals(Items.iron_ingot); case OBSIDIAN: - return repairMaterial.getItem().equals(Item.getItemFromBlock(Blocks.obsidian)); + return repairMaterial.getItem() + .equals(Item.getItemFromBlock(Blocks.obsidian)); case NETHERSTAR: - return repairMaterial.getItem().equals(Items.nether_star); + return repairMaterial.getItem() + .equals(Items.nether_star); } return false; } @@ -97,14 +111,14 @@ public class ItemChisel extends Item implements IChiselItem { String modes = I18n.format(base + "modes"); list.add(gui); if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN - || type == ChiselType.NETHERSTAR - || Configurations.ironChiselCanLeftClick) { + || type == ChiselType.NETHERSTAR + || Configurations.ironChiselCanLeftClick) { list.add(lc1); list.add(lc2); } if (type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN - || type == ChiselType.NETHERSTAR - || Configurations.ironChiselHasModes) { + || type == ChiselType.NETHERSTAR + || Configurations.ironChiselHasModes) { list.add(""); list.add(modes); } @@ -120,8 +134,8 @@ public class ItemChisel extends Item implements IChiselItem { public Multimap getAttributeModifiers(ItemStack stack) { Multimap multimap = HashMultimap.create(); multimap.put( - SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), - new AttributeModifier(field_111210_e, "Chisel Damage", type.attackDamage, 0)); + SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), + new AttributeModifier(field_111210_e, "Chisel Damage", type.attackDamage, 0)); return multimap; } @@ -149,15 +163,15 @@ public class ItemChisel extends Item implements IChiselItem { @Override public boolean canChiselBlock(World world, EntityPlayer player, int x, int y, int z, Block block, int metadata) { return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN - || type == ChiselType.NETHERSTAR - || Configurations.ironChiselCanLeftClick; + || type == ChiselType.NETHERSTAR + || Configurations.ironChiselCanLeftClick; } @Override public boolean hasModes(ItemStack chisel) { return type == ChiselType.DIAMOND || type == ChiselType.OBSIDIAN - || type == ChiselType.NETHERSTAR - || Configurations.ironChiselHasModes; + || type == ChiselType.NETHERSTAR + || Configurations.ironChiselHasModes; } @Override diff --git a/src/main/java/team/chisel/network/ChiselGuiHandler.java b/src/main/java/team/chisel/network/ChiselGuiHandler.java index e7714535..ae42416c 100644 --- a/src/main/java/team/chisel/network/ChiselGuiHandler.java +++ b/src/main/java/team/chisel/network/ChiselGuiHandler.java @@ -4,6 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; import team.chisel.block.tileentity.TileEntityAutoChisel; import team.chisel.block.tileentity.TileEntityPresent; import team.chisel.client.gui.GuiAutoChisel; @@ -13,7 +14,6 @@ import team.chisel.inventory.ContainerAutoChisel; import team.chisel.inventory.ContainerChisel; import team.chisel.inventory.ContainerPresent; import team.chisel.inventory.InventoryChiselSelection; -import cpw.mods.fml.common.network.IGuiHandler; public class ChiselGuiHandler implements IGuiHandler { @@ -22,8 +22,8 @@ public class ChiselGuiHandler implements IGuiHandler { switch (ID) { case 0: return new ContainerChisel( - player.inventory, - new InventoryChiselSelection(player.getCurrentEquippedItem())); + player.inventory, + new InventoryChiselSelection(player.getCurrentEquippedItem())); case 1: TileEntity tileentity = world.getTileEntity(x, y, z); if (tileentity instanceof TileEntityAutoChisel) diff --git a/src/main/java/team/chisel/network/PacketHandler.java b/src/main/java/team/chisel/network/PacketHandler.java index e18f059f..bc0a874e 100644 --- a/src/main/java/team/chisel/network/PacketHandler.java +++ b/src/main/java/team/chisel/network/PacketHandler.java @@ -1,5 +1,7 @@ package team.chisel.network; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.relauncher.Side; import team.chisel.Chisel; import team.chisel.network.message.MessageAutoChisel; import team.chisel.network.message.MessageChiselMode; @@ -7,8 +9,6 @@ import team.chisel.network.message.MessageChiselSound; import team.chisel.network.message.MessagePresentConnect; import team.chisel.network.message.MessageScrollUpdate; import team.chisel.network.message.MessageSlotUpdate; -import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import cpw.mods.fml.relauncher.Side; public class PacketHandler { diff --git a/src/main/java/team/chisel/network/message/MessageAutoChisel.java b/src/main/java/team/chisel/network/message/MessageAutoChisel.java index d52e6fd3..da41ff3b 100644 --- a/src/main/java/team/chisel/network/message/MessageAutoChisel.java +++ b/src/main/java/team/chisel/network/message/MessageAutoChisel.java @@ -3,13 +3,13 @@ package team.chisel.network.message; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import team.chisel.block.tileentity.TileEntityAutoChisel; -import team.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; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.network.message.base.MessageCoords; public class MessageAutoChisel extends MessageCoords { @@ -56,7 +56,7 @@ public class MessageAutoChisel extends MessageCoords { TileEntity te = message.getTileEntity(ctx); if (te instanceof TileEntityAutoChisel) { ((TileEntityAutoChisel) te) - .doChiselAnim(message.base, message.chiseled, message.playSound, message.breakChisel); + .doChiselAnim(message.base, message.chiseled, message.playSound, message.breakChisel); } return null; } diff --git a/src/main/java/team/chisel/network/message/MessageChiselMode.java b/src/main/java/team/chisel/network/message/MessageChiselMode.java index 10ca5208..9b374d34 100644 --- a/src/main/java/team/chisel/network/message/MessageChiselMode.java +++ b/src/main/java/team/chisel/network/message/MessageChiselMode.java @@ -2,9 +2,6 @@ package team.chisel.network.message; import net.minecraft.item.ItemStack; -import team.chisel.item.chisel.ChiselMode; -import team.chisel.utils.General; - import com.cricketcraft.chisel.api.IAdvancedChisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.IChiselMode; @@ -14,6 +11,8 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import team.chisel.item.chisel.ChiselMode; +import team.chisel.utils.General; public class MessageChiselMode implements IMessage { diff --git a/src/main/java/team/chisel/network/message/MessageChiselSound.java b/src/main/java/team/chisel/network/message/MessageChiselSound.java index 2a680996..02d1d987 100644 --- a/src/main/java/team/chisel/network/message/MessageChiselSound.java +++ b/src/main/java/team/chisel/network/message/MessageChiselSound.java @@ -3,17 +3,16 @@ package team.chisel.network.message; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; -import team.chisel.Chisel; -import team.chisel.client.GeneralChiselClient; -import team.chisel.item.chisel.ItemChisel; -import team.chisel.network.message.base.MessageCoords; - import com.cricketcraft.chisel.api.carving.ICarvingVariation; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.item.chisel.ItemChisel; +import team.chisel.network.message.base.MessageCoords; public class MessageChiselSound extends MessageCoords { diff --git a/src/main/java/team/chisel/network/message/MessagePresentConnect.java b/src/main/java/team/chisel/network/message/MessagePresentConnect.java index 450393fd..b7feff5f 100644 --- a/src/main/java/team/chisel/network/message/MessagePresentConnect.java +++ b/src/main/java/team/chisel/network/message/MessagePresentConnect.java @@ -3,12 +3,12 @@ package team.chisel.network.message; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import team.chisel.block.tileentity.TileEntityPresent; -import team.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; import io.netty.buffer.ByteBuf; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.network.message.base.MessageCoords; public class MessagePresentConnect extends MessageCoords { @@ -24,7 +24,7 @@ public class MessagePresentConnect extends MessageCoords { } public MessagePresentConnect(TileEntityPresent present, ForgeDirection dir, boolean connecting, - boolean preserveDir) { + boolean preserveDir) { super(present); this.dir = dir; this.connect = connecting; diff --git a/src/main/java/team/chisel/network/message/MessageScrollUpdate.java b/src/main/java/team/chisel/network/message/MessageScrollUpdate.java index e25d424d..035af12a 100644 --- a/src/main/java/team/chisel/network/message/MessageScrollUpdate.java +++ b/src/main/java/team/chisel/network/message/MessageScrollUpdate.java @@ -2,11 +2,11 @@ package team.chisel.network.message; import net.minecraft.inventory.Container; -import team.chisel.inventory.ContainerChisel; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import team.chisel.inventory.ContainerChisel; public class MessageScrollUpdate implements IMessage { diff --git a/src/main/java/team/chisel/network/message/MessageSlotUpdate.java b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java index 89637797..6a7c1451 100644 --- a/src/main/java/team/chisel/network/message/MessageSlotUpdate.java +++ b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java @@ -4,13 +4,13 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import team.chisel.Chisel; -import team.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; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import team.chisel.Chisel; +import team.chisel.network.message.base.MessageCoords; public class MessageSlotUpdate extends MessageCoords { @@ -43,7 +43,8 @@ public class MessageSlotUpdate extends MessageCoords { @Override public IMessage onMessage(MessageSlotUpdate message, MessageContext ctx) { - TileEntity te = Chisel.proxy.getClientWorld().getTileEntity(message.x, message.y, message.z); + TileEntity te = Chisel.proxy.getClientWorld() + .getTileEntity(message.x, message.y, message.z); if (te != null && te instanceof IInventory) { ((IInventory) te).setInventorySlotContents(message.slot, message.stack); } diff --git a/src/main/java/team/chisel/network/message/base/MessageCoords.java b/src/main/java/team/chisel/network/message/base/MessageCoords.java index c8570c4c..423718f9 100644 --- a/src/main/java/team/chisel/network/message/base/MessageCoords.java +++ b/src/main/java/team/chisel/network/message/base/MessageCoords.java @@ -4,11 +4,11 @@ import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import team.chisel.Chisel; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; +import team.chisel.Chisel; public abstract class MessageCoords implements IMessage { diff --git a/src/main/java/team/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java index 13d2510b..a7ad7ef6 100644 --- a/src/main/java/team/chisel/proxy/ClientProxy.java +++ b/src/main/java/team/chisel/proxy/ClientProxy.java @@ -7,6 +7,8 @@ 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; import team.chisel.Features; import team.chisel.block.BlockCarvableBeacon; import team.chisel.block.tileentity.TileEntityAutoChisel; @@ -32,8 +34,6 @@ import team.chisel.entity.EntityCloudInABottle; import team.chisel.entity.EntitySmashingRock; import team.chisel.init.ChiselBlocks; import team.chisel.init.ChiselItems; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; public class ClientProxy extends CommonProxy { @@ -76,17 +76,16 @@ public class ClientProxy extends CommonProxy { if (Features.CLOUD.enabled()) { RenderingRegistry.registerEntityRenderingHandler( - EntityCloudInABottle.class, - new RenderSnowball(ChiselItems.cloudinabottle)); + EntityCloudInABottle.class, + new RenderSnowball(ChiselItems.cloudinabottle)); } if (Features.BALL_OF_MOSS.enabled()) { RenderingRegistry - .registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss)); + .registerEntityRenderingHandler(EntityBallOMoss.class, new RenderSnowball(ChiselItems.ballomoss)); } if (Features.SMASHING_ROCK.enabled()) { - RenderingRegistry.registerEntityRenderingHandler( - EntitySmashingRock.class, - new RenderSnowball(ChiselItems.smashingrock)); + RenderingRegistry + .registerEntityRenderingHandler(EntitySmashingRock.class, new RenderSnowball(ChiselItems.smashingrock)); } if (Features.PUMPKIN.enabled()) { RenderingRegistry.registerEntityRenderingHandler(EntityChiselSnowman.class, new RenderChiselSnowman()); diff --git a/src/main/java/team/chisel/proxy/CommonProxy.java b/src/main/java/team/chisel/proxy/CommonProxy.java index 902e1c78..1de9e471 100644 --- a/src/main/java/team/chisel/proxy/CommonProxy.java +++ b/src/main/java/team/chisel/proxy/CommonProxy.java @@ -3,10 +3,10 @@ package team.chisel.proxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; import team.chisel.block.tileentity.TileEntityAutoChisel; import team.chisel.block.tileentity.TileEntityCarvableBeacon; import team.chisel.block.tileentity.TileEntityPresent; -import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { diff --git a/src/main/java/team/chisel/utils/General.java b/src/main/java/team/chisel/utils/General.java index 5f073b68..efbd094f 100644 --- a/src/main/java/team/chisel/utils/General.java +++ b/src/main/java/team/chisel/utils/General.java @@ -2,8 +2,6 @@ package team.chisel.utils; import java.util.Random; -import joptsimple.internal.Strings; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -16,14 +14,15 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import team.chisel.carving.Carving; -import team.chisel.item.chisel.ChiselMode; - 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 joptsimple.internal.Strings; +import team.chisel.carving.Carving; +import team.chisel.item.chisel.ChiselMode; + public class General { public static Random rand = new Random(); @@ -71,20 +70,22 @@ public class General { } public static String cleanTags(String tag) { - return tag.replaceAll("[Cc]hisel\\p{Punct}", "").replaceFirst("^tile\\.", "").replaceFirst("^item\\.", ""); + return tag.replaceAll("[Cc]hisel\\p{Punct}", "") + .replaceFirst("^tile\\.", "") + .replaceFirst("^item\\.", ""); } public static MovingObjectPosition getMovingObjectPositionFromPlayer(World par1World, EntityPlayer par2EntityPlayer, - boolean par3) { + boolean par3) { float var4 = 1.0F; float var5 = par2EntityPlayer.prevRotationPitch - + (par2EntityPlayer.rotationPitch - par2EntityPlayer.prevRotationPitch) * var4; + + (par2EntityPlayer.rotationPitch - par2EntityPlayer.prevRotationPitch) * var4; float var6 = par2EntityPlayer.prevRotationYaw - + (par2EntityPlayer.rotationYaw - par2EntityPlayer.prevRotationYaw) * var4; + + (par2EntityPlayer.rotationYaw - par2EntityPlayer.prevRotationYaw) * var4; double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * var4; double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * var4 - + 1.62D - - par2EntityPlayer.yOffset; + + 1.62D + - par2EntityPlayer.yOffset; double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * var4; // TODO- 1.7.10 fix? Vec3 var13 = Vec3.createVectorHelper(var7, var9, var11); @@ -106,15 +107,15 @@ public class General { public static ItemStack getChiselTarget(ItemStack chisel) { return chisel.hasTagCompound() - ? ItemStack.loadItemStackFromNBT(chisel.stackTagCompound.getCompoundTag("chiselTarget")) - : null; + ? ItemStack.loadItemStackFromNBT(chisel.stackTagCompound.getCompoundTag("chiselTarget")) + : null; } public static final String[] sGNames = new String[] { "White", "Orange", "Magenta", "Light Blue", "Yellow", "Lime", - "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; + "Pink", "Gray", "Light Gray", "Cyan", "Purple", "Blue", "Brown", "Green", "Red", "Black" }; public static final String[] featureColors = new String[] { "white", "orange", "magenta", "lightblue", "yellow", - "lime", "pink", "darkgray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; + "lime", "pink", "darkgray", "lightgray", "cyan", "purple", "blue", "brown", "green", "red", "black" }; public static void setChiselTarget(ItemStack chisel, ItemStack target) { initTag(chisel); @@ -122,7 +123,8 @@ public class General { if (target != null) { target.writeToNBT(targetTag); } - chisel.getTagCompound().setTag("chiselTarget", targetTag); + chisel.getTagCompound() + .setTag("chiselTarget", targetTag); } private static void initTag(ItemStack stack) { @@ -158,10 +160,9 @@ public class General { public static ICarvingVariation getVariation(ItemStack stack) { ICarvingVariation v = Carving.chisel - .getVariation(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); + .getVariation(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); return v == null - ? CarvingUtils - .getDefaultVariationFor(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 99) - : v; + ? CarvingUtils.getDefaultVariationFor(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage(), 99) + : v; } } diff --git a/src/main/java/team/chisel/utils/GeneralClient.java b/src/main/java/team/chisel/utils/GeneralClient.java index 7a583b81..81ffe31d 100644 --- a/src/main/java/team/chisel/utils/GeneralClient.java +++ b/src/main/java/team/chisel/utils/GeneralClient.java @@ -15,13 +15,13 @@ public class GeneralClient { public static void playChiselSound(World world, int x, int y, int z, String sound) { Minecraft.getMinecraft().theWorld.playSound( - x + 0.5, - y + 0.5, - z + 0.5, - sound, - 0.3f + 0.7f * rand.nextFloat(), - 0.6f + 0.4f * rand.nextFloat(), - true); + x + 0.5, + y + 0.5, + z + 0.5, + sound, + 0.3f + 0.7f * rand.nextFloat(), + 0.6f + 0.4f * rand.nextFloat(), + true); } static HashMap resources = new HashMap(); @@ -34,7 +34,9 @@ public class GeneralClient { resources.put(textureName, res); } - Minecraft.getMinecraft().getTextureManager().bindTexture(res); + Minecraft.getMinecraft() + .getTextureManager() + .bindTexture(res); } public static void setGLColorFromInt(int color) { diff --git a/src/main/java/team/chisel/utils/RecipeUtil.java b/src/main/java/team/chisel/utils/RecipeUtil.java index d907cdec..73e4a632 100644 --- a/src/main/java/team/chisel/utils/RecipeUtil.java +++ b/src/main/java/team/chisel/utils/RecipeUtil.java @@ -14,7 +14,8 @@ public class RecipeUtil { @SuppressWarnings("unchecked") public static boolean isCraftable(ItemStack stack) { - for (IRecipe recipe : (List) CraftingManager.getInstance().getRecipeList()) { + for (IRecipe recipe : (List) CraftingManager.getInstance() + .getRecipeList()) { if (recipe.getRecipeOutput() == null) { continue; } @@ -26,7 +27,9 @@ public class RecipeUtil { } public static boolean isSmeltable(ItemStack stack) { - return FurnaceRecipes.smelting().getSmeltingList().containsKey(stack); + return FurnaceRecipes.smelting() + .getSmeltingList() + .containsKey(stack); } public static boolean isCreatable(ItemStack stack) { diff --git a/src/main/java/team/chisel/world/GeneratorChisel.java b/src/main/java/team/chisel/world/GeneratorChisel.java index 91cdb43e..850f50ea 100644 --- a/src/main/java/team/chisel/world/GeneratorChisel.java +++ b/src/main/java/team/chisel/world/GeneratorChisel.java @@ -9,6 +9,7 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; import com.google.common.collect.Maps; + import cpw.mods.fml.common.IWorldGenerator; public class GeneratorChisel implements IWorldGenerator { @@ -56,7 +57,7 @@ public class GeneratorChisel implements IWorldGenerator { @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, - IChunkProvider chunkProvider) { + IChunkProvider chunkProvider) { for (WorldGenMinable gen : map.keySet()) { genStandardOre(gen, map.get(gen), world, random, chunkX * 16, chunkZ * 16); }