From 5899036f44d018982bcf230d9caeb078063f595c Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 22 Jun 2020 18:34:05 -0500 Subject: [PATCH] De-objectholderify particles and containers --- .../client/core/handler/ModelHandler.java | 2 +- .../botania/client/fx/ModParticles.java | 12 +- .../client/gui/bag/ContainerFlowerBag.java | 8 +- .../client/gui/box/ContainerBaubleBox.java | 8 +- .../botania/client/render/tile/TEISR.java | 1 - .../java/vazkii/botania/common/Botania.java | 1 - .../common/core/BotaniaCreativeTab.java | 1 - .../common/entity/EntityBabylonWeapon.java | 2 - .../common/entity/EntityCorporeaSpark.java | 2 - .../common/entity/EntityDoppleganger.java | 1 - .../common/entity/EntityEnderAirBottle.java | 2 - .../common/entity/EntityFallingStar.java | 2 - .../common/entity/EntityFlameRing.java | 2 - .../common/entity/EntityMagicLandmine.java | 2 - .../common/entity/EntityMagicMissile.java | 2 - .../common/entity/EntityManaBurst.java | 2 - .../common/entity/EntityManaStorm.java | 2 - .../common/entity/EntityPinkWither.java | 3 - .../botania/common/entity/EntityPixie.java | 2 - .../common/entity/EntityPoolMinecart.java | 2 - .../common/entity/EntitySignalFlare.java | 2 - .../botania/common/entity/EntitySpark.java | 2 - .../common/entity/EntityThornChakram.java | 2 - .../common/entity/EntityThrownItem.java | 2 - .../botania/common/entity/EntityVineBall.java | 2 - .../botania/common/entity/ModEntities.java | 202 +++++++++--------- .../vazkii/botania/common/item/ModItems.java | 14 +- 27 files changed, 117 insertions(+), 168 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 5e7c159a9..6693d6642 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -32,7 +32,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex; import vazkii.botania.common.block.tile.mana.*; import vazkii.botania.common.block.tile.string.*; -import vazkii.botania.common.entity.*; +import vazkii.botania.common.entity.ModEntities; import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; diff --git a/src/main/java/vazkii/botania/client/fx/ModParticles.java b/src/main/java/vazkii/botania/client/fx/ModParticles.java index c2aa708c5..97c8f0313 100644 --- a/src/main/java/vazkii/botania/client/fx/ModParticles.java +++ b/src/main/java/vazkii/botania/client/fx/ModParticles.java @@ -12,20 +12,16 @@ import net.minecraft.client.Minecraft; import net.minecraft.particles.ParticleType; import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibMisc; import static vazkii.botania.common.block.ModBlocks.register; public class ModParticles { - @ObjectHolder(LibMisc.MOD_ID + ":wisp") public static ParticleType WISP; - - @ObjectHolder(LibMisc.MOD_ID + ":sparkle") public static ParticleType SPARKLE; + public static final ParticleType WISP = new WispParticleType(); + public static final ParticleType SPARKLE = new SparkleParticleType(); public static void registerParticles(RegistryEvent.Register> evt) { - register(evt.getRegistry(), "wisp", new WispParticleType()); - register(evt.getRegistry(), "sparkle", new SparkleParticleType()); + register(evt.getRegistry(), "wisp", WISP); + register(evt.getRegistry(), "sparkle", SPARKLE); } public static class FactoryHandler { diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index af2c51fd5..5586739aa 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -12,7 +12,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; @@ -20,16 +19,13 @@ import net.minecraft.util.Hand; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.SlotItemHandler; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.BlockModFlower; -import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; public class ContainerFlowerBag extends Container { - @ObjectHolder("botania:" + LibItemNames.FLOWER_BAG) public static ContainerType TYPE; - public static ContainerFlowerBag fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { Hand hand = buf.readBoolean() ? Hand.MAIN_HAND : Hand.OFF_HAND; return new ContainerFlowerBag(windowId, inv, inv.player.getHeldItem(hand)); @@ -38,7 +34,7 @@ public class ContainerFlowerBag extends Container { private final ItemStack bag; public ContainerFlowerBag(int windowId, PlayerInventory playerInv, ItemStack bag) { - super(TYPE, windowId); + super(ModItems.FLOWER_BAG_CONTAINER, windowId); int i; int j; diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index dce89e783..0ce1e4b53 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -11,7 +11,6 @@ package vazkii.botania.client.gui.box; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; @@ -19,16 +18,13 @@ import net.minecraft.util.Hand; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.SlotItemHandler; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.core.handler.EquipmentHandler; -import vazkii.botania.common.lib.LibItemNames; +import vazkii.botania.common.item.ModItems; import javax.annotation.Nonnull; public class ContainerBaubleBox extends Container { - @ObjectHolder("botania:" + LibItemNames.BAUBLE_BOX) public static ContainerType TYPE; - public static ContainerBaubleBox fromNetwork(int windowId, PlayerInventory inv, PacketBuffer buf) { Hand hand = buf.readBoolean() ? Hand.MAIN_HAND : Hand.OFF_HAND; return new ContainerBaubleBox(windowId, inv, inv.player.getHeldItem(hand)); @@ -38,7 +34,7 @@ public class ContainerBaubleBox extends Container { public IItemHandlerModifiable baubles; public ContainerBaubleBox(int windowId, PlayerInventory playerInv, ItemStack box) { - super(TYPE, windowId); + super(ModItems.BAUBLE_BOX_CONTAINER, windowId); int i; int j; diff --git a/src/main/java/vazkii/botania/client/render/tile/TEISR.java b/src/main/java/vazkii/botania/client/render/tile/TEISR.java index 077d68564..209abf6e9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/TEISR.java +++ b/src/main/java/vazkii/botania/client/render/tile/TEISR.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.LazyValue; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; public class TEISR extends ItemStackTileEntityRenderer { diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 216675df9..7344e29ec 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -16,7 +16,6 @@ import net.minecraft.entity.EntityType; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipeSerializer; -import net.minecraft.item.crafting.IRecipeType; import net.minecraft.particles.ParticleType; import net.minecraft.potion.Effect; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 5d8901e6e..b4ed78643 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -16,7 +16,6 @@ import net.minecraft.util.IItemProvider; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraftforge.registries.ForgeRegistryEntry; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index c36e3cb9d..0426cb455 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -23,7 +23,6 @@ import net.minecraft.util.math.*; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.handler.ModSounds; @@ -32,7 +31,6 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.relic.ItemKingKey; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 0093cb53b..971064592 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -28,14 +28,12 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.corporea.ICorporeaSpark; import vazkii.botania.api.corporea.InvWithLocation; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.material.ItemDye; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 04140677c..3e65a70e5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -62,7 +62,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.core.handler.BossBarHandler; import vazkii.botania.client.core.helper.ShaderCallback; diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 93b688383..f05703126 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -25,10 +25,8 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 9677d993e..42bd4aaa7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -19,11 +19,9 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import java.util.List; diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 0a956759e..5c1a7077f 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -19,11 +19,9 @@ import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.helper.MathHelper; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index 7b3764211..719705467 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -21,11 +21,9 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.core.handler.ModSounds; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index a55b891b9..7ebe287b2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -31,11 +31,9 @@ import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index e3b7a263b..70d164c5c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -27,7 +27,6 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -39,7 +38,6 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet; import vazkii.botania.common.item.lens.LensWarp; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 9fc95302f..8c1cf1d41 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -16,11 +16,9 @@ import net.minecraft.network.IPacket; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 2c3b03cf0..86c9b9266 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -21,9 +21,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; - -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index b260e9c8a..4dc524cba 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -21,10 +21,8 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.SparkleParticleData; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index 22d644064..0dffe8596 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -27,7 +27,6 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.client.fx.WispParticleData; @@ -35,7 +34,6 @@ import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.mana.TilePool; import vazkii.botania.common.block.tile.mana.TilePump; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 3ce58bc30..a0d2de270 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -19,11 +19,9 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.client.fx.WispParticleData; import vazkii.botania.common.Botania; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 0cd3be927..46553c625 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -27,7 +27,6 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.IItemHandler; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaItem; @@ -39,7 +38,6 @@ import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.material.ItemDye; -import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 419a188bf..122b9c279 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -37,11 +37,9 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 808e067a4..90dcf4148 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -18,10 +18,8 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.math.*; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.core.helper.Vector3; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index bbb4afa15..8cd107af4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -33,11 +33,9 @@ import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkHooks; -import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index 4afbae4ee..d51ee7c49 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -11,8 +11,8 @@ package vazkii.botania.common.entity; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraftforge.event.RegistryEvent; - import net.minecraftforge.registries.IForgeRegistry; + import vazkii.botania.common.block.tile.TileLightRelay.EntityPlayerMover; import vazkii.botania.common.lib.LibEntityNames; @@ -20,124 +20,124 @@ import static vazkii.botania.common.block.ModBlocks.register; public final class ModEntities { public static final EntityType MANA_BURST = EntityType.Builder.create( - EntityManaBurst::new, EntityClassification.MISC) - .size(0, 0) - .setUpdateInterval(10) - .setTrackingRange(64) - .setShouldReceiveVelocityUpdates(true) - .build(""); + EntityManaBurst::new, EntityClassification.MISC) + .size(0, 0) + .setUpdateInterval(10) + .setTrackingRange(64) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType SIGNAL_FLARE = EntityType.Builder.create( - EntitySignalFlare::new, EntityClassification.MISC) - .size(0, 0) - .setUpdateInterval(10) - .setTrackingRange(2048) - .setShouldReceiveVelocityUpdates(false) - .build(""); + EntitySignalFlare::new, EntityClassification.MISC) + .size(0, 0) + .setUpdateInterval(10) + .setTrackingRange(2048) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType PIXIE = EntityType.Builder.create(EntityPixie::new, EntityClassification.MISC) - .size(1, 1) - .setUpdateInterval(3) - .setTrackingRange(16) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(1, 1) + .setUpdateInterval(3) + .setTrackingRange(16) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType FLAME_RING = EntityType.Builder.create(EntityFlameRing::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(32) - .setUpdateInterval(40) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0, 0) + .setTrackingRange(32) + .setUpdateInterval(40) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType VINE_BALL = EntityType.Builder.create(EntityVineBall::new, EntityClassification.MISC) - .size(0.25F, 0.25F) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.25F, 0.25F) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType DOPPLEGANGER = EntityType.Builder.create(EntityDoppleganger::new, EntityClassification.MONSTER) - .size(0.6F, 1.8F) - .immuneToFire() - .setTrackingRange(128) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.6F, 1.8F) + .immuneToFire() + .setTrackingRange(128) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType MAGIC_LANDMINE = EntityType.Builder.create(EntityMagicLandmine::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(128) - .setUpdateInterval(40) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0, 0) + .setTrackingRange(128) + .setUpdateInterval(40) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType SPARK = EntityType.Builder.create(EntitySpark::new, EntityClassification.MISC) - .size(0.1F, 0.5F) - .immuneToFire() - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0.1F, 0.5F) + .immuneToFire() + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType THROWN_ITEM = EntityType.Builder.create(EntityThrownItem::new, EntityClassification.MISC) - .size(0.25F, 0.25F) - .setTrackingRange(64) - .setUpdateInterval(20) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.25F, 0.25F) + .setTrackingRange(64) + .setUpdateInterval(20) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType MAGIC_MISSILE = EntityType.Builder.create(EntityMagicMissile::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(64) - .setUpdateInterval(2) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0, 0) + .setTrackingRange(64) + .setUpdateInterval(2) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType THORN_CHAKRAM = EntityType.Builder.create(EntityThornChakram::new, EntityClassification.MISC) - .size(0.25F, 0.25F) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.25F, 0.25F) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType CORPOREA_SPARK = EntityType.Builder.create(EntityCorporeaSpark::new, EntityClassification.MISC) - .size(0.1F, 0.5F) - .immuneToFire() - .setTrackingRange(64) - .setUpdateInterval(40) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0.1F, 0.5F) + .immuneToFire() + .setTrackingRange(64) + .setUpdateInterval(40) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType ENDER_AIR_BOTTLE = EntityType.Builder.create(EntityEnderAirBottle::new, EntityClassification.MISC) - .size(0.25F, 0.25F) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.25F, 0.25F) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType POOL_MINECART = EntityType.Builder.create(EntityPoolMinecart::new, EntityClassification.MISC) - .size(0.98F, 0.7F) - .setTrackingRange(80) - .setUpdateInterval(3) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0.98F, 0.7F) + .setTrackingRange(80) + .setUpdateInterval(3) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType PINK_WITHER = EntityType.Builder.create(EntityPinkWither::new, EntityClassification.MISC) - .size(0.9F, 3.5F) - .setTrackingRange(80) - .setUpdateInterval(3) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0.9F, 3.5F) + .setTrackingRange(80) + .setUpdateInterval(3) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType PLAYER_MOVER = EntityType.Builder.create(EntityPlayerMover::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(40) - .setUpdateInterval(3) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0, 0) + .setTrackingRange(40) + .setUpdateInterval(3) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType MANA_STORM = EntityType.Builder.create(EntityManaStorm::new, EntityClassification.MISC) - .size(0.98F, 0.98F) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(false) - .build(""); + .size(0.98F, 0.98F) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(false) + .build(""); public static final EntityType BABYLON_WEAPON = EntityType.Builder.create(EntityBabylonWeapon::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0, 0) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static final EntityType FALLING_STAR = EntityType.Builder.create(EntityFallingStar::new, EntityClassification.MISC) - .size(0, 0) - .setTrackingRange(64) - .setUpdateInterval(10) - .setShouldReceiveVelocityUpdates(true) - .build(""); + .size(0, 0) + .setTrackingRange(64) + .setUpdateInterval(10) + .setShouldReceiveVelocityUpdates(true) + .build(""); public static void registerEntities(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 2740b13f0..81d84ec7f 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -406,6 +406,9 @@ public final class ModItems { @ObjectHolder(LibItemNames.ASTROLABE) public static Item astrolabe; @ObjectHolder(LibItemNames.GODDESS_CHARM) public static Item goddessCharm; + public static final ContainerType FLOWER_BAG_CONTAINER = IForgeContainerType.create(ContainerFlowerBag::fromNetwork); + public static final ContainerType BAUBLE_BOX_CONTAINER = IForgeContainerType.create(ContainerBaubleBox::fromNetwork); + public static Item.Properties defaultBuilder() { return new Item.Properties().group(BotaniaCreativeTab.INSTANCE); } @@ -702,15 +705,12 @@ public final class ModItems { public static void registerContainers(RegistryEvent.Register> evt) { IForgeRegistry> r = evt.getRegistry(); - ContainerType bag = IForgeContainerType.create(ContainerFlowerBag::fromNetwork); - register(r, Registry.ITEM.getKey(flowerBag), bag); - - ContainerType box = IForgeContainerType.create(ContainerBaubleBox::fromNetwork); - register(r, Registry.ITEM.getKey(baubleBox), box); + register(r, Registry.ITEM.getKey(flowerBag), FLOWER_BAG_CONTAINER); + register(r, Registry.ITEM.getKey(baubleBox), BAUBLE_BOX_CONTAINER); DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> { - ScreenManager.registerFactory(bag, GuiFlowerBag::new); - ScreenManager.registerFactory(box, GuiBaubleBox::new); + ScreenManager.registerFactory(FLOWER_BAG_CONTAINER, GuiFlowerBag::new); + ScreenManager.registerFactory(BAUBLE_BOX_CONTAINER, GuiBaubleBox::new); }); }