diff --git a/build.gradle b/build.gradle index 63a38bcf0..7526bf9ef 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "1.7.10-0.0.5.0" +version = "1.7.10-0.0.5.1" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" @@ -40,11 +40,6 @@ repositories { dependencies { compile "mcp.mobius.waila:Waila:1.5.6_1.7.10" - - /*When Compiling from Github, you will need to have this file present - because InventoryTweaks doesn't have a Maven Repo. - But no one is going to download and compile this anyway, so it doesn't really matter. */ - compile files("lib/InventoryTweaks-api-1.58-147.jar") } task copyChickenBones(type: Copy, dependsOn: "extractUserDev") { diff --git a/newestVersion.txt b/newestVersion.txt index 79ca37a9a..6b0a207ec 100644 --- a/newestVersion.txt +++ b/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.5.0 \ No newline at end of file +1.7.10-0.0.5.1 \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt index cc501acef..8f389e4b3 100644 --- a/src/main/java/ellpeck/actuallyadditions/PLANNED.txt +++ b/src/main/java/ellpeck/actuallyadditions/PLANNED.txt @@ -10,10 +10,11 @@ -Instant Teleport Device -Teleports Players to where they look (Much like the Bukkit Compass) --Magnet - -Pulls Mobs and Items towards it - -Has a certain Redstone Output depending on Mob Amount - -Can be toggled On and Off +-Ender Attractor / Repulsor + -Attracts/Repulses Mobs + -Has an aggressive and a friendly version + -Maybe for Items + -Crafted with an Ender Casing -Void Bag -Sucks up picked up Items @@ -57,9 +58,6 @@ -File Jukebox -Plays Sound Files put into your Minecraft Folder --Oil Plant - -Used to make Oil (For use with other mods' machines) - -Pharmacy Plants -Give you different effects @@ -80,7 +78,9 @@ -Phantom Chest -Is bound to Inventory on Right-Click -Allows you to open the bound Inventory when placed down - -Only accessible with Pipes etc. - -ISided like the bound Block -Range of 10, Range Upgrade adds 15 Range -Nether Star allows direct GUI Access and adds 50 Range + +-Thermopile + -Needs a hot and a cold fluid + -Depending on the fluids, it generates more power \ No newline at end of file diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java index 231dade0f..4f5703b1c 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java @@ -37,6 +37,7 @@ public class GrinderCrafting{ grindRecHan.searchCases.add(new SearchCase("ingot", 1)); grindRecHan.searchCases.add(new SearchCase("gem", 1)); grindRecHan.searchCases.add(new SearchCase("ore", 2)); + grindRecHan.exceptions.add("ingotBrick"); grindRecHan.exceptions.add("ingotBrickNether"); diff --git a/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java b/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java index d26b563b2..e5d0b7037 100644 --- a/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java +++ b/src/main/java/ellpeck/actuallyadditions/event/RenderPlayerEventAA.java @@ -13,7 +13,7 @@ public class RenderPlayerEventAA{ private RenderSpecial ellpeckRender = new RenderSpecial(new ModelStandardBlock("Ellpeck")); private RenderSpecial hoseRender = new RenderSpecial(new ModelTorch()); - private RenderSpecial paktoRender = new RenderSpecial(new ModelStandardBlock("Pakto")); + //private RenderSpecial paktoRender = new RenderSpecial(new ModelStandardBlock("Pakto")); private RenderSpecial glenRender = new RenderSpecial(new ModelStandardBlock("Glenthor")); @SubscribeEvent(priority = EventPriority.HIGHEST) @@ -26,10 +26,10 @@ public class RenderPlayerEventAA{ } //Paktosan - if(event.entityPlayer.getUniqueID().equals(UUID.fromString("0bac71ad-9156-487e-9ade-9c5b57274b23"))){ + /*if(event.entityPlayer.getUniqueID().equals(UUID.fromString("0bac71ad-9156-487e-9ade-9c5b57274b23"))){ paktoRender.render(event.entityPlayer, event.partialRenderTick, 0.3F, 1F); return; - } + }*/ //TwoOfEight if(event.entityPlayer.getUniqueID().equals(UUID.fromString("a57d2829-9711-4552-a7de-ee800802f643"))){ diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java index 4217aa86c..4807e9e9e 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCanolaPress.java @@ -106,7 +106,6 @@ public class ContainerCanolaPress extends Container{ if(slot <= hotbarEnd && slot >= hotbarStart){ this.mergeItemStack(newStack, inventoryStart, inventoryEnd+1, false); } - else if(slot <= inventoryEnd && slot >= inventoryStart){ this.mergeItemStack(newStack, hotbarStart, hotbarEnd+1, false); } diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeHandler.java index ee4b4a5d7..801c315e1 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipeHandler.java @@ -78,5 +78,4 @@ public class GrinderRecipeHandler{ } } } - } diff --git a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java index 208a5f2d0..28cdafd63 100644 --- a/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java +++ b/src/main/java/ellpeck/actuallyadditions/recipe/GrinderRecipes.java @@ -19,18 +19,21 @@ public class GrinderRecipes{ this.recipes.add(new GrinderRecipe(input, outputOne, outputTwo, secondChance)); } - public void registerRecipe(String input, String outputOne, String outputTwo, int secondChance, int outputTwoAmount){ + public void registerRecipe(String input, String outputOne, String outputTwo, int secondChance, int outputAmount){ ArrayList inputStacks = OreDictionary.getOres(input); ArrayList outputOneStacks = OreDictionary.getOres(outputOne); ArrayList outputTwoStacks = OreDictionary.getOres(outputTwo); if(inputStacks != null && !inputStacks.isEmpty()){ - for(ItemStack theInput : inputStacks){ + for(ItemStack anInput : inputStacks){ + ItemStack theInput = anInput.copy(); if(outputOneStacks != null && !outputOneStacks.isEmpty()){ - for(ItemStack theOutputOne : outputOneStacks){ - theOutputOne.stackSize = outputTwoAmount; + for(ItemStack anOutputOne : outputOneStacks){ + ItemStack theOutputOne = anOutputOne.copy(); + theOutputOne.stackSize = outputAmount; if(outputTwoStacks != null && !outputTwoStacks.isEmpty()){ - for(ItemStack theOutputTwo : outputTwoStacks){ + for(ItemStack anOutputTwo : outputTwoStacks){ + ItemStack theOutputTwo = anOutputTwo.copy(); this.registerRecipe(theInput, theOutputOne, theOutputTwo, secondChance); } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java index 4319d7753..f5326be85 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/StringUtil.java @@ -24,8 +24,6 @@ public class StringUtil{ public static final String OBFUSCATED = (char)167 + "k"; public static final String RESET = (char)167 + "r"; - public static final String[] ROMAN_NUMERALS = new String[]{"", "I", "II", "III", "IV", "V", "VI", "VII", "VIII", "IX", "X"}; - public static final int DECIMAL_COLOR_WHITE = 16777215; public static final int DECIMAL_COLOR_GRAY_TEXT = 4210752; diff --git a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java index 4d088e31d..ccb40a609 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/WorldUtil.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidHandler; @@ -51,6 +52,10 @@ public class WorldUtil{ public static boolean placeBlockAtSide(ForgeDirection side, World world, int x, int y, int z, ItemStack stack){ if(world instanceof WorldServer){ + if(FluidContainerRegistry.isBucket(stack) && stack.isItemEqual(FluidContainerRegistry.EMPTY_BUCKET)){ + //if() + return false; + } if(stack.getItem() instanceof IPlantable){ if(((IPlantable)stack.getItem()).getPlant(world, x, y, z).canPlaceBlockAt(world, x+side.offsetX, y+side.offsetY, z+side.offsetZ)){ return world.setBlock(x+side.offsetX, y+side.offsetY, z+side.offsetZ, ((IPlantable)stack.getItem()).getPlant(world, x, y, z)); @@ -86,13 +91,15 @@ public class WorldUtil{ } public static ForgeDirection getDirectionByRotatingSide(int side){ - if(side == 0) return ForgeDirection.UP; - if(side == 1) return ForgeDirection.DOWN; - if(side == 2) return ForgeDirection.NORTH; - if(side == 3) return ForgeDirection.EAST; - if(side == 4) return ForgeDirection.SOUTH; - if(side == 5) return ForgeDirection.WEST; - else return ForgeDirection.UNKNOWN; + switch(side){ + case 0: return ForgeDirection.UP; + case 1: return ForgeDirection.DOWN; + case 2: return ForgeDirection.NORTH; + case 3: return ForgeDirection.EAST; + case 4: return ForgeDirection.SOUTH; + case 5: return ForgeDirection.WEST; + default: return ForgeDirection.UNKNOWN; + } } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 74d25c21b..e76c2ffcc 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "ActuallyAdditions", "name": "Actually Additions", "description": "Actually Additions is a Mod that offers a bunch of things from Machines for Automation and tons of food to advanced Hopper Mechanisms and Effect Rings!", - "version": "0.0.5.0", + "version": "0.0.5.1", "mcversion": "1.7.10", "url": "https://github.com/Ellpeck/ActuallyAdditions", "updateUrl": "",