From d7a55206e0368e3ec3adcb1d5219258974e044c9 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 17 Jul 2015 23:22:10 +0200 Subject: [PATCH] 0.0.7.5! --- build.gradle | 2 +- .../ellpeck/actuallyadditions/config/GuiConfiguration.java | 2 +- .../java/ellpeck/actuallyadditions/crafting/ItemCrafting.java | 4 ++-- src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java | 2 +- src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java | 2 +- .../java/ellpeck/actuallyadditions/items/ItemLeafBlower.java | 2 +- .../ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java | 2 +- .../ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java | 2 +- .../actuallyadditions/recipe/CrusherRecipeAutoRegistry.java | 2 +- .../actuallyadditions/recipe/CrusherRecipeManualRegistry.java | 2 +- src/main/java/ellpeck/actuallyadditions/util/ModUtil.java | 2 +- update/changelog.txt | 2 +- update/newestVersion.txt | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 03f73802e..83ca54fed 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "1.7.10-0.0.7.4" +version = "1.7.10-0.0.7.5" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" diff --git a/src/main/java/ellpeck/actuallyadditions/config/GuiConfiguration.java b/src/main/java/ellpeck/actuallyadditions/config/GuiConfiguration.java index 544ad9d18..f3a76eaa6 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/GuiConfiguration.java +++ b/src/main/java/ellpeck/actuallyadditions/config/GuiConfiguration.java @@ -17,7 +17,7 @@ public class GuiConfiguration extends GuiConfig{ } private static List getConfigElements(){ - List list = new ArrayList<>(); + List list = new ArrayList(); for(int i = 0; i < ConfigCategories.values().length; i++){ list.add(new ConfigElement(ConfigurationHandler.config.getCategory(ConfigCategories.values()[i].name.toLowerCase()))); } diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index 543158abc..cece82ef0 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -177,8 +177,8 @@ public class ItemCrafting{ GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), "WNW", "WDW", "WNW", 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), - 'D', "blockDiamond", - 'N', new ItemStack(Items.nether_star))); + 'N', "blockDiamond", + 'D', new ItemStack(Items.nether_star))); //Quartz if(ConfigCrafting.QUARTZ.isEnabled()) diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java index 0f308b352..79d6a425b 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemCoffee.java @@ -129,7 +129,7 @@ public class ItemCoffee extends ItemFood implements INameableItem{ } public static PotionEffect[] getEffectsFromStack(ItemStack stack){ - ArrayList effects = new ArrayList<>(); + ArrayList effects = new ArrayList(); NBTTagCompound tag = stack.getTagCompound(); if(tag != null){ int counter = tag.getInteger("Counter"); diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java index f1e2015fb..02b68abd3 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemDrill.java @@ -453,7 +453,7 @@ public class ItemDrill extends ItemEnergy implements INameableItem{ @Override public Set getToolClasses(ItemStack stack){ - HashSet hashSet = new HashSet<>(); + HashSet hashSet = new HashSet(); hashSet.add("pickaxe"); hashSet.add("shovel"); return hashSet; diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java index ffd0d2f5e..4f73ecaab 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemLeafBlower.java @@ -65,7 +65,7 @@ public class ItemLeafBlower extends Item implements INameableItem{ if(block != null && (block instanceof BlockBush || (this.isAdvanced && block instanceof BlockLeavesBase))){ WorldPos theCoord = new WorldPos(world, x+reachX, y+reachY, z+reachZ); Block theBlock = world.getBlock(theCoord.getX(), theCoord.getY(), theCoord.getZ()); - ArrayList drops = new ArrayList<>(); + ArrayList drops = new ArrayList(); int meta = world.getBlockMetadata(theCoord.getX(), theCoord.getY(), theCoord.getZ()); //Gets all of the Drops the Block should have drops.addAll(theBlock.getDrops(world, theCoord.getX(), theCoord.getY(), theCoord.getZ(), meta, 0)); diff --git a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java index a4e91a6d9..6c280a55d 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java +++ b/src/main/java/ellpeck/actuallyadditions/items/ItemWingsOfTheBats.java @@ -25,7 +25,7 @@ public class ItemWingsOfTheBats extends Item implements INameableItem{ * Saves Remote Players separately to make de-synced Event Calling * not bug out Capabilities when taking off the Wings */ - public static ArrayList wingedPlayers = new ArrayList<>(); + public static ArrayList wingedPlayers = new ArrayList(); public ItemWingsOfTheBats(){ this.setMaxStackSize(1); diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index 293911f78..ce22dac97 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -123,7 +123,7 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{ @Override public Set getToolClasses(ItemStack stack){ - HashSet hashSet = new HashSet<>(); + HashSet hashSet = new HashSet(); hashSet.add("pickaxe"); hashSet.add("axe"); hashSet.add("shovel"); diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java index 2bc40cf58..8d4c1e905 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeAutoRegistry.java @@ -7,7 +7,7 @@ import java.util.ArrayList; public class CrusherRecipeAutoRegistry{ - public static ArrayList searchCases = new ArrayList<>(); + public static ArrayList searchCases = new ArrayList(); public static class SearchCase{ diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java index 14b33d901..a479e5958 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/CrusherRecipeManualRegistry.java @@ -10,7 +10,7 @@ import java.util.ArrayList; public class CrusherRecipeManualRegistry{ - public static ArrayList recipes = new ArrayList<>(); + public static ArrayList recipes = new ArrayList(); public static void registerRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int secondChance){ if(!hasRecipe(input, outputOne)){ diff --git a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java index 4b161d58e..2420f2ac3 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; public class ModUtil{ - public static final String VERSION = "1.7.10-0.0.7.4"; + public static final String VERSION = "1.7.10-0.0.7.5"; public static final String MOD_ID = "ActuallyAdditions"; public static final String NAME = "Actually Additions"; diff --git a/update/changelog.txt b/update/changelog.txt index 44ec1bd4b..cf015323a 100644 --- a/update/changelog.txt +++ b/update/changelog.txt @@ -1 +1 @@ -Added Thermal Foundation and Mekanism Material Paxels, fixed an RF API Bug \ No newline at end of file +Wings Of The Bats that allow you to fly, XP Solidifier, Drills can now hold Batteries to automatically charge themselves up \ No newline at end of file diff --git a/update/newestVersion.txt b/update/newestVersion.txt index eb92f1d5a..ced7e2581 100644 --- a/update/newestVersion.txt +++ b/update/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.7.4 \ No newline at end of file +1.7.10-0.0.7.5 \ No newline at end of file