aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-11-03 19:44:00 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-11-03 19:44:00 +0100
commit6d7a985fce0dbcb1301833e4dd9d3f02689f28fe (patch)
treeed7f84a46ad39d9234aaf252d524f43c44fd16ce /src
parentb3a8c4077381ffc2dc6f23114aeb76536eafd5a1 (diff)
downloadGT5-Unofficial-6d7a985fce0dbcb1301833e4dd9d3f02689f28fe.tar.gz
GT5-Unofficial-6d7a985fce0dbcb1301833e4dd9d3f02689f28fe.tar.bz2
GT5-Unofficial-6d7a985fce0dbcb1301833e4dd9d3f02689f28fe.zip
fixes
+fixed small ore names +fixed Hg-Compound Werkstoffs not giving out Hg +fixed cell amount in a recipe Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> Former-commit-id: db1b903fe9f5b93a1abc381791fe7d8bd0760f6d
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java25
3 files changed, 24 insertions, 5 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java
index f09bb6f33d..be3a5d9643 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java
@@ -50,7 +50,7 @@ public class BW_MetaGeneratedOre_Item extends BW_ItemBlocks {
}
public String getItemStackDisplayName(ItemStack aStack) {
- return GT_LanguageManager.getTranslation("bw.blockores.01." + aStack.getItemDamage() + ".name");
+ return GT_LanguageManager.getTranslation( getUnlocalizedName(aStack) + ".name");
}
@Override
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
index f9ca22d37a..fa28531234 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
@@ -146,7 +146,7 @@ public class PlatinumSludgeOverHaul {
}, 600, 30);
GT_Values.RA.addChemicalRecipeForBasicMachineOnly(PDRawPowder.get(dust, 2), Materials.Empty.getCells(1), FormicAcid.getFluidOrGas(4000), Materials.Ammonia.getGas(2000), Materials.Palladium.getDust(2), Materials.Ethylene.getCells(1), 250, 30);
GT_Values.RA.addMultiblockChemicalRecipe(new ItemStack[]{PDRawPowder.get(dust, 2)}, new FluidStack[]{FormicAcid.getFluidOrGas(4000)}, new FluidStack[]{Materials.Ammonia.getGas(2000), Materials.Ethylene.getGas(1000), Materials.Water.getFluid(1000)}, new ItemStack[]{Materials.Palladium.getDust(2)}, 250, 30);
- GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust, 2), Materials.Hydrogen.getCells(1), null, Materials.SulfuricAcid.getFluid(2000), Materials.Sodium.getDust(1), Materials.Empty.getCells(3), 30);
+ GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust, 2), Materials.Hydrogen.getCells(1), null, Materials.SulfuricAcid.getFluid(2000), Materials.Sodium.getDust(1), Materials.Empty.getCells(1), 30);
//K2S2O7
// GT_Values.RA.addChemicalRecipe(Sodiumsulfate.get(dust), Materials.Potassium.getDust(2), Materials.Oxygen.getGas(3000), null, PotassiumDisulfate.get(dust,6), null, 30);
//Rh/Os/Ir/Ru
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index 72683e7bb8..e2778cc0dc 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -1277,6 +1277,7 @@ public class WerkstoffLoader implements Runnable {
public static final Werkstoff Temagamite = new Werkstoff(
new short[]{245,245,245},
"Temagamite",
+ subscriptNumbers("Pd3HgTe"),
new Werkstoff.Stats().setElektrolysis(true),
Werkstoff.Types.COMPOUND,
new Werkstoff.GenerationFeatures(),
@@ -1970,7 +1971,7 @@ public class WerkstoffLoader implements Runnable {
if (werkstoff.getStats().isElektrolysis() || werkstoff.getStats().isCentrifuge() || werkstoff.getGenerationFeatures().hasChemicalRecipes()) {
for (Pair<ISubTagContainer, Integer> container : werkstoff.getContents().getValue().toArray(new Pair[0])) {
if (container.getKey() instanceof Materials) {
- if (((Materials) container.getKey()).hasCorrespondingGas() || ((Materials) container.getKey()).hasCorrespondingFluid() || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) {
+ if (((Materials) container.getKey()).getGas(0) != null || ((Materials) container.getKey()).getFluid(0) != null || ((Materials) container.getKey()).mIconSet == TextureSet.SET_FLUID) {
FluidStack tmpFl = ((Materials) container.getKey()).getGas(1000 * container.getValue());
if (tmpFl == null || tmpFl.getFluid() == null) {
tmpFl = ((Materials) container.getKey()).getFluid(1000 * container.getValue());
@@ -1987,8 +1988,26 @@ public class WerkstoffLoader implements Runnable {
cells += container.getValue();
}
} else {
- if (((Materials) container.getKey()).getDust(container.getValue()) == null )
- continue;
+ if (((Materials) container.getKey()).getDust(container.getValue()) == null ) {
+ if (((Materials) container.getKey()).getCells(container.getValue()) != null && (((Materials) container.getKey()).getMolten(0) != null || ((Materials) container.getKey()).getSolid(0) != null)) {
+ FluidStack tmpFl = ((Materials) container.getKey()).getMolten(1000 * container.getValue());
+ if (tmpFl == null || tmpFl.getFluid() == null) {
+ tmpFl = ((Materials) container.getKey()).getSolid(1000 * container.getValue());
+ }
+ flOutputs.add(tmpFl);
+ if (flOutputs.size() > 1) {
+ if (!tracker.containsKey(container.getKey())) {
+ stOutputs.add(((Materials) container.getKey()).getCells(container.getValue()));
+ tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1));
+ } else {
+ stOutputs.add(((Materials) container.getKey()).getCells(tracker.get(container.getKey()).getKey() + container.getValue()));
+ stOutputs.remove(tracker.get(container.getKey()).getValue() + 1);
+ }
+ cells += container.getValue();
+ }
+ } else
+ continue;
+ }
if (!tracker.containsKey(container.getKey())) {
stOutputs.add(((Materials) container.getKey()).getDust(container.getValue()));
tracker.put(container.getKey(), new Pair<>(container.getValue(), stOutputs.size() - 1));