From a30a223b8781467b7c89b85d407f993ecd5395e7 Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Thu, 29 Dec 2022 13:15:23 +0100 Subject: [PATCH] extend enchantment IDs --- README.MD | 2 +- .../constants/ExtendedConstants.java | 1 + .../vanilla/enchantment/EnchantmentMixin.java | 18 ++++++++++++++++++ .../endlessids/mixin/plugin/Mixin.java | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java diff --git a/README.MD b/README.MD index cd87525..11a081a 100644 --- a/README.MD +++ b/README.MD @@ -10,7 +10,7 @@ Comparison of the known limits: | Biome IDs | 256 | 256 | 65,536 since 1.4 | | Entity IDs | 256 | 256 | 256 right now, extension planned | | Potion IDs | 32 | 32 | 65,536 since 1.5 | -| Enchantment IDs | 256 | 256 | 256 right now, extension planned | +| Enchantment IDs | 256 | 256 | 32,768 since 1.5 | | Dimension IDs | Theoretically unlimited, 4,294,967,295 in practice | Same | Same | This mod also contains patches for the following mods: diff --git a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java index bcc5c26..044f71a 100644 --- a/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java +++ b/src/main/java/com/falsepattern/endlessids/constants/ExtendedConstants.java @@ -12,6 +12,7 @@ public class ExtendedConstants { public static final int bitsPerBiome = 16; public static final int maximumPotionIDs = 65536; + public static final int maximumEnchantmentIDs = 32768; //BlockItemIDs public static final int nibblesPerID = bitsPerID / 4; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java new file mode 100644 index 0000000..c9a2b3e --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java @@ -0,0 +1,18 @@ +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.enchantment; + +import com.falsepattern.endlessids.constants.ExtendedConstants; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +import net.minecraft.enchantment.Enchantment; + +@Mixin(Enchantment.class) +public abstract class EnchantmentMixin { + @ModifyConstant(method = "", + constant = @Constant(intValue = 256), + require = 1) + private static int extendEnchantmentIDRange(int original) { + return ExtendedConstants.maximumEnchantmentIDs; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 349e2da..9f22be7 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -52,6 +52,9 @@ public enum Mixin implements IMixin { S1DPacketEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1DPacketEntityEffectMixin"), S1EPacketRemoveEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1EPacketRemoveEntityEffectMixin"), //endregion Minecraft->common->potion + //region Minecraft->common->enchantment + EnchantmentMixin(Side.COMMON, always(), "vanilla.enchantment.EnchantmentMixin"), + //endregion Minecraft->common->enchantment //endregion Minecraft->common //region Minecraft->client ChunkMixinClient(Side.CLIENT, always(), "vanilla.ChunkMixin"),