From 81a58d013e56ba9d8c6bd7c41ed1c133588e9147 Mon Sep 17 00:00:00 2001 From: Space Walker Date: Thu, 29 Oct 2026 23:24:16 +0100 Subject: [PATCH 1/2] [biomes] switch to using Conditional Mixin --- .../osl/biomes/impl/BiomesMixinPlugin.java | 45 ----------- .../osl/biomes/impl/VanillaBiomes.java | 1 + .../biomes/impl/mixin/common/BiomeMixin.java | 7 +- .../src/main/resources/osl.biomes.mixins.json | 1 - .../osl/biomes/impl/BiomesMixinPlugin.java | 59 --------------- .../osl/biomes/impl/VanillaBiomes.java | 1 + .../client/CustomizeWorldScreenMixin.java | 4 + .../impl/mixin/client/DebugOverlayMixin.java | 4 + .../impl/mixin/client/GameGuiMixin.java | 4 + .../biomes/impl/mixin/common/BiomeMixin.java | 74 ++++++++++++++++++- .../impl/mixin/common/BiomeMixinNew.java | 63 ---------------- .../impl/mixin/common/BiomeMixinOld.java | 64 ---------------- .../src/main/resources/osl.biomes.mixins.json | 9 ++- .../osl/biomes/impl/BiomesMixinPlugin.java | 51 ------------- .../osl/biomes/impl/VanillaBiomes.java | 1 + .../impl/mixin/client/GameGuiMixin.java | 4 + .../biomes/impl/mixin/common/BiomeMixin.java | 5 +- .../src/main/resources/osl.biomes.mixins.json | 2 +- 18 files changed, 100 insertions(+), 299 deletions(-) delete mode 100644 libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java delete mode 100644 libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java delete mode 100644 libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinNew.java delete mode 100644 libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinOld.java delete mode 100644 libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java diff --git a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java deleted file mode 100644 index e52a2ca82..000000000 --- a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.ornithemc.osl.biomes.impl; - -import java.util.List; -import java.util.Set; - -import org.objectweb.asm.tree.ClassNode; - -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -public class BiomesMixinPlugin implements IMixinConfigPlugin { - - public static final boolean BIOME_IDS_BEYOND_255_SUPPORTED = false; - - @Override - public void onLoad(String mixinPackage) { - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } -} diff --git a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java index a17199dda..ee4ef8284 100644 --- a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java +++ b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java @@ -109,6 +109,7 @@ public final class VanillaBiomes { public static final int MAX_ID = 255; public static final int MUTATED_ID_OFFSET = 128; + public static final boolean IDS_ABOVE_255_SUPPORTED = false; static void init() { for (Field f : Biome.class.getDeclaredFields()) { diff --git a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java index 9b88499a7..19e2afb9a 100644 --- a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java +++ b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java @@ -24,7 +24,6 @@ import net.ornithemc.osl.biomes.api.BiomeRegistry; import net.ornithemc.osl.biomes.api.biome.BiomeExtension; import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; -import net.ornithemc.osl.biomes.impl.BiomesMixinPlugin; import net.ornithemc.osl.biomes.impl.VanillaBiomes; import net.ornithemc.osl.registries.api.registry.RegistryKeys; import net.ornithemc.osl.registries.api.registry.SyncedRegistries; @@ -94,12 +93,12 @@ public class BiomeMixin implements BiomeExtension { id = DynamicArray.length(BY_ID); // keep 0-255 free for all Vanilla biomes - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { id = VanillaBiomes.MAX_ID + 1; } } - if (!BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { + if (!VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { throw new IllegalStateException("Biome IDs above 255 are not supported at this time!" + " Biome IDs should be limited to the range 0-255" + " unless the save format has been modified to support IDs beyond 255."); @@ -131,7 +130,7 @@ public class BiomeMixin implements BiomeExtension { ) ) private static Biome osl$biomes$handleAutoAssignIdForMutatedBiomes(Biome original, int id, Operation op) { - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { // the Biome[] array must contain all biomes so this should // give us a valid ID for the Biome registry to use. id = DynamicArray.length(BY_ID); diff --git a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/osl.biomes.mixins.json b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/osl.biomes.mixins.json index 5f82a1dbe..685e41f68 100644 --- a/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/osl.biomes.mixins.json +++ b/libraries/biomes/biomes-mc1.8.2-pre5-mc15w51b/src/main/resources/osl.biomes.mixins.json @@ -3,7 +3,6 @@ "minVersion": "0.8", "package": "net.ornithemc.osl.biomes.impl.mixin", "compatibilityLevel": "JAVA_8", - "plugin": "net.ornithemc.osl.biomes.impl.BiomesMixinPlugin", "mixins": [ "common.BiomeMixin" ], diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java deleted file mode 100644 index 252c05d9c..000000000 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java +++ /dev/null @@ -1,59 +0,0 @@ -package net.ornithemc.osl.biomes.impl; - -import java.util.List; -import java.util.Set; - -import org.objectweb.asm.tree.ClassNode; - -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -import net.ornithemc.osl.core.impl.util.MinecraftVersion; - -public class BiomesMixinPlugin implements IMixinConfigPlugin { - - public static final boolean BIOME_IDS_BEYOND_255_SUPPORTED = false; - - @Override - public void onLoad(String mixinPackage) { - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - if ("net.ornithemc.osl.biomes.impl.mixin.client.DebugOverlayMixin".equals(mixinClassName) - || "net.ornithemc.osl.biomes.impl.mixin.common.BiomeMixinNew".equals(mixinClassName)) { - return MinecraftVersion.resolve().compareTo("14w05a") >= 0; - } - if ("net.ornithemc.osl.biomes.impl.mixin.client.GameGuiMixin".equals(mixinClassName) - || "net.ornithemc.osl.biomes.impl.mixin.common.BiomeMixinOld".equals(mixinClassName)) { - return MinecraftVersion.resolve().compareTo("14w05a") < 0; - } - if ("net.ornithemc.osl.biomes.impl.mixin.client.CustomizeWorldScreenMixin".equals(mixinClassName)) { - return MinecraftVersion.resolve().compareTo("14w17a") >= 0; - } - - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } -} diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java index a17199dda..ee4ef8284 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java @@ -109,6 +109,7 @@ public final class VanillaBiomes { public static final int MAX_ID = 255; public static final int MUTATED_ID_OFFSET = 128; + public static final boolean IDS_ABOVE_255_SUPPORTED = false; static void init() { for (Field f : Biome.class.getDeclaredFields()) { diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/CustomizeWorldScreenMixin.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/CustomizeWorldScreenMixin.java index 38e73a20b..be58976b0 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/CustomizeWorldScreenMixin.java +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/CustomizeWorldScreenMixin.java @@ -9,6 +9,10 @@ import net.minecraft.client.gui.screen.world.CustomizeWorldScreen; import net.minecraft.world.biome.Biome; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + +@Conditional(minecraftVersion = @Version(">=14w17a")) @Mixin(CustomizeWorldScreen.class) public class CustomizeWorldScreenMixin { diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/DebugOverlayMixin.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/DebugOverlayMixin.java index 2d3e10498..75644b56a 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/DebugOverlayMixin.java +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/DebugOverlayMixin.java @@ -9,6 +9,10 @@ import net.minecraft.client.gui.overlay.DebugOverlay; import net.minecraft.world.biome.Biome; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + +@Conditional(minecraftVersion = @Version(">=14w05a")) @Mixin(DebugOverlay.class) public class DebugOverlayMixin { diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java index f0009c5e7..7f48fc105 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java @@ -9,6 +9,10 @@ import net.minecraft.client.gui.GameGui; import net.minecraft.world.biome.Biome; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + +@Conditional(minecraftVersion = @Version("<14w05a")) @Mixin(GameGui.class) public class GameGuiMixin { diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java index e57b4076d..f4f7032ab 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java @@ -13,14 +13,20 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.world.biome.Biome; +import com.llamalad7.mixinextras.injector.wrapoperation.Operation; +import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; + +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.MutatedBiome; import net.ornithemc.osl.core.api.util.NamespacedIdentifiers; import net.ornithemc.osl.core.impl.util.Util; import net.ornithemc.osl.localization.api.L10n; import net.ornithemc.osl.biomes.api.BiomeRegistry; import net.ornithemc.osl.biomes.api.biome.BiomeExtension; -import net.ornithemc.osl.biomes.impl.BiomesMixinPlugin; +import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; import net.ornithemc.osl.biomes.impl.VanillaBiomes; import net.ornithemc.osl.registries.api.registry.RegistryKeys; import net.ornithemc.osl.registries.api.registry.SyncedRegistries; @@ -39,6 +45,30 @@ public class BiomeMixin implements BiomeExtension { @Unique private String key; + @Inject( + method = "", + at = @At( + value = "HEAD" + ) + ) + private static void osl$biomes$unlockBiomeRegistry(CallbackInfo ci) { + BiomeRegistryImpl.unlock(); + } + + @Inject( + method = "", + at = @At( + value = "FIELD", + target = "Lnet/minecraft/world/biome/Biome;BY_ID:[Lnet/minecraft/world/biome/Biome;", + opcode = Opcodes.GETSTATIC, + ordinal = 0 + ) + ) + private static void osl$biomes$registerBiomes(CallbackInfo ci) { + BiomeRegistryImpl.registerBiomes(); + BiomeRegistryImpl.registerUnknownBiomes(); + } + @Inject( method = "", at = @At( @@ -66,12 +96,12 @@ public class BiomeMixin implements BiomeExtension { id = DynamicArray.length(BY_ID); // keep 0-255 free for all Vanilla biomes - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { id = VanillaBiomes.MAX_ID + 1; } } - if (!BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { + if (!VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { throw new IllegalStateException("Biome IDs above 255 are not supported at this time!" + " Biome IDs should be limited to the range 0-255" + " unless the save format has been modified to support IDs beyond 255."); @@ -95,6 +125,42 @@ public class BiomeMixin implements BiomeExtension { BY_ID = DynamicArray.grow(BY_ID, capacity); } + @Conditional(minecraftVersion = @Version("<14w05a")) + @WrapOperation( + method = "mutate", + at = @At( + value = "NEW", + target = "net/minecraft/world/biome/MutatedBiome" + ) + ) + private static MutatedBiome osl$biomes$handleAutoAssignIdForMutatedBiomes(int id, Biome original, Operation op) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { + // the Biome[] array must contain all biomes so this should + // give us a valid ID for the Biome registry to use. + id = DynamicArray.length(Biome.BY_ID); + } + + return op.call(id, original); + } + + @Conditional(minecraftVersion = @Version(">=14w05a")) + @WrapOperation( + method = "mutate()Lnet/minecraft/world/biome/Biome;", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/biome/Biome;mutate(I)Lnet/minecraft/world/biome/Biome;" + ) + ) + private static Biome osl$biomes$handleAutoAssignIdForMutatedBiomes(Biome original, int id, Operation op) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { + // the Biome[] array must contain all biomes so this should + // give us a valid ID for the Biome registry to use. + id = DynamicArray.length(Biome.BY_ID); + } + + return op.call(original, id); + } + @Override public String getName() { if (this.key == null) { diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinNew.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinNew.java deleted file mode 100644 index 3d1e34998..000000000 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinNew.java +++ /dev/null @@ -1,63 +0,0 @@ -package net.ornithemc.osl.biomes.impl.mixin.common; - -import org.objectweb.asm.Opcodes; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; -import net.ornithemc.osl.biomes.impl.BiomesMixinPlugin; -import net.ornithemc.osl.biomes.impl.VanillaBiomes; -import net.ornithemc.osl.registries.api.registry.sync.DynamicArray; - -@Mixin(Biome.class) -public class BiomeMixinNew { - - @Inject( - method = "", - at = @At( - value = "HEAD" - ) - ) - private static void osl$biomes$unlockBiomeRegistry(CallbackInfo ci) { - BiomeRegistryImpl.unlock(); - } - - @Inject( - method = "", - at = @At( - value = "FIELD", - target = "Lnet/minecraft/world/biome/Biome;BY_ID:[Lnet/minecraft/world/biome/Biome;", - opcode = Opcodes.GETSTATIC, - ordinal = 0 - ) - ) - private static void osl$biomes$registerBiomes(CallbackInfo ci) { - BiomeRegistryImpl.registerBiomes(); - BiomeRegistryImpl.registerUnknownBiomes(); - } - - @WrapOperation( - method = "mutate()Lnet/minecraft/world/biome/Biome;", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/world/biome/Biome;mutate(I)Lnet/minecraft/world/biome/Biome;" - ) - ) - private static Biome osl$biomes$handleAutoAssignIdForMutatedBiomes(Biome original, int id, Operation op) { - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { - // the Biome[] array must contain all biomes so this should - // give us a valid ID for the Biome registry to use. - id = DynamicArray.length(Biome.BY_ID); - } - - return op.call(original, id); - } -} diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinOld.java b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinOld.java deleted file mode 100644 index 08eab3291..000000000 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixinOld.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.ornithemc.osl.biomes.impl.mixin.common; - -import org.objectweb.asm.Opcodes; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.llamalad7.mixinextras.injector.wrapoperation.Operation; -import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; - -import net.minecraft.world.biome.Biome; -import net.minecraft.world.biome.MutatedBiome; - -import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; -import net.ornithemc.osl.biomes.impl.BiomesMixinPlugin; -import net.ornithemc.osl.biomes.impl.VanillaBiomes; -import net.ornithemc.osl.registries.api.registry.sync.DynamicArray; - -@Mixin(Biome.class) -public class BiomeMixinOld { - - @Inject( - method = "", - at = @At( - value = "HEAD" - ) - ) - private static void osl$biomes$unlockBiomeRegistry(CallbackInfo ci) { - BiomeRegistryImpl.unlock(); - } - - @Inject( - method = "", - at = @At( - value = "FIELD", - target = "Lnet/minecraft/world/biome/Biome;BY_ID:[Lnet/minecraft/world/biome/Biome;", - opcode = Opcodes.GETSTATIC, - ordinal = 0 - ) - ) - private static void osl$biomes$registerBiomes(CallbackInfo ci) { - BiomeRegistryImpl.registerBiomes(); - BiomeRegistryImpl.registerUnknownBiomes(); - } - - @WrapOperation( - method = "mutate", - at = @At( - value = "NEW", - target = "net/minecraft/world/biome/MutatedBiome" - ) - ) - private static MutatedBiome osl$biomes$handleAutoAssignIdForMutatedBiomes(int id, Biome original, Operation op) { - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && original.id > VanillaBiomes.MAX_ID) { - // the Biome[] array must contain all biomes so this should - // give us a valid ID for the Biome registry to use. - id = DynamicArray.length(Biome.BY_ID); - } - - return op.call(id, original); - } -} diff --git a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/osl.biomes.mixins.json b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/osl.biomes.mixins.json index 36184a5e6..33a86249b 100644 --- a/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/osl.biomes.mixins.json +++ b/libraries/biomes/biomes-mc13w36a-mc1.8.2-pre4/src/main/resources/osl.biomes.mixins.json @@ -3,13 +3,14 @@ "minVersion": "0.8", "package": "net.ornithemc.osl.biomes.impl.mixin", "compatibilityLevel": "JAVA_8", - "plugin": "net.ornithemc.osl.biomes.impl.BiomesMixinPlugin", + "plugin": "net.ornithemc.conditionalmixin.mixin.ConditionalMixinPlugin", "mixins": [ - "common.BiomeMixin", - "common.BiomeMixinNew", - "common.BiomeMixinOld" + "common.BiomeMixin" ], "client": [ + "client.CustomizeWorldScreenMixin", + "client.DebugOverlayMixin", + "client.GameGuiMixin" ], "server": [ ], diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java deleted file mode 100644 index 0a62aa0e9..000000000 --- a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesMixinPlugin.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.ornithemc.osl.biomes.impl; - -import java.util.List; -import java.util.Set; - -import org.objectweb.asm.tree.ClassNode; - -import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -import net.ornithemc.osl.core.impl.util.MinecraftVersion; - -public class BiomesMixinPlugin implements IMixinConfigPlugin { - - public static final boolean BIOME_IDS_BEYOND_255_SUPPORTED = false; - - @Override - public void onLoad(String mixinPackage) { - } - - @Override - public String getRefMapperConfig() { - return null; - } - - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - if ("net.ornithemc.osl.biomes.impl.mixin.client.GameGuiMixin".equals(mixinClassName)) { - return MinecraftVersion.resolve().compareTo("1.2") >= 0; - } - - return true; - } - - @Override - public void acceptTargets(Set myTargets, Set otherTargets) { - } - - @Override - public List getMixins() { - return null; - } - - @Override - public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - } -} diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java index f8b11ddf8..b9a4ca202 100644 --- a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java +++ b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/VanillaBiomes.java @@ -45,6 +45,7 @@ public final class VanillaBiomes { }; public static final int MAX_ID = 255; + public static final boolean IDS_ABOVE_255_SUPPORTED = false; static void init() { for (Field f : Biome.class.getDeclaredFields()) { diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java index f0009c5e7..adf6769f9 100644 --- a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java +++ b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/client/GameGuiMixin.java @@ -9,6 +9,10 @@ import net.minecraft.client.gui.GameGui; import net.minecraft.world.biome.Biome; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + +@Conditional(minecraftVersion = @Version(">=1.2")) @Mixin(GameGui.class) public class GameGuiMixin { diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java index da1643712..92df7e636 100644 --- a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java +++ b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java @@ -21,7 +21,6 @@ import net.ornithemc.osl.biomes.api.BiomeRegistry; import net.ornithemc.osl.biomes.api.biome.BiomeExtension; import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; -import net.ornithemc.osl.biomes.impl.BiomesMixinPlugin; import net.ornithemc.osl.biomes.impl.VanillaBiomes; import net.ornithemc.osl.registries.api.registry.RegistryKeys; import net.ornithemc.osl.registries.api.registry.SyncedRegistries; @@ -80,12 +79,12 @@ public class BiomeMixin implements BiomeExtension { id = DynamicArray.length(BY_ID); // keep 0-255 free for all Vanilla biomes - if (BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { + if (VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id <= VanillaBiomes.MAX_ID) { id = VanillaBiomes.MAX_ID + 1; } } - if (!BiomesMixinPlugin.BIOME_IDS_BEYOND_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { + if (!VanillaBiomes.IDS_ABOVE_255_SUPPORTED && id > VanillaBiomes.MAX_ID) { throw new IllegalStateException("Biome IDs above 255 are not supported at this time!" + " Biome IDs should be limited to the range 0-255" + " unless the save format has been modified to support IDs beyond 255."); diff --git a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.biomes.mixins.json b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.biomes.mixins.json index 4365ae120..7cbd97f6e 100644 --- a/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.biomes.mixins.json +++ b/libraries/biomes/biomes-mcb1.8-pre1-mc1.6.4/src/main/resources/osl.biomes.mixins.json @@ -3,7 +3,7 @@ "minVersion": "0.8", "package": "net.ornithemc.osl.biomes.impl.mixin", "compatibilityLevel": "JAVA_8", - "plugin": "net.ornithemc.osl.biomes.impl.BiomesMixinPlugin", + "plugin": "net.ornithemc.conditionalmixin.mixin.ConditionalMixinPlugin", "mixins": [ "common.BiomeMixin" ], From 537a6f19116e30f686fd2a27f4c3b3e8141d7ed2 Mon Sep 17 00:00:00 2001 From: Space Walker Date: Thu, 12 Nov 2026 11:38:05 +0100 Subject: [PATCH 2/2] [biomes] collapse 18w32a-1.14.4 into a single module --- .../gradle.properties | 4 - .../src/main/resources/osl.biomes.mixins.json | 17 --- .../build.gradle | 0 .../gradle.properties | 2 +- .../ornithemc/osl/biomes/api/BiomeEvents.java | 0 .../osl/biomes/api/BiomeRegistry.java | 0 .../osl/biomes/api/biome/BiomeExtension.java | 0 .../osl/biomes/impl/BiomeIdRegistry.java | 0 .../osl/biomes/impl/BiomeRegistryImpl.java | 0 .../ornithemc/osl/biomes/impl/BiomesInit.java | 0 .../osl/biomes/impl/access/BiomeAccess.java | 0 .../biomes/impl/biome/BiomeExtensionImpl.java | 0 .../impl/mixin/common/BiomeBuilderMixin.java | 0 .../biomes/impl/mixin/common/BiomeMixin.java | 9 +- .../biomes/impl/mixin/common/BiomesMixin.java | 4 + .../src/main/resources/fabric.mod.json | 4 +- .../main/resources/osl.biomes.classtweaker | 0 .../src/main/resources/osl.biomes.mixins.json | 1 + .../biomes-mc18w43a-mc1.14.4/build.gradle | 1 - .../ornithemc/osl/biomes/api/BiomeEvents.java | 34 ------ .../osl/biomes/api/BiomeRegistry.java | 91 ---------------- .../osl/biomes/api/biome/BiomeExtension.java | 14 --- .../osl/biomes/impl/BiomeIdRegistry.java | 19 ---- .../osl/biomes/impl/BiomeRegistryImpl.java | 102 ------------------ .../osl/biomes/impl/access/BiomeAccess.java | 10 -- .../biomes/impl/biome/BiomeExtensionImpl.java | 17 --- .../impl/mixin/common/BiomeBuilderMixin.java | 22 ---- .../biomes/impl/mixin/common/BiomeMixin.java | 41 ------- .../main/resources/osl.biomes.classtweaker | 8 -- settings.gradle | 3 +- 30 files changed, 16 insertions(+), 387 deletions(-) delete mode 100644 libraries/biomes/biomes-mc18w32a-mc1.13.2/gradle.properties delete mode 100644 libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.mixins.json rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/build.gradle (100%) rename libraries/biomes/{biomes-mc18w43a-mc1.14.4 => biomes-mc18w32a-mc1.14.4}/gradle.properties (68%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/BiomesInit.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java (100%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java (86%) rename libraries/biomes/{biomes-mc18w43a-mc1.14.4 => biomes-mc18w32a-mc1.14.4}/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java (81%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/resources/fabric.mod.json (96%) rename libraries/biomes/{biomes-mc18w32a-mc1.13.2 => biomes-mc18w32a-mc1.14.4}/src/main/resources/osl.biomes.classtweaker (100%) rename libraries/biomes/{biomes-mc18w43a-mc1.14.4 => biomes-mc18w32a-mc1.14.4}/src/main/resources/osl.biomes.mixins.json (80%) delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/build.gradle delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java delete mode 100644 libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.classtweaker diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/gradle.properties b/libraries/biomes/biomes-mc18w32a-mc1.13.2/gradle.properties deleted file mode 100644 index 1a4324eff..000000000 --- a/libraries/biomes/biomes-mc18w32a-mc1.13.2/gradle.properties +++ /dev/null @@ -1,4 +0,0 @@ -min_mc_version = 18w32a -max_mc_version = 1.13.2 - -minecraft_version = 1.13.2 diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.mixins.json b/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.mixins.json deleted file mode 100644 index e4e4720ce..000000000 --- a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.mixins.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "net.ornithemc.osl.biomes.impl.mixin", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "common.BiomeMixin", - "common.BiomeBuilderMixin" - ], - "client": [ - ], - "server": [ - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/build.gradle b/libraries/biomes/biomes-mc18w32a-mc1.14.4/build.gradle similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/build.gradle rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/build.gradle diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/gradle.properties b/libraries/biomes/biomes-mc18w32a-mc1.14.4/gradle.properties similarity index 68% rename from libraries/biomes/biomes-mc18w43a-mc1.14.4/gradle.properties rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/gradle.properties index 54620cacd..c3086efd7 100644 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/gradle.properties +++ b/libraries/biomes/biomes-mc18w32a-mc1.14.4/gradle.properties @@ -1,4 +1,4 @@ -min_mc_version = 18w43a +min_mc_version = 18w32a max_mc_version = 1.14.4 minecraft_version = 1.14.4 diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomesInit.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesInit.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/BiomesInit.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomesInit.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java similarity index 86% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java index 6c36bd4e1..c2218212d 100644 --- a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java +++ b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java @@ -11,6 +11,9 @@ import net.minecraft.util.Id2ObjectBiMap; import net.minecraft.world.biome.Biome; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + import net.ornithemc.osl.biomes.api.biome.BiomeExtension; import net.ornithemc.osl.biomes.impl.BiomeIdRegistry; import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; @@ -37,8 +40,9 @@ public class BiomeMixin implements BiomeExtension, BiomeAccess { return BiomeIdRegistry.MUTATED_BIOMES; } + @Conditional(minecraftVersion = @Version("<=1.13.2")) @Inject( - method = "init", + method = "m_85926046", at = @At( value = "HEAD" ) @@ -47,8 +51,9 @@ public class BiomeMixin implements BiomeExtension, BiomeAccess { BiomeRegistryImpl.unlock(); } + @Conditional(minecraftVersion = @Version("<=1.13.2")) @Inject( - method = "init", + method = "m_85926046", at = @At( value = "TAIL" ) diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java similarity index 81% rename from libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java index f6133f570..6bf916873 100644 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java +++ b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomesMixin.java @@ -7,8 +7,12 @@ import net.minecraft.world.biome.Biomes; +import net.ornithemc.conditionalmixin.annotations.Conditional; +import net.ornithemc.conditionalmixin.annotations.Version; + import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; +@Conditional(minecraftVersion = @Version(">1.13.2")) @Mixin(Biomes.class) public class BiomesMixin { diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/fabric.mod.json similarity index 96% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/fabric.mod.json index b8b3c453a..706769d40 100644 --- a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/fabric.mod.json +++ b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "osl-biomes", - "version": "0.1.1+mc18w32a-mc1.13.2", + "version": "0.1.1+mc18w32a-mc1.14.4", "environment": "*", "entrypoints": { "init": [ @@ -14,7 +14,7 @@ "accessWidener": "osl.biomes.classtweaker", "depends": { "fabricloader": "\u003e\u003d0.18.0", - "minecraft": "\u003e\u003d1.13.1-alpha.18.32.a \u003c\u003d1.13.2", + "minecraft": "\u003e\u003d1.13.1-alpha.18.32.a \u003c\u003d1.14.4", "osl-core": "\u003e\u003d0.11.0", "osl-entrypoints": "\u003e\u003d0.5.0", "osl-lifecycle-events": "\u003e\u003d0.6.0", diff --git a/libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.classtweaker b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/osl.biomes.classtweaker similarity index 100% rename from libraries/biomes/biomes-mc18w32a-mc1.13.2/src/main/resources/osl.biomes.classtweaker rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/osl.biomes.classtweaker diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.mixins.json b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/osl.biomes.mixins.json similarity index 80% rename from libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.mixins.json rename to libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/osl.biomes.mixins.json index 20937baf9..7dde9e862 100644 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.mixins.json +++ b/libraries/biomes/biomes-mc18w32a-mc1.14.4/src/main/resources/osl.biomes.mixins.json @@ -3,6 +3,7 @@ "minVersion": "0.8", "package": "net.ornithemc.osl.biomes.impl.mixin", "compatibilityLevel": "JAVA_8", + "plugin": "net.ornithemc.conditionalmixin.mixin.ConditionalMixinPlugin", "mixins": [ "common.BiomeMixin", "common.BiomesMixin", diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/build.gradle b/libraries/biomes/biomes-mc18w43a-mc1.14.4/build.gradle deleted file mode 100644 index 0a350fdb3..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/build.gradle +++ /dev/null @@ -1 +0,0 @@ -setUpModule(project) diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java deleted file mode 100644 index 0d49c6f29..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeEvents.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.ornithemc.osl.biomes.api; - -import net.ornithemc.osl.core.api.events.Event; - -/** - * Events related to the biomes lifecycle. - */ -public final class BiomeEvents { - - /** - * This event is invoked upon game start-up, after Vanilla biome registration is finished. - * - *

- * Custom biome registration should be done in a listener of this event. - * Helper methods for registering biomes can be found in the {@linkplain - * BiomeRegistry} class. - * - *

- * Listeners to this event should be registered in your mod's entrypoint, - * and can be done as follows: - * - * 

-	 * {@code
-	 * BiomeEvents.REGISTER_BIOMES.register(() -> {
-	 * 	BiomeRegistry.register(NamespacedIdentifiers.from("example", "cookie"), new CookieBiome());
-	 * });
-	 * }
-	 *
- * - * @see BiomeRegistry - */ - public static final Event REGISTER_BIOMES = Event.runnable(); - -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java deleted file mode 100644 index bc8fb5661..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/BiomeRegistry.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.ornithemc.osl.biomes.api; - -import java.util.Set; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; -import net.ornithemc.osl.biomes.impl.BiomeRegistryImpl; -import net.ornithemc.osl.registries.api.registry.ResourceKey; - -/** - * Public access to the Biomes registry. - */ -public final class BiomeRegistry { - - /** - * @return the numerical ID assigned to the given biome. - */ - public static int getId(Biome biome) { - return BiomeRegistryImpl.getId(biome); - } - - /** - * @return the namespaced ID assigned to the given biome. - */ - public static NamespacedIdentifier getIdentifier(Biome biome) { - return BiomeRegistryImpl.getIdentifier(biome); - } - - /** - * @return the resource key assigned to the given biome. - */ - public static ResourceKey getKey(Biome biome) { - return BiomeRegistryImpl.getKey(biome); - } - - /** - * @return the biome mapped to the given numerical ID. - */ - public static Biome getBiome(int id) { - return BiomeRegistryImpl.getBiome(id); - } - - /** - * @return the biome mapped to the given namespaced ID. - */ - public static Biome getBiome(NamespacedIdentifier identifier) { - return BiomeRegistryImpl.getBiome(identifier); - } - - /** - * @return the biome mapped to the given resource key. - */ - public static Biome getBiome(ResourceKey key) { - return BiomeRegistryImpl.getBiome(key); - } - - /** - * @return a set containing all namespaced IDs in the registry. - */ - public static Set identifierSet() { - return BiomeRegistryImpl.identifierSet(); - } - - /** - * @return a set containing all resource keys in the registry. - */ - public static Set> keySet() { - return BiomeRegistryImpl.keySet(); - } - - /** - * @param the biome type. - * @param identifier the namespaced ID of the biome. - * @param biome the biome to register. - * @return the registered biome. - */ - public static T register(NamespacedIdentifier identifier, T biome) { - return BiomeRegistryImpl.register(identifier, biome); - } - - /** - * @param the biome type. - * @param key the resource key of the biome. - * @param biome the biome to register. - * @return the registered biome. - */ - public static T register(ResourceKey key, T biome) { - return BiomeRegistryImpl.register(key, biome); - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java deleted file mode 100644 index c572d3907..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/api/biome/BiomeExtension.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.ornithemc.osl.biomes.api.biome; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; - -public interface BiomeExtension { - - interface BuilderExtension { - - Biome.Builder parent(NamespacedIdentifier identifier); - - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java deleted file mode 100644 index 8ce5a3762..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeIdRegistry.java +++ /dev/null @@ -1,19 +0,0 @@ -package net.ornithemc.osl.biomes.impl; - -import net.minecraft.util.Id2ObjectBiMap; -import net.minecraft.world.biome.Biome; - -/** - * The biome registry is created and populated in Biome's class initializer. - * This breaks OSL's usual pattern of registering the registry in the API entrypoint but - * triggering registry population during bootstrapping, since OSL has to wrap the Vanilla - * registry which is not possible without triggering Biome class load and registry - * population. - * The solution: move the Vanilla registry to another class and replace the IdRegistry - * reference in Biome with this one. - */ -public final class BiomeIdRegistry { - - public static final Id2ObjectBiMap MUTATED_BIOMES = new Id2ObjectBiMap<>(); - -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java deleted file mode 100644 index f49c4dbcd..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/BiomeRegistryImpl.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.ornithemc.osl.biomes.impl; - -import java.util.Set; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; -import net.ornithemc.osl.core.api.util.NamespacedIdentifiers; -import net.ornithemc.osl.biomes.api.BiomeEvents; -import net.ornithemc.osl.registries.api.registry.Registry; -import net.ornithemc.osl.registries.api.registry.RegistryKeys; -import net.ornithemc.osl.registries.api.registry.ResourceKey; -import net.ornithemc.osl.registries.api.registry.SyncedRegistries; -import net.ornithemc.osl.registries.api.registry.sync.Id2ObjectBiMapMapper; -import net.ornithemc.osl.registries.impl.registry.VanillaRegistries; - -public final class BiomeRegistryImpl { - - public static final Registry REGISTRY = VanillaRegistries.registerSimple(RegistryKeys.BIOME, net.minecraft.util.registry.Registry.BIOME); - - private static boolean locked = true; - - public static int getId(Biome biome) { - return REGISTRY.getId(biome); - } - - public static NamespacedIdentifier getIdentifier(Biome biome) { - return REGISTRY.getIdentifier(biome); - } - - public static ResourceKey getKey(Biome biome) { - return REGISTRY.getKey(biome); - } - - public static Biome getBiome(int id) { - return REGISTRY.get(id); - } - - public static Biome getBiome(NamespacedIdentifier identifier) { - return REGISTRY.get(identifier); - } - - public static Biome getBiome(ResourceKey key) { - return REGISTRY.get(key); - } - - public static Set identifierSet() { - return REGISTRY.identifierSet(); - } - - public static Set> keySet() { - return REGISTRY.keySet(); - } - - public static T register(NamespacedIdentifier identifier, T biome) { - if (locked) { - throw new IllegalStateException("register called too early: registry locked!"); - } else { - if (biome.isMutated()) { - registerBiomeMutation(identifier, biome); - } - - return Registry.register(REGISTRY, identifier, biome); - } - } - - public static T register(ResourceKey key, T biome) { - if (locked) { - throw new IllegalStateException("register called too early: registry locked!"); - } else { - if (biome.isMutated()) { - registerBiomeMutation(key.identifier(), biome); - } - - return Registry.register(REGISTRY, key, biome); - } - } - - private static void registerBiomeMutation(NamespacedIdentifier identifier, Biome biome) { - NamespacedIdentifier parentIdentifier = biome.osl$biomes$getParentIdentifier(); - Biome parent = REGISTRY.get(parentIdentifier); - - if (parent == null) { - throw new IllegalStateException("Error registering mutated biome " + identifier + ": parent " + parentIdentifier + " does not exist!"); - } else { - Biome.MUTATED_BIOMES.put(biome, REGISTRY.getId(parent)); - } - } - - public static void init() { - SyncedRegistries.register(RegistryKeys.BIOME); - SyncedRegistries.registerMapper(RegistryKeys.BIOME, NamespacedIdentifiers.from("mutated_biome"), Id2ObjectBiMapMapper.of(BiomeIdRegistry.MUTATED_BIOMES)); - } - - public static void unlock() { - locked = false; - } - - public static void registerBiomes() { - BiomeEvents.REGISTER_BIOMES.invoker().run(); - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java deleted file mode 100644 index e64d16692..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/access/BiomeAccess.java +++ /dev/null @@ -1,10 +0,0 @@ -package net.ornithemc.osl.biomes.impl.access; - -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; - -public interface BiomeAccess { - - default NamespacedIdentifier osl$biomes$getParentIdentifier() { - throw new AbstractMethodError(); - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java deleted file mode 100644 index cf87b89b1..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.ornithemc.osl.biomes.impl.biome; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.biomes.api.biome.BiomeExtension; -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; - -public interface BiomeExtensionImpl extends BiomeExtension { - - interface BuilderExtensionImpl extends BuilderExtension { - - @Override - default Biome.Builder parent(NamespacedIdentifier identifier) { - throw new AbstractMethodError(); - } - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java deleted file mode 100644 index 361f23f5d..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeBuilderMixin.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.ornithemc.osl.biomes.impl.mixin.common; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.biomes.api.biome.BiomeExtension; -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; - -@Mixin(Biome.Builder.class) -public class BiomeBuilderMixin implements BiomeExtension.BuilderExtension { - - @Shadow - public String parent; - - @Override - public Biome.Builder parent(NamespacedIdentifier identifier) { - this.parent = identifier.toString(); - return (Biome.Builder) (Object) this; - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java deleted file mode 100644 index 584327604..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/java/net/ornithemc/osl/biomes/impl/mixin/common/BiomeMixin.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.ornithemc.osl.biomes.impl.mixin.common; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.util.Id2ObjectBiMap; -import net.minecraft.world.biome.Biome; - -import net.ornithemc.osl.biomes.api.biome.BiomeExtension; -import net.ornithemc.osl.biomes.impl.BiomeIdRegistry; -import net.ornithemc.osl.biomes.impl.access.BiomeAccess; -import net.ornithemc.osl.core.api.util.NamespacedIdentifier; -import net.ornithemc.osl.core.api.util.NamespacedIdentifiers; - -@Mixin(Biome.class) -public class BiomeMixin implements BiomeExtension, BiomeAccess { - - @Shadow @Final - private String parent; - - @Redirect( - method = "", - at = @At( - value = "NEW", - target = "net/minecraft/util/Id2ObjectBiMap" - ) - ) - private static Id2ObjectBiMap osl$biomes$replaceIdMap() { - // this allows us to register the muated biomes mapper in - // the API entrypoint without triggering a Biome class load - return BiomeIdRegistry.MUTATED_BIOMES; - } - - @Override - public NamespacedIdentifier osl$biomes$getParentIdentifier() { - return this.parent == null ? null : NamespacedIdentifiers.parse(this.parent); - } -} diff --git a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.classtweaker b/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.classtweaker deleted file mode 100644 index b6382d789..000000000 --- a/libraries/biomes/biomes-mc18w43a-mc1.14.4/src/main/resources/osl.biomes.classtweaker +++ /dev/null @@ -1,8 +0,0 @@ -classTweaker v1 named - -transitive-accessible method net/minecraft/world/biome/Biome (Lnet/minecraft/world/biome/Biome$Builder;)V - -transitive-inject-interface net/minecraft/world/biome/Biome net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl -transitive-inject-interface net/minecraft/world/biome/Biome$Builder net/ornithemc/osl/biomes/impl/biome/BiomeExtensionImpl$BuilderExtensionImpl - -inject-interface net/minecraft/world/biome/Biome net/ornithemc/osl/biomes/impl/access/BiomeAccess diff --git a/settings.gradle b/settings.gradle index 9c7dd77b1..3ed611c8e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -28,8 +28,7 @@ include ':libraries:biomes:biomes-mc13w36a-mc1.8.2-pre4' include ':libraries:biomes:biomes-mc1.8.2-pre5-mc15w51b' include ':libraries:biomes:biomes-mc16w02a-mc18w05a' include ':libraries:biomes:biomes-mc18w06a-mc18w31a' -include ':libraries:biomes:biomes-mc18w32a-mc1.13.2' -include ':libraries:biomes:biomes-mc18w43a-mc1.14.4' +include ':libraries:biomes:biomes-mc18w32a-mc1.14.4' include ':libraries:blocks' include ':libraries:blocks:blocks-mca1.0.1_01-mc1.6.4'