remove old CT file

GregTechCEu · Sep 5, 2021 · be1cab6 · be1cab6
1 parent 561c32a
commit be1cab6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 97 deletions.
diff --git a/src/main/java/gregtech/api/unification/crafttweaker/CTMaterialRegistry.java b/src/main/java/gregtech/api/unification/crafttweaker/CTMaterialRegistry.java
diff --git a/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java b/src/main/java/gregtech/api/unification/crafttweaker/MaterialBracketHandler.java
@@ -5,6 +5,7 @@
 import crafttweaker.annotations.ZenRegister;
 import crafttweaker.zenscript.IBracketHandler;
 import gregtech.api.unification.material.Material;
+import gregtech.api.unification.material.MaterialRegistry;
 import stanhebben.zenscript.compiler.IEnvironmentGlobal;
 import stanhebben.zenscript.expression.ExpressionCallStatic;
 import stanhebben.zenscript.expression.ExpressionString;
@@ -25,7 +26,7 @@ public MaterialBracketHandler() {
     }
 
     public static Material getMaterial(String name) {
-        return name == null ? null : CTMaterialRegistry.get(name);
+        return name == null ? null : MaterialRegistry.get(name);
     }
 
     @Override

diff --git a/src/main/java/gregtech/api/unification/material/MaterialRegistry.java b/src/main/java/gregtech/api/unification/material/MaterialRegistry.java
@@ -1,11 +1,18 @@
 package gregtech.api.unification.material;
 
+import com.google.common.collect.Lists;
+import crafttweaker.annotations.ZenRegister;
 import gregtech.api.util.GTControlledRegistry;
 import gregtech.api.util.GTLog;
+import stanhebben.zenscript.annotations.ZenClass;
+import stanhebben.zenscript.annotations.ZenMethod;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 
+@ZenClass("mods.gregtech.material.MaterialRegistry")
+@ZenRegister
 public class MaterialRegistry {
 
     private MaterialRegistry() {
@@ -39,4 +46,15 @@ private static void postVerify(Material material) {
     public static void register(Material material) {
         DEFERRED_REGISTRY.add(material);
     }
+
+    @ZenMethod
+    @Nullable
+    public static Material get(String name) {
+        return MATERIAL_REGISTRY.getObject(name);
+    }
+
+    @ZenMethod
+    public static List<Material> getAllMaterials() {
+        return Lists.newArrayList(MATERIAL_REGISTRY);
+    }
 }