1.0.0

build.gradle

@@ -2,7 +2,7 @@ import net.darkhax.curseforgegradle.TaskPublishCurseForge
 import net.darkhax.curseforgegradle.UploadArtifact
 
 plugins {
-    id "dev.architectury.loom" version "1.3-SNAPSHOT"
+    id "dev.architectury.loom" version "1.4-SNAPSHOT"
     id 'com.modrinth.minotaur' version '2.+'
     id 'net.darkhax.curseforgegradle' version '1.1.+'
 }
@@ -56,7 +56,9 @@ dependencies {
     }
     //mappings "net.fabricmc:yarn:${minecraft_version}+build.${project.yarn_mappings}:v2"
     forge "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    modImplementation("curse.maven:potacore-951521:4966622")
+    modImplementation("maven.modrinth:potacore:0.2.8")
+    modImplementation("maven.modrinth:potacore:0.2.8:universal-sources")
+    modImplementation("maven.modrinth:potacore:0.2.8:universal-javadoc")
 }
 
 processResources {

gradle.properties

@@ -3,20 +3,20 @@ org.gradle.daemon=false
 org.gradle.parallel=true
 org.gradle.caching=true
 
-systemProp.http.proxyHost=localhost
-systemProp.http.proxyPort=7890
-systemProp.https.proxyHost=localhost
-systemProp.https.proxyPort=7890
-
 loom.platform=forge
 minecraft_version=1.16.5
 forge_version=36.2.39
 parchment_version=2022.03.06
 yarn_mappings=10
-cf_project_id=111111111
+cf_project_id=870831
 
-mod_version=0.1.0
+mod_version=1.0.0
 maven_group=com.teampotato.piglinsafety
 archives_base_name=piglinsafety
 mod_id=piglinsafety
 mod_author=TeamPotato
+
+systemProp.http.proxyHost=localhost
+systemProp.http.proxyPort=7890
+systemProp.https.proxyHost=localhost
+systemProp.https.proxyPort=7890

src/main/java/com/teampotato/piglinsafety/ConfigSetup.java

@@ -0,0 +1,68 @@
+package com.teampotato.piglinsafety;
+
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import net.minecraftforge.fml.loading.FMLPaths;
+import org.apache.logging.log4j.LogManager;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.io.*;
+import java.util.List;
+import java.util.Set;
+
+public class ConfigSetup implements IMixinConfigPlugin {
+
+    private static boolean piglin, hoglin, piglinBrute;
+
+    public ConfigSetup() {
+        File file = FMLPaths.CONFIGDIR.get().resolve("piglinsafety.json").toFile();
+        if (!file.exists()) {
+            try {
+                FileWriter writer = writeFile(file);
+                writer.close();
+            } catch (IOException e) {
+                LogManager.getLogger().error("Error writing config", e);
+            }
+        }
+
+        try {
+            BufferedReader reader = new BufferedReader(new FileReader(file));
+            JsonObject config = new JsonParser().parse(reader).getAsJsonObject();
+            piglin = config.get("Piglin").getAsBoolean();
+            hoglin = config.get("Hoglin").getAsBoolean();
+            piglinBrute = config.get("PiglinBrute").getAsBoolean();
+            reader.close();
+        } catch (IOException e) {
+            LogManager.getLogger().error("Error reading config", e);
+        }
+    }
+
+    private static FileWriter writeFile(File file) throws IOException {
+        JsonObject defaultConfig = new JsonObject();
+        defaultConfig.addProperty("Piglin", true);
+        defaultConfig.addProperty("Hoglin", true);
+        defaultConfig.addProperty("PiglinBrute", true);
+        FileWriter writer = new FileWriter(file);
+        writer.write(defaultConfig.toString());
+        return writer;
+    }
+
+
+    @Override
+    public boolean shouldApplyMixin(String s, String mixinClassName) {
+        if (mixinClassName.contains("PiglinBrute")) return piglinBrute;
+        if (mixinClassName.contains("Piglin")) return piglin;
+        if (mixinClassName.contains("Hoglin")) return hoglin;
+        return true;
+    }
+
+
+    @Override public void onLoad(String s) {}
+    @Override public String getRefMapperConfig() {return null;}
+    @Override public void acceptTargets(Set<String> set, Set<String> set1) {}
+    @Override public List<String> getMixins() {return null;}
+    @Override public void preApply(String s, ClassNode classNode, String s1, IMixinInfo iMixinInfo) {}
+    @Override public void postApply(String s, ClassNode classNode, String s1, IMixinInfo iMixinInfo) {}
+}

src/main/java/com/teampotato/piglinsafety/mixin/MixinHoglin.java

@@ -0,0 +1,12 @@
+package com.teampotato.piglinsafety.mixin;
+
+import net.minecraft.world.entity.monster.hoglin.Hoglin;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Hoglin.class)
+public class MixinHoglin extends MixinEntity {
+    protected void checkFireImmune(CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(Boolean.TRUE);
+    }
+}

src/main/java/com/teampotato/piglinsafety/mixin/MixinPiglin.java

@@ -0,0 +1,12 @@
+package com.teampotato.piglinsafety.mixin;
+
+import net.minecraft.world.entity.monster.piglin.Piglin;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(Piglin.class)
+public class MixinPiglin extends MixinEntity {
+    protected void checkFireImmune(CallbackInfoReturnable<Boolean> cir) {
+        cir.setReturnValue(Boolean.TRUE);
+    }
+}

src/main/java/com/teampotato/piglinsafety/mixin/MixinPiglins.java → src/main/java/com/teampotato/piglinsafety/mixin/MixinPiglinBrute.java

@@ -1,12 +1,11 @@
 package com.teampotato.piglinsafety.mixin;
 
-import net.minecraft.world.entity.monster.piglin.Piglin;
 import net.minecraft.world.entity.monster.piglin.PiglinBrute;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin({PiglinBrute.class, Piglin.class})
-public class MixinPiglins extends MixinEntity {
+@Mixin(PiglinBrute.class)
+public class MixinPiglinBrute extends MixinEntity {
     protected void checkFireImmune(CallbackInfoReturnable<Boolean> cir) {
         cir.setReturnValue(Boolean.TRUE);
     }

src/main/resources/piglinsafety.mixins.json

@@ -1,13 +1,16 @@
 {
   "required": true,
   "package": "com.teampotato.piglinsafety.mixin",
+  "plugin": "com.teampotato.piglinsafety.ConfigSetup",
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.8",
   "injectors": {
     "defaultRequire": 1
   },
   "mixins": [
     "MixinEntity",
-    "MixinPiglins"
+    "MixinHoglin",
+    "MixinPiglin",
+    "MixinPiglinBrute"
   ]
 }