diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-09-26 00:53:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-26 06:53:27 +0200 |
| commit | 05877d269c462e42fdebbdd518cf7a6f32b2d816 (patch) | |
| tree | 10ce803b6afaf6ba7bcb986b10f420d5e5ec06fa /src/main/java/gtnhlanth | |
| parent | 21999bb1be1fd27264ca932403cda3b24b227468 (diff) | |
| download | GT5-Unofficial-05877d269c462e42fdebbdd518cf7a6f32b2d816.tar.gz GT5-Unofficial-05877d269c462e42fdebbdd518cf7a6f32b2d816.tar.bz2 GT5-Unofficial-05877d269c462e42fdebbdd518cf7a6f32b2d816.zip | |
Collisions (#3284)
Diffstat (limited to 'src/main/java/gtnhlanth')
| -rw-r--r-- | src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java | 14 | ||||
| -rw-r--r-- | src/main/java/gtnhlanth/loader/RecipeLoader.java | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java index 70bc2a1cf8..178c62d041 100644 --- a/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -113,19 +113,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID + 6, TextureSet.SET_DULL); - public static final Werkstoff Zirconium = new Werkstoff( - new short[] { 225, 230, 225 }, - "Zirconium", - subscriptNumbers("Zr"), - new Werkstoff.Stats().setBlastFurnace(true), - Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMetalItems(), - // .enforceUnification(), - offsetID + 7, - TextureSet.SET_METALLIC); - public static final Werkstoff Zirconia = new Werkstoff( new short[] { 177, 152, 101 }, "Zirconia", @@ -824,7 +811,6 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable() .onlyDust() - .addMolten() .addCells(), offsetID2 + 24, TextureSet.SET_DULL, diff --git a/src/main/java/gtnhlanth/loader/RecipeLoader.java b/src/main/java/gtnhlanth/loader/RecipeLoader.java index 28e88ef831..6eb4fc8c62 100644 --- a/src/main/java/gtnhlanth/loader/RecipeLoader.java +++ b/src/main/java/gtnhlanth/loader/RecipeLoader.java @@ -828,7 +828,7 @@ public class RecipeLoader { GTUtility.getIntegratedCircuit(2), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2)) .itemOutputs( - WerkstoffMaterialPool.Zirconium.get(OrePrefixes.ingotHot, 1), + WerkstoffLoader.Zirconium.get(OrePrefixes.ingotHot, 1), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Magnesiumchloride, 6)) .fluidInputs(WerkstoffMaterialPool.ZirconiumTetrachlorideSolution.getFluidOrGas(1000)) .duration(30 * SECONDS) |