Merge remote-tracking branch 'origin/master'

dependencies.gradle

@@ -36,14 +36,14 @@
 dependencies {
     api("com.github.GTNewHorizons:StructureLib:1.3.4:dev")
     api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    api("com.github.GTNewHorizons:NotEnoughItems:2.6.42-GTNH:dev")
+    api("com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev")
     api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
-    api("com.github.GTNewHorizons:GTNHLib:0.5.14:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.5.17:dev")
     api("com.github.GTNewHorizons:ModularUI:1.2.11:dev")
     api("com.github.GTNewHorizons:ModularUI2:2.1.14-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.1:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-468-GTNH:dev")
-    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.39-gtnh:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-471-GTNH:dev")
+    api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.41-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.13:dev")
 
@@ -54,14 +54,14 @@ dependencies {
     // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
 
-    devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.9.0-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.9.1-GTNH:dev")
 
     compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.54:dev")
 
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta7:api') { transitive = false }
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta10:api') { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.3:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.18:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.20:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.9.16:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false }
@@ -75,12 +75,12 @@ dependencies {
     compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.5-GTNH:dev") { transitive = false }
     implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.12-GTNH:dev")
 
-    compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
     compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    implementation("com.github.GTNewHorizons:Hodgepodge:2.5.71:dev")
+    implementation("com.github.GTNewHorizons:Hodgepodge:2.5.74:dev")
     compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
@@ -89,7 +89,7 @@ dependencies {
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
     compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.26-GTNH:dev') {transitive =  false}
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.6:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.7:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
@@ -121,7 +121,7 @@ dependencies {
     functionalTestImplementation('org.junit.platform:junit-platform-reporting')
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.18:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:EnderIO:2.8.20:dev')
 
     // For testing
     //runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.1:dev')

src/main/java/bartworks/client/renderer/RendererGlassBlock.java

@@ -79,22 +79,21 @@ public void renderInventoryBlock(Block block, int metadata, int modelId, RenderB
 
     // spotless:off
     @Override
-    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId,
-                                    RenderBlocks renderer) {
+    public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
         boolean flag = false;
         if (block instanceof BWBlocksGlass) {
+            final short[] color = ((BWBlocksGlass) block).getColor(world.getBlockMetadata(x, y, z));
             flag |= renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses, x, y, z);
-            flag |= renderer.renderStandardBlockWithColorMultiplier(block, x, y, z,
-                ((BWBlocksGlass) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
-                ((BWBlocksGlass) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
-                ((BWBlocksGlass) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+            flag |= renderer.renderStandardBlockWithColorMultiplier(block,
+                x, y, z,
+                color[0] / 255f, color[1] / 255f, color[2] / 255f);
         }
         if (block instanceof BWBlocksGlass2) {
+            final short[] color = ((BWBlocksGlass2) block).getColor(world.getBlockMetadata(x, y, z));
             flag |= renderer.renderStandardBlock(ItemRegistry.bw_fake_glasses2, x, y, z);
-            flag |= renderer.renderStandardBlockWithColorMultiplier(block, x, y, z,
-                ((BWBlocksGlass2) block).getColor(world.getBlockMetadata(x, y, z))[0] / 255f,
-                ((BWBlocksGlass2) block).getColor(world.getBlockMetadata(x, y, z))[1] / 255f,
-                ((BWBlocksGlass2) block).getColor(world.getBlockMetadata(x, y, z))[2] / 255f);
+            flag |= renderer.renderStandardBlockWithColorMultiplier(block,
+                x, y, z,
+                color[0] / 255f, color[1] / 255f, color[2] / 255f);
         }
         return flag;
     }

src/main/java/bartworks/client/renderer/RendererSwitchingColorFluid.java

@@ -31,6 +31,7 @@
 import bartworks.common.tileentities.multis.MTEBioVat;
 import bartworks.util.Coords;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -49,6 +50,7 @@ public class RendererSwitchingColorFluid implements ISimpleBlockRenderingHandler
 
     public static void register() {
         instance = new RendererSwitchingColorFluid();
+        RenderingRegistry.registerBlockHandler(instance);
     }
 
     private float getFluidHeightAverage(float[] flow) {

src/main/java/bartworks/common/configs/Configuration.java

@@ -19,8 +19,6 @@ public class Configuration {
 
     public static final SingleBlocks singleBlocks = new SingleBlocks();
 
-    public static final Pollution pollution = new Pollution();
-
     public static final RossRuinMetas rossRuinMetas = new RossRuinMetas();
 
     @Config.Comment("Mixins section.")
@@ -72,10 +70,6 @@ public static class Multiblocks {
         @Config.DefaultInt(20_000_000)
         public int energyPerCell;
 
-        @Config.Comment("This switch enables the Direct Steam Mode of the DEHP. If enabled it will take in Waterand output steam. If disabled it will Input IC2Coolant and output hot coolant")
-        @Config.DefaultBoolean(false)
-        public boolean DEHPDirectSteam;
-
         @Config.Ignore()
         public static int megaMachinesMax = 256;
 
@@ -110,18 +104,6 @@ public static class SingleBlocks {
         public int mbWaterperSec;
     }
 
-    @Config.Comment("Pollution section.")
-    public static class Pollution {
-
-        @Config.Comment("How much should the Simple Stirling Water Pump produce pollution per second")
-        @Config.DefaultInt(5)
-        public int pollutionHeatedWaterPumpSecond;
-
-        @Config.Comment("How much should the MBF produce pollution per tick per ingot. Then it'll be multiplied by the amount of ingots done in parallel")
-        @Config.DefaultInt(400)
-        public int basePollutionMBFSecond;
-    }
-
     @Config.Comment("Ross' ruins machine metaIDs section.")
     public static class RossRuinMetas {
 

src/main/java/bartworks/common/loaders/recipes/Assembler.java

@@ -10,6 +10,7 @@
 
 import bartworks.common.loaders.ItemRegistry;
 import bartworks.system.material.WerkstoffLoader;
+import goodgenerator.items.GGMaterial;
 import gregtech.api.GregTechAPI;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
@@ -98,6 +99,19 @@ public void run() {
             .eut(TierEU.RECIPE_HV)
             .addTo(assemblerRecipes);
 
+        GTValues.RA.stdBuilder() // DEHP
+            .itemInputs(
+                ItemList.OilDrill4.get(1),
+                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 8),
+                GGMaterial.incoloy903.get(OrePrefixes.gearGt, 32),
+                GTOreDictUnificator.get(OrePrefixes.plateDense, Materials.Polytetrafluoroethylene, 16),
+                ItemList.Field_Generator_IV.get(1))
+            .itemOutputs(ItemRegistry.dehp)
+            .fluidInputs(Materials.HSSE.getMolten(32 * 144))
+            .duration(60 * SECONDS)
+            .eut(TierEU.RECIPE_IV)
+            .addTo(assemblerRecipes);
+
         GTValues.RA.stdBuilder()
             .itemInputs(
                 GTOreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L),

src/main/java/bartworks/common/loaders/recipes/AssemblyLine.java

@@ -1,6 +1,5 @@
 package bartworks.common.loaders.recipes;
 
-import static gregtech.api.util.GTRecipeBuilder.HOURS;
 import static gregtech.api.util.GTRecipeBuilder.MINUTES;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeConstants.AssemblyLine;
@@ -27,22 +26,6 @@ public void run() {
         Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null
             ? FluidRegistry.getFluid("molten.indalloy140")
             : FluidRegistry.getFluid("molten.solderingalloy");
-        GTValues.RA.stdBuilder()
-            .metadata(RESEARCH_ITEM, ItemList.Pump_HV.get(1L))
-            .metadata(RESEARCH_TIME, 1 * HOURS)
-            .itemInputs(
-                ItemList.Pump_HV.get(16),
-                GTOreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L),
-                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),
-                GTOreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L),
-                ItemList.Field_Generator_LuV.get(8))
-            .fluidInputs(
-                new FluidStack(solderIndalloy, 32 * 144),
-                Materials.Polytetrafluoroethylene.getMolten(32 * 144))
-            .itemOutputs(ItemRegistry.dehp)
-            .eut(TierEU.RECIPE_LuV)
-            .duration(4 * MINUTES + 10 * SECONDS)
-            .addTo(AssemblyLine);
 
         GTValues.RA.stdBuilder()
             .metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L))

src/main/java/bartworks/common/tileentities/classic/TileEntityHeatedWaterPump.java

@@ -49,7 +49,8 @@
 import bartworks.MainMod;
 import bartworks.common.configs.Configuration;
 import gregtech.api.util.GTUtility;
-import gregtech.common.Pollution;
+import gregtech.common.pollution.Pollution;
+import gregtech.common.pollution.PollutionConfig;
 
 public class TileEntityHeatedWaterPump extends TileEntity implements ITileDropsContent, IFluidHandler, IFluidTank,
     ITileWithModularUI, ITileAddsInformation, ITileHasDifferentTextureSides {
@@ -167,8 +168,7 @@ private void causePollution() {
             .ifPresent(e -> {
                 if (e.getTotalWorldTime() % 20 == 0) {
                     Optional.ofNullable(e.getChunkFromBlockCoords(this.xCoord, this.zCoord))
-                        .ifPresent(
-                            c -> Pollution.addPollution(c, Configuration.pollution.pollutionHeatedWaterPumpSecond));
+                        .ifPresent(c -> Pollution.addPollution(c, PollutionConfig.pollutionHeatedWaterPumpSecond));
                 }
             });
     }
@@ -334,7 +334,7 @@ public String[] getInfoData() {
                 + GTUtility.formatNumbers(Configuration.singleBlocks.mbWaterperSec)
                 + String.format(
                     StatCollector.translateToLocal("tooltip.tile.waterpump.1.name"),
-                    Configuration.pollution.pollutionHeatedWaterPumpSecond),
+                    PollutionConfig.pollutionHeatedWaterPumpSecond),
             StatCollector.translateToLocal("tooltip.tile.waterpump.2.name") };
     }
 

src/main/java/bartworks/common/tileentities/multis/MTECircuitAssemblyLine.java

@@ -263,8 +263,7 @@ public void loadNBTData(NBTTagCompound aNBT) {
     @Override
     public void setItemNBT(NBTTagCompound aNBT) {
         if (isImprinted()) aNBT.setTag(IMPRINT_KEY, this.type);
-        aNBT.setInteger(RUNNING_MODE_KEY, mode);
-        super.saveNBTData(aNBT);
+        super.setItemNBT(aNBT);
     }
 
     @Override