aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item/base
diff options
context:
space:
mode:
authorAlkalus <Draknyte1@hotmail.com>2020-03-31 01:25:58 +0100
committerAlkalus <Draknyte1@hotmail.com>2020-03-31 01:25:58 +0100
commit75ea33600537047847091b55a46f5b88c3c75dbb (patch)
tree3050dc52746859cb9003e09f75dc91a7d7eb5911 /src/Java/gtPlusPlus/core/item/base
parentb5cbe510e959ae0fe8803b5df1031f2752c50e30 (diff)
downloadGT5-Unofficial-75ea33600537047847091b55a46f5b88c3c75dbb.tar.gz
GT5-Unofficial-75ea33600537047847091b55a46f5b88c3c75dbb.tar.bz2
GT5-Unofficial-75ea33600537047847091b55a46f5b88c3c75dbb.zip
+ Added Custom NEI Handler for IsaMIll.
+ Added Death by IsaMIll. % Moved debug mode switch to AsmConfig. $ Fixed handling of custom OrePrefixes. $ Fixed OreDict registration of MetaFoodItems. $ Improved handling of Core Classes being static initialised too early. $ Fixed client-side bug in Distillus which would cause an infinite loop. $ Fixed bug in ForgeEnumHelper. $ Fixed bug in setField methods from ReflectionUtils.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
-rw-r--r--src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 24c87c3334..356fdac24e 100644
--- a/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/Java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -18,6 +18,7 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@@ -92,7 +93,7 @@ public class BaseOreComponent extends Item{
aKey = OrePrefixes.dustPure.name();
}
else if (componentType == ComponentTypes.MILLED) {
- aKey = "milled";
+ aKey = CustomOrePrefix.milled.get().name();
}
ItemStack x = aMap.get(aKey);