diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 17:58:27 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2017-06-06 17:58:27 +1000 |
| commit | eae002a116c4685b41e7cdea15fc55bf22a3fd09 (patch) | |
| tree | 7a34a58f89e92d0fba71f90f911842401302aa83 /src/Java/gtPlusPlus/core/item/base | |
| parent | 14f58372394c22de8ce31220ba2aa854eecfb6f2 (diff) | |
| parent | 1d49ad58f6ada069813739c985c5e10d21c10a83 (diff) | |
| download | GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.tar.gz GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.tar.bz2 GT5-Unofficial-eae002a116c4685b41e7cdea15fc55bf22a3fd09.zip | |
Merge branch 'master' of https://github.com/draknyte1/GTplusplus
# Conflicts:
# src/Java/gtPlusPlus/core/util/recipe/RecipeUtils.java (Actually fixed it this time)
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/base')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java | 8 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java index 4729b2182a..54be041972 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -64,6 +64,9 @@ public class BaseItemComponent extends Item{ if (this.componentType == ComponentTypes.GEAR){ return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGt"; } + else if (this.componentType == ComponentTypes.SMALLGEAR){ + return "gregtech" + ":" + "materialicons/METALLIC/" + "gearGtSmall"; + } else if (this.componentType == ComponentTypes.ROD){ return "gregtech" + ":" + "materialicons/METALLIC/" + "stick"; } @@ -79,6 +82,10 @@ public class BaseItemComponent extends Item{ @Override public String getItemStackDisplayName(final ItemStack p_77653_1_) { + if (this.componentType == ComponentTypes.SMALLGEAR){ + return "Small " + this.materialName+" Gear"; + } + if (this.componentMaterial != null) { return (this.componentMaterial.getLocalizedName()+this.componentType.DISPLAY_NAME); } @@ -181,6 +188,7 @@ public class BaseItemComponent extends Item{ ROD("Rod", " Rod", "stick"), RODLONG("RodLong", " Long Rod", "stickLong"), GEAR("Gear", " Gear", "gear"), + SMALLGEAR("SmallGear", " Gear", "gearGtSmall"), //TODO SCREW("Screw", " Screw", "screw"), BOLT("Bolt", " Bolt", "bolt"), ROTOR("Rotor", " Rotor", "rotor"), diff --git a/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java new file mode 100644 index 0000000000..5435c692c6 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/gears/BaseItemSmallGear.java @@ -0,0 +1,11 @@ +package gtPlusPlus.core.item.base.gears; + +import gtPlusPlus.core.item.base.BaseItemComponent; +import gtPlusPlus.core.material.Material; + +public class BaseItemSmallGear extends BaseItemComponent{ + + public BaseItemSmallGear(final Material material) { + super(material, BaseItemComponent.ComponentTypes.SMALLGEAR); + } +} |