Re-enable compact mk5 + adjust mk4 (#155)

* bump dep

* nei catalyst

* change mk5 blocks

* mk5 recipes

* right texture

* adjust mk4 recipes + mk5 disassembly

* bump dep again

* update coremod dep

* update buildscript

* update bartworks dep

* update dep file

* update bs

* merge conflict

* ++ dep

* nei catalyst

* change mk5 blocks

* mk5 recipes

* right texture

* adjust mk4 recipes + mk5 disassembly

* ++ dep

* no complex fusion

* fix mk4 casing

* move to research station + fix oredict issue

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 72 insertions, 93 deletions

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
index cb577e6bc5..42b7bb4b89 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer4.java
@@ -3,8 +3,6 @@ package goodgenerator.blocks.tileEntity;
 import static goodgenerator.util.DescTextLocalization.BLUE_PRINT_INFO;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS;
 
-import java.lang.reflect.Field;
-
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
@@ -44,10 +42,6 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP {
         power = new AdvFusionPower((byte) 9, Integer.MAX_VALUE);
     }
 
-    // Some hacky shit
-    public static Block mMK4Casing = null;
-    public static int mMK4CasingMeta;
-
     @Override
     protected GT_Multiblock_Tooltip_Builder createTooltip() {
         final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder();
@@ -89,25 +83,12 @@ public class LargeFusionComputer4 extends LargeFusionComputerPP {
 
     @Override
     public Block getCasingBlock() {
-        if (mMK4Casing == null) doCasingInit();
-        return mMK4Casing;
+        return ModBlocks.blockCasings3Misc;
     }
 
     @Override
     public int getCasingMeta() {
-        if (mMK4Casing == null) doCasingInit();
-        return mMK4CasingMeta;
-    }
-
-    private void doCasingInit() {
-        try {
-            Field f = ModBlocks.class.getDeclaredField("blockCasings6Misc");
-            mMK4Casing = (Block) f.get(null);
-            mMK4CasingMeta = 0;
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            mMK4Casing = ModBlocks.blockCasings3Misc;
-            mMK4CasingMeta = 12;
-        }
+        return 12;
     }
 
     @Override
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
index 6aed8a2a95..e070b9598c 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer5.java
@@ -83,12 +83,12 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
 
     @Override
     public Block getCasingBlock() {
-        return ModBlocks.blockCasings3Misc;
+        return ModBlocks.blockCasings6Misc;
     }
 
     @Override
     public int getCasingMeta() {
-        return 12;
+        return 0;
     }
 
     @Override
@@ -123,8 +123,8 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
 
     @Override
     public ITexture getTextureOverlay() {
-        if (this.mMaxProgresstime > 0) return TextureFactory
-                .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_3).extFacing().build());
+        if (this.getBaseMetaTileEntity().isActive()) return TextureFactory.of(
+                TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_Rainbow).extFacing().build());
         else return TextureFactory
                 .of(TextureFactory.builder().addIcon(TexturesGtBlock.Casing_Machine_Screen_1).extFacing().build());
     }
@@ -164,22 +164,22 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
     public boolean turnCasingActive(boolean status) {
         if (this.mEnergyHatches != null) {
             for (GT_MetaTileEntity_Hatch_Energy hatch : this.mEnergyHatches) {
-                hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+                hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
             }
         }
         if (this.eEnergyMulti != null) {
             for (GT_MetaTileEntity_Hatch_EnergyMulti hatch : this.eEnergyMulti) {
-                hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+                hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
             }
         }
         if (this.mOutputHatches != null) {
             for (GT_MetaTileEntity_Hatch_Output hatch : this.mOutputHatches) {
-                hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+                hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
             }
         }
         if (this.mInputHatches != null) {
             for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) {
-                hatch.updateTexture(status ? TAE.getIndexFromPage(2, 14) : 53);
+                hatch.updateTexture(status ? TAE.getIndexFromPage(3, 6) : 53);
             }
         }
         return true;
@@ -192,7 +192,7 @@ public class LargeFusionComputer5 extends LargeFusionComputerPP {
             return new ITexture[] { TextureFactory.builder().addIcon(MACHINE_CASING_FUSION_GLASS).extFacing().build(),
                     getTextureOverlay() };
         if (!aActive) return new ITexture[] { Textures.BlockIcons.getCasingTextureForId(52) };
-        return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA)
+        return new ITexture[] { TextureFactory.builder().addIcon(TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER)
                 .extFacing().build() };
     }
 
diff --git a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java
index 8035e6db8c..863e18fe92 100644
--- a/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java
+++ b/src/main/java/goodgenerator/crossmod/nei/IMCForNEI.java
@@ -23,18 +23,8 @@ public class IMCForNEI {
         sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32021", -10);
         if (LoadedList.GTPP) {
             sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32022", -10);
+            sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10);
         }
-        // sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact Fusion
-        // MK-V
-
-        sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32019", -10);
-        sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32020", -10);
-        sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32021", -10);
-        if (LoadedList.GTPP) {
-            sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32022", -10);
-        }
-        // sendCatalyst("gt.recipe.complexfusionreactor", "gregtech:gt.blockmachines:32023", -10); // Compact
-        // Fusion MK-V
 
         sendHandler("gg.recipe.componentassemblyline", "gregtech:gt.blockmachines:32026", 2);
         sendCatalyst("gg.recipe.componentassemblyline", "gregtech:gt.blockmachines:32026");
diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
index 203dac136e..cd2f8149de 100644
--- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java
+++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java
@@ -7,18 +7,21 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+import com.github.technus.tectech.recipe.TT_recipeAdder;
 
 import goodgenerator.crossmod.LoadedList;
 import goodgenerator.items.MyMaterial;
 import goodgenerator.util.CrackRecipeAdder;
 import goodgenerator.util.ItemRefer;
 import goodgenerator.util.MyRecipeAdder;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
 import gregtech.api.util.*;
 import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.material.ALLOY;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import ic2.core.Ic2Items;
 
 @SuppressWarnings("deprecation")
@@ -1257,61 +1260,66 @@ public class RecipeLoader_02 {
             GT_Values.RA.addAssemblerRecipe(
                     new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T3.get(1), },
                     null,
-                    GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 3, 13),
+                    GregtechItemList.Casing_Fusion_Internal.get(3),
                     600,
-                    7680000);
+                    (int) TierEU.RECIPE_UEV);
 
-            GT_Values.RA.addAssemblylineRecipe(
+            TT_recipeAdder.addResearchableAssemblylineRecipe(
                     ItemRefer.Compact_Fusion_MK3.get(1),
-                    24000,
-                    new Object[] { GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965),
-                            GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorLuV, 32),
-                            ItemList.Circuit_Wafer_PPIC.get(64), ItemList.UHV_Coil.get(16),
-                            ItemRefer.Compact_Fusion_Coil_T2.get(8), ItemRefer.HiC_T4.get(8) },
-                    new FluidStack[] { FluidRegistry.getFluidStack("molten.teflon", 1152),
-                            MyMaterial.dalisenite.getMolten(576), FluidRegistry.getFluidStack("molten.botmium", 288) },
+                    2_560_000,
+                    4_096,
+                    (int) TierEU.RECIPE_UHV,
+                    256,
+                    new Object[] { GregtechItemList.FusionComputer_UV2.get(48), new Object[] { "circuitInfinite", 1 },
+                            new Object[] { "circuitInfinite", 1 }, new Object[] { "circuitInfinite", 1 },
+                            new Object[] { "circuitInfinite", 1 }, ItemList.Circuit_Wafer_PPIC.get(64),
+                            ItemList.UHV_Coil.get(16), ALLOY.TITANSTEEL.getPlateDense(8), ItemRefer.HiC_T4.get(8),
+                            ItemList.Field_Generator_UHV.get(8),
+                            MyMaterial.enrichedNaquadahAlloy.get(OrePrefixes.gearGtSmall, 64) },
+                    new FluidStack[] { GenericChem.TEFLON.getFluidStack(2304), MyMaterial.dalisenite.getMolten(1152),
+                            ALLOY.BOTMIUM.getFluidStack(288) },
                     ItemRefer.Compact_Fusion_MK4.get(1),
                     6000,
-                    520000);
-
-            // MyRecipeAdder.instance.addPreciseAssemblerRecipe(
-            // new ItemStack[] {
-            // ItemRefer.Compact_Fusion_Coil_T3.get(1),
-            // GT_ModHandler.getModItem("miscutils", "gtplusplus.blockcasings.3", 1, 13),
-            // ItemRefer.HiC_T5.get(4),
-            // GT_ModHandler.getModItem("miscutils", "item.itemBufferCore6", 1),
-            // },
-            // new FluidStack[] {
-            // FluidRegistry.getFluidStack("molten.laurenium", 1152),
-            // MyMaterial.hikarium.getMolten(576)
-            // },
-            // ItemRefer.Compact_Fusion_Coil_T4.get(1),
-            // 1100000,
-            // 1919,
-            // 3
-            // );
+                    (int) TierEU.RECIPE_UV);
+
+            // Compact MK5 Fusion Coil
+            MyRecipeAdder.instance.addPreciseAssemblerRecipe(
+                    new ItemStack[] { GregtechItemList.Casing_Fusion_Internal2.get(3),
+                            GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Bio, 1), ItemRefer.HiC_T5.get(4),
+                            CI.getEnergyCore(5, 1), },
+                    new FluidStack[] { ALLOY.BLACK_TITANIUM.getFluidStack(1152),
+                            MyMaterial.metastableOganesson.getMolten(576) },
+                    ItemRefer.Compact_Fusion_Coil_T4.get(1),
+                    (int) TierEU.RECIPE_UHV,
+                    2000,
+                    3);
 
             // Compact MK5 Computer
-            // GT_Values.RA.addAssemblylineRecipe(
-            // ItemRefer.Compact_Fusion_MK4.get(1),
-            // 24000,
-            // new Object[] {
-            // GT_ModHandler.getModItem("gregtech", "gt.blockmachines", 48, 965),
-            // GT_OreDictUnificator.get(OrePrefixes.wireGt08, Materials.SuperconductorUV, 32),
-            // ItemList.Circuit_Wafer_QPIC.get(64),
-            // ItemList.UHV_Coil.get(64),
-            // ItemRefer.Compact_Fusion_Coil_T3.get(8),
-            // ItemRefer.HiC_T5.get(8)
-            // },
-            // new FluidStack[] {
-            // MyMaterial.tairitsu.getMolten( 1152),
-            // MyMaterial.artheriumSn.getMolten(576),
-            // FluidRegistry.getFluidStack("molten.rhugnor", 288)
-            // },
-            // ItemRefer.Compact_Fusion_MK5.get(1),
-            // 6000,
-            // 1100000
-            // );
+            TT_recipeAdder.addResearchableAssemblylineRecipe(
+                    ItemRefer.Compact_Fusion_MK3.get(1),
+                    10_240_000,
+                    16_384,
+                    (int) TierEU.RECIPE_UEV,
+                    256,
+                    new Object[] { GregtechItemList.FusionComputer_UV3.get(48), new Object[] { "circuitBio", 1 },
+                            new Object[] { "circuitBio", 1 }, new Object[] { "circuitBio", 1 },
+                            new Object[] { "circuitBio", 1 }, ItemList.Circuit_Wafer_QPIC.get(64),
+                            ItemList.UHV_Coil.get(64), ELEMENT.STANDALONE.HYPOGEN.getPlateDense(8),
+                            ItemRefer.HiC_T5.get(8), ItemList.Field_Generator_UEV.get(8),
+                            MyMaterial.metastableOganesson.get(OrePrefixes.gearGtSmall, 64) },
+                    new FluidStack[] { MyMaterial.tairitsu.getMolten(2304), ALLOY.OCTIRON.getFluidStack(1152),
+                            ELEMENT.STANDALONE.RHUGNOR.getFluidStack(288) },
+                    ItemRefer.Compact_Fusion_MK5.get(1),
+                    6000,
+                    (int) TierEU.RECIPE_UHV);
+
+            // Compact MK5 Fusion Disassembly Recipe
+            GT_Values.RA.addAssemblerRecipe(
+                    new ItemStack[] { ItemRefer.Compact_Fusion_Coil_T4.get(1), },
+                    null,
+                    GregtechItemList.Casing_Fusion_Internal2.get(3),
+                    600,
+                    (int) TierEU.RECIPE_UIV);
         }
 
         GT_Values.RA.addMultiblockChemicalRecipe(