diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 1 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java | 2 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java | 18 |
3 files changed, 14 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 6b85e90d08..9e82297bc3 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -381,6 +381,7 @@ public final class ModItems { //Steels + MaterialGenerator.generateDusts(ALLOY.EGLIN_STEEL_BASE); MaterialGenerator.generate(ALLOY.EGLIN_STEEL); MaterialGenerator.generate(ALLOY.MARAGING250); MaterialGenerator.generate(ALLOY.MARAGING300); diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 54be041972..22db669020 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -168,7 +168,7 @@ public class BaseItemComponent extends Item{ @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (this.componentMaterial != null){ - EntityUtils.applyRadiationDamageToEntity(this.componentMaterial.vRadioationLevel, world, entityHolding); + EntityUtils.applyRadiationDamageToEntity(this.componentMaterial.vRadiationLevel, world, entityHolding); } } diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index eb86f995d3..adc9f8a62a 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -29,7 +29,11 @@ public class BaseItemDust extends Item{ private final int mTier; private final Material dustInfo; - public BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier, final int sRadioactivity) { + public BaseItemDust(final String unlocalizedName, final String materialName, final Material matInfo, final int colour, final String pileSize, final int tier, final int sRadioactivity){ + this(unlocalizedName, materialName, matInfo, colour, pileSize, tier, sRadioactivity, true); + } + + public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, int sRadioactivity, boolean addRecipes) { this.setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); @@ -67,8 +71,10 @@ public class BaseItemDust extends Item{ if ((temp != null) && !temp.equals("")){ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } - this.addFurnaceRecipe(); - this.addMacerationRecipe(); + if (addRecipes){ + this.addFurnaceRecipe(); + this.addMacerationRecipe(); + } } private String getCorrectTexture(final String pileSize){ @@ -264,13 +270,13 @@ public class BaseItemDust extends Item{ Utils.LOG_INFO("Found "+input2.getDisplayName()); } }*/ - + int timeTaken = 250*this.mTier*20; - + if (this.mTier <= 4){ timeTaken = 50*this.mTier*20; } - + GT_Values.RA.addBlastRecipe( input1, input2, |