diff --git a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java index 2c1019a3..a55fb59d 100644 --- a/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java +++ b/src/api/java/exterminatorJeff/undergroundBiomes/api/UBOreTexturizer.java @@ -20,40 +20,40 @@ public interface UBOreTexturizer { // Overlay name is the fully qualified name, e.g. modname:overlayName // that static vars are fully qualified names for all the textures in the UB pack, just pass as is // the event isn't needed per se, but if this is called anytime else, the blocks will not "stick" - public void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event); + void setupUBOre(Block oreBlock, String overlayName, FMLPreInitializationEvent event); - public void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); + void setupUBOre(Block oreBlock, int metadata, String overlayName, FMLPreInitializationEvent event); - public void setupUBOre( + void setupUBOre( Block oreBlock, int metadata, String overlayName, String blockName, FMLPreInitializationEvent event); - public void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; + void requestUBOreSetup(Block oreBlock, String overlayName) throws BlocksAreAlreadySet; - public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet; + void requestUBOreSetup(Block oreBlock, int metadata, String overlayName) throws BlocksAreAlreadySet; - public void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) + void requestUBOreSetup(Block oreBlock, int metadata, String overlayName, String blockName) throws BlocksAreAlreadySet; - public void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld); + void redoOres(int xInBlockCoordinates, int zInBlockCoordinates, World serverSideWorld); - public static String amber_overlay = "undergroundbiomes:amber_overlay"; - public static String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay"; - public static String coal_overlay = "undergroundbiomes:coal_overlay"; - public static String copper_overlay = "undergroundbiomes:copper_overlay"; - public static String diamond_overlay = "undergroundbiomes:diamond_overlay"; - public static String emerald_overlay = "undergroundbiomes:emerald_overlay"; - public static String gold_overlay = "undergroundbiomes:gold_overlay"; - public static String iron_overlay = "undergroundbiomes:iron_overlay"; - public static String lapis_overlay = "undergroundbiomes:lapis_overlay"; - public static String lead_overlay = "undergroundbiomes:lead_overlay"; - public static String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay"; - public static String redstone_overlay = "undergroundbiomes:redstone_overlay"; - public static String ruby_overlay = "undergroundbiomes:ruby_overlay"; - public static String sapphire_overlay = "undergroundbiomes:sapphire_overlay"; - public static String tin_overlay = "undergroundbiomes:tin_overlay"; - public static String uranium_overlay = "undergroundbiomes:uranium_overlay"; + String amber_overlay = "undergroundbiomes:amber_overlay"; + String cinnabar_overlay = "undergroundbiomes:cinnabar_overlay"; + String coal_overlay = "undergroundbiomes:coal_overlay"; + String copper_overlay = "undergroundbiomes:copper_overlay"; + String diamond_overlay = "undergroundbiomes:diamond_overlay"; + String emerald_overlay = "undergroundbiomes:emerald_overlay"; + String gold_overlay = "undergroundbiomes:gold_overlay"; + String iron_overlay = "undergroundbiomes:iron_overlay"; + String lapis_overlay = "undergroundbiomes:lapis_overlay"; + String lead_overlay = "undergroundbiomes:lead_overlay"; + String olivine_peridot_overlay = "undergroundbiomes:olivine-peridot_overlay"; + String redstone_overlay = "undergroundbiomes:redstone_overlay"; + String ruby_overlay = "undergroundbiomes:ruby_overlay"; + String sapphire_overlay = "undergroundbiomes:sapphire_overlay"; + String tin_overlay = "undergroundbiomes:tin_overlay"; + String uranium_overlay = "undergroundbiomes:uranium_overlay"; - public class BlocksAreAlreadySet extends RuntimeException { + class BlocksAreAlreadySet extends RuntimeException { // this is thrown if UB has already run its pre-initialization step and can no longer register blocks public final Block oreBlock; public final String overlayName; diff --git a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java index c2658f57..274cbf4a 100644 --- a/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java +++ b/src/main/java/tconstruct/api/IPlayerExtendedInventoryWrapper.java @@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; public interface IPlayerExtendedInventoryWrapper { - public IInventory getKnapsackInventory(EntityPlayer player); + IInventory getKnapsackInventory(EntityPlayer player); - public IInventory getAccessoryInventory(EntityPlayer player); + IInventory getAccessoryInventory(EntityPlayer player); } diff --git a/src/main/java/tconstruct/library/accessory/IAccessory.java b/src/main/java/tconstruct/library/accessory/IAccessory.java index 462423e5..3ffa3bd8 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IAccessory.java @@ -9,5 +9,5 @@ public interface IAccessory { * @param slot Accessory slot * @return Whether the accessory can be inserted into the slot */ - public boolean canEquipAccessory(ItemStack item, int slot); + boolean canEquipAccessory(ItemStack item, int slot); } diff --git a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java index 69cc998e..2a61c3c3 100644 --- a/src/main/java/tconstruct/library/accessory/IAccessoryModel.java +++ b/src/main/java/tconstruct/library/accessory/IAccessoryModel.java @@ -14,5 +14,5 @@ public interface IAccessoryModel { * @return Resource location of the texture. Return null for none */ @SideOnly(Side.CLIENT) - public ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot); + ResourceLocation getWearbleTexture(Entity entity, ItemStack stack, int slot); } diff --git a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java index 617c7687..965630a4 100644 --- a/src/main/java/tconstruct/library/accessory/IHealthAccessory.java +++ b/src/main/java/tconstruct/library/accessory/IHealthAccessory.java @@ -3,5 +3,5 @@ package tconstruct.library.accessory; import net.minecraft.item.ItemStack; public interface IHealthAccessory extends IAccessory { - public int getHealthBoost(ItemStack item); + int getHealthBoost(ItemStack item); } diff --git a/src/main/java/tconstruct/library/component/IComponentHolder.java b/src/main/java/tconstruct/library/component/IComponentHolder.java index 47bd193f..4d7c8818 100644 --- a/src/main/java/tconstruct/library/component/IComponentHolder.java +++ b/src/main/java/tconstruct/library/component/IComponentHolder.java @@ -3,5 +3,5 @@ package tconstruct.library.component; import java.util.List; public interface IComponentHolder { - public List getComponents(); + List getComponents(); } diff --git a/src/main/java/tconstruct/library/modifier/IModifyable.java b/src/main/java/tconstruct/library/modifier/IModifyable.java index 16214742..768f06f6 100644 --- a/src/main/java/tconstruct/library/modifier/IModifyable.java +++ b/src/main/java/tconstruct/library/modifier/IModifyable.java @@ -4,9 +4,9 @@ public interface IModifyable { /** * @return The base tag to modify. Ex: InfiTool */ - public String getBaseTagName(); + String getBaseTagName(); - public String getModifyType(); + String getModifyType(); - public String[] getTraits(); + String[] getTraits(); } diff --git a/src/main/java/tconstruct/library/util/IPattern.java b/src/main/java/tconstruct/library/util/IPattern.java index 72d3a47a..1744307a 100644 --- a/src/main/java/tconstruct/library/util/IPattern.java +++ b/src/main/java/tconstruct/library/util/IPattern.java @@ -4,7 +4,7 @@ import net.minecraft.item.ItemStack; import tconstruct.library.crafting.PatternBuilder.MaterialSet; public interface IPattern { - public int getPatternCost(ItemStack pattern); + int getPatternCost(ItemStack pattern); - public ItemStack getPatternOutput(ItemStack pattern, ItemStack input, MaterialSet set); + ItemStack getPatternOutput(ItemStack pattern, ItemStack input, MaterialSet set); } diff --git a/src/main/java/tconstruct/library/util/IToolPart.java b/src/main/java/tconstruct/library/util/IToolPart.java index f8ab58f4..7a978e0b 100644 --- a/src/main/java/tconstruct/library/util/IToolPart.java +++ b/src/main/java/tconstruct/library/util/IToolPart.java @@ -10,5 +10,5 @@ public interface IToolPart { * This item * @return Proper material ID. -1 for invalid */ - public int getMaterialID(ItemStack stack); + int getMaterialID(ItemStack stack); } diff --git a/src/main/java/tconstruct/library/weaponry/IAccuracy.java b/src/main/java/tconstruct/library/weaponry/IAccuracy.java index c2d30033..e0fd7988 100644 --- a/src/main/java/tconstruct/library/weaponry/IAccuracy.java +++ b/src/main/java/tconstruct/library/weaponry/IAccuracy.java @@ -3,9 +3,9 @@ package tconstruct.library.weaponry; import net.minecraft.item.ItemStack; public interface IAccuracy { - public float minAccuracy(ItemStack itemStack); + float minAccuracy(ItemStack itemStack); - public float maxAccuracy(ItemStack itemStack); + float maxAccuracy(ItemStack itemStack); - public float getAccuracy(ItemStack itemStack, int time); + float getAccuracy(ItemStack itemStack, int time); } diff --git a/src/main/java/tconstruct/library/weaponry/IWindup.java b/src/main/java/tconstruct/library/weaponry/IWindup.java index a4b91b3d..5878f106 100644 --- a/src/main/java/tconstruct/library/weaponry/IWindup.java +++ b/src/main/java/tconstruct/library/weaponry/IWindup.java @@ -9,15 +9,15 @@ import tconstruct.weaponry.client.CrosshairType; * Windup progress is visualized with a special crosshair. */ public interface IWindup { - public int getWindupTime(ItemStack itemStack); // how long it takes to fully wind up + int getWindupTime(ItemStack itemStack); // how long it takes to fully wind up - public float getWindupProgress(ItemStack itemStack, EntityPlayer player); // how far we've winded up, 0.0-1.0 + float getWindupProgress(ItemStack itemStack, EntityPlayer player); // how far we've winded up, 0.0-1.0 - public float getMinWindupProgress(ItemStack itemStack); // how long it has been winded up at least to fire (0.0-1.0) + float getMinWindupProgress(ItemStack itemStack); // how long it has been winded up at least to fire (0.0-1.0) - public CrosshairType getCrosshairType(); + CrosshairType getCrosshairType(); - public boolean zoomOnWindup(ItemStack itemStack); + boolean zoomOnWindup(ItemStack itemStack); - public float getZoom(ItemStack itemStack); + float getZoom(ItemStack itemStack); }