diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-10-15 16:06:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 16:06:10 +0200 |
| commit | b89db1739879761e4b67d9519de3a2c311405f2c (patch) | |
| tree | 0d2230e9953af17a771cee1104c1987dd6185400 | |
| parent | 889c4cd331ff4076cf4a1b82848459c1fd31f233 (diff) | |
| parent | 8246ae355556814fe84f08ea23bf87cb13241833 (diff) | |
| download | GT5-Unofficial-b89db1739879761e4b67d9519de3a2c311405f2c.tar.gz GT5-Unofficial-b89db1739879761e4b67d9519de3a2c311405f2c.tar.bz2 GT5-Unofficial-b89db1739879761e4b67d9519de3a2c311405f2c.zip | |
Merge pull request #46 from D-Cysteine/master
Fix generating duplicate materials
Former-commit-id: d97b63c6056771d23534699c7a69193cca2bb145
3 files changed, 7 insertions, 3 deletions
diff --git a/gradle.properties b/gradle.properties index 5f17374d7c..8d09f2976d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000 majorUpdate=0 minorUpdate=5 -buildNumber=22 +buildNumber=23 apiVersion=11 ic2Version=2.2.828-experimental applecoreVersion=1.7.10-3.1.1 diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java index 332cbdfb66..73cdeb8a4b 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java @@ -391,10 +391,12 @@ public class AdditionalRecipes { boolean aElementSet = false; for (Element e : Element.values()) { if (e.toString().equals("Uuo")) { - werkstoffBridgeMaterial = new Materials(-1, werkstoff.getTexSet(), 0, 0, 0, false, werkstoff.getDefaultName(), werkstoff.getDefaultName()); + werkstoffBridgeMaterial = werkstoff.getBridgeMaterial() != null ? werkstoff.getBridgeMaterial() : + new Materials(-1, werkstoff.getTexSet(), 0, 0, 0, false, werkstoff.getDefaultName(), werkstoff.getDefaultName()); werkstoffBridgeMaterial.mElement = e; e.mLinkedMaterials.add(werkstoffBridgeMaterial); aElementSet = true; + werkstoff.setBridgeMaterial(werkstoffBridgeMaterial); break; } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java index ab589c3bec..896ea0ca23 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/recipe/CellLoader.java @@ -158,10 +158,12 @@ public class CellLoader implements IWerkstoffRunnable { boolean ElementSet = false; for (Element e : Element.values()) { if (e.toString().equals(werkstoff.getToolTip())) { - werkstoffBridgeMaterial = new Materials(-1, werkstoff.getTexSet(), 0, 0, 0, false, werkstoff.getDefaultName(), werkstoff.getDefaultName()); + werkstoffBridgeMaterial = werkstoff.getBridgeMaterial() != null ? werkstoff.getBridgeMaterial() : + new Materials(-1, werkstoff.getTexSet(), 0, 0, 0, false, werkstoff.getDefaultName(), werkstoff.getDefaultName()); werkstoffBridgeMaterial.mElement = e; e.mLinkedMaterials.add(werkstoffBridgeMaterial); ElementSet = true; + werkstoff.setBridgeMaterial(werkstoffBridgeMaterial); break; } } |