From 418deff17ece735deabd28cc76e8aec45ad29ef7 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Mar 2022 20:34:58 +1100 Subject: Fix disstank, fix NEI issues, fix localization --- .../java/com/elisis/gtnhlanth/GTNHLanthanides.java | 2 +- .../common/register/WerkstoffMaterialPool.java | 13 +++++- .../gtnhlanth/common/tileentity/Digester.java | 2 +- .../common/tileentity/DissolutionTank.java | 52 +++++++++++----------- .../com/elisis/gtnhlanth/loader/RecipeAdder.java | 6 +-- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 38 ++++++++++++++++ .../elisis/gtnhlanth/xmod/nei/DigesterHandler.java | 9 ++-- .../elisis/gtnhlanth/xmod/nei/DisstankHandler.java | 27 +++++++++++ .../java/com/elisis/gtnhlanth/xmod/nei/IMC.java | 1 + .../com/elisis/gtnhlanth/xmod/nei/NEI_Config.java | 7 ++- .../resources/assets/gtnhlanth/lang/en_US.lang | 17 +++++++ 11 files changed, 135 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/elisis/gtnhlanth/xmod/nei/DisstankHandler.java create mode 100644 src/main/resources/assets/gtnhlanth/lang/en_US.lang diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 4d8a00bd19..a37b59e858 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -54,7 +54,7 @@ public class GTNHLanthanides { public static void init(FMLInitializationEvent e) { proxy.init(e); WerkstoffMaterialPool.runInit(); - //IMC.IMCSender(); + IMC.IMCSender(); } @EventHandler diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 4e6b8cdca6..68a2b4e424 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -894,7 +894,7 @@ public class WerkstoffMaterialPool implements Runnable { "Terbium Nitrate", subscriptNumbers("TbNO3"), new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.MIXTURE, + Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID2 + 27, TextureSet.SET_DULL, @@ -904,7 +904,16 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Oxygen, 3) ); - + public static final Werkstoff SamariumOreConcentrate = new Werkstoff( + new short[] {255, 200, 230}, + "Samarium Ore Concentrate", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 28, + TextureSet.SET_DULL + ); diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 08d3ea73db..8aa0096a93 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -176,7 +176,7 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase @Override public String[] getStructureDescription(ItemStack arg0) { - return DescTextLocalization.addText("Digester.hint", 5); + return DescTextLocalization.addText("Digester.hint", 6); } @Override diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index 02723e9b9a..6662f02ebe 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -109,7 +109,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase tFluidInputs = this.getStoredFluids(); FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]); @@ -128,7 +128,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase Date: Tue, 1 Mar 2022 10:50:14 +0100 Subject: Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b647108772..c9bb6ce785 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ buildscript { } } dependencies { - classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.5' + classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7' } } -- cgit