Update to 1.19.3 [build] [publish]

Mrbysco · Jun 27, 2023 · 06e0baf · 06e0baf
1 parent 8711c58
commit 06e0baf
Show file tree

Hide file tree

Showing 15 changed files with 77 additions and 27 deletions.
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1 @@
+* Initial update to 1.19.3
diff --git a/gradle.properties b/gradle.properties
@@ -4,19 +4,19 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Base info
-mc_version=1.19.2
-forge_version=43.2.14
+mc_version=1.19.3
+forge_version=44.1.23
 mcp_channel=official
-mcp_mappings=1.19.2
+mcp_mappings=1.19.3
 
 #Publishing
 mod_name=Angry Mobs
 curseforge_id=430225
 modrinth_id=W9PF5nLR
 
 # Version
-version=2.0.0
+version=3.0.0
 
 # Mod support
-jei_version=11.6.0.1015
-crafttweaker_version=10.1.46
+jei_version=12.4.0.22
+crafttweaker_version=11.0.1
diff --git a/gradle/curseforge.gradle b/gradle/curseforge.gradle
@@ -5,7 +5,7 @@ if (System.getenv().CURSEFORGE_KEY) {
         apiKey = System.getenv().CURSEFORGE_KEY
         project {
             id = project.curseforge_id
-            releaseType = "release"
+            releaseType = "beta"
             addGameVersion "Forge"
             addGameVersion "${mc_version}"
             addGameVersion "Java 17"

diff --git a/gradle/modrinth.gradle b/gradle/modrinth.gradle
@@ -5,7 +5,7 @@ if (System.getenv().MODRINTH_KEY) {
     modrinth {
         token = System.getenv().MODRINTH_KEY
         projectId = project.modrinth_id
-        versionType = "release"
+        versionType = "beta"
         versionName = "${mod_name} ${mc_version}"
         versionNumber = project.version
         uploadFile = jar

diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddAttackNearestTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddAttackNearestTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.AttackNearestTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddAttackNearestTweak implements IRuntimeAction {
 	public final AttackNearestTweak attackNearestTweak;
 
-	public ActionAddAttackNearestTweak(EntityType entity, EntityType targetEntity, int priority, boolean checkSight) {
+	public ActionAddAttackNearestTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, boolean checkSight) {
 		this.attackNearestTweak = new AttackNearestTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), ForgeRegistries.ENTITY_TYPES.getKey(targetEntity), priority, checkSight);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", attackNearestTweak.getName(), attackNearestTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddBreakDoorTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddBreakDoorTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.BreakDoorTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddBreakDoorTweak implements IRuntimeAction {
 	public final BreakDoorTweak breakDoorTweak;
 
-	public ActionAddBreakDoorTweak(EntityType entity, int priority, int difficulty) {
+	public ActionAddBreakDoorTweak(EntityType<Entity> entity, int priority, int difficulty) {
 		this.breakDoorTweak = new BreakDoorTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), priority, difficulty);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", breakDoorTweak.getName(), breakDoorTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddHurtTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddHurtTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.HurtByTargetTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddHurtTweak implements IRuntimeAction {
 	public final HurtByTargetTweak hurtByTargetTweak;
 
-	public ActionAddHurtTweak(EntityType entity, int priority, boolean callReinforcements) {
+	public ActionAddHurtTweak(EntityType<Entity> entity, int priority, boolean callReinforcements) {
 		this.hurtByTargetTweak = new HurtByTargetTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), priority, callReinforcements);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", hurtByTargetTweak.getName(), hurtByTargetTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddLeapTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddLeapTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.LeapAtTargetTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddLeapTweak implements IRuntimeAction {
 	public final LeapAtTargetTweak leapTweak;
 
-	public ActionAddLeapTweak(EntityType entity, int priority, float leapMotion) {
+	public ActionAddLeapTweak(EntityType<Entity> entity, int priority, float leapMotion) {
 		this.leapTweak = new LeapAtTargetTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), priority, leapMotion);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", leapTweak.getName(), leapTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddMeleeTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddMeleeTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.MeleeAttackTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddMeleeTweak implements IRuntimeAction {
 	public final MeleeAttackTweak meleeTweak;
 
-	public ActionAddMeleeTweak(EntityType entity, int priority, double speedIn, float damage, boolean useLongMemory) {
+	public ActionAddMeleeTweak(EntityType<Entity> entity, int priority, double speedIn, float damage, boolean useLongMemory) {
 		this.meleeTweak = new MeleeAttackTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), priority, speedIn, damage, useLongMemory);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", meleeTweak.getName(), meleeTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddProjectileAttackTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAddProjectileAttackTweak.java
@@ -4,13 +4,14 @@
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.ProjectileAttackTweak;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAddProjectileAttackTweak implements IRuntimeAction {
 	public final ProjectileAttackTweak projectileTweak;
 
-	public ActionAddProjectileAttackTweak(EntityType entity, EntityType projectileEntity, String soundLocation, int priority, float attackDamage, float velocity) {
+	public ActionAddProjectileAttackTweak(EntityType<Entity> entity, EntityType<Entity> projectileEntity, String soundLocation, int priority, float attackDamage, float velocity) {
 		this.projectileTweak = new ProjectileAttackTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), ForgeRegistries.ENTITY_TYPES.getKey(projectileEntity), new ResourceLocation(soundLocation),
 				priority, attackDamage, velocity);
 	}
@@ -24,4 +25,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", projectileTweak.getName(), projectileTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAvoidEntityTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionAvoidEntityTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.AvoidEntityTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionAvoidEntityTweak implements IRuntimeAction {
 	public final AvoidEntityTweak attackNearestTweak;
 
-	public ActionAvoidEntityTweak(EntityType entity, EntityType targetEntity, int priority, float maxDistance, double walkSpeedModifier, double sprintSpeedModifier) {
+	public ActionAvoidEntityTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, float maxDistance, double walkSpeedModifier, double sprintSpeedModifier) {
 		this.attackNearestTweak = new AvoidEntityTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), ForgeRegistries.ENTITY_TYPES.getKey(targetEntity), priority, maxDistance, walkSpeedModifier, sprintSpeedModifier);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", attackNearestTweak.getName(), attackNearestTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionLookAtEntityTweak.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/ActionLookAtEntityTweak.java
@@ -3,13 +3,14 @@
 import com.blamejared.crafttweaker.api.action.base.IRuntimeAction;
 import com.mrbysco.angrymobs.registry.AITweakRegistry;
 import com.mrbysco.angrymobs.registry.tweaks.LookAtEntityTweak;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraftforge.registries.ForgeRegistries;
 
 public class ActionLookAtEntityTweak implements IRuntimeAction {
 	public final LookAtEntityTweak lookAtPlayerTweak;
 
-	public ActionLookAtEntityTweak(EntityType entity, EntityType targetEntity, int priority, float lookDistance) {
+	public ActionLookAtEntityTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, float lookDistance) {
 		this.lookAtPlayerTweak = new LookAtEntityTweak(ForgeRegistries.ENTITY_TYPES.getKey(entity), ForgeRegistries.ENTITY_TYPES.getKey(targetEntity), priority, lookDistance);
 	}
 
@@ -22,4 +23,9 @@ public void apply() {
 	public String describe() {
 		return String.format("Added %s tweak for Entity %s", lookAtPlayerTweak.getName(), lookAtPlayerTweak.getEntityLocation());
 	}
+
+	@Override
+	public String systemName() {
+		return "AngryMobs";
+	}
 }
diff --git a/src/main/java/com/mrbysco/angrymobs/compat/ct/TweakCT.java b/src/main/java/com/mrbysco/angrymobs/compat/ct/TweakCT.java
@@ -2,6 +2,7 @@
 
 import com.blamejared.crafttweaker.api.CraftTweakerAPI;
 import com.blamejared.crafttweaker.api.annotation.ZenRegister;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import org.openzen.zencode.java.ZenCodeType.Method;
 import org.openzen.zencode.java.ZenCodeType.Name;
@@ -10,37 +11,37 @@
 @Name("mods.angrymobs.AITweaks")
 public class TweakCT {
 	@Method
-	public static void addMeleeAttackTweak(EntityType entity, int priority, double speedIn, float attackDamage, boolean useLongMemory) {
+	public static void addMeleeAttackTweak(EntityType<Entity> entity, int priority, double speedIn, float attackDamage, boolean useLongMemory) {
 		CraftTweakerAPI.apply(new ActionAddMeleeTweak(entity, priority, speedIn, attackDamage, useLongMemory));
 	}
 
 	@Method
-	public static void addProjectileAttackTweak(EntityType entity, EntityType projectileEntity, String soundLocation, int priority, float attackDamage, float velocity) {
+	public static void addProjectileAttackTweak(EntityType<Entity> entity, EntityType<Entity> projectileEntity, String soundLocation, int priority, float attackDamage, float velocity) {
 		CraftTweakerAPI.apply(new ActionAddProjectileAttackTweak(entity, projectileEntity, soundLocation, priority, attackDamage, velocity));
 	}
 
 	@Method
-	public static void addHurtByTargetTweak(EntityType entity, int priority, boolean callReinforcements) {
+	public static void addHurtByTargetTweak(EntityType<Entity> entity, int priority, boolean callReinforcements) {
 		CraftTweakerAPI.apply(new ActionAddHurtTweak(entity, priority, callReinforcements));
 	}
 
 	@Method
-	public static void addLeapTweak(EntityType entity, int priority, float leapMotion) {
+	public static void addLeapTweak(EntityType<Entity> entity, int priority, float leapMotion) {
 		CraftTweakerAPI.apply(new ActionAddLeapTweak(entity, priority, leapMotion));
 	}
 
 	@Method
-	public static void addAttackNearestTweak(EntityType entity, EntityType targetEntity, int priority, boolean checkSight) {
+	public static void addAttackNearestTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, boolean checkSight) {
 		CraftTweakerAPI.apply(new ActionAddAttackNearestTweak(entity, targetEntity, priority, checkSight));
 	}
 
 	@Method
-	public static void addAvoidEntityTweak(EntityType entity, EntityType targetEntity, int priority, float maxDistance, double walkSpeedModifier, double sprintSpeedModifier) {
+	public static void addAvoidEntityTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, float maxDistance, double walkSpeedModifier, double sprintSpeedModifier) {
 		CraftTweakerAPI.apply(new ActionAvoidEntityTweak(entity, targetEntity, priority, maxDistance, walkSpeedModifier, sprintSpeedModifier));
 	}
 
 	@Method
-	public static void addLookAtEntityTweak(EntityType entity, EntityType targetEntity, int priority, float lookDistance) {
+	public static void addLookAtEntityTweak(EntityType<Entity> entity, EntityType<Entity> targetEntity, int priority, float lookDistance) {
 		CraftTweakerAPI.apply(new ActionLookAtEntityTweak(entity, targetEntity, priority, lookDistance));
 	}
 

diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[43,)"
+loaderVersion="[44,)"
 issueTrackerURL="https://github.com/Mrbysco/AngryMobs/issues"
 license="MIT"
 
@@ -16,6 +16,6 @@ Allows a pack developer to add additional AI goals to existing mobs
 [[dependencies.angrymobs]]
 modId="minecraft"
 mandatory=true
-versionRange="[1.19.2,]"
+versionRange="[1.19.3,1.19.4]"
 ordering="NONE"
 side="BOTH"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
@@ -1,8 +1,8 @@
 {
     "pack": {
         "description": "Angry Mobs resources",
-        "pack_format": 9,
-        "forge:resource_pack_format": 9,
+        "pack_format": 12,
+        "forge:resource_pack_format": 12,
         "forge:data_pack_format": 10
     }
 }