diff options
author | Technus <daniel112092@gmail.com> | 2017-12-14 21:55:50 +0100 |
---|---|---|
committer | Technus <daniel112092@gmail.com> | 2017-12-14 21:55:50 +0100 |
commit | 88f7de0d81f1b92862e53d2ae9c2aa6515e80e90 (patch) | |
tree | be9ab9b525378d0b9f09ff712dab1a5870637d98 | |
parent | b6e219b61b99eb2e8b1f8894c86fedd834e01479 (diff) | |
download | GT5-Unofficial-88f7de0d81f1b92862e53d2ae9c2aa6515e80e90.tar.gz GT5-Unofficial-88f7de0d81f1b92862e53d2ae9c2aa6515e80e90.tar.bz2 GT5-Unofficial-88f7de0d81f1b92862e53d2ae9c2aa6515e80e90.zip |
more cleanup
3 files changed, 8 insertions, 9 deletions
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java index f8814c7861..49823d4088 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalMutableDefinitionStackMap.java @@ -246,4 +246,10 @@ public final class cElementalMutableDefinitionStackMap extends cElementalStackMa } return new cElementalMutableDefinitionStackMap(defStacks); } + + public void cleanUp(){ + for(Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry:map.entrySet()){ + if(entry.getValue().amount<=0) map.remove(entry.getKey()); + } + } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java index 0234e59f30..a5139bc254 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/cElementalStackMap.java @@ -5,7 +5,6 @@ import com.github.technus.tectech.elementalMatter.core.templates.iElementalDefin import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; -import java.util.Map; import java.util.TreeMap; /** @@ -119,12 +118,6 @@ abstract class cElementalStackMap implements Comparable<cElementalStackMap> { return hash; } - public void cleanUp(){ - for(Map.Entry<iElementalDefinition, cElementalDefinitionStack> entry:map.entrySet()){ - if(entry.getValue().amount<=0) map.remove(entry.getKey()); - } - } - public double getMass(){ double mass=0; for(cElementalDefinitionStack stack:map.values()){ diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java index f4883b10db..6a86d943a1 100644 --- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java @@ -32,7 +32,7 @@ public class RecipeLoader implements Runnable { Materials.Aluminium.getMolten(864), new ItemStack(TT_Container_Casings.sHintCasingsTT, 1,i),32,120); - if (Loader.isModLoaded("dreamcraft")) new DreamCraftRecipeLoader().run();//TODO init recipes for GTNH version - else new BloodyRecipeLoader().run();//TODO init recipes for NON-GTNH version + if (Loader.isModLoaded("dreamcraft")) new DreamCraftRecipeLoader().run();//init recipes for GTNH version + else new BloodyRecipeLoader().run();//init recipes for NON-GTNH version } } |