From fcc8dbb22793af8e6f41a1b7d786eee4316c3a39 Mon Sep 17 00:00:00 2001 From: craisinlord Date: Sat, 25 Jul 2026 09:34:34 -0500 Subject: [PATCH] Fixed incompat with enderscape Fixed lukring terror and creeping horror eggs having incorrect block loot tables fixed jumpy bug spawning with lower health than it should --- .../antarchy/config/ConfigResetGuard.java | 2 +- .../mixins/FarChunkSetBlockWarningMixin.java | 7 +- .../blocks/creeping_horror_egg.json | 83 ++----------------- .../loot_table/blocks/lurking_terror_egg.json | 83 ++----------------- gradle.properties | 2 +- .../antarchy/neoforge/AntarchyMobsConfig.java | 2 +- 6 files changed, 19 insertions(+), 160 deletions(-) diff --git a/common/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java b/common/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java index 1989ba75..afc1eacf 100644 --- a/common/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java +++ b/common/src/main/java/com/craisinlord/antarchy/config/ConfigResetGuard.java @@ -6,7 +6,7 @@ import java.nio.file.Files; import java.nio.file.Path; public final class ConfigResetGuard { - public static final int RESET_GENERATION = 4; + public static final int RESET_GENERATION = 5; private static final String MARKER_FILE_NAME = ".config_generation"; private ConfigResetGuard() { diff --git a/common/src/main/java/com/craisinlord/antarchy/mixins/FarChunkSetBlockWarningMixin.java b/common/src/main/java/com/craisinlord/antarchy/mixins/FarChunkSetBlockWarningMixin.java index 42b74700..fd78f92d 100644 --- a/common/src/main/java/com/craisinlord/antarchy/mixins/FarChunkSetBlockWarningMixin.java +++ b/common/src/main/java/com/craisinlord/antarchy/mixins/FarChunkSetBlockWarningMixin.java @@ -1,16 +1,17 @@ package com.craisinlord.antarchy.mixins; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import net.minecraft.server.level.WorldGenRegion; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(WorldGenRegion.class) public abstract class FarChunkSetBlockWarningMixin { - @Redirect( + @WrapOperation( method = "ensureCanWrite", at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;logAndPauseIfInIde(Ljava/lang/String;)V") ) - private void antarchy$suppressFarChunkWarning(String message) { + private void antarchy$suppressFarChunkWarning(String message, Operation original) { } } diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json index 836c069c..2a3ec5b3 100644 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json +++ b/common/src/main/resources/data/antarchy/loot_table/blocks/creeping_horror_egg.json @@ -2,89 +2,18 @@ "type": "minecraft:block", "pools": [ { + "rolls": 1.0, "entries": [ { - "type": "minecraft:alternatives", - "children": [ + "type": "minecraft:item", + "name": "antarchy:creeping_horror_egg", + "functions": [ { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:creeping_horror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:creeping_horror_egg" + "function": "minecraft:explosion_decay" } ] } - ], - "rolls": 1.0 + ] } ], "random_sequence": "minecraft:blocks/turtle_egg" diff --git a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json b/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json index 8f78d48b..1cfefbdd 100644 --- a/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json +++ b/common/src/main/resources/data/antarchy/loot_table/blocks/lurking_terror_egg.json @@ -2,89 +2,18 @@ "type": "minecraft:block", "pools": [ { + "rolls": 1.0, "entries": [ { - "type": "minecraft:alternatives", - "children": [ + "type": "minecraft:item", + "name": "antarchy:lurking_terror_egg", + "functions": [ { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "4" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 4.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "3" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 3.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:block_state_property", - "block": "antarchy:lurking_terror_egg", - "properties": { - "eggs": "2" - } - } - ], - "functions": [ - { - "function": "minecraft:set_count", - "count": 2.0 - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" - }, - { - "type": "minecraft:item", - "functions": [ - { - "function": "minecraft:explosion_decay" - } - ], - "name": "antarchy:lurking_terror_egg" + "function": "minecraft:explosion_decay" } ] } - ], - "rolls": 1.0 + ] } ], "random_sequence": "minecraft:blocks/turtle_egg" diff --git a/gradle.properties b/gradle.properties index dbbcd2aa..cfada1ac 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx4G minecraft_version=1.21.1 modid=antarchy mod_id=antarchy -mod_version=1.0.1 +mod_version=1.0.2 maven_group=com.craisinlord mixin_version=0.15.4+mixin.0.8.7 diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java index 434ff576..f26fd9b6 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyMobsConfig.java @@ -375,7 +375,7 @@ public final class AntarchyMobsConfig { // Jumpy Bug b.push("jumpyBug"); - JUMPY_BUG_HEALTH = b.comment("Base max health.").defineInRange("health", 12.0D, 1.0D, 32768.0D); + JUMPY_BUG_HEALTH = b.comment("Base max health.").defineInRange("health", 100.0D, 1.0D, 32768.0D); JUMPY_BUG_POUNCE_DAMAGE = b.comment("Damage dealt on a successful pounce latch.").defineInRange("pounceDamage", 2.0D, 0.0D, 1024.0D); JUMPY_BUG_LATCH_DAMAGE = b.comment("Damage dealt while latched onto a target.").defineInRange("latchDamage", 2.0D, 0.0D, 1024.0D); JUMPY_BUG_CAMOUFLAGE_ALPHA = b.comment("Renderer alpha while camouflaged.").defineInRange("camouflageAlpha", 0.18D, 0.01D, 1.0D);