Update Chemistry for consistancy with GTCE

src/main/java/gregicadditions/ClientProxy.java

@@ -1,7 +1,6 @@
 package gregicadditions;
 
 import codechicken.lib.util.ItemNBTUtils;
-import com.mojang.realmsclient.gui.ChatFormatting;
 import gregicadditions.blocks.GABlockOre;
 import gregicadditions.blocks.GAMetalCasing;
 import gregicadditions.input.Keybinds;
@@ -19,6 +18,7 @@
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -82,24 +82,12 @@ public static void addMaterialFormulaHandler(ItemTooltipEvent event) {
             if (oreDictName.isPresent() && GADustItem.oreDictToSimpleDust.containsKey(oreDictName.get())) {
                 SimpleDustMaterial material = SimpleDustMaterial.GA_DUSTS.get((short) itemStack.getItemDamage());
                 if (material != null) {
-                    String formula = material.chemicalFormula;
+                    String formula = material.getFormula();
                     if (formula != null && !formula.isEmpty() && event.getToolTip().size() == 0) {
-                        event.getToolTip().add(1, ChatFormatting.GRAY.toString() + material.chemicalFormula);
+                        event.getToolTip().add(1, TextFormatting.GRAY.toString() + material.getFormula());
                     }
                 }
             }
         }
-
-        if (ItemNBTUtils.hasTag(itemStack)) {
-
-            // Vanilla bucket
-            String fluidName = ItemNBTUtils.getString(itemStack, "FluidName");
-            if (fluidName != null) {
-                SimpleFluidMaterial material = SimpleFluidMaterial.GA_FLUIDS.get(fluidName);
-                if (material != null && material.chemicalFormula != null && !material.chemicalFormula.isEmpty()) {
-                    event.getToolTip().add(1, ChatFormatting.GRAY + material.chemicalFormula);
-                }
-            }
-        }
     }
 }

src/main/java/gregicadditions/CommonProxy.java

@@ -151,6 +151,7 @@ public static void registerRecipes(RegistryEvent.Register<IRecipe> event) {
         if (Loader.isModLoaded(MysticalAgradditions.MOD_ID) && !GAConfig.mysticalAgriculture.disable) {
             MysticalAgricultureItems.removeMARecipe();
         }
+        ConfigCircuitRecipeRemoval.init();
         GAMachineRecipeRemoval.init();
         GARecipeAddition.generatedRecipes();
         RecipeHandler.registerLargeChemicalRecipes();

src/main/java/gregicadditions/Gregicality.java

@@ -35,7 +35,7 @@
 import java.io.IOException;
 
 @Mod(modid = Gregicality.MODID, name = Gregicality.NAME, version = Gregicality.VERSION,
-        dependencies = "required-after:gregtech@[1.13.0.681,);" +
+        dependencies = "required-after:gregtech@[1.14.0.689,);" +
                 "after:forestry;" +
                 "after:tconstruct;" +
                 "after:exnihilocreatio;" +

src/main/java/gregicadditions/coremod/GAClassTransformer.java

@@ -38,9 +38,6 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
             case "gregtech.api.metatileentity.MetaTileEntity":
                 tform = MetaTileEntityTransformer.INSTANCE;
                 break;
-            case "gregtech.api.util.GTUtility":
-                tform = GTUtilityTransformer.INSTANCE;
-                break;
             default:
                 return basicClass;
         }

src/main/java/gregicadditions/coremod/hooks/GregTechCEHooks.java

@@ -19,6 +19,7 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fluids.FluidStack;
 
+@SuppressWarnings("unused")
 public class GregTechCEHooks {
 
     //origin: gregtech/api/metatileentity/MetaTileEntityHolder/hasFastRenderer
@@ -123,17 +124,4 @@ public static boolean canPlaceCoverOnSide2(MetaTileEntity coverable, EnumFacing
         }
         return coverable.canPlaceCoverOnSide(side);
     }
-
-    //origin: gregtech/api/util/GTUtility.formulaHook(FluidStack fluidStack)
-    public static void getSimpleFluidTooltip(FluidStack fluidStack, StringBuilder formula) {
-        if (fluidStack != null) {
-            String[] materialArray = fluidStack.getUnlocalizedName().split("\\.");
-            if (materialArray.length >= 2 && materialArray[0].equals("fluid")) {
-                SimpleFluidMaterial material = SimpleFluidMaterial.GA_FLUIDS.get(materialArray[1]);
-                if (material != null && material.chemicalFormula != null && !material.chemicalFormula.isEmpty()) {
-                    formula.append(material.chemicalFormula);
-                }
-            }
-        }
-    }
 }

src/main/java/gregicadditions/fluid/GAMetaFluids.java

@@ -5,6 +5,7 @@
 import gregicadditions.materials.SimpleFluidMaterial;
 import gregtech.api.unification.material.type.FluidMaterial;
 import gregtech.api.unification.material.type.Material;
+import gregtech.api.util.FluidTooltipUtil;
 import gregtech.common.MetaFluids;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -50,6 +51,7 @@ public static void init() {
             fluid.setTemperature(fluidMat.temperature);
             if (!FluidRegistry.isFluidRegistered(fluid.getName())) {
                 FluidRegistry.registerFluid(fluid);
+                FluidTooltipUtil.registerTooltip(fluid, fluidMat.getFormula());
                 FluidRegistry.addBucketForFluid(fluid);
                 fluidMat.fluid = fluid;
             } else {
@@ -63,6 +65,7 @@ public static void init() {
                 plasma.setTemperature(fluidMat.temperature + 10000);
                 if (!FluidRegistry.isFluidRegistered(plasma.getName())) {
                     FluidRegistry.registerFluid(plasma);
+                    FluidTooltipUtil.registerTooltip(plasma, fluidMat.getFormula());
                     FluidRegistry.addBucketForFluid(plasma);
                     fluidMat.plasma = plasma;
                 } else {

src/main/java/gregicadditions/item/GADustItem.java

@@ -76,8 +76,8 @@ public void registerModels() {
     public void addInformation(ItemStack itemStack, @Nullable World worldIn, List<String> lines, ITooltipFlag tooltipFlag) {
         super.addInformation(itemStack, worldIn, lines, tooltipFlag);
         String oreDict = OreDictUnifier.getOreDictionaryNames(itemStack).stream().filter(oreDictToSimpleDust::containsKey).findFirst().orElse("");
-        if (!oreDict.isEmpty() && !oreDictToSimpleDust.get(oreDict).chemicalFormula.isEmpty()) {
-            lines.add(oreDictToSimpleDust.get(oreDict).chemicalFormula);
+        if (!oreDict.isEmpty() && !oreDictToSimpleDust.get(oreDict).getFormula().isEmpty()) {
+            lines.add(oreDictToSimpleDust.get(oreDict).getFormula());
         }
     }
 }

src/main/java/gregicadditions/jei/JEIGAPlugin.java

@@ -17,7 +17,6 @@
 import gregtech.api.capability.impl.AbstractRecipeLogic;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.recipes.RecipeMap;
-import gregtech.api.recipes.machines.RecipeMapFurnace;
 import gregtech.common.items.MetaItems;
 import gregtech.common.metatileentities.MetaTileEntities;
 import mezz.jei.api.*;
@@ -76,7 +75,7 @@ public void register(IModRegistry registry) {
         for (RecipeMap<?> recipeMap : RecipeMap.getRecipeMaps()) {
             List<GARecipeWrapper> recipesList = recipeMap.getRecipeList()
                     .stream().filter(recipe -> !recipe.isHidden() && recipe.hasValidInputsForDisplay())
-                    .map(r -> new GARecipeWrapper(recipeMap, r))
+                    .map(r -> new GARecipeWrapper(r))
                     .collect(Collectors.toList());
             registry.addRecipes(recipesList, Gregicality.MODID + ":" + recipeMap.unlocalizedName);
         }

src/main/java/gregicadditions/machines/multi/TileEntityProcessingArray.java

@@ -89,7 +89,7 @@ protected void addDisplayText(List<ITextComponent> textList) {
                 textList.add(new TextComponentTranslation("gregtech.multiblock.max_energy_per_tick", maxVoltage, voltageName));
             }
 
-            String myRecipeMap = ((ProcessingArrayWorkable) recipeMapWorkable).recipeMapName;
+            String myRecipeMap = "recipemap." + ((ProcessingArrayWorkable) recipeMapWorkable).recipeMapName + ".name";
             if (myRecipeMap != null) {
                 textList.add(new TextComponentTranslation("gtadditions.machine.pa.display1", myRecipeMap).setStyle(new Style().setColor(TextFormatting.GOLD)));
                 textList.add(new TextComponentTranslation("gtadditions.machine.pa.display2",
@@ -141,7 +141,7 @@ protected Recipe findRecipe(long maxVoltage, IItemHandlerModifiable inputs, IMul
                 recipeMapName = null;
                 return null;
             }
-            recipeMapName = recipeMap.getLocalizedName();
+            recipeMapName = recipeMap.getUnlocalizedName();
 
             List<IItemHandlerModifiable> itemInputs = ((TileEntityProcessingArray) this.getMetaTileEntity()).getAbilities(MultiblockAbility.IMPORT_ITEMS);
             Tuple<Recipe, IItemHandlerModifiable> recipePerInput = itemInputs.stream()

src/main/java/gregicadditions/materials/SimpleDustMaterial.java

@@ -39,6 +39,12 @@ public SimpleDustMaterial(String name, int rgb, short id, MaterialIconSet materi
         this.chemicalFormula = calculateChemicalFormula(formula);
     }
 
+    public SimpleDustMaterial(String name, int rgb, short id, MaterialIconSet materialIconSet, String formula, boolean fancy) {
+        this(name, rgb, id, materialIconSet, formula);
+        this.fancy = fancy;
+
+    }
+
     public String getOre() {
         return "dust" + toCamelCaseString(name);
     }

src/main/java/gregicadditions/materials/SimpleFluidMaterial.java

@@ -5,9 +5,7 @@
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class SimpleFluidMaterial extends SimpleMaterial {
@@ -17,58 +15,65 @@ public class SimpleFluidMaterial extends SimpleMaterial {
     public Fluid fluid;
     public boolean hasPlasma;
     public Fluid plasma;
-    public final ImmutableList<MaterialStack> materialComponents;
-    public String chemicalFormula;
-
 
     public SimpleFluidMaterial(String name, int rgb) {
-        this(name, rgb, 300, false, null);
+        this(name, rgb, 300, false, "");
     }
 
-    public SimpleFluidMaterial(String name, int rgb, ImmutableList<MaterialStack> materialComponents) {
-        this(name, rgb, 300, false, materialComponents);
+    public SimpleFluidMaterial(String name, int rgb, int temperature) {
+        this(name, rgb, temperature, false, "");
     }
 
-    public SimpleFluidMaterial(String name, int rgb, int temperature) {
-        this(name, rgb, temperature, false, null);
+    // TODO Remove
+    public SimpleFluidMaterial(String name, int rgb, ImmutableList<MaterialStack> formula) {
+        this(name, rgb, 300, false);
+        chemicalFormula = calculateChemicalFormula(formula);
     }
 
-    public SimpleFluidMaterial(String name, int rgb, int temperature, ImmutableList<MaterialStack> materialComponents) {
-        this(name, rgb, temperature, false, materialComponents);
+    public SimpleFluidMaterial(String name, int rgb, String formula) {
+        this(name, rgb, 300, false);
+        chemicalFormula = calculateChemicalFormula(formula);
+    }
+
+    public SimpleFluidMaterial(String name, int rgb, String formula, boolean fancy) {
+        this(name, rgb, 300, false);
+        chemicalFormula = calculateChemicalFormula(formula);
+        this.fancy = fancy;
     }
 
     public SimpleFluidMaterial(String name, int rgb, boolean hasPlasma) {
-        this(name, rgb, 300, hasPlasma, null);
+        this(name, rgb, 300, hasPlasma);
     }
 
-    public SimpleFluidMaterial(String name, int rgb, boolean hasPlasma, ImmutableList<MaterialStack> materialComponents) {
-        this(name, rgb, 300, hasPlasma, materialComponents);
+    public SimpleFluidMaterial(String name, int rgb, String formula, boolean hasPlasma, boolean fancy) {
+        this(name, rgb, 300, hasPlasma);
+        chemicalFormula = calculateChemicalFormula(formula);
+        this.fancy = fancy;
     }
 
-    public SimpleFluidMaterial(String name, int rgb, int temperature, boolean hasPlasma, ImmutableList<MaterialStack> materialComponents) {
+    public SimpleFluidMaterial(String name, int rgb, int temperature, boolean hasPlasma, String formula) {
+        this(name, rgb, temperature, hasPlasma);
+        this.chemicalFormula = formula;
+    }
+
+    public SimpleFluidMaterial(String name, int rgb, boolean hasPlasma, String formula) {
+        this(name, rgb, 300, hasPlasma);
+        chemicalFormula = calculateChemicalFormula(formula);
+    }
+
+    public SimpleFluidMaterial(String name, int rgb, int temperature, boolean hasPlasma) {
         this.name = name;
         this.rgb = rgb;
         this.temperature = temperature;
         this.hasPlasma = hasPlasma;
-        this.materialComponents = materialComponents;
-        this.chemicalFormula = calculateChemicalFormula();
         GA_FLUIDS.put(name, this);
     }
 
     public FluidStack getFluid(int amount) {
         return new FluidStack(fluid, amount);
     }
 
-    public FluidStack getPlasma(int amount) { return hasPlasma ? new FluidStack(plasma, amount) : null; }
-
-    private String calculateChemicalFormula() {
-        if (materialComponents != null && !materialComponents.isEmpty()) {
-            StringBuilder components = new StringBuilder();
-            for (MaterialStack component : materialComponents)
-                components.append(component.toString());
-            return components.toString();
-        }
-        return "";
+    public FluidStack getPlasma(int amount) {
+        return hasPlasma ? new FluidStack(plasma, amount) : null;
     }
-
 }

src/main/java/gregicadditions/materials/SimpleMaterial.java

@@ -3,12 +3,17 @@
 import com.google.common.collect.ImmutableList;
 import gregtech.api.unification.stack.MaterialStack;
 import gregtech.api.util.SmallDigits;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.TextFormatting;
+
+import static net.minecraft.util.text.TextFormatting.*;
 
 public abstract class SimpleMaterial {
 
     public String name;
     public int rgb;
-    public String chemicalFormula;
+    protected String chemicalFormula;
+    public boolean fancy = false;
 
     protected String calculateChemicalFormula(ImmutableList<MaterialStack> materialComponents) {
         if (!materialComponents.isEmpty()) {
@@ -32,4 +37,34 @@ protected String calculateChemicalFormula(String unformattedFormula) {
         }
         return sb.toString(); // returns "" if no formula, like other method
     }
+
+    public String getFormula() {
+        return fancy ? makeFancy(chemicalFormula) : chemicalFormula;
+    }
+
+    private static final TextFormatting[] fanciness = new TextFormatting[] { RED, GOLD, YELLOW, GREEN, AQUA, BLUE, LIGHT_PURPLE };
+
+    private static String makeFancy(String input) {
+        return fancyTest(input, fanciness, 80.0, 1);
+    }
+
+    private static String fancyTest(String input, TextFormatting[] colors, double delay, int posstep) {
+        StringBuilder sb = new StringBuilder();
+
+        int offset = (int) Math.floor(MinecraftServer.getCurrentTimeMillis() / delay) % colors.length;
+        String format = null;
+
+        for (int i = 0; i < input.length(); i++) {
+            char c = input.charAt(i);
+
+            if (!(c == '&' || c == '\u00a7')) {
+                int col = ((i * posstep) + colors.length - offset) % colors.length;
+                sb.append(colors[col].toString());
+                if (format != null)
+                    sb.append(format);
+                sb.append(c);
+            } else format = input.charAt(++i) == 'r' ? null : format == null ? "" + c + input.charAt(i) : format + c + input.charAt(i);
+        }
+        return sb.toString();
+    }
 }