diff options
| author | Martin Robertz <dream-master@gmx.net> | 2024-05-22 22:29:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 22:29:07 +0200 |
| commit | 38f38a991e433f6eff30476b87a71eeadee228ce (patch) | |
| tree | 7afa17827288ea19e9693101e4796b7a0a4aff6c /src/main/java/gtPlusPlus/core/item | |
| parent | 23494ade8145f1a70d4c533d74815b77b990314a (diff) | |
| download | GT5-Unofficial-38f38a991e433f6eff30476b87a71eeadee228ce.tar.gz GT5-Unofficial-38f38a991e433f6eff30476b87a71eeadee228ce.tar.bz2 GT5-Unofficial-38f38a991e433f6eff30476b87a71eeadee228ce.zip | |
Add RawOre items and processing (#879)
* Add RawOre items and processing
* Added textures
* Change to a switch instead of elseif and add shouldFortune check
Removed isNatural check since GT++ Ores aren't TileEntities
* update
* update
* Fixed the controller texture for the turbines.
* The file is not called anywhere?
This file doesn't seem to be used anywhere. Maybe it's worth removing?
* update
* update
* Update random code
* fixed
* Add Silk Touch
* Update dependencies.gradle
* Update dependencies.gradle
---------
Co-authored-by: Ethryan <3237986+Ethryan@users.noreply.github.com>
Co-authored-by: Pilad <piladt@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseItemRawOre.java | 10 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java | 24 |
2 files changed, 20 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemRawOre.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemRawOre.java new file mode 100644 index 0000000000..bca44d0045 --- /dev/null +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseItemRawOre.java @@ -0,0 +1,10 @@ +package gtPlusPlus.core.item.base.ore; + +import gtPlusPlus.core.material.Material; + +public class BaseItemRawOre extends BaseOreComponent { + + public BaseItemRawOre(final Material material) { + super(material, BaseOreComponent.ComponentTypes.RAWORE); + } +} diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 13c8986a78..eff545871b 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -71,20 +71,15 @@ public class BaseOreComponent extends Item { aMap = new HashMap<>(); } String aKey = "Invalid"; - if (componentType == ComponentTypes.CRUSHED) { - aKey = OrePrefixes.crushed.name(); - } else if (componentType == ComponentTypes.CRUSHEDCENTRIFUGED) { - aKey = OrePrefixes.crushedCentrifuged.name(); - } else if (componentType == ComponentTypes.CRUSHEDPURIFIED) { - aKey = OrePrefixes.crushedPurified.name(); - } else if (componentType == ComponentTypes.DUST) { - aKey = OrePrefixes.dust.name(); - } else if (componentType == ComponentTypes.DUSTIMPURE) { - aKey = OrePrefixes.dustImpure.name(); - } else if (componentType == ComponentTypes.DUSTPURE) { - aKey = OrePrefixes.dustPure.name(); - } else if (componentType == ComponentTypes.MILLED) { - aKey = OrePrefixes.milled.name(); + switch (componentType) { + case CRUSHED -> aKey = OrePrefixes.crushed.name(); + case CRUSHEDCENTRIFUGED -> aKey = OrePrefixes.crushedCentrifuged.name(); + case CRUSHEDPURIFIED -> aKey = OrePrefixes.crushedPurified.name(); + case DUST -> aKey = OrePrefixes.dust.name(); + case DUSTIMPURE -> aKey = OrePrefixes.dustImpure.name(); + case DUSTPURE -> aKey = OrePrefixes.dustPure.name(); + case MILLED -> aKey = OrePrefixes.milled.name(); + case RAWORE -> aKey = OrePrefixes.rawOre.name(); } ItemStack x = aMap.get(aKey); @@ -241,6 +236,7 @@ public class BaseOreComponent extends Item { CRUSHED("crushed", "Crushed ", " Ore", true), CRUSHEDCENTRIFUGED("crushedCentrifuged", "Centrifuged Crushed ", " Ore", true), CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true), + RAWORE("oreRaw", "Raw ", " Ore", true), MILLED("milled", "Milled ", " Ore", true); private final String COMPONENT_NAME; |