From 9beab25b7ae1fbe3c66ba3b98b3311bba140f37a Mon Sep 17 00:00:00 2001 From: bombcar Date: Tue, 7 Nov 2023 15:32:25 -0600 Subject: [PATCH] Update for spotlessApply --- repositories.gradle | 10 -- .../chisel/api/IAdvancedChisel.java | 4 +- .../cricketcraft/chisel/api/ICarvable.java | 4 +- .../cricketcraft/chisel/api/IChiselItem.java | 10 +- .../chisel/api/carving/CarvingUtils.java | 8 +- .../chisel/api/carving/ICarvingRegistry.java | 32 ++--- .../chisel/api/rendering/TextureType.java | 112 +++++++++--------- src/main/java/team/chisel/Features.java | 63 +++++++++- .../java/team/chisel/block/BlockCarvable.java | 6 +- .../team/chisel/block/BlockCarvableSand.java | 6 +- .../java/team/chisel/carving/Carving.java | 5 +- .../gui/widgets/GuiButtonChiselMode.java | 4 +- .../client/render/RendererMultiLayer.java | 10 +- .../render/SubmapManagerFakeController.java | 9 +- .../client/render/tile/RenderAutoChisel.java | 16 ++- .../java/team/chisel/init/ChiselBlocks.java | 29 ++++- .../chisel/inventory/ContainerAutoChisel.java | 2 +- 17 files changed, 218 insertions(+), 112 deletions(-) diff --git a/repositories.gradle b/repositories.gradle index 83329ef8..c227b16e 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,14 +1,4 @@ // Add any additional repositories for your dependencies here repositories { - maven { - name = "GTNH" - url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - } - maven { - url "https://cursemaven.com" - } - maven { - url = "https://jitpack.io" - } } diff --git a/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java b/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java index 9f27dce9..e8a5309d 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java +++ b/src/main/java/com/cricketcraft/chisel/api/IAdvancedChisel.java @@ -11,7 +11,7 @@ public interface IAdvancedChisel { /** * Gets the next mode the button in the GUI should switch to given the current mode. - * + * * @param stack The {@link ItemStack} representing the chisel * @param current The {@link IChiselMode} that is currently active * @return The next {@link IChiselMode} in the loop @@ -20,7 +20,7 @@ public interface IAdvancedChisel { /** * Gets an {@link IChiselMode} instance from a String name - * + * * @param chisel The {@link ItemStack} representing the chisel * @param name The name of the {@link IChiselMode mode} * @return An {@link IChiselMode} that has the name {@code name} diff --git a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java index 860623a7..13f2dd12 100644 --- a/src/main/java/com/cricketcraft/chisel/api/ICarvable.java +++ b/src/main/java/com/cricketcraft/chisel/api/ICarvable.java @@ -19,7 +19,7 @@ public interface ICarvable extends ICTMBlock { *

* Typically you can refer this method to {@link CarvableHelper#getVariation(int)} but this method is provided for * more complex metadata handling. - * + * * @param metadata The metadata of the block * @param world {@link IBlockAccess} object, usually a world. Use of {@link IBlockAccess} Is necessary due to * this method's use in rendering. @@ -34,7 +34,7 @@ public interface ICarvable extends ICTMBlock { /** * Gets the {@link ISubmapManager} for this block when it is in item form. - * + * * @return A {@link ISubmapManager} */ @Override diff --git a/src/main/java/com/cricketcraft/chisel/api/IChiselItem.java b/src/main/java/com/cricketcraft/chisel/api/IChiselItem.java index fa91a412..6b9523e6 100644 --- a/src/main/java/com/cricketcraft/chisel/api/IChiselItem.java +++ b/src/main/java/com/cricketcraft/chisel/api/IChiselItem.java @@ -14,7 +14,7 @@ public interface IChiselItem { /** * Checks whether the chisel can have its GUI opened - * + * * @param world {@link World} object * @param player The player holding the chisel. It can always be assumed that the player's current item will be * this. @@ -25,7 +25,7 @@ public interface IChiselItem { /** * Called when an item is chiseled using this chisel - * + * * @param world {@link World} object * @param chisel The {@link ItemStack} representing the chisel * @param target The {@link ICarvingVariation} representing the target item @@ -39,7 +39,7 @@ public interface IChiselItem { *

* It is not necessary to take into account whether this item has any variants, this method will only be * called after that check. - * + * * @param world {@link World} object * @param chisel The {@link ItemStack} representing the chisel * @param target The {@link ICarvingVariation} representing the target item @@ -49,7 +49,7 @@ public interface IChiselItem { /** * Allows you to control if your item can chisel this block in the world. - * + * * @param world World object * @param player {@link EntityPlayer The player} holding the chisel. * @param x X coord of the block being chiseled @@ -63,7 +63,7 @@ public interface IChiselItem { /** * Allows you to control if your item has chiseling modes. - * + * * @param chisel The {@link ItemStack} representing the chisel. * @return True if the chisel supports modes. False otherwise. */ diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java index 2b56c02d..aef47152 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/CarvingUtils.java @@ -14,7 +14,7 @@ public class CarvingUtils { /** * A simple way to compare two {@link ICarvingVariation} objects based on the {@link ICarvingVariation#getOrder() * getOrder()} method. - * + * * @param v1 The first {@link ICarvingVariation variation}. * @param v2 The second {@link ICarvingVariation variation}. * @return A positive integer if the first's order is greater, a negative integer if the second's is greater, and 0 @@ -26,7 +26,7 @@ public class CarvingUtils { /** * Gets an {@link ItemStack} representing the passed {@link ICarvingVariation}. - * + * * @param variation An {@link ICarvingVariation} * @return An {@link ItemStack} */ @@ -48,7 +48,7 @@ public class CarvingUtils { /** * Creates a standard {@link ICarvingVariation} for the given data. Use this if you do not need any custom behavior * in your own variation. - * + * * @param block The block of the variation * @param metadata The metadata of both the block and item * @param order The sorting order. @@ -61,7 +61,7 @@ public class CarvingUtils { /** * Creates a standard {@link ICarvingGroup} for the given name. Use this if you do not need any custom behavior in * your own group. - * + * * @param name The name of the group. * @return A standard {@link ICarvingGroup} instance. */ diff --git a/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingRegistry.java b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingRegistry.java index 9ab7fd07..19654b28 100644 --- a/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingRegistry.java +++ b/src/main/java/com/cricketcraft/chisel/api/carving/ICarvingRegistry.java @@ -18,7 +18,7 @@ public interface ICarvingRegistry { /** * Finds the group the block/meta pair belongs to in the registry. - * + * * @param block The block of the variation * @param meta The metadata of the variation * @return The {@link ICarvingGroup} that the block/meta pair belongs to @@ -27,7 +27,7 @@ public interface ICarvingRegistry { /** * Gets an {@link ICarvingGroup} by its name. - * + * * @param name The name of the group * @return An {@link ICarvingGroup} */ @@ -35,7 +35,7 @@ public interface ICarvingRegistry { /** * Gets the {@link ICarvingVariation} instance represented by this block/meta pair. - * + * * @param block The block of the variatoin * @param meta The metadata of the variation * @return The {@link ICarvingVariation} containing this block/meta pair @@ -44,7 +44,7 @@ public interface ICarvingRegistry { /** * Gets the list of {@link ICarvingVariation}s from the group that contains this block/meta pair. - * + * * @param block The block of the variation * @param meta The metadata of the variation * @return All of the {@link ICarvingVariation}s in the group that contains this block/meta pair @@ -53,7 +53,7 @@ public interface ICarvingRegistry { /** * Gets the oredict name for the group that contains this block/meta pair. - * + * * @param block The block of the variation * @param meta The metadata of the variation * @return A string oredict name for the group @@ -62,7 +62,7 @@ public interface ICarvingRegistry { /** * Gets the possible output items for this {@link ItemStack}. To be used for machines/GUIs that chisel items. - * + * * @param chiseled The {@link ItemStack} being chiseled * @return A list of stacks that can be chiseled from the passed {@link ItemStack stack} */ @@ -70,7 +70,7 @@ public interface ICarvingRegistry { /** * Gets the sound resource string for the group represented by this block/meta pair. - * + * * @param block The block of the variation * @param metadata The metadata of the variation * @return The string resource for the sound that can be used in @@ -83,7 +83,7 @@ public interface ICarvingRegistry { *

* Mostly a convenience for calling {@link #getVariationSound(Block, int)} with * {@link Block#getBlockFromItem(Item)}. - * + * * @param item The item of the variation * @param metadata The metadata of the variation * @return The string resource for the sound that can be used in @@ -100,7 +100,7 @@ public interface ICarvingRegistry { /** * Adds a variation to the registry. - * + * * @param groupName The name of the group to add to. * @param block The block of the variation * @param metadata The metadata of the variation @@ -111,7 +111,7 @@ public interface ICarvingRegistry { /** * Adds a variation to the registry. - * + * * @param groupName The name of the group to add to * @param variation The {@link ICarvingVariation} to add */ @@ -119,7 +119,7 @@ public interface ICarvingRegistry { /** * Adds a group to the registry. - * + * * @param group The {@link ICarvingGroup} to add. */ void addGroup(ICarvingGroup group); @@ -130,7 +130,7 @@ public interface ICarvingRegistry { * This in effect removes all variations associated with the group, though they are not explicitly removed from the * object. If you maintain a reference to the {@link ICarvingGroup} that is removed, it will still contain its * variations. - * + * * @param groupName The name of the group to remove. * @return The {@link ICarvingGroup} that was removed. */ @@ -139,7 +139,7 @@ public interface ICarvingRegistry { /** * Removes a varaition with the passed {@link Block} and metadata from the registry. If this variation is registered * with mutiple groups, it will remove it from all of them. - * + * * @param block The {@link Block} of the {@link ICarvingVariation variation} * @param metadata The metadata of the {@link ICarvingVariation variation} * @return The ICarvingVariation that was removed. Null if nothing was removed. @@ -149,7 +149,7 @@ public interface ICarvingRegistry { /** * Removes a varaition with the passed {@link Block} and metadata from the registry, but only from the specified * {@link ICarvingGroup} name. - * + * * @param block The {@link Block} of the {@link ICarvingVariation variation} * @param metadata The metadata of the {@link ICarvingVariation variation} * @param group The name of the group that the variation should be removed from @@ -162,7 +162,7 @@ public interface ICarvingRegistry { *

* Doing this means that all blocks that are registered to this oredict name will act as if they are a part of this * group. - * + * * @param groupName The name of the group * @param oreName The oredict name */ @@ -173,7 +173,7 @@ public interface ICarvingRegistry { *

* This is the sound that is used when a block from this group is chiseled.
* Does not need to be explicitly set. - * + * * @param name The name of the group * @param sound The resource string for the sound */ 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 1465a8c5..8c8be963 100644 --- a/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java +++ b/src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java @@ -42,7 +42,7 @@ public enum TextureType { register.registerIcon(modName + ":" + texturePath + "-top") }; } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { IIcon[] icons = (IIcon[]) cachedObject; @@ -57,7 +57,7 @@ public enum TextureType { register.registerIcon(modName + ":" + texturePath + "-top") }; } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { IIcon[] icons = (IIcon[]) cachedObject; @@ -65,18 +65,18 @@ public enum TextureType { } }, CTMV("ctmv", "top"){ - + @Override protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return Pair.of(new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-ctmv"), 2, 2), register.registerIcon(modName + ":" + texturePath + "-top")); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { Pair data = (Pair) cachedObject; return side < 2 ? data.getRight() : data.getLeft().getSubIcon(0, 0); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { Pair data = (Pair) cachedObject; @@ -96,13 +96,13 @@ public enum TextureType { return map.getSubIcon(1, 0); return map.getSubIcon(0, 0); } - + @Override @SideOnly(Side.CLIENT) protected RenderBlocks createRenderContext(RenderBlocks rendererOld, IBlockAccess world, Object cachedObject) { RenderBlocksColumn ret = theRenderBlocksColumn; Pair data = (Pair) cachedObject; - + ret.blockAccess = world; ret.renderMaxX = 1.0; ret.renderMaxY = 1.0; @@ -117,13 +117,13 @@ public enum TextureType { @Override protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return Pair.of(new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-ctmh"), 2, 2), register.registerIcon(modName + ":" + texturePath + "-top")); - } - + } + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return CTMV.getIcon(variation, cachedObject, side, meta); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { Pair data = (Pair) cachedObject; @@ -143,7 +143,7 @@ public enum TextureType { p = ctm.isConnected(world, x, y, z - 1, side, block, meta); n = ctm.isConnected(world, x, y, z + 1, side, block, meta); } - + TextureSubmap map = data.getLeft(); if (p && n) return map.getSubIcon(1, 0); @@ -159,14 +159,14 @@ public enum TextureType { protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-v9"), 3, 3); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return ((TextureSubmap)cachedObject).getSubIcon(1, 1); } @Override - protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { + protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getVIcon(this, (TextureSubmap) cachedObject, x, y, z, side); } }, @@ -175,12 +175,12 @@ public enum TextureType { protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-v4"), 2, 2); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return ((TextureSubmap)cachedObject).getSubIcon(0, 0); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getVIcon(this, (TextureSubmap) cachedObject, x, y, z, side); @@ -196,12 +196,12 @@ public enum TextureType { new TextureSubmap(baseIcon, 2, 2) ); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return ((Triple)cachedObject).getLeft(); } - + @Override @SideOnly(Side.CLIENT) protected RenderBlocks createRenderContext(RenderBlocks rendererOld, IBlockAccess world, Object cachedObject) { @@ -220,13 +220,13 @@ public enum TextureType { @Override protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-r16"), 4, 4); - } - + } + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return V9.getIcon(variation, cachedObject, side, meta); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getRIcon(this, (TextureSubmap) cachedObject, x, y, z, side); @@ -236,30 +236,30 @@ public enum TextureType { @Override protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-r9"), 3, 3); - } - + } + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return V9.getIcon(variation, cachedObject, side, meta); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getRIcon(this, (TextureSubmap) cachedObject, x, y, z, side); } }, R4("r4"){ - + @Override protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-r4"), 2, 2); - } - + } + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return V4.getIcon(variation, cachedObject, side, meta); } - + @Override protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getRIcon(this, (TextureSubmap) cachedObject, x, y, z, side); @@ -267,9 +267,9 @@ public enum TextureType { }, NORMAL, CUSTOM; - + /* Some util stuff for shared code between v* and r* */ - + public static IIcon getVIcon(TextureType type, TextureSubmap map, int x, int y, int z, int side) { int variationSize = (type == TextureType.V9) ? 3 : 2; @@ -304,23 +304,23 @@ public enum TextureType { return map.getSubIcon(index % variationSize, index / variationSize); } - + public static IIcon getRIcon(TextureType type, TextureSubmap map, int x, int y, int z, int side) { rand.setSeed(getCoordinateRandom(x, y, z)); rand.nextBoolean(); int size = type == TextureType.R4 ? 2 : type == TextureType.R9 ? 3 : 4; return map.getSubIcon(rand.nextInt(size), rand.nextInt(size)); } - + private static long getCoordinateRandom(int x, int y, int z) { // MC 1.8 code... long l = (x * 3129871) ^ z * 116129781L ^ y; l = l * l * 42317861L + l * 11L; return l; } - + /* End of that mess */ - + private static final TextureType[] VALUES; private static final CTM ctm = CTM.getInstance(); private static final Random rand = new Random(); @@ -337,31 +337,31 @@ public enum TextureType { private TextureType(String... suffixes) { this.suffixes = suffixes.length == 0 ? new String[] { "" } : suffixes; } - + private static void initStatics() { if (theRenderBlocksCTM == null) { theRenderBlocksCTM = new RenderBlocksCTM(); theRenderBlocksColumn = new RenderBlocksColumn(); } } - + public ISubmapManager createManagerFor(ICarvingVariation variation, String texturePath) { return new SubmapManagerDefault(this, variation, texturePath); } - + public ISubmapManager createManagerFor(ICarvingVariation variation, Block block, int meta) { return new SubmapManagerExistingIcon(this, variation, block, meta); } - + @SideOnly(Side.CLIENT) protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) { return register.registerIcon(modName + ":" + texturePath); } - + protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, int side, int meta) { return (IIcon) cachedObject; } - + protected IIcon getIcon(ICarvingVariation variation, Object cachedObject, IBlockAccess world, int x, int y, int z, int side, int meta) { return getIcon(variation, cachedObject, side, meta); } @@ -370,7 +370,7 @@ public enum TextureType { protected RenderBlocks createRenderContext(RenderBlocks rendererOld, IBlockAccess world, Object cachedObject) { return rendererOld; } - + public static TextureType getTypeFor(CarvableHelper inst, String modid, String path) { if (path == null) { return CUSTOM; @@ -388,7 +388,7 @@ public enum TextureType { } return CUSTOM; } - + // This is ugly, but faster than class.getResource private static boolean exists(String modid, String path, String postfix) { ResourceLocation rl = new ResourceLocation(modid, "textures/blocks/" + path + postfix + ".png"); @@ -399,18 +399,18 @@ public enum TextureType { return false; } } - + @SideOnly(Side.CLIENT) public abstract static class AbstractSubmapManager implements ISubmapManager { protected final TextureType type; protected ICarvingVariation variation; protected Object cachedObject; - + private AbstractSubmapManager(TextureType type, ICarvingVariation variation) { this.type = type; this.variation = variation; } - + @Override public IIcon getIcon(int side, int meta) { return type.getIcon(variation, cachedObject, side, meta); @@ -420,7 +420,7 @@ public enum TextureType { public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { return type.getIcon(variation, cachedObject, world, x, y, z, side, world.getBlockMetadata(x, y, z)); } - + @Override public RenderBlocks createRenderContext(RenderBlocks rendererOld, Block block, IBlockAccess world) { initStatics(); @@ -428,15 +428,15 @@ public enum TextureType { rb.setRenderBoundsFromBlock(block); return rb; } - + @Override public void preRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) { } - + @Override - public void postRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) { + public void postRenderSide(RenderBlocks renderer, IBlockAccess world, int x, int y, int z, ForgeDirection side) { } - + public Object getCachedObject() { return cachedObject; } @@ -446,7 +446,7 @@ public enum TextureType { private static class SubmapManagerDefault extends AbstractSubmapManager { private String texturePath; - + private SubmapManagerDefault(TextureType type, ICarvingVariation variation, String texturePath) { super(type, variation); this.texturePath = texturePath; @@ -457,24 +457,24 @@ public enum TextureType { cachedObject = type.registerIcons(variation, modName, texturePath, register); } } - + @SideOnly(Side.CLIENT) private static class SubmapManagerExistingIcon extends AbstractSubmapManager { - + private Block block; private int meta; - + private SubmapManagerExistingIcon(TextureType type, ICarvingVariation variation, Block block, int meta) { super(type, variation); this.block = block; this.meta = meta; } - + @Override public IIcon getIcon(int side, int meta) { return block.getIcon(side, this.meta); } - + @Override public IIcon getIcon(IBlockAccess world, int x, int y, int z, int side) { return getIcon(side, world.getBlockMetadata(x, y, z)); @@ -484,4 +484,4 @@ public enum TextureType { public void registerIcons(String modName, Block block, IIconRegister register) { } } -} \ No newline at end of file +} diff --git a/src/main/java/team/chisel/Features.java b/src/main/java/team/chisel/Features.java index d91eee28..ebf144fb 100644 --- a/src/main/java/team/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -1,7 +1,21 @@ package team.chisel; -import static team.chisel.init.ChiselBlocks.*; -import static team.chisel.utils.General.*; +import static team.chisel.init.ChiselBlocks.andesite; +import static team.chisel.init.ChiselBlocks.cubit; +import static team.chisel.init.ChiselBlocks.diorite; +import static team.chisel.init.ChiselBlocks.granite; +import static team.chisel.init.ChiselBlocks.jackolantern; +import static team.chisel.init.ChiselBlocks.neonite; +import static team.chisel.init.ChiselBlocks.nucrete; +import static team.chisel.init.ChiselBlocks.planks; +import static team.chisel.init.ChiselBlocks.pumpkin; +import static team.chisel.init.ChiselBlocks.stainedGlass; +import static team.chisel.init.ChiselBlocks.stainedGlassForestry; +import static team.chisel.init.ChiselBlocks.stainedGlassPane; +import static team.chisel.init.ChiselBlocks.sveltstone; +import static team.chisel.init.ChiselBlocks.torches; +import static team.chisel.utils.General.featureColors; +import static team.chisel.utils.General.sGNames; import java.util.List; @@ -30,10 +44,51 @@ 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.block.BlockAutoChisel; +import team.chisel.block.BlockBeaconBase; +import team.chisel.block.BlockCarvable; +import team.chisel.block.BlockCarvableBeacon; +import team.chisel.block.BlockCarvableBookshelf; +import team.chisel.block.BlockCarvableCarpet; +import team.chisel.block.BlockCarvableGlass; +import team.chisel.block.BlockCarvableGlow; +import team.chisel.block.BlockCarvableGlowie; +import team.chisel.block.BlockCarvableGlowstone; +import team.chisel.block.BlockCarvableIce; +import team.chisel.block.BlockCarvableIceStairs; +import team.chisel.block.BlockCarvableLayered; +import team.chisel.block.BlockCarvablePackedIce; +import team.chisel.block.BlockCarvablePackedIceStairs; +import team.chisel.block.BlockCarvablePane; +import team.chisel.block.BlockCarvablePowered; +import team.chisel.block.BlockCarvablePumpkin; +import team.chisel.block.BlockCarvableSand; +import team.chisel.block.BlockCarvableSlab; +import team.chisel.block.BlockCarvableStairs; +import team.chisel.block.BlockCarvableTorch; +import team.chisel.block.BlockCloud; +import team.chisel.block.BlockConcrete; +import team.chisel.block.BlockEldritch; +import team.chisel.block.BlockGrimstone; +import team.chisel.block.BlockHolystone; +import team.chisel.block.BlockLavastone; +import team.chisel.block.BlockLeaf; +import team.chisel.block.BlockPresent; +import team.chisel.block.BlockRoadLine; +import team.chisel.block.BlockSnakestone; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.block.BlockWaterstone; +import team.chisel.block.CarvableStairsMaker; +import team.chisel.block.IStairsCreator; import team.chisel.carving.Carving; -import team.chisel.client.render.*; +import team.chisel.client.render.SubmapManagerAntiblock; +import team.chisel.client.render.SubmapManagerCarpetFloor; +import team.chisel.client.render.SubmapManagerCombinedCTM; +import team.chisel.client.render.SubmapManagerFakeController; +import team.chisel.client.render.SubmapManagerLeaves; +import team.chisel.client.render.SubmapManagerSlab; import team.chisel.client.render.SubmapManagerSpecialMaterial; +import team.chisel.client.render.SubmapManagerVoidstone; import team.chisel.compat.fmp.ItemBlockChiselTorchPart; import team.chisel.config.Configurations; import team.chisel.entity.EntityBallOMoss; diff --git a/src/main/java/team/chisel/block/BlockCarvable.java b/src/main/java/team/chisel/block/BlockCarvable.java index e302e6b5..beab8514 100644 --- a/src/main/java/team/chisel/block/BlockCarvable.java +++ b/src/main/java/team/chisel/block/BlockCarvable.java @@ -104,7 +104,7 @@ public class BlockCarvable extends Block implements ICarvable { /** * Creates a SoundType with automatic names for step and break sounds. Sound names dig.soundName and * step.soundName must be specified in the sounds.json - * + * * @param soundName block of the sound. Will automatically be expanded to "mod:dig.soundName" and * "mod:step.soundName" respectively) * @param volume default 1.0f @@ -120,7 +120,7 @@ public class BlockCarvable extends Block implements ICarvable { /** * Creates a SoundType with manual names for step and break sounds. Sound names must be specified in the * sounds.json - * + * * @param soundNameBreak block break sound * @param soundNameStep block step sound * @param volume default 1.0f @@ -136,7 +136,7 @@ public class BlockCarvable extends Block implements ICarvable { /** * Creates a SoundType with manual names for step, break and place sounds. Sound names must be specified in the * sounds.json - * + * * @param soundNameBreak block break sound * @param soundNameStep block step sound * @param soundNamePlace block place sound diff --git a/src/main/java/team/chisel/block/BlockCarvableSand.java b/src/main/java/team/chisel/block/BlockCarvableSand.java index 029ae9dc..ba347f8c 100644 --- a/src/main/java/team/chisel/block/BlockCarvableSand.java +++ b/src/main/java/team/chisel/block/BlockCarvableSand.java @@ -92,7 +92,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { /** * Creates a SoundType with automatic names for step and break sounds. Sound names dig.soundName and * step.soundName must be specified in the sounds.json - * + * * @param soundName block of the sound. Will automatically be expanded to "mod:dig.soundName" and * "mod:step.soundName" respectively) * @param volume default 1.0f @@ -108,7 +108,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { /** * Creates a SoundType with manual names for step and break sounds. Sound names must be specified in the * sounds.json - * + * * @param soundNameBreak block break sound * @param soundNameStep block step sound * @param volume default 1.0f @@ -124,7 +124,7 @@ public class BlockCarvableSand extends BlockSand implements ICarvable { /** * Creates a SoundType with manual names for step, break and place sounds. Sound names must be specified in the * sounds.json - * + * * @param soundNameBreak block break sound * @param soundNameStep block step sound * @param soundNamePlace block place sound diff --git a/src/main/java/team/chisel/carving/Carving.java b/src/main/java/team/chisel/carving/Carving.java index 6b7f2eda..925f6b63 100644 --- a/src/main/java/team/chisel/carving/Carving.java +++ b/src/main/java/team/chisel/carving/Carving.java @@ -1,6 +1,9 @@ package team.chisel.carving; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.item.Item; 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 bc106e25..ae052518 100644 --- a/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java +++ b/src/main/java/team/chisel/client/gui/widgets/GuiButtonChiselMode.java @@ -1,6 +1,8 @@ package team.chisel.client.gui.widgets; -import static team.chisel.client.gui.GuiChisel.*; +import static team.chisel.client.gui.GuiChisel.TEXTURE_HEIGHT; +import static team.chisel.client.gui.GuiChisel.TEXTURE_RESOURCE_LOCATION; +import static team.chisel.client.gui.GuiChisel.TEXTURE_WIDTH; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/team/chisel/client/render/RendererMultiLayer.java b/src/main/java/team/chisel/client/render/RendererMultiLayer.java index 918f5216..3aa50bec 100644 --- a/src/main/java/team/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/team/chisel/client/render/RendererMultiLayer.java @@ -1,6 +1,14 @@ package team.chisel.client.render; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glDisable; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glTranslatef; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java index cec3fa77..9ed16258 100644 --- a/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java @@ -1,6 +1,13 @@ package team.chisel.client.render; -import static team.chisel.ctmlib.Dir.*; +import static team.chisel.ctmlib.Dir.BOTTOM; +import static team.chisel.ctmlib.Dir.BOTTOM_LEFT; +import static team.chisel.ctmlib.Dir.BOTTOM_RIGHT; +import static team.chisel.ctmlib.Dir.LEFT; +import static team.chisel.ctmlib.Dir.RIGHT; +import static team.chisel.ctmlib.Dir.TOP; +import static team.chisel.ctmlib.Dir.TOP_LEFT; +import static team.chisel.ctmlib.Dir.TOP_RIGHT; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; 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 7eeebcc7..f7eeec80 100644 --- a/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java @@ -1,6 +1,20 @@ package team.chisel.client.render.tile; -import static org.lwjgl.opengl.GL11.*; +import static org.lwjgl.opengl.GL11.GL_ALL_ATTRIB_BITS; +import static org.lwjgl.opengl.GL11.GL_BLEND; +import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_CONSTANT_ALPHA; +import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; +import static org.lwjgl.opengl.GL11.glBlendFunc; +import static org.lwjgl.opengl.GL11.glDepthMask; +import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.glPopAttrib; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushAttrib; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glRotatef; +import static org.lwjgl.opengl.GL11.glScalef; +import static org.lwjgl.opengl.GL11.glTranslated; +import static org.lwjgl.opengl.GL11.glTranslatef; import java.util.Random; diff --git a/src/main/java/team/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java index f2f0620a..f8c8d07d 100644 --- a/src/main/java/team/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -4,7 +4,34 @@ import net.minecraft.block.Block; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import team.chisel.Chisel; -import team.chisel.block.*; +import team.chisel.block.BlockCarvable; +import team.chisel.block.BlockCarvableBeacon; +import team.chisel.block.BlockCarvableCarpet; +import team.chisel.block.BlockCarvableGlass; +import team.chisel.block.BlockCarvableGlowstone; +import team.chisel.block.BlockCarvableIce; +import team.chisel.block.BlockCarvableIceStairs; +import team.chisel.block.BlockCarvableLayered; +import team.chisel.block.BlockCarvablePackedIce; +import team.chisel.block.BlockCarvablePackedIceStairs; +import team.chisel.block.BlockCarvablePane; +import team.chisel.block.BlockCarvablePowered; +import team.chisel.block.BlockCarvablePumpkin; +import team.chisel.block.BlockCarvableSand; +import team.chisel.block.BlockCarvableSlab; +import team.chisel.block.BlockCarvableStairs; +import team.chisel.block.BlockCarvableTorch; +import team.chisel.block.BlockCarvableWall; +import team.chisel.block.BlockCloud; +import team.chisel.block.BlockConcrete; +import team.chisel.block.BlockGrimstone; +import team.chisel.block.BlockHolystone; +import team.chisel.block.BlockLavastone; +import team.chisel.block.BlockPresent; +import team.chisel.block.BlockRoadLine; +import team.chisel.block.BlockSnakestone; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.block.BlockWaterstone; @ObjectHolder(Chisel.MOD_ID) public final class ChiselBlocks { diff --git a/src/main/java/team/chisel/inventory/ContainerAutoChisel.java b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java index f0a63135..6aa341bb 100644 --- a/src/main/java/team/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java @@ -118,7 +118,7 @@ public class ContainerAutoChisel extends Container { /** * Added validation of slot input - * + * * @author CrazyPants */ @Override