Nikolite & Miner Fixes (#230)

+ Fixed gt recipes not working for Electrotine
+ Fixed Miner loading with "0" chunks when placed down
+ Version increase

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

3 files changed, 31 insertions, 26 deletions

diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 63c8777b7a..fe32c47cab 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -945,31 +945,33 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
 

     static {

         initSubTags();

-        Iron                    .mOreReRegistrations.add(AnyIron    );

-        PigIron                 .mOreReRegistrations.add(AnyIron    );

-        WroughtIron             .mOreReRegistrations.add(AnyIron    );

+        Iron.mOreReRegistrations.add(AnyIron);

+        PigIron.mOreReRegistrations.add(AnyIron);

+        WroughtIron.mOreReRegistrations.add(AnyIron);

 

-        Copper                  .mOreReRegistrations.add(AnyCopper  );

-        AnnealedCopper          .mOreReRegistrations.add(AnyCopper  );

+        Copper.mOreReRegistrations.add(AnyCopper);

+        AnnealedCopper.mOreReRegistrations.add(AnyCopper);

 

-        Bronze                  .mOreReRegistrations.add(AnyBronze  );

+        Bronze.mOreReRegistrations.add(AnyBronze);

 

-        Rubber					.mOreReRegistrations.add(AnyRubber);

-        StyreneButadieneRubber	.mOreReRegistrations.add(AnyRubber);

-        Silicone				.mOreReRegistrations.add(AnyRubber);

+        Rubber.mOreReRegistrations.add(AnyRubber);

+        StyreneButadieneRubber.mOreReRegistrations.add(AnyRubber);

+        Silicone.mOreReRegistrations.add(AnyRubber);

 

-        StyreneButadieneRubber	.mOreReRegistrations.add(AnySyntheticRubber);

-        Silicone				.mOreReRegistrations.add(AnySyntheticRubber);

+        StyreneButadieneRubber.mOreReRegistrations.add(AnySyntheticRubber);

+        Silicone.mOreReRegistrations.add(AnySyntheticRubber);

 

-        Peanutwood              .setMaceratingInto(Wood             );

-        WoodSealed              .setMaceratingInto(Wood             );

-        NetherBrick             .setMaceratingInto(Netherrack       );

+        Electrotine.mOreReRegistrations.add(Nikolite);

 

-        SamariumMagnetic        .setSmeltingInto(Samarium           ).setMaceratingInto(Samarium        ).setArcSmeltingInto(Samarium           );

-        NeodymiumMagnetic       .setSmeltingInto(Neodymium          ).setMaceratingInto(Neodymium       ).setArcSmeltingInto(Neodymium          );

-        SteelMagnetic           .setSmeltingInto(Steel              ).setMaceratingInto(Steel           ).setArcSmeltingInto(Steel              );

-        Iron                    .setSmeltingInto(Iron               ).setMaceratingInto(Iron            ).setArcSmeltingInto(WroughtIron        );

-        AnyIron                 .setSmeltingInto(Iron               ).setMaceratingInto(Iron            ).setArcSmeltingInto(WroughtIron        );

+        Peanutwood.setMaceratingInto(Wood);

+        WoodSealed.setMaceratingInto(Wood);

+        NetherBrick.setMaceratingInto(Netherrack);

+

+        SamariumMagnetic.setSmeltingInto(Samarium).setMaceratingInto(Samarium).setArcSmeltingInto(Samarium);

+        NeodymiumMagnetic.setSmeltingInto(Neodymium).setMaceratingInto(Neodymium).setArcSmeltingInto(Neodymium);

+        SteelMagnetic.setSmeltingInto(Steel).setMaceratingInto(Steel).setArcSmeltingInto(Steel);

+        Iron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);

+        AnyIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);

         PigIron                 .setSmeltingInto(Iron               ).setMaceratingInto(Iron            ).setArcSmeltingInto(WroughtIron        );

         WroughtIron             .setSmeltingInto(WroughtIron        ).setMaceratingInto(WroughtIron     ).setArcSmeltingInto(WroughtIron        );

         IronMagnetic            .setSmeltingInto(Iron               ).setMaceratingInto(Iron            ).setArcSmeltingInto(WroughtIron        );

@@ -1599,7 +1601,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
                 aMaterial.mTransparent = GregTech_API.sMaterialProperties.get(aConfigPath, "Transparent", aMaterial.mTransparent);

                 String aColor = GregTech_API.sMaterialProperties.get(aConfigPath, "DyeColor", aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString());

                 aMaterial.mColor = aColor.equals("None") ? Dyes._NULL : Dyes.get(aColor);

-                String[] aRGBA = GregTech_API.sMaterialProperties.get(aConfigPath, "MatRGBA", String.valueOf(aMaterial.mRGBa[0] + "," + aMaterial.mRGBa[1] + "," + aMaterial.mRGBa[2] + "," + aMaterial.mRGBa[3] + ",")).split(",");

+                String[] aRGBA = GregTech_API.sMaterialProperties.get(aConfigPath, "MatRGBA", aMaterial.mRGBa[0] + "," + aMaterial.mRGBa[1] + "," + aMaterial.mRGBa[2] + "," + aMaterial.mRGBa[3] + ",").split(",");

                 aMaterial.mRGBa[0] = Short.parseShort(aRGBA[0]);

                 aMaterial.mRGBa[1] = Short.parseShort(aRGBA[1]);

                 aMaterial.mRGBa[2] = Short.parseShort(aRGBA[2]);

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
index 22bb275ea2..b1fe243374 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
@@ -260,15 +260,19 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
         drillX = aNBT.getInteger("drillX");
         drillY = aNBT.getInteger("drillY");
         drillZ = aNBT.getInteger("drillZ");
-        radiusConfig = aNBT.getInteger("radiusConfig");
+        if (aNBT.hasKey("radiusConfig"))
+            radiusConfig = aNBT.getInteger("radiusConfig");
     }
 
     private FakePlayer mFakePlayer = null;
 
     protected FakePlayer getFakePlayer(IGregTechTileEntity aBaseTile) {
-        if (mFakePlayer == null) mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
-        mFakePlayer.setWorld(aBaseTile.getWorld());
-        mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
+        if (mFakePlayer == null)
+            mFakePlayer = GT_Utility.getFakePlayer(aBaseTile);
+        if (mFakePlayer != null) {
+            mFakePlayer.setWorld(aBaseTile.getWorld());
+            mFakePlayer.setPosition(aBaseTile.getXCoord(), aBaseTile.getYCoord(), aBaseTile.getZCoord());
+        }
         return mFakePlayer;
     }
 
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index d9d880294b..5339363e63 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -10,7 +10,6 @@ import gregtech.api.objects.MaterialStack;
 import gregtech.api.util.*;
 import gregtech.common.GT_DummyWorld;
 import gregtech.common.items.GT_MetaGenerated_Item_03;
-import gregtech.common.items.GT_VolumetricFlask;
 import ic2.api.recipe.ILiquidHeatExchangerManager;
 import ic2.api.recipe.Recipes;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
@@ -49,7 +48,7 @@ public class GT_MachineRecipeLoader implements Runnable {
             {new MaterialStack(Materials.Lead, 4L), new MaterialStack(Materials.Antimony, 1L), new MaterialStack(Materials.BatteryAlloy, 5L)},
             {new MaterialStack(Materials.Gold, 1L), new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Electrum, 2L)},
             {new MaterialStack(Materials.Magnesium, 1L), new MaterialStack(Materials.Aluminium, 2L), new MaterialStack(Materials.Magnalium, 3L)},
-            {new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Nikolite, 4L), new MaterialStack(Materials.BlueAlloy, 1L)},
+            {new MaterialStack(Materials.Silver, 1L), new MaterialStack(Materials.Electrotine, 4L), new MaterialStack(Materials.BlueAlloy, 1L)},
             {new MaterialStack(Materials.Boron, 1L), new MaterialStack(Materials.Glass, 7L), new MaterialStack(Materials.BorosilicateGlass, 8L)}};
     private static final String aTextAE = "appliedenergistics2"; private static final String aTextAEMM = "item.ItemMultiMaterial"; private static final String aTextForestry = "Forestry";
     private static final String aTextEBXL = "ExtrabiomesXL"; private static final String aTextTCGTPage = "gt.research.page.1.";