commit a2423cefd06cd348c49252f3f7c97be6bca13c27 from: rohanverma2007 date: Sat Apr 25 16:28:01 2026 UTC fix another furniture commit - 546a78f77fa588fbd1f48d14c4b0ee16273abe26 commit + a2423cefd06cd348c49252f3f7c97be6bca13c27 blob - 1717c77b0f7afac91b30ba8e469ae5b9416c0a7b blob + ed5c08b5915e9fd5f7edc7f2828a57c48ba7fec9 --- build.gradle +++ build.gradle @@ -87,6 +87,7 @@ jar { exclude 'dev/ryanhcode/**' exclude 'me/srrapero720/**' exclude 'com/github/alexthe666/**' + exclude 'com/starfish_studios/**' } var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) { blob - 65cd64a8d97e1d3216bf8cade6b59dd7a7703c4e blob + 3327d62863fc62ffcd7bff214307980a6fbf2f10 --- src/main/java/sh/rsap/aeronauticscompat/mixin/AeronauticsCompatMixinPlugin.java +++ src/main/java/sh/rsap/aeronauticscompat/mixin/AeronauticsCompatMixinPlugin.java @@ -14,6 +14,7 @@ public class AeronauticsCompatMixinPlugin implements I private static final String ETCHED = "gg.moonflower.etched.api.sound.StopListeningSound"; private static final String WATERFRAMES = "me.srrapero720.waterframes.WaterFrames"; private static final String CITADEL = "com.github.alexthe666.citadel.server.entity.pathfinding.raycoms.AdvancedPathNavigate"; + private static final String ANOTHER_FURNITURE = "com.starfish_studios.another_furniture.entity.SeatEntity"; /** Per-mixin marker-class requirements (all must resolve to apply). */ private static final Map REQUIREMENTS = Map.of( @@ -47,6 +48,11 @@ public class AeronauticsCompatMixinPlugin implements I } private static boolean resolves(String fqn, ClassLoader cl) { + // IMPORTANT: don't use Class.forName here — it *defines* the class even + // with initialize=false, which trips Mixin's "target loaded too early" + // check if we happen to probe a class that another mixin wants to + // transform. getResource only looks for the .class file on the + // classpath; it does not load it. String resource = fqn.replace('.', '/') + ".class"; return cl.getResource(resource) != null; } blob - /dev/null blob + 3d4c894dcc2473bbbe35e032c618f974b915b7f8 (mode 644) --- /dev/null +++ src/main/resources/data/create/tags/block/seats.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "#another_furniture:seats", + "required": false + } + ] +} blob - /dev/null blob + 4a8b49713cad52ea939d99110428b9065ac54e08 (mode 644) --- /dev/null +++ src/main/resources/data/sable/tags/entity_type/retain_in_sub_level.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + { + "id": "another_furniture:seat", + "required": false + } + ] +}