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/material | |
| 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/material')
| -rw-r--r-- | src/main/java/gtPlusPlus/core/material/Material.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/material/MaterialGenerator.java | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index 11ef72f06c..d6598d4d29 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -1191,6 +1191,10 @@ public class Material { return getComponentByPrefix(OrePrefixes.milled, stacksize); } + public final ItemStack getRawOre(final int stacksize) { + return getComponentByPrefix(OrePrefixes.rawOre, stacksize); + } + public final boolean hasSolidForm() { if (ItemUtils .checkForInvalidItems(new ItemStack[] { getDust(1), getBlock(1), getTinyDust(1), getSmallDust(1) })) { diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 2e120107c9..3b7881616b 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -27,6 +27,7 @@ import gtPlusPlus.core.item.base.ore.BaseItemCrushedOre; import gtPlusPlus.core.item.base.ore.BaseItemImpureDust; import gtPlusPlus.core.item.base.ore.BaseItemPurifiedCrushedOre; import gtPlusPlus.core.item.base.ore.BaseItemPurifiedDust; +import gtPlusPlus.core.item.base.ore.BaseItemRawOre; import gtPlusPlus.core.item.base.plates.BaseItemPlate; import gtPlusPlus.core.item.base.plates.BaseItemPlateDense; import gtPlusPlus.core.item.base.plates.BaseItemPlateDouble; @@ -357,6 +358,7 @@ public class MaterialGenerator { temp = new BaseItemPurifiedCrushedOre(matInfo); temp = new BaseItemImpureDust(matInfo); temp = new BaseItemPurifiedDust(matInfo); + temp = new BaseItemRawOre(matInfo); Logger.MATERIALS( "Generated all ore components for " + matInfo.getLocalizedName() @@ -398,6 +400,7 @@ public class MaterialGenerator { temp = new BaseItemPurifiedCrushedOre(matInfo); temp = new BaseItemImpureDust(matInfo); temp = new BaseItemPurifiedDust(matInfo); + temp = new BaseItemRawOre(matInfo); Logger.MATERIALS( "Generated all ore & base components for " + matInfo.getLocalizedName() |