aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/bartworks
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-09-25 16:19:07 -0400
committerGitHub <noreply@github.com>2024-09-25 22:19:07 +0200
commitd392aef3a42041ce152e2206810a638e65a493bf (patch)
treec97e76bbc828d24e85ffbce0b61a939188151640 /src/main/java/bartworks
parent5c5d94ad6517090ca6706341d3a739b490784fef (diff)
downloadGT5-Unofficial-d392aef3a42041ce152e2206810a638e65a493bf.tar.gz
GT5-Unofficial-d392aef3a42041ce152e2206810a638e65a493bf.tar.bz2
GT5-Unofficial-d392aef3a42041ce152e2206810a638e65a493bf.zip
Fix sealed wood + more collisions (#3282)
Diffstat (limited to 'src/main/java/bartworks')
-rw-r--r--src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java45
-rw-r--r--src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java23
2 files changed, 13 insertions, 55 deletions
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
index ab7a2167aa..bcc5d422b0 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/DustLoader.java
@@ -205,7 +205,6 @@ public class DustLoader implements IWerkstoffRunnable {
* 30,
0);
RecipeMaps.electrolyzerRecipes.add(tRecipe);
- RecipeMaps.electrolyzerNonCellRecipes.add(tRecipe);
}
if (werkstoffStats.isCentrifuge()) {
RecipeMaps.centrifugeRecipes.add(
@@ -230,28 +229,6 @@ public class DustLoader implements IWerkstoffRunnable {
.size())
* 5,
0));
- GTRecipe tRecipe = new GTRecipe(
- false,
- stOutputs.toArray(new ItemStack[0]),
- new ItemStack[] { input },
- null,
- null,
- new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
- null,
- (int) Math.max(
- 1L,
- Math.abs(
- werkstoffStats.getProtons() / werkstoff.getContents()
- .getValue()
- .size())),
- Math.min(
- 4,
- werkstoff.getContents()
- .getValue()
- .size())
- * 30,
- 0);
- RecipeMaps.centrifugeNonCellRecipes.add(tRecipe);
}
if (werkstoff.getGenerationFeatures()
.hasChemicalRecipes()) {
@@ -304,28 +281,6 @@ public class DustLoader implements IWerkstoffRunnable {
.size())
* 5,
0));
- GTRecipe tRecipe = new GTRecipe(
- false,
- stOutputs.toArray(new ItemStack[0]),
- new ItemStack[] { input },
- null,
- null,
- new FluidStack[] { flOutputs.size() > 0 ? flOutputs.get(0) : null },
- null,
- (int) Math.max(
- 1L,
- Math.abs(
- werkstoffStats.getProtons() / werkstoff.getContents()
- .getValue()
- .size())),
- Math.min(
- 4,
- werkstoff.getContents()
- .getValue()
- .size())
- * 30,
- 0);
- RecipeMaps.mixerNonCellRecipes.add(tRecipe);
}
}
diff --git a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
index a9c1143e58..299bc5d393 100644
--- a/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
+++ b/src/main/java/bartworks/system/material/werkstoff_loaders/recipe/SimpleMetalLoader.java
@@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack;
import bartworks.API.SideReference;
import bartworks.client.textures.PrefixTextureLinker;
import bartworks.system.material.Werkstoff;
+import bartworks.system.material.WerkstoffLoader;
import bartworks.system.material.werkstoff_loaders.IWerkstoffRunnable;
import gregtech.api.GregTechAPI;
import gregtech.api.enums.GTValues;
@@ -151,16 +152,18 @@ public class SimpleMetalLoader implements IWerkstoffRunnable {
.eut(16)
.addTo(latheRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(werkstoff.get(plate), GTUtility.getIntegratedCircuit(1))
- .itemOutputs(werkstoff.get(foil, 4))
- .duration(
- (int) Math.max(
- werkstoff.getStats()
- .getMass() * 1L,
- 1L))
- .eut(24)
- .addTo(benderRecipes);
+ if (werkstoff != WerkstoffLoader.Fluorophlogopite) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(werkstoff.get(plate), GTUtility.getIntegratedCircuit(1))
+ .itemOutputs(werkstoff.get(foil, 4))
+ .duration(
+ (int) Math.max(
+ werkstoff.getStats()
+ .getMass(),
+ 1L))
+ .eut(24)
+ .addTo(benderRecipes);
+ }
GTValues.RA.stdBuilder()
.itemInputs(werkstoff.get(ingot), GTUtility.getIntegratedCircuit(10))