diff options
| author | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-10-13 21:17:20 -0600 |
|---|---|---|
| committer | D-Cysteine <54219287+D-Cysteine@users.noreply.github.com> | 2021-10-13 21:17:20 -0600 |
| commit | 8246ae355556814fe84f08ea23bf87cb13241833 (patch) | |
| tree | 7767ffdccf148f4a33e3251f8a65bde290084aeb | |
| parent | 00fb20acb11e9b32b959663aaa8521da2da4628b (diff) | |
| download | GT5-Unofficial-8246ae355556814fe84f08ea23bf87cb13241833.tar.gz GT5-Unofficial-8246ae355556814fe84f08ea23bf87cb13241833.tar.bz2 GT5-Unofficial-8246ae355556814fe84f08ea23bf87cb13241833.zip | |
Fix generating duplicate materials
Former-commit-id: b486cc4fa135cb8aa1fa7e3908b3b198ae7d7a50
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; } } |