Merge pull request #279 from GTNewHorizons/DropBartApi

Drop barts api

5 files changed, 10 insertions, 106 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index de199ac057..e4fedf1fa1 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -1012,9 +1012,6 @@ public class GT_Mod implements IGT_Mod {
             }
         }
 
-        if (Loader.isModLoaded("bartworks"))
-            GT_BW_VoidminerLoader.initDeepDark();
-
         addSolidFakeLargeBoilerFuels();
 
         achievements = new GT_Achievements();
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
index 353a62c319..17dbd560a2 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
@@ -85,18 +85,17 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_
                         case 6:
                         case 7:
                         case 8:
-                            if (Loader.isModLoaded("bartworks")) {
+                            if (Loader.isModLoaded("bartworks")) {//todo remove via provider pattern on all enums?
                                 aRecipe[i] = "blockGlass"+VN[aTier];
                                 break;
                             }
                         default:
-                            if (Loader.isModLoaded("bartworks")) {
+                            if (Loader.isModLoaded("bartworks")) {//todo remove via provider pattern on all enums?
                                 aRecipe[i] = "blockGlass"+VN[8];
-                                break;
                             } else {
                                 aRecipe[i] = Ic2Items.reinforcedGlass;
-                                break;
                             }
+                            break;
                     }
                     continue;
                 }
diff --git a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
deleted file mode 100644
index eedae52716..0000000000
--- a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gregtech.api.util;
-
-import com.github.bartimaeusnek.bartworks.API.VoidMinerDropAdder;
-import com.github.bartimaeusnek.bartworks.API.WerkstoffAPI;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import gregtech.api.enums.Materials;
-import gregtech.api.interfaces.ISubTagContainer;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Optional;
-
-public class GT_BartWorks_Compat {
-
-    public static Materials getBartWorksMaterialByVarName(String name) {
-        Materials materials = Materials._NULL;
-        try {
-            materials = WerkstoffAPI.getWerkstoff(name).getBridgeMaterial();
-        } catch (NoSuchFieldException | IllegalAccessException exception) {
-            exception.printStackTrace();
-        }
-        return materials;
-    }
-
-    public static Materials getBartWorksMaterialByODName(String name) {
-        Optional<Werkstoff> material = Werkstoff.werkstoffHashSet.stream().filter(e -> e.getVarName().equals(name)).findFirst();
-        if (material.isPresent()) {
-            return material.get().getBridgeMaterial();
-        }
-        return Materials._NULL;
-    }
-
-    public static Materials getBartWorksMaterialByIGNName(String name) {
-        return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffNameHashMap.get(name)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL);
-    }
-
-    public static Materials getBartWorksMaterialByID(int id) {
-        return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffHashMap.get((short) id)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL);
-    }
-
-    public static void addVoidMinerDropsToDimension(int dimID, ISubTagContainer material, float chance){
-        try {
-            VoidMinerDropAdder.addDropsToDim(dimID, material, chance);
-        } catch (InvocationTargetException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index fabd9432ac..20dbccf2cb 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -25,8 +25,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.util.MathHelper;
 
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
     public static GT_MetaGenerated_Item_01 INSTANCE;
@@ -861,7 +860,11 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         GT_Values.RA.addAssemblerRecipe(ItemList.Emitter_MV.get(1L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L), ItemList.Cover_NeedsMaintainance.get(1L, new Object[0]), 600, 24);
     }
 
-    private static boolean bw = Loader.isModLoaded("bartworks");
+    private static final Map<Materials,Materials> cauldronRemap =new HashMap<>();
+
+    public static void registerCauldronCleaningFor(Materials in,Materials out){
+        cauldronRemap.put(in,out);
+    }
 
     public boolean onEntityItemUpdate(EntityItem aItemEntity) {
         int aDamage = aItemEntity.getEntityItem().getItemDamage();
@@ -877,16 +880,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
                     byte tMetaData = (byte) aItemEntity.worldObj.getBlockMetadata(tX, tY, tZ);
                     if ((tBlock == Blocks.cauldron) && (tMetaData > 0)) {
 
-                        if (bw) {
-                            if (aMaterial == Materials.Osmium)
-                                aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Rarest Metal Residue");
-                            else if (aMaterial == Materials.Iridium)
-                                aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Iridium Metal Residue");
-                            else if (aMaterial == Materials.Platinum)
-                                aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Platinum Metallic Powder");
-                            else if (aMaterial == Materials.Palladium)
-                                aMaterial = GT_BartWorks_Compat.getBartWorksMaterialByIGNName("Palladium Metallic Powder");
-                        }
+                        aMaterial= cauldronRemap.getOrDefault(aMaterial,aMaterial);
 
                         aItemEntity.setEntityItemStack(GT_OreDictUnificator.get(OrePrefixes.dust, aMaterial, aItemEntity.getEntityItem().stackSize));
                         aItemEntity.worldObj.setBlockMetadataWithNotify(tX, tY, tZ, tMetaData - 1, 3);
diff --git a/src/main/java/gregtech/loaders/postload/GT_BW_VoidminerLoader.java b/src/main/java/gregtech/loaders/postload/GT_BW_VoidminerLoader.java
deleted file mode 100644
index 3576d70ef5..0000000000
--- a/src/main/java/gregtech/loaders/postload/GT_BW_VoidminerLoader.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package gregtech.loaders.postload;
-
-
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.interfaces.ISubTagContainer;
-
-import java.util.Arrays;
-
-import static gregtech.api.enums.Materials.values;
-import static gregtech.api.util.GT_BartWorks_Compat.addVoidMinerDropsToDimension;
-
-public class GT_BW_VoidminerLoader {
-
-    private GT_BW_VoidminerLoader() {
-    }
-
-    private static final int DEEPDARK_ID = 100;
-
-    private static boolean hasOres(Materials materials){
-        return (materials.mTypes & 8) != 0;
-    }
-
-    private static boolean hasOres(Werkstoff materials){
-        return materials.hasItemType(OrePrefixes.ore);
-    }
-
-    private static void addVoidDimerDrops(ISubTagContainer materials){
-        addVoidMinerDropsToDimension(DEEPDARK_ID, materials, 1f);
-    }
-
-    public static void initDeepDark() {
-        Arrays.stream(values()).filter(GT_BW_VoidminerLoader::hasOres).forEach(GT_BW_VoidminerLoader::addVoidDimerDrops);
-        Werkstoff.werkstoffHashSet.stream().filter(GT_BW_VoidminerLoader::hasOres).forEach(GT_BW_VoidminerLoader::addVoidDimerDrops);
-    }
-
-}
\ No newline at end of file