This commit is contained in:
Ellpeck 2015-07-17 23:22:10 +02:00
parent 6e30c8bf85
commit d7a55206e0
13 changed files with 14 additions and 14 deletions

View file

@ -18,7 +18,7 @@ buildscript {
apply plugin: 'forge' apply plugin: 'forge'
apply plugin: 'maven' apply plugin: 'maven'
version = "1.7.10-0.0.7.4" version = "1.7.10-0.0.7.5"
group = "ellpeck.actuallyadditions" group = "ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions" archivesBaseName = "ActuallyAdditions"

View file

@ -17,7 +17,7 @@ public class GuiConfiguration extends GuiConfig{
} }
private static List<IConfigElement> getConfigElements(){ private static List<IConfigElement> getConfigElements(){
List<IConfigElement> list = new ArrayList<>(); List<IConfigElement> list = new ArrayList<IConfigElement>();
for(int i = 0; i < ConfigCategories.values().length; i++){ for(int i = 0; i < ConfigCategories.values().length; i++){
list.add(new ConfigElement<ConfigCategory>(ConfigurationHandler.config.getCategory(ConfigCategories.values()[i].name.toLowerCase()))); list.add(new ConfigElement<ConfigCategory>(ConfigurationHandler.config.getCategory(ConfigCategories.values()[i].name.toLowerCase())));
} }

View file

@ -177,8 +177,8 @@ public class ItemCrafting{
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats), GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemWingsOfTheBats),
"WNW", "WDW", "WNW", "WNW", "WDW", "WNW",
'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()), 'W', new ItemStack(InitItems.itemMisc, 1, TheMiscItems.BAT_WING.ordinal()),
'D', "blockDiamond", 'N', "blockDiamond",
'N', new ItemStack(Items.nether_star))); 'D', new ItemStack(Items.nether_star)));
//Quartz //Quartz
if(ConfigCrafting.QUARTZ.isEnabled()) if(ConfigCrafting.QUARTZ.isEnabled())

View file

@ -129,7 +129,7 @@ public class ItemCoffee extends ItemFood implements INameableItem{
} }
public static PotionEffect[] getEffectsFromStack(ItemStack stack){ public static PotionEffect[] getEffectsFromStack(ItemStack stack){
ArrayList<PotionEffect> effects = new ArrayList<>(); ArrayList<PotionEffect> effects = new ArrayList<PotionEffect>();
NBTTagCompound tag = stack.getTagCompound(); NBTTagCompound tag = stack.getTagCompound();
if(tag != null){ if(tag != null){
int counter = tag.getInteger("Counter"); int counter = tag.getInteger("Counter");

View file

@ -453,7 +453,7 @@ public class ItemDrill extends ItemEnergy implements INameableItem{
@Override @Override
public Set<String> getToolClasses(ItemStack stack){ public Set<String> getToolClasses(ItemStack stack){
HashSet<String> hashSet = new HashSet<>(); HashSet<String> hashSet = new HashSet<String>();
hashSet.add("pickaxe"); hashSet.add("pickaxe");
hashSet.add("shovel"); hashSet.add("shovel");
return hashSet; return hashSet;

View file

@ -65,7 +65,7 @@ public class ItemLeafBlower extends Item implements INameableItem{
if(block != null && (block instanceof BlockBush || (this.isAdvanced && block instanceof BlockLeavesBase))){ if(block != null && (block instanceof BlockBush || (this.isAdvanced && block instanceof BlockLeavesBase))){
WorldPos theCoord = new WorldPos(world, x+reachX, y+reachY, z+reachZ); WorldPos theCoord = new WorldPos(world, x+reachX, y+reachY, z+reachZ);
Block theBlock = world.getBlock(theCoord.getX(), theCoord.getY(), theCoord.getZ()); Block theBlock = world.getBlock(theCoord.getX(), theCoord.getY(), theCoord.getZ());
ArrayList<ItemStack> drops = new ArrayList<>(); ArrayList<ItemStack> drops = new ArrayList<ItemStack>();
int meta = world.getBlockMetadata(theCoord.getX(), theCoord.getY(), theCoord.getZ()); int meta = world.getBlockMetadata(theCoord.getX(), theCoord.getY(), theCoord.getZ());
//Gets all of the Drops the Block should have //Gets all of the Drops the Block should have
drops.addAll(theBlock.getDrops(world, theCoord.getX(), theCoord.getY(), theCoord.getZ(), meta, 0)); drops.addAll(theBlock.getDrops(world, theCoord.getX(), theCoord.getY(), theCoord.getZ(), meta, 0));

View file

@ -25,7 +25,7 @@ public class ItemWingsOfTheBats extends Item implements INameableItem{
* Saves Remote Players separately to make de-synced Event Calling * Saves Remote Players separately to make de-synced Event Calling
* not bug out Capabilities when taking off the Wings * not bug out Capabilities when taking off the Wings
*/ */
public static ArrayList<String> wingedPlayers = new ArrayList<>(); public static ArrayList<String> wingedPlayers = new ArrayList<String>();
public ItemWingsOfTheBats(){ public ItemWingsOfTheBats(){
this.setMaxStackSize(1); this.setMaxStackSize(1);

View file

@ -123,7 +123,7 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{
@Override @Override
public Set<String> getToolClasses(ItemStack stack){ public Set<String> getToolClasses(ItemStack stack){
HashSet<String> hashSet = new HashSet<>(); HashSet<String> hashSet = new HashSet<String>();
hashSet.add("pickaxe"); hashSet.add("pickaxe");
hashSet.add("axe"); hashSet.add("axe");
hashSet.add("shovel"); hashSet.add("shovel");

View file

@ -7,7 +7,7 @@ import java.util.ArrayList;
public class CrusherRecipeAutoRegistry{ public class CrusherRecipeAutoRegistry{
public static ArrayList<SearchCase> searchCases = new ArrayList<>(); public static ArrayList<SearchCase> searchCases = new ArrayList<SearchCase>();
public static class SearchCase{ public static class SearchCase{

View file

@ -10,7 +10,7 @@ import java.util.ArrayList;
public class CrusherRecipeManualRegistry{ public class CrusherRecipeManualRegistry{
public static ArrayList<CrusherRecipe> recipes = new ArrayList<>(); public static ArrayList<CrusherRecipe> recipes = new ArrayList<CrusherRecipe>();
public static void registerRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int secondChance){ public static void registerRecipe(ItemStack input, ItemStack outputOne, ItemStack outputTwo, int secondChance){
if(!hasRecipe(input, outputOne)){ if(!hasRecipe(input, outputOne)){

View file

@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger;
public class ModUtil{ 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 MOD_ID = "ActuallyAdditions";
public static final String NAME = "Actually Additions"; public static final String NAME = "Actually Additions";

View file

@ -1 +1 @@
Added Thermal Foundation and Mekanism Material Paxels, fixed an RF API Bug Wings Of The Bats that allow you to fly, XP Solidifier, Drills can now hold Batteries to automatically charge themselves up

View file

@ -1 +1 @@
1.7.10-0.0.7.4 1.7.10-0.0.7.5