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
This commit is contained in:
craisinlord committed 2026-07-25 09:34:34 -05:00
1 parent 958948a642
commit fcc8dbb227
6 files changed
+19 -160

No files matched your search

@@ -6,7 +6,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
public final class ConfigResetGuard { 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 static final String MARKER_FILE_NAME = ".config_generation";
private ConfigResetGuard() { private ConfigResetGuard() {
@@ -1,16 +1,17 @@
package com.craisinlord.antarchy.mixins; 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 net.minecraft.server.level.WorldGenRegion;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(WorldGenRegion.class) @Mixin(WorldGenRegion.class)
public abstract class FarChunkSetBlockWarningMixin { public abstract class FarChunkSetBlockWarningMixin {
@Redirect( @WrapOperation(
method = "ensureCanWrite", method = "ensureCanWrite",
at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;logAndPauseIfInIde(Ljava/lang/String;)V") 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<Void> original) {
} }
} }
@@ -2,89 +2,18 @@
"type": "minecraft:block", "type": "minecraft:block",
"pools": [ "pools": [
{ {
"rolls": 1.0,
"entries": [ "entries": [
{ {
"type": "minecraft:alternatives", "type": "minecraft:item",
"children": [ "name": "antarchy:creeping_horror_egg",
"functions": [
{ {
"type": "minecraft:item", "function": "minecraft:explosion_decay"
"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"
} }
] ]
} }
], ]
"rolls": 1.0
} }
], ],
"random_sequence": "minecraft:blocks/turtle_egg" "random_sequence": "minecraft:blocks/turtle_egg"
@@ -2,89 +2,18 @@
"type": "minecraft:block", "type": "minecraft:block",
"pools": [ "pools": [
{ {
"rolls": 1.0,
"entries": [ "entries": [
{ {
"type": "minecraft:alternatives", "type": "minecraft:item",
"children": [ "name": "antarchy:lurking_terror_egg",
"functions": [
{ {
"type": "minecraft:item", "function": "minecraft:explosion_decay"
"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"
} }
] ]
} }
], ]
"rolls": 1.0
} }
], ],
"random_sequence": "minecraft:blocks/turtle_egg" "random_sequence": "minecraft:blocks/turtle_egg"
+1 -1
View File
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx4G
minecraft_version=1.21.1 minecraft_version=1.21.1
modid=antarchy modid=antarchy
mod_id=antarchy mod_id=antarchy
mod_version=1.0.1 mod_version=1.0.2
maven_group=com.craisinlord maven_group=com.craisinlord
mixin_version=0.15.4+mixin.0.8.7 mixin_version=0.15.4+mixin.0.8.7
@@ -375,7 +375,7 @@ public final class AntarchyMobsConfig {
// Jumpy Bug // Jumpy Bug
b.push("jumpyBug"); 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_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_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); JUMPY_BUG_CAMOUFLAGE_ALPHA = b.comment("Renderer alpha while camouflaged.").defineInRange("camouflageAlpha", 0.18D, 0.01D, 1.0D);