From 1555a7cffafd0544ca2ef376e5682398e2af296f Mon Sep 17 00:00:00 2001 From: Towdium Date: Wed, 2 Mar 2016 22:13:58 +0800 Subject: [PATCH] Now check player's inventory for items --- build.gradle | 6 ++- .../JustEnoughCalculation.java | 2 +- .../core/ItemStackWrapper.java | 10 +++++ .../gui/commom/GuiJustEnoughCalculation.java | 1 - .../gui/guis/calculator/GuiCalculator.java | 43 ++++++++++++++++--- .../guis/recipeViewer/GuiRecipeViewer.java | 4 +- 6 files changed, 55 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 3b7484f..66108d4 100644 --- a/build.gradle +++ b/build.gradle @@ -20,13 +20,17 @@ plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" } */ -version = "0.1.2" +version = "0.2.0" group= "pers.towdium.justEnoughcalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "je_calculation" sourceCompatibility = 1.7 targetCompatibility = 1.7 +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + minecraft { version = "1.8.9-11.15.1.1722" runDir = "run" diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index e86159b..343e98a 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -43,7 +43,7 @@ public class JustEnoughCalculation { public static class Reference { public static final String MODID = "je_calculation"; public static final String MODNAME = "Just Enough Calculation"; - public static final String VERSION = "0.1.2"; + public static final String VERSION = "0.2.0"; } @Mod.EventHandler diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java index aec02c8..7a319b4 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java @@ -137,6 +137,16 @@ public class ItemStackWrapper { return s; } + public static long getGhostItemAmount(ItemStack itemStack){ + if (itemStack.hasTagCompound()){ + long l = itemStack.getTagCompound().getLong("amount"); + return (l+99)/100; + }else { + return 0; + } + + } + public static class NBT { public static void initNBT(ItemStack itemStack){ if(!itemStack.hasTagCompound()){ diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java index 3dbaf61..e41dbc6 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiJustEnoughCalculation.java @@ -1,6 +1,5 @@ package pers.towdium.justEnoughCalculation.gui.commom; -import com.sun.istack.internal.NotNull; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java index 1398cd1..d8d64ae 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/calculator/GuiCalculator.java @@ -21,10 +21,7 @@ import pers.towdium.justEnoughCalculation.gui.guis.recipeViewer.GuiRecipeViewer; import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Timer; -import java.util.TimerTask; +import java.util.*; /** * @author Towdium @@ -38,6 +35,7 @@ public class GuiCalculator extends GuiTooltipScreen{ GuiButton buttonCalculate; GuiButton buttonView; CostRecord costRecord; + Map items; int activeSlot = -1; int page = 1; int total = 0; @@ -49,6 +47,7 @@ public class GuiCalculator extends GuiTooltipScreen{ public GuiCalculator(ContainerCalculator containerCalculator){ super(containerCalculator, null); JustEnoughCalculation.networkWrapper.sendToServer(new PacketSyncRecord()); + items = new HashMap<>(36); } @Override @@ -88,6 +87,7 @@ public class GuiCalculator extends GuiTooltipScreen{ this.drawTexturedModalRect(this.guiLeft+slot.xDisplayPosition-1, this.guiTop+slot.yDisplayPosition-1, 196, 0, 18, 18); } textFieldAmount.drawTextBox(); + drawMissingTexture(); } @Override @@ -227,6 +227,7 @@ public class GuiCalculator extends GuiTooltipScreen{ } buttonLeft.enabled = page != 1; buttonRight.enabled = page < total; + checkItem(); } public int getActiveSlot() { @@ -250,7 +251,7 @@ public class GuiCalculator extends GuiTooltipScreen{ } } - private void fillSlotsWith(List itemStacks, int start){ + protected void fillSlotsWith(List itemStacks, int start){ int pos = 1; for(int i=start; i15 ? 0 : 15-d; + items.put(i, d); + } + } } \ No newline at end of file diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java index f769e1d..1959476 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java @@ -1,6 +1,5 @@ package pers.towdium.justEnoughCalculation.gui.guis.recipeViewer; -import com.sun.istack.internal.NotNull; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; @@ -15,6 +14,7 @@ import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeE import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; import pers.towdium.justEnoughCalculation.network.packets.PacketRecipeUpdate; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; import java.util.List; @@ -29,7 +29,7 @@ public class GuiRecipeViewer extends GuiJustEnoughCalculation { int page = 1; int total; - public GuiRecipeViewer (@NotNull ContainerRecipeViewer container, @Nullable GuiScreen parent){ + public GuiRecipeViewer (@Nonnull ContainerRecipeViewer container, @Nullable GuiScreen parent){ super(container, parent); }