diff options
author | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-06 17:15:04 +1000 |
---|---|---|
committer | Jordan Byrne <draknyte1@hotmail.com> | 2018-03-06 17:15:04 +1000 |
commit | fb9cfbd808e89837b9a60fa3d434dfec7410d365 (patch) | |
tree | fc6e6a7543dd9a7e4b2b25f83753e4709c164072 /src/Java/gtPlusPlus/core/item | |
parent | 6aac532119fa994f5e708e28e4a1545ddd819d23 (diff) | |
download | GT5-Unofficial-fb9cfbd808e89837b9a60fa3d434dfec7410d365.tar.gz GT5-Unofficial-fb9cfbd808e89837b9a60fa3d434dfec7410d365.tar.bz2 GT5-Unofficial-fb9cfbd808e89837b9a60fa3d434dfec7410d365.zip |
+ Added temp recipes for the Cyclotron and it's casings.
+ Added a config option for the Cyclotron.
- Reduced output chance and quantity of AM241 pellets.
$ Fixed localization for all sizes of dusts.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 4 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java | 12 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java (renamed from src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java) | 19 |
3 files changed, 20 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 1205d8ac43..788dfde18d 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -34,9 +34,7 @@ import gtPlusPlus.core.item.effects.RarityUncommon; import gtPlusPlus.core.item.general.*; import gtPlusPlus.core.item.general.books.ItemBaseBook; import gtPlusPlus.core.item.general.capture.ItemEntityCatcher; -import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; -import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; -import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; +import gtPlusPlus.core.item.general.chassis.*; import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; import gtPlusPlus.core.item.init.ItemsFoods; diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 0b6193253a..59d97c306d 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -100,7 +100,15 @@ public class BaseItemDust extends Item{ @Override public String getItemStackDisplayName(final ItemStack iStack) { - if (this.getUnlocalizedName().contains("DustTiny")){ + String unlocal = super.getItemStackDisplayName(iStack); + if (!unlocal.toLowerCase().contains(".name")) { + return unlocal; + } + else { + return unlocal; + } + + /*if (this.getUnlocalizedName().contains("DustTiny")){ this.name = "Tiny Pile of "+this.materialName + " Dust"; } else if (this.getUnlocalizedName().contains("DustSmall")){ @@ -109,7 +117,7 @@ public class BaseItemDust extends Item{ else { this.name = this.materialName + " Dust"; } - return this.name; + return this.name;*/ } protected final int sRadiation; diff --git a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java b/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java index 86073c9e11..0501f616c9 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemHalfCompleteCasings.java +++ b/src/Java/gtPlusPlus/core/item/general/chassis/ItemHalfCompleteCasings.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.item.general; +package gtPlusPlus.core.item.general.chassis; import java.util.List; @@ -30,25 +30,24 @@ public class ItemHalfCompleteCasings extends BaseItemColourable{ } } - /*@Override + @Override public String getItemStackDisplayName(final ItemStack tItem) { - String prefix = "Half Complete Casing "; + String prefix = super.getItemStackDisplayName(tItem); String casingType = ""; if (tItem.getItemDamage() == 0){ - casingType = "I"; + casingType = " I"; } else if (tItem.getItemDamage() == 1){ - casingType = "II"; + casingType = " II"; } else if (tItem.getItemDamage() == 2){ - casingType = "III"; + casingType = " III"; } else if (tItem.getItemDamage() == 3){ - casingType = "IV"; + casingType = " IV"; } - return (prefix+casingType); - - }*/ + return (prefix+casingType); + } @Override public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { |