Fixed damaged item logic on Loot Recycler

HenryLoenwind · May 9, 2016 · 29abaea · 29abaea
1 parent 919b5dd
commit 29abaea
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@ minecraft_version=1.7.10
 forge_version=10.13.4.1492-1.7.10
 forgeDep_version=10.13.4
 
-mod_version=0.10.7
+mod_version=0.10.8
 
 #Comment out this line to get rid of the appendix
 mod_appendix=beta

diff --git a/src/main/java/info/loenwind/enderioaddons/machine/tcom/GuiTcom.java b/src/main/java/info/loenwind/enderioaddons/machine/tcom/GuiTcom.java
@@ -350,7 +350,7 @@ private void drawMaterialLine(ItemStack itemStack, int x, int y0) {
   }
 
   private void drawMaterialLineAmount(int amount, int x, int y0) {
-    if (amount > 1) {
+    if (amount > 0) {
       drawFakeItemsStart();
       GL11.glDisable(GL11.GL_LIGHTING);
       GL11.glDisable(GL11.GL_DEPTH_TEST);

diff --git a/src/main/java/info/loenwind/enderioaddons/machine/tcom/engine/EngineTcom.java b/src/main/java/info/loenwind/enderioaddons/machine/tcom/engine/EngineTcom.java
@@ -61,7 +61,10 @@ public boolean add(ItemStack itemStack) {
     int maxDamage = itemStack.getMaxDamage();
     int stackSize = itemStack.stackSize;
     Map<Integer, Integer> enchantments = EnchantmentHelper.getEnchantments(itemStack);
-    float factor = (maxDamage - itemDamage) / maxDamage * stackSize * (1f - minloss - (float) rand.nextDouble() * randloss);
+    float factor = 0;
+    for (int i = 0; i < stackSize; i++) {
+      factor += (maxDamage - itemDamage) / (float) maxDamage * (1f - minloss - (float) rand.nextDouble() * randloss);
+    }
     for (Mats mat : mats) {
       materialPool[mat.ordinal()] += 1f * factor;
     }