From fc4a7421d6927713c28862a553fa7067b813a63b Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 27 Apr 2015 17:08:50 +0200 Subject: [PATCH] Update Checker done, NEI, InventoryTweaks and Waila implemented --- build.gradle | 11 +++--- newestVersion.txt | 2 +- .../crafting/GrinderCrafting.java | 8 +++-- .../crafting/ItemCrafting.java | 2 +- .../inventory/ContainerBreaker.java | 2 ++ .../inventory/ContainerCrafter.java | 2 ++ .../inventory/ContainerFeeder.java | 2 ++ .../inventory/ContainerFurnaceDouble.java | 2 ++ .../inventory/ContainerGiantChest.java | 2 ++ .../inventory/ContainerGrinder.java | 2 ++ .../inventory/ContainerInputter.java | 2 ++ .../inventory/ContainerRepairer.java | 2 ++ .../nei/CrusherRecipeHandler.java | 2 +- .../actuallyadditions/proxy/ClientProxy.java | 5 ++- .../update/UpdateChecker.java | 1 + .../actuallyadditions/util/ModUtil.java | 2 +- .../waila/WailaDataProvider.java | 34 +++++++++++-------- src/main/resources/mcmod.info | 2 +- 18 files changed, 58 insertions(+), 27 deletions(-) diff --git a/build.gradle b/build.gradle index 4ae778a53..b8bacda7a 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "1.7.10-0.0.4" +version = "1.7.10-0.0.4.1" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" @@ -40,9 +40,14 @@ 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 copyChicken(type: Copy, dependsOn: "extractUserDev") { +task copyChickenBones(type: Copy, dependsOn: "extractUserDev") { from { configurations.compile } include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar" exclude "**/CodeChickenLib*" @@ -50,8 +55,6 @@ task copyChicken(type: Copy, dependsOn: "extractUserDev") { mustRunAfter "deobfBinJar" mustRunAfter "repackMinecraft" } -tasks.setupDevWorkspace.dependsOn copyChicken -tasks.setupDecompWorkspace.dependsOn copyChicken processResources{ diff --git a/newestVersion.txt b/newestVersion.txt index f091a644d..5f436a3e1 100644 --- a/newestVersion.txt +++ b/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.4 \ No newline at end of file +1.7.10-0.0.4.1 \ 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 0958fdaa3..10ec0bed8 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/GrinderCrafting.java @@ -63,13 +63,17 @@ public class GrinderCrafting{ ItemStack input = theInput.copy(); if(GrinderRecipes.instance().getOutput(input, false) == null){ ArrayList specialStacks = null; + int specialAmount = 0; - if(name.equals("oreNickel")) specialStacks = OreDictionary.getOres("dustPlatinum"); + if(name.equals("oreNickel")){ + specialStacks = OreDictionary.getOres("dustPlatinum"); + specialAmount = 30; + } if(specialStacks != null && specialStacks.size() > 0){ for(ItemStack theSpecial : specialStacks){ ItemStack special = theSpecial.copy(); - GrinderRecipes.instance().registerRecipe(input, output, special, 10); + GrinderRecipes.instance().registerRecipe(input, output, special, specialAmount); } } else GrinderRecipes.instance().registerRecipe(input, output, null, 0); diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java index fe349c6ba..fee9b529e 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/ItemCrafting.java @@ -83,7 +83,7 @@ public class ItemCrafting{ //SpeedUpgrade if(ConfigCrafting.SPEED_UPGRADE.isEnabled()) - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSpeedUpgrade), + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitItems.itemSpeedUpgrade, 2), "RGR", "GUG", "RGR", 'U', TheMiscItems.COIL.getOredictName(), 'R', "dustRedstone", diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java index bdcc63144..224a8f0dd 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerBreaker.java @@ -2,12 +2,14 @@ package ellpeck.actuallyadditions.inventory; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityBreaker; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +@InventoryContainer public class ContainerBreaker extends Container{ private TileEntityBreaker breaker; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java index 874aee73d..29338aa30 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerCrafter.java @@ -1,5 +1,6 @@ package ellpeck.actuallyadditions.inventory; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.*; @@ -7,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.world.World; +@InventoryContainer public class ContainerCrafter extends Container{ public InventoryCrafting craftMatrix = new InventoryCrafting(this, 3, 3); diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java index e33ea433d..ae0d3528f 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFeeder.java @@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityFeeder; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -11,6 +12,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +@InventoryContainer public class ContainerFeeder extends Container{ private TileEntityFeeder tileFeeder; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java index 0e680e1f6..c2e2fbc89 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerFurnaceDouble.java @@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.inventory.slot.SlotOutput; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityFurnaceDouble; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.tileentity.TileEntityFurnace; +@InventoryContainer public class ContainerFurnaceDouble extends Container{ private TileEntityFurnaceDouble tileFurnace; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java index 27ee0269b..3d5d510a8 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGiantChest.java @@ -2,12 +2,14 @@ package ellpeck.actuallyadditions.inventory; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityGiantChest; +import invtweaks.api.container.ChestContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +@ChestContainer(rowSize = 13) public class ContainerGiantChest extends Container{ public TileEntityGiantChest tileChest; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java index fdd439a3a..a3e0c6abb 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerGrinder.java @@ -6,6 +6,7 @@ import ellpeck.actuallyadditions.inventory.slot.SlotOutput; import ellpeck.actuallyadditions.recipe.GrinderRecipes; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityGrinder; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -14,6 +15,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +@InventoryContainer public class ContainerGrinder extends Container{ private TileEntityGrinder tileGrinder; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java index 847814ae4..648ea273a 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerInputter.java @@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.inventory.slot.SlotFilter; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityInputter; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -12,6 +13,7 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +@InventoryContainer public class ContainerInputter extends Container{ private TileEntityInputter tileInputter; diff --git a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java index b1ea0abc3..0eb861132 100644 --- a/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java +++ b/src/main/java/ellpeck/actuallyadditions/inventory/ContainerRepairer.java @@ -5,6 +5,7 @@ import cpw.mods.fml.relauncher.SideOnly; import ellpeck.actuallyadditions.inventory.slot.SlotOutput; import ellpeck.actuallyadditions.tile.TileEntityBase; import ellpeck.actuallyadditions.tile.TileEntityItemRepairer; +import invtweaks.api.container.InventoryContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -13,6 +14,7 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; +@InventoryContainer public class ContainerRepairer extends Container{ private TileEntityItemRepairer tileRepairer; diff --git a/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java b/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java index 2ed43faf5..1742bc438 100644 --- a/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java +++ b/src/main/java/ellpeck/actuallyadditions/nei/CrusherRecipeHandler.java @@ -158,7 +158,7 @@ public class CrusherRecipeHandler extends TemplateRecipeHandler{ if(crush.resultTwo != null){ int secondChance = crush.secondChance; String secondString = secondChance + "%"; - GuiDraw.drawString(secondString, 87, 24, StringUtil.DECIMAL_COLOR_WHITE, false); + GuiDraw.drawString(secondString, 87, 24, StringUtil.DECIMAL_COLOR_GRAY_TEXT, false); } } diff --git a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java index 0e274f86a..d304b006c 100644 --- a/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java +++ b/src/main/java/ellpeck/actuallyadditions/proxy/ClientProxy.java @@ -30,6 +30,10 @@ public class ClientProxy implements IProxy{ public void init(){ Util.logInfo("Initializing ClientProxy..."); + if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()){ + new UpdateChecker().init(); + } + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCompost.class, new RenderTileEntity(new ModelCompost())); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(InitBlocks.blockCompost), new RenderItems(new ModelCompost())); @@ -42,7 +46,6 @@ public class ClientProxy implements IProxy{ VillagerRegistry.instance().registerVillagerSkin(ConfigIntValues.JAM_VILLAGER_ID.getValue(), new ResourceLocation(ModUtil.MOD_ID_LOWER, "textures/entity/villager/jamVillager.png")); Util.registerEvent(new RenderPlayerEventAA()); - if(ConfigBoolValues.DO_UPDATE_CHECK.isEnabled()) new UpdateChecker().init(); } @Override diff --git a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java index 281abfed4..209abe198 100644 --- a/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java +++ b/src/main/java/ellpeck/actuallyadditions/update/UpdateChecker.java @@ -65,6 +65,7 @@ public class UpdateChecker{ BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); onlineVersion = r.readLine(); r.close(); + Util.logInfo("Update Check done!"); } catch(Exception e){ ModUtil.AA_LOGGER.log(Level.ERROR, "Update Check failed!"); diff --git a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java index b9fe14f7f..2292a9c30 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.4"; + public static final String VERSION = "1.7.10-0.0.4.1"; public static final String MOD_ID = "ActuallyAdditions"; public static final String NAME = "Actually Additions"; diff --git a/src/main/java/ellpeck/actuallyadditions/waila/WailaDataProvider.java b/src/main/java/ellpeck/actuallyadditions/waila/WailaDataProvider.java index e090464b8..d2dd090fa 100644 --- a/src/main/java/ellpeck/actuallyadditions/waila/WailaDataProvider.java +++ b/src/main/java/ellpeck/actuallyadditions/waila/WailaDataProvider.java @@ -34,26 +34,30 @@ public class WailaDataProvider implements IWailaDataProvider{ public List getWailaBody(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config){ if (accessor.getTileEntity() instanceof TileEntityCompost){ - int meta = accessor.getMetadata(); - TileEntityCompost tile = (TileEntityCompost)accessor.getTileEntity(); - - if(meta <= tile.amountNeededToConvert){ - String tip1 = StatCollector.translateToLocal(WAILA_PRE_LANG + "compostAmount" + ".name") + ": " + meta + "/" + tile.amountNeededToConvert; - currentTip.add(tip1); - - if(meta == tile.amountNeededToConvert){ - currentTip.add(StatCollector.translateToLocal(WAILA_PRE_LANG + "compostConverting" + ".name")); - } - } - - if(meta == tile.amountNeededToConvert+1){ - currentTip.add(StatCollector.translateToLocal(WAILA_PRE_LANG + "compostDone" + ".name")); - } + this.compostBody(accessor, currentTip); } return currentTip; } + public void compostBody(IWailaDataAccessor accessor, List currentTip){ + int meta = accessor.getMetadata(); + TileEntityCompost tile = (TileEntityCompost)accessor.getTileEntity(); + + if(meta <= tile.amountNeededToConvert){ + String tip1 = StatCollector.translateToLocal(WAILA_PRE_LANG + "compostAmount" + ".name") + ": " + meta + "/" + tile.amountNeededToConvert; + currentTip.add(tip1); + + if(meta == tile.amountNeededToConvert){ + currentTip.add(StatCollector.translateToLocal(WAILA_PRE_LANG + "compostConverting" + ".name")); + } + } + + if(meta == tile.amountNeededToConvert+1){ + currentTip.add(StatCollector.translateToLocal(WAILA_PRE_LANG + "compostDone" + ".name")); + } + } + @Override public List getWailaTail(ItemStack itemStack, List currentTip, IWailaDataAccessor accessor, IWailaConfigHandler config){ return currentTip; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 58979cf58..ddeb97860 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.4", + "version": "0.0.4.1", "mcversion": "1.7.10", "url": "https://github.com/Ellpeck/ActuallyAdditions", "updateUrl": "",