diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index 346cbd462..1344f9645 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -18,11 +18,11 @@ import net.minecraft.item.*; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IRegistryDelegate; import org.apache.logging.log4j.LogManager; @@ -65,7 +65,11 @@ public interface BotaniaAPI { return 0; } - default IForgeRegistry getBrewRegistry() { + /** + * Get the registry for brews. + * Forge documentation: This is purely a read-only wrapper. Register brews using the registry events. + */ + default Registry getBrewRegistry() { return null; } diff --git a/src/main/java/vazkii/botania/api/brew/Brew.java b/src/main/java/vazkii/botania/api/brew/Brew.java index cc2e69c0d..b93455480 100644 --- a/src/main/java/vazkii/botania/api/brew/Brew.java +++ b/src/main/java/vazkii/botania/api/brew/Brew.java @@ -12,7 +12,9 @@ import com.google.common.collect.ImmutableList; import net.minecraft.item.ItemStack; import net.minecraft.potion.EffectInstance; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.registries.ForgeRegistryEntry; +import vazkii.botania.api.BotaniaAPI; import java.util.List; @@ -68,7 +70,8 @@ public class Brew extends ForgeRegistryEntry { * Gets the insensitive unlocalized name. This is used for the lexicon. */ public String getTranslationKey() { - return String.format("%s.brew.%s", getRegistryName().getNamespace(), getRegistryName().getPath()); + ResourceLocation id = BotaniaAPI.instance().getBrewRegistry().getKey(this); + return String.format("%s.brew.%s", id.getNamespace(), id.getPath()); } /** diff --git a/src/main/java/vazkii/botania/common/brew/ModBrews.java b/src/main/java/vazkii/botania/common/brew/ModBrews.java index 2b6385333..0129350b9 100644 --- a/src/main/java/vazkii/botania/common/brew/ModBrews.java +++ b/src/main/java/vazkii/botania/common/brew/ModBrews.java @@ -14,12 +14,15 @@ import net.minecraft.potion.PotionUtils; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; import net.minecraftforge.event.RegistryEvent; +import net.minecraftforge.registries.GameData; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.RegistryBuilder; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.lib.LibBrewNames; +import vazkii.botania.common.lib.LibObfuscation; +import java.lang.invoke.MethodHandle; import java.util.Arrays; import static vazkii.botania.common.block.ModBlocks.register; @@ -27,8 +30,8 @@ import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; public class ModBrews { - public static IForgeRegistry registry; - public static final Brew fallbackBrew = new Brew(0, 0); + public static Registry registry; + public static final Brew fallbackBrew = new Brew(0, 0).setNotBloodPendantInfusable().setNotIncenseInfusable(); public static final Brew speed = new Brew(0x59B7FF, 4000, new EffectInstance(Effects.SPEED, 1800, 1)); public static final Brew strength = new Brew(0xEE3F3F, 4000, new EffectInstance(Effects.STRENGTH, 1800, 1)); public static final Brew haste = new Brew(0xF4A432, 4000, new EffectInstance(Effects.HASTE, 1800, 1)); @@ -54,12 +57,17 @@ public class ModBrews { public static Brew warpWard; public static void registerRegistry(RegistryEvent.NewRegistry evt) { - registry = new RegistryBuilder() - .setName(prefix("brews")) - .setType(Brew.class) - .setDefaultKey(prefix("fallback")) - .disableSaving() - .create(); + // Some sneaky hacks to get Forge to create the registry with a vanilla wrapper attached + MethodHandle makeBuilder = LibObfuscation.getMethod(GameData.class, "makeRegistry", ResourceLocation.class, Class.class, ResourceLocation.class); + try { + @SuppressWarnings("unchecked") + RegistryBuilder builder = (RegistryBuilder) makeBuilder.invokeExact(prefix("brews"), Brew.class, prefix("fallback")); + builder.disableSaving().create(); + // grab the vanilla wrapper for use + registry = GameData.getWrapperDefaulted(Brew.class); + } catch (Throwable throwable) { + throw new RuntimeException(throwable); + } } public static void registerBrews(RegistryEvent.Register evt) { diff --git a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java index f8c7dbcdd..3a7fe1cff 100644 --- a/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java +++ b/src/main/java/vazkii/botania/common/crafting/RecipeBrew.java @@ -148,7 +148,7 @@ public class RecipeBrew implements IBrewRecipe { if (brewId == null || !BotaniaAPI.instance().getBrewRegistry().containsKey(brewId)) { throw new JsonParseException("Unknown brew " + brewStr); } - Brew brew = BotaniaAPI.instance().getBrewRegistry().getValue(brewId); + Brew brew = BotaniaAPI.instance().getBrewRegistry().getOrDefault(brewId); JsonArray ingrs = JSONUtils.getJsonArray(json, "ingredients"); List inputs = new ArrayList<>(); @@ -160,7 +160,8 @@ public class RecipeBrew implements IBrewRecipe { @Override public RecipeBrew read(@Nonnull ResourceLocation id, @Nonnull PacketBuffer buf) { - Brew brew = buf.readRegistryIdUnsafe(BotaniaAPI.instance().getBrewRegistry()); + int intId = buf.readVarInt(); + Brew brew = BotaniaAPI.instance().getBrewRegistry().getByValue(intId); Ingredient[] inputs = new Ingredient[buf.readVarInt()]; for (int i = 0; i < inputs.length; i++) { inputs[i] = Ingredient.read(buf); @@ -170,7 +171,8 @@ public class RecipeBrew implements IBrewRecipe { @Override public void write(@Nonnull PacketBuffer buf, @Nonnull RecipeBrew recipe) { - buf.writeRegistryIdUnsafe(BotaniaAPI.instance().getBrewRegistry(), recipe.getBrew()); + int intId = BotaniaAPI.instance().getBrewRegistry().getId(recipe.getBrew()); + buf.writeVarInt(intId); buf.writeVarInt(recipe.getIngredients().size()); for (Ingredient input : recipe.getIngredients()) { input.write(buf); diff --git a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java index 781893fc6..34334d0bc 100644 --- a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java +++ b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -10,19 +10,18 @@ package vazkii.botania.common.impl; import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.*; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.registry.Registry; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.EmptyHandler; -import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IRegistryDelegate; import vazkii.botania.api.BotaniaAPI; @@ -32,12 +31,8 @@ import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.IWrappedInventory; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.api.internal.IManaNetwork; -import vazkii.botania.api.subtile.TileEntityFunctionalFlower; -import vazkii.botania.api.subtile.TileEntityGeneratingFlower; -import vazkii.botania.api.subtile.TileEntitySpecialFlower; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.Botania; -import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.subtile.functional.SubTileSolegnolia; import vazkii.botania.common.brew.ModBrews; import vazkii.botania.common.core.handler.*; @@ -187,7 +182,7 @@ public class BotaniaAPIImpl implements BotaniaAPI { } @Override - public IForgeRegistry getBrewRegistry() { + public Registry getBrewRegistry() { return ModBrews.registry; } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index 11df13d87..821521c23 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -37,11 +37,14 @@ import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; import java.util.Map; import java.util.function.Supplier; +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + public class ItemBrewBase extends Item implements IBrewItem { private static final String TAG_BREW_KEY = "brewKey"; @@ -114,7 +117,7 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public void fillItemGroup(ItemGroup tab, NonNullList list) { if (isInGroup(tab)) { - for (ResourceLocation id : BotaniaAPI.instance().getBrewRegistry().getKeys()) { + for (ResourceLocation id : BotaniaAPI.instance().getBrewRegistry().keySet()) { ItemStack stack = new ItemStack(this); setBrew(stack, id); list.add(stack); @@ -193,11 +196,17 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getOrDefault(ResourceLocation.tryCreate(key)); } - public static void setBrew(ItemStack stack, Brew brew) { - setBrew(stack, (brew == null ? ModBrews.fallbackBrew : brew).getRegistryName()); + public static void setBrew(ItemStack stack, @Nullable Brew brew) { + ResourceLocation id; + if (brew != null) { + id = BotaniaAPI.instance().getBrewRegistry().getKey(brew); + } else { + id = prefix("fallback"); + } + setBrew(stack, id); } public static void setBrew(ItemStack stack, ResourceLocation brew) { diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index a84717ff7..765e3f2d0 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -70,11 +70,11 @@ public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getOrDefault(ResourceLocation.tryCreate(key)); } public static void setBrew(ItemStack stack, Brew brew) { - setBrew(stack, brew.getRegistryName()); + setBrew(stack, BotaniaAPI.instance().getBrewRegistry().getKey(brew)); } public static void setBrew(ItemStack stack, ResourceLocation brew) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 813fa803b..f973211e0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -140,11 +140,11 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public Brew getBrew(ItemStack stack) { String key = ItemNBTHelper.getString(stack, TAG_BREW_KEY, ""); - return BotaniaAPI.instance().getBrewRegistry().getValue(ResourceLocation.tryCreate(key)); + return BotaniaAPI.instance().getBrewRegistry().getOrDefault(ResourceLocation.tryCreate(key)); } public static void setBrew(ItemStack stack, Brew brew) { - setBrew(stack, brew.getRegistryName()); + setBrew(stack, BotaniaAPI.instance().getBrewRegistry().getKey(brew)); } public static void setBrew(ItemStack stack, ResourceLocation brew) { diff --git a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java index 4eeb69118..3a17da460 100644 --- a/src/main/java/vazkii/botania/data/recipes/BrewProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/BrewProvider.java @@ -23,6 +23,7 @@ import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; +import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.brew.Brew; import vazkii.botania.common.Botania; import vazkii.botania.common.brew.ModBrews; @@ -87,7 +88,7 @@ public class BrewProvider extends RecipeProvider { @Override public void serialize(JsonObject json) { - json.addProperty("brew", brew.getRegistryName().toString()); + json.addProperty("brew", BotaniaAPI.instance().getBrewRegistry().getKey(brew).toString()); JsonArray ingredients = new JsonArray(); for (Ingredient ingr : inputs) { ingredients.add(ingr.serialize());