From b3ce4438663591a49ea04f944a279ba9a89cef9f Mon Sep 17 00:00:00 2001
From: TheDarkDnKTv <x22dnk@hotmail.com>
Date: Thu, 17 Jun 2021 05:36:55 +0300
Subject: [PATCH] Fixed granite get renamed into black one

Closes #126
---
 src/main/java/gregtechmod/api/enums/Materials.java          | 1 -
 .../java/gregtechmod/api/util/GT_OreDictUnificator.java     | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/gregtechmod/api/enums/Materials.java b/src/main/java/gregtechmod/api/enums/Materials.java
index c68dc5b..3b3715b 100644
--- a/src/main/java/gregtechmod/api/enums/Materials.java
+++ b/src/main/java/gregtechmod/api/enums/Materials.java
@@ -531,7 +531,6 @@ public enum Materials {
 	@Deprecated Eyeofender			(EnderEye, false),
 	@Deprecated Flour				(Wheat, false),
 	@Deprecated Garnet				(GarnetRed, true),
-	@Deprecated Granite				(GraniteBlack, false),
 	@Deprecated Kalium				(Potassium, false),
 	@Deprecated Lapislazuli			(Lapis, false),
 	@Deprecated LapisLazuli			(Lapis, false),
diff --git a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java
index 81f3c4d..657a0d5 100644
--- a/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtechmod/api/util/GT_OreDictUnificator.java
@@ -36,6 +36,7 @@ public class GT_OreDictUnificator {
 	private static int isRegisteringOre = 0, isAddingOre = 0;
 	
 	public static void activateUnificator() {
+		isRegisteringOre++;
 		GT_Log.log.info("Registering oredictionary tags...");
 		for (Entry<ItemStack, String> entry : sToRegister.entrySet()) {
 			OreDictionary.registerOre(entry.getValue(), entry.getKey());
@@ -44,6 +45,7 @@ public class GT_OreDictUnificator {
 			}
 		}
 		
+		isRegisteringOre--;
 		sToRegister.clear();
 	}
 	
@@ -101,13 +103,11 @@ public class GT_OreDictUnificator {
 	
 	public static void setLater(Object aName, ItemStack aStack, boolean aOverwrite, boolean aAlreadyRegistered) {
 		if (GT_Utility.isStringInvalid(aName) || GT_Utility.isStackInvalid(aStack) || Items.feather.getDamage(aStack) == GregTech_API.ITEM_WILDCARD_DAMAGE) return;
-		isAddingOre++;
 		aStack = GT_Utility.copyAmount(1, aStack);
 		if (!aAlreadyRegistered) sToRegister.put(aStack, aName.toString());
 		if (aOverwrite || GT_Utility.isStackInvalid(sName2OreMap.get(aName.toString()))) {
 			sName2OreMap.put(aName.toString(), aStack);
 		}
-		isAddingOre--;
 	}
 	
 	public static ItemStack getFirstOre(Object aName, long aAmount) {
@@ -250,9 +250,7 @@ public class GT_OreDictUnificator {
     	if (tName.equals("")) return false;
     	List<ItemStack> tList = getOres(tName);
     	for (int i = 0; i < tList.size(); i++) if (GT_Utility.areStacksEqual(tList.get(i), aStack, true)) return false;
-    	isRegisteringOre++;
     	sToRegister.put(GT_Utility.copyAmount(1, aStack), tName);
-    	isRegisteringOre--;
     	return true;
     }