From 80170942e58b52d9ca2aa34d9ffa592f9d60daab Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 2 Apr 2019 01:15:36 -0500 Subject: [PATCH] use forgeregistries instead of iregistry where possible --- .../vazkii/botania/api/subtile/SubTileFunctional.java | 3 ++- .../vazkii/botania/api/subtile/SubTileGenerating.java | 3 ++- .../botania/client/core/handler/DebugHandler.java | 1 + .../botania/common/block/tile/TileEnchanter.java | 5 +++-- .../botania/common/crafting/ModBrewRecipes.java | 7 ++++--- .../botania/common/item/ItemBlackHoleTalisman.java | 11 +++++------ .../vazkii/botania/common/item/ItemCacophonium.java | 3 ++- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index dbd9ded3f..65f231d67 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -22,6 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.IRegistry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaPool; @@ -136,7 +137,7 @@ public class SubTileFunctional extends SubTileEntity { return false; knownMana = mana; - SoundEvent evt = IRegistry.SOUND_EVENT.get(DING_SOUND_EVENT); + SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT); if(evt != null) player.playSound(evt, 0.1F, 1F); diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index c76a7887c..fd4eac297 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -28,6 +28,7 @@ import net.minecraft.util.registry.IRegistry; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.IManaNetwork; import vazkii.botania.api.mana.IManaCollector; @@ -226,7 +227,7 @@ public class SubTileGenerating extends SubTileEntity { sync(); knownMana = mana; - SoundEvent evt = IRegistry.SOUND_EVENT.get(DING_SOUND_EVENT); + SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT); if(evt != null) player.playSound(evt, 0.1F, 1F); diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 0ee4c3b4f..413d213cb 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -26,6 +26,7 @@ import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.registries.ForgeRegistries; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBVertexShader; import org.lwjgl.opengl.GL; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 5dfa5e75d..a1ed69733 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -38,6 +38,7 @@ import net.minecraft.util.registry.IRegistry; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -365,7 +366,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl cmp.put(TAG_ITEM, itemCmp); String enchStr = enchants.stream() - .map(e -> IRegistry.ENCHANTMENT.getKey(e.enchantment) + "=" + e.enchantmentLevel) + .map(e -> ForgeRegistries.ENCHANTMENTS.getKey(e.enchantment) + "=" + e.enchantmentLevel) .collect(Collectors.joining(",")); cmp.putString(TAG_ENCHANTS, enchStr); } @@ -388,7 +389,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl for(String token : enchTokens) { try { String[] entryTokens = token.split("="); - Enchantment ench = IRegistry.ENCHANTMENT.get(new ResourceLocation(entryTokens[0])); + Enchantment ench = ForgeRegistries.ENCHANTMENTS.getValue(new ResourceLocation(entryTokens[0])); int lvl = Integer.parseInt(entryTokens[1]); enchants.add(new EnchantmentData(ench, lvl)); } catch (ResourceLocationException ignored) {} diff --git a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java index a90c5c585..9d8a43fb8 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModBrewRecipes.java @@ -18,6 +18,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.tags.ItemTags; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.IRegistry; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeBrew; import vazkii.botania.common.brew.ModBrews; @@ -75,9 +76,9 @@ public class ModBrewRecipes { } public static void initTC() { - Item salisMundus = IRegistry.ITEM.get(new ResourceLocation("thaumcraft", "salis_mundus")); - Item bathSalts = IRegistry.ITEM.get(new ResourceLocation("thaumcraft", "bath_salts")); - Item amber = IRegistry.ITEM.get(new ResourceLocation("thaumcraft", "amber")); + Item salisMundus = ForgeRegistries.ITEMS.getValue(new ResourceLocation("thaumcraft", "salis_mundus")); + Item bathSalts = ForgeRegistries.ITEMS.getValue(new ResourceLocation("thaumcraft", "bath_salts")); + Item amber = ForgeRegistries.ITEMS.getValue(new ResourceLocation("thaumcraft", "amber")); warpWardBrew = BotaniaAPI.registerBrewRecipe(ModBrews.warpWard, Ingredient.fromItems(Items.NETHER_WART), Ingredient.fromItems(salisMundus), Ingredient.fromItems(bathSalts), Ingredient.fromItems(amber)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 78f99c5cd..038bbf0a7 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -110,8 +110,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { } else { if(player == null || player.abilities.isCreativeMode || getBlockCount(stack) > 0) { ItemStack toUse = new ItemStack(bBlock); - // todo 1.13 need the protected constructor probably - ItemUseContext newCtx = new ItemUseContext(ctx.getPlayer(), stack, pos, side, ctx.getHitX(), ctx.getHitY(), ctx.getHitZ()); + ItemUseContext newCtx = new ItemUseContext(world, ctx.getPlayer(), stack, pos, side, ctx.getHitX(), ctx.getHitY(), ctx.getHitZ()); EnumActionResult result = toUse.getItem().onItemUse(newCtx); if (result == EnumActionResult.SUCCESS) { @@ -261,11 +260,11 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nullable public static Block getBlock(ItemStack stack) { - try { - return IRegistry.BLOCK.get(new ResourceLocation(getBlockName(stack))); - } catch (ResourceLocationException ex) { - return null; + ResourceLocation id = ResourceLocation.tryCreate(getBlockName(stack)); + if(id != null) { + return ForgeRegistries.BLOCKS.getValue(id); } + return null; } public static int getBlockCount(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 32f97c7be..fc6dd458c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -40,6 +40,7 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; +import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileCacophonium; @@ -166,7 +167,7 @@ public class ItemCacophonium extends ItemMod { return ModSounds.doit; else { try { - return IRegistry.SOUND_EVENT.get(new ResourceLocation(ItemNBTHelper.getString(stack, TAG_SOUND, ""))); + return ForgeRegistries.SOUND_EVENTS.getValue(new ResourceLocation(ItemNBTHelper.getString(stack, TAG_SOUND, ""))); } catch (ResourceLocationException ex) { return null; }