diff options
| author | Yang Xizhi <60341015+GlodBlock@users.noreply.github.com> | 2022-07-31 10:49:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-31 09:49:57 +0700 |
| commit | 65aa1aa200a4d60cb2e3d0ee5a6499e38cb90f9d (patch) | |
| tree | 002e211622698094cfb3ad8b05604db37e6646ea /src | |
| parent | 74e72d73c2c0ba59b9d0cd39086baad449bff5d6 (diff) | |
| download | GT5-Unofficial-65aa1aa200a4d60cb2e3d0ee5a6499e38cb90f9d.tar.gz GT5-Unofficial-65aa1aa200a4d60cb2e3d0ee5a6499e38cb90f9d.tar.bz2 GT5-Unofficial-65aa1aa200a4d60cb2e3d0ee5a6499e38cb90f9d.zip | |
fix small ore and cass ore (#1150)
Diffstat (limited to 'src')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index a1fd06ae3f..c51086369b 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -1282,8 +1282,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2); Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2); Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2); - Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2); - CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2); + Cassiterite.setOreMultiplier(6).setSmeltingMultiplier(2); + CassiteriteSand.setOreMultiplier(6).setSmeltingMultiplier(2); NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2); TricalciumPhosphate.setOreMultiplier(3).setSmeltingMultiplier(3); diff --git a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java index 66dd4b7277..4885910877 100644 --- a/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_TileEntity_Ores.java @@ -210,17 +210,18 @@ public class GT_TileEntity_Ores extends TileEntity implements ITexturedTileEntit rList.add(new ItemStack(aDroppedOre, 1, this.mMetaData)); return rList; } - Materials aMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)]; + Materials aOreMaterial = GregTech_API.sGeneratedMaterials[(this.mMetaData % 1000)]; // Everyone gets a free small fortune boost aFortune += 1; if (!this.mNatural) { aFortune = 0; } - if (aMaterial != null) { + if (aOreMaterial != null) { Random tRandom = new XSTR(this.xCoord ^ this.yCoord ^ this.zCoord); ArrayList<ItemStack> tSelector = new ArrayList<>(); + Materials aMaterial = aOreMaterial.mOreReplacement; ItemStack tStack = GT_OreDictUnificator.get(OrePrefixes.gemExquisite, aMaterial, GT_OreDictUnificator.get(OrePrefixes.gem, aMaterial, 1L), 1L); if (tStack != null) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java index 938e453bf3..5299e66bb0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java @@ -42,7 +42,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra aOreStack = GT_Utility.copyAmount(1L, aOreStack); aOreStack.stackSize = 1; - ItemStack tIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial.mDirectSmelting, 1L); ItemStack tGem = GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, 1L); ItemStack tSmeltInto = tIngot == null ? null : aMaterial.contains(SubTag.SMELTING_TO_GEM) ? GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial.mDirectSmelting, GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial.mDirectSmelting, GT_OreDictUnificator.get(OrePrefixes.gem, tMaterial, GT_OreDictUnificator.get(OrePrefixes.crystal, tMaterial, 1L), 1L), 1L), 1L) : tIngot; |