more helper functions

Linguardium · Linguardium · commit cfa6513e713f · 2020-07-30T20:21:06.000-07:00
diff --git a/src/main/java/mod/linguardium/itemnbtmodels/Main.java b/src/main/java/mod/linguardium/itemnbtmodels/Main.java
@@ -1,21 +1,39 @@
 package mod.linguardium.itemnbtmodels;
 
+import mod.linguardium.itemnbtmodels.compat.CITParser;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.fabricmc.api.ModInitializer;
 
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
+import net.fabricmc.fabric.api.client.model.ModelAppender;
+import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
+import net.fabricmc.fabric.api.client.model.ModelResourceProvider;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceReloadListener;
+import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class Main implements ModInitializer {
+import java.util.Collection;
+import java.util.function.Consumer;
+@Environment(EnvType.CLIENT)
+public class Main implements ClientModInitializer {
 
     public static Logger LOGGER = LogManager.getLogger();
 
     public static final String MOD_ID = "itemnbtmodels";
     public static final String MOD_NAME = "ItemNbtModels";
 
     @Override
-    public void onInitialize() {
+    public void onInitializeClient() {
         log(Level.INFO, "Initializing");
+        //ModelLoadingRegistry.INSTANCE.registerAppender(CITParser::ModelLoaderListener);
+        //ModelLoadingRegistry.INSTANCE.registerVariantProvider(CITParser.CITVariantProvider::new);
         //TODO: Initializer
     }
 
diff --git a/src/main/java/mod/linguardium/itemnbtmodels/api/NbtMatcher.java b/src/main/java/mod/linguardium/itemnbtmodels/api/NbtMatcher.java
@@ -5,12 +5,10 @@
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import jdk.nashorn.api.scripting.NashornScriptEngineFactory;
 import net.minecraft.command.arguments.NbtPathArgumentType;
-import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.Tag;
 import net.minecraft.text.Text;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
 
 import javax.script.Bindings;
 import javax.script.ScriptEngine;
@@ -33,8 +31,9 @@ static public class NbtCheckValue {
 
     public static class StackMatcher {
         ItemStack stack;
-        StackMatcher(ItemStack itemStack) {
-            stack = itemStack;
+        LivingEntity entity;
+        StackMatcher(ItemStack itemStack, LivingEntity entity) {
+            stack = itemStack; this.entity=entity;
         }
         public Long Number(String string) {
             Long l = 0L;
@@ -63,9 +62,22 @@ public String Text(String string) {
                 return t.asString();
             return "";
         }
-        public Integer Enchantment(String string) {
-                return EnchantmentHelper.getLevel(Registry.ENCHANTMENT.get(new Identifier(string)),stack);
+        public Integer Count() {
+                return stack.getCount();
         }
+        public Boolean MainHand() {
+            return entity.getMainHandStack().equals(stack);
+        }
+        public Boolean OffHand() {
+            return entity.getOffHandStack().equals(stack);
+        }
+        public Integer Damage() {
+            return stack.getDamage();
+        }
+        public Integer MaxDamage() {
+            return stack.getMaxDamage();
+        }
+
         public String path(String string) {
             try {
                 Tag ret = null;
@@ -78,14 +90,11 @@ public String path(String string) {
         }
 
     }
-    public static boolean matches(ItemStack stack, NbtCheckValue pred) {
+    public static boolean matches(ItemStack stack, LivingEntity entity, NbtCheckValue pred) {
         Bindings bindings = Engine.createBindings();
-        bindings.put("Nbt",new StackMatcher(stack.copy()));
-        //Value bindings = context.getBindings("js");
-        //bindings.putMember("Nbt",new StackMatcher(stack.copy()));
+        bindings.put("Nbt",new StackMatcher(stack,entity));
         try {
             Object retval = Engine.eval(pred.eval,bindings);
-            //Value retval = context.eval("js", pred.eval);
             if (retval instanceof Boolean)
                 return (Boolean)retval;
         }catch(ScriptException ignored) { }
diff --git a/src/main/java/mod/linguardium/itemnbtmodels/compat/CITParser.java b/src/main/java/mod/linguardium/itemnbtmodels/compat/CITParser.java
@@ -0,0 +1,74 @@
+package mod.linguardium.itemnbtmodels.compat;
+
+import com.google.common.collect.Lists;
+import com.google.gson.JsonElement;
+import mod.linguardium.itemnbtmodels.Main;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.client.model.ModelProviderContext;
+import net.fabricmc.fabric.api.client.model.ModelProviderException;
+import net.fabricmc.fabric.api.client.model.ModelResourceProvider;
+import net.fabricmc.fabric.api.client.model.ModelVariantProvider;
+import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
+import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.model.UnbakedModel;
+import net.minecraft.client.render.model.json.JsonUnbakedModel;
+import net.minecraft.client.util.ModelIdentifier;
+import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.Identifier;
+import org.apache.logging.log4j.Level;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+@Environment(EnvType.CLIENT)
+public class CITParser {
+
+    private String LoadPropertiesFile(Identifier id) {
+        return "";
+    }
+    public static void applyPropertiesFiles() {
+
+    }
+    public static void ModelLoaderListener(ResourceManager manager, Consumer<ModelIdentifier> processor) {
+        List<Identifier> models = Lists.newArrayList(manager.findResources("optifine/cit",
+                (string) -> string.endsWith(".json")));
+                for(Identifier id : models) {
+                    ModelIdentifier modelId = new ModelIdentifier(new Identifier(id.getNamespace(),id.getPath().replace(".json","")),"");
+                    processor.accept(modelId);
+                }
+    }
+    public static class CITVariantProvider implements ModelVariantProvider {
+        private final ResourceManager manager;
+        public CITVariantProvider(ResourceManager resourceManager) {
+            this.manager=resourceManager;
+        }
+
+        @Override
+        public UnbakedModel loadModelVariant(ModelIdentifier mId, ModelProviderContext context) throws ModelProviderException {
+            if (mId.getPath().startsWith("optifine/cit")) {
+                //JsonUnbakedModel jsonUnbakedModel = this.loadModelFromJson(identifier2);
+                //this.putModel(modelIdentifier, jsonUnbakedModel);
+                //this.unbakedModels.put(identifier2, jsonUnbakedModel);
+                Resource resource = null;
+                Identifier file = new Identifier(mId.getNamespace(),mId.getPath()+".json");
+                try {
+                    resource = manager.getResource(file);
+                    InputStreamReader reader = new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8);
+                    JsonUnbakedModel ubModel = JsonUnbakedModel.deserialize(reader);
+                    ubModel.id=mId.toString();
+                    return ubModel;
+                } catch (IOException e) {
+                    Main.log(Level.ERROR,"Unable to load model json: "+mId);
+                }
+            }
+            return null;
+        }
+    }
+}
diff --git a/src/main/java/mod/linguardium/itemnbtmodels/mixin/ModelLoaderMixin.java b/src/main/java/mod/linguardium/itemnbtmodels/mixin/ModelLoaderMixin.java
@@ -0,0 +1,22 @@
+package mod.linguardium.itemnbtmodels.mixin;
+
+import mod.linguardium.itemnbtmodels.compat.CITParser;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.render.model.ModelLoader;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.util.profiler.Profiler;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Environment(EnvType.CLIENT)
+@Mixin(ModelLoader.class)
+public class ModelLoaderMixin {
+    @Inject(at=@At("RETURN"),method="<init>")
+    private void applyCITModelPredicates(ResourceManager resourceManager, BlockColors blockColors, Profiler profiler, int i, CallbackInfo ci) {
+        //CITParser.applyPropertiesFiles();
+    }
+}
diff --git a/src/main/java/mod/linguardium/itemnbtmodels/mixin/ModelOverrideMixin.java b/src/main/java/mod/linguardium/itemnbtmodels/mixin/ModelOverrideMixin.java
@@ -33,7 +33,7 @@ public List<NbtMatcher.NbtCheckValue> getNbtPredicates() {
     @Inject(at=@At(value="FIELD", target="net/minecraft/client/render/model/json/ModelOverride.predicateToThresholds:Ljava/util/Map;"),method="matches", cancellable = true)
     private void checkNBTPredicatesFirst(ItemStack stack, ClientWorld world, LivingEntity entity, CallbackInfoReturnable<Boolean> cir) {
         for(NbtMatcher.NbtCheckValue predicate : getNbtPredicates()) {
-            if (!NbtMatcher.matches(stack, predicate)) {
+            if (!NbtMatcher.matches(stack, entity, predicate)) {
                 cir.setReturnValue(false);
             }
         }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -14,9 +14,9 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "mod.linguardium.itemnbtmodels.Main"
+
     ],
-    "client": [],
+    "client": ["mod.linguardium.itemnbtmodels.Main"],
     "server": []
   },
   "mixins": [
diff --git a/src/main/resources/itemnbtmodels.mixins.json b/src/main/resources/itemnbtmodels.mixins.json
@@ -2,8 +2,9 @@
   "required": true,
   "package": "mod.linguardium.itemnbtmodels.mixin",
   "compatibilityLevel": "JAVA_8",
-  "mixins": [  ],
+  "mixins": [],
   "client": [
+    "ModelLoaderMixin",
     "ModelOverrideDeserializerMixin",
     "ModelOverrideMixin"
   ],

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public List<NbtMatcher.NbtCheckValue> getNbtPredicates() {`
`33`	`33`	`@Inject(at=@At(value="FIELD", target="net/minecraft/client/render/model/json/ModelOverride.predicateToThresholds:Ljava/util/Map;"),method="matches", cancellable = true)`
`34`	`34`	`private void checkNBTPredicatesFirst(ItemStack stack, ClientWorld world, LivingEntity entity, CallbackInfoReturnable<Boolean> cir) {`
`35`	`35`	`for(NbtMatcher.NbtCheckValue predicate : getNbtPredicates()) {`
`36`		`- if (!NbtMatcher.matches(stack, predicate)) {`
	`36`	`+ if (!NbtMatcher.matches(stack, entity, predicate)) {`
`37`	`37`	`cir.setReturnValue(false);`
`38`	`38`	`}`
`39`	`39`	`}`