From 17ccb624f8660e27101e980380ac1c176d8e1ecb Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 26 Jun 2020 09:59:25 -0500 Subject: [PATCH] Lots of work --- .../java/vazkii/botania/api/BotaniaAPI.java | 10 +- .../api/item/AccessoryRenderHelper.java | 2 +- .../api/state/enums/AlfPortalState.java | 2 +- .../botania/api/state/enums/CratePattern.java | 2 +- .../api/state/enums/LuminizerVariant.java | 2 +- .../subtile/TileEntityGeneratingFlower.java | 2 +- .../api/subtile/TileEntitySpecialFlower.java | 8 +- .../core/handler/BaubleRenderHandler.java | 2 +- .../handler/BlockHighlightRenderHandler.java | 2 +- .../core/handler/BoundTileRenderer.java | 1 + .../handler/ContributorFancinessHandler.java | 4 +- .../core/handler/CorporeaInputHandler.java | 6 +- .../client/core/handler/DebugHandler.java | 8 +- .../core/handler/MiscellaneousIcons.java | 10 +- .../client/core/handler/RenderLexicon.java | 9 +- .../client/core/handler/TooltipHandler.java | 6 +- .../client/core/helper/IconHelper.java | 2 +- .../client/core/helper/RenderHelper.java | 6 +- .../vazkii/botania/client/fx/FXLightning.java | 4 +- .../vazkii/botania/client/fx/FXSparkle.java | 2 +- .../client/fx/SparkleParticleType.java | 4 +- .../botania/client/fx/WispParticleType.java | 4 +- .../botania/client/model/DelegatedModel.java | 4 +- .../client/model/FloatingFlowerModel.java | 10 +- .../vazkii/botania/client/model/GunModel.java | 7 +- .../botania/client/model/ModelBellows.java | 2 +- .../botania/client/model/ModelBrewery.java | 2 +- .../botania/client/model/ModelHourglass.java | 2 +- .../processor/ManaInfusionProcessor.java | 2 +- .../render/entity/RenderBabylonWeapon.java | 6 +- .../render/entity/RenderCorporeaSpark.java | 2 +- .../client/render/entity/RenderNoop.java | 4 +- .../client/render/entity/RenderSparkBase.java | 4 +- .../render/tile/RenderTileAlfPortal.java | 5 +- .../client/render/tile/RenderTileAltar.java | 6 +- .../render/tile/RenderTileAnimatedTorch.java | 2 +- .../client/render/tile/RenderTileAvatar.java | 2 +- .../client/render/tile/RenderTileBellows.java | 2 +- .../client/render/tile/RenderTileCocoon.java | 2 +- .../tile/RenderTileCorporeaCrystalCube.java | 4 +- .../render/tile/RenderTileCorporeaIndex.java | 4 +- .../render/tile/RenderTileEnchanter.java | 2 +- .../render/tile/RenderTileFloatingFlower.java | 4 +- .../render/tile/RenderTileHourglass.java | 2 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 4 +- .../client/render/tile/RenderTilePool.java | 2 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../client/render/tile/RenderTilePump.java | 2 +- .../client/render/tile/RenderTilePylon.java | 5 +- .../render/tile/RenderTileRuneAltar.java | 2 +- .../render/tile/RenderTileSparkChanger.java | 2 +- .../render/tile/RenderTileSpreader.java | 4 +- .../render/tile/RenderTileStarfield.java | 2 +- .../render/tile/RenderTileTerraPlate.java | 2 +- .../render/tile/RenderTileTeruTeruBozu.java | 2 +- .../render/tile/RenderTileTinyPotato.java | 4 +- .../botania/client/render/tile/TEISR.java | 3 +- .../render/world/SkyblockSkyRenderer.java | 4 +- .../java/vazkii/botania/common/Botania.java | 13 +- .../botania/common/block/BlockAlfPortal.java | 6 - .../botania/common/block/BlockAltGrass.java | 2 +- .../common/block/BlockAnimatedTorch.java | 2 +- .../common/block/BlockBifrostPerm.java | 2 +- .../common/block/BlockEnchantedSoil.java | 2 +- .../botania/common/block/BlockFakeAir.java | 7 +- .../block/BlockFloatingSpecialFlower.java | 4 +- .../botania/common/block/BlockGhostRail.java | 18 +- .../botania/common/block/BlockHourglass.java | 8 +- .../botania/common/block/BlockLightRelay.java | 5 - .../botania/common/block/BlockModFlower.java | 2 +- .../common/block/BlockModWaterloggable.java | 6 +- .../common/block/BlockPistonRelay.java | 18 +- .../botania/common/block/BlockSolidVines.java | 5 - .../common/block/BlockSpecialFlower.java | 6 +- .../botania/common/block/ModBanners.java | 2 +- .../botania/common/block/ModBlocks.java | 46 ++-- .../botania/common/block/ModSubtiles.java | 2 +- .../BlockCorporeaBaseWaterloggable.java | 6 +- .../corporea/BlockCorporeaInterceptor.java | 5 - .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockModGlass.java | 7 - .../block/dispenser/BehaviourFelPumpkin.java | 2 +- .../dispenser/BehaviourPoolMinecart.java | 4 +- .../common/block/mana/BlockForestDrum.java | 27 ++- .../botania/common/block/mana/BlockPool.java | 4 +- .../common/block/mana/BlockSpreader.java | 5 - .../common/block/mana/BlockTerraPlate.java | 2 +- .../string/BlockRedStringInterceptor.java | 5 - .../functional/BergamuteEventHandler.java | 6 +- .../subtile/functional/SubTileBergamute.java | 2 +- .../functional/SubTileFallenKanade.java | 4 +- .../subtile/functional/SubTileLoonuim.java | 18 +- .../subtile/functional/SubTileOrechid.java | 11 +- .../functional/SubTileOrechidIgnem.java | 2 +- .../functional/SubTileRannuncarpus.java | 6 +- .../functional/SubTileSpectranthemum.java | 4 +- .../subtile/generating/SubTileArcaneRose.java | 2 +- .../subtile/generating/SubTileEndoflame.java | 2 +- .../generating/SubTileEntropinnyum.java | 4 +- .../generating/SubTileGourmaryllis.java | 2 +- .../generating/SubTileHydroangeas.java | 10 +- .../subtile/generating/SubTileRafflowsia.java | 2 +- .../subtile/generating/SubTileShulkMeNot.java | 2 +- .../subtile/generating/SubTileThermalily.java | 3 +- .../common/block/tile/TileAlfPortal.java | 4 +- .../common/block/tile/TileBifrost.java | 5 +- .../common/block/tile/TileFakeAir.java | 5 +- .../common/block/tile/TileHourglass.java | 2 +- .../common/block/tile/TileLightRelay.java | 4 +- .../botania/common/block/tile/TileMod.java | 5 +- .../common/block/tile/TileOpenCrate.java | 2 +- .../common/block/tile/TileRuneAltar.java | 2 +- .../common/block/tile/TileSpawnerClaw.java | 2 +- .../common/block/tile/TileTeruTeruBozu.java | 4 +- .../common/block/tile/TileTinyPotato.java | 4 +- .../tile/corporea/TileCorporeaIndex.java | 5 +- .../corporea/TileCorporeaInterceptor.java | 2 +- .../common/block/tile/mana/TilePool.java | 2 +- .../tile/string/TileRedStringInterceptor.java | 2 +- .../common/core/BotaniaCreativeTab.java | 2 +- .../core/command/CommandSkyblockSpread.java | 3 +- .../common/core/handler/ConfigHandler.java | 1 + .../common/core/handler/PixieHandler.java | 20 +- .../common/core/helper/ItemNBTHelper.java | 4 +- .../botania/common/core/helper/Vector3.java | 6 +- .../botania/common/core/loot/BindUuid.java | 18 +- .../common/core/loot/EnableRelics.java | 21 +- .../common/core/loot/ModLootModifiers.java | 19 ++ .../common/core/loot/TrueGuardianKiller.java | 27 ++- .../common/core/proxy/ServerProxy.java | 4 +- .../crafting/StateIngredientBlocks.java | 6 +- .../crafting/StateIngredientHelper.java | 9 +- .../common/crafting/StateIngredientTag.java | 15 +- .../common/crafting/recipe/BannerRecipe.java | 4 +- .../common/entity/EntityBabylonWeapon.java | 5 +- .../common/entity/EntityCorporeaSpark.java | 13 +- .../common/entity/EntityDoppleganger.java | 11 +- .../common/entity/EntityEnderAirBottle.java | 2 +- .../common/entity/EntityFallingStar.java | 4 +- .../common/entity/EntityMagicMissile.java | 6 +- .../common/entity/EntityPinkWither.java | 7 +- .../botania/common/entity/EntityPixie.java | 1 - .../botania/common/entity/EntitySpark.java | 17 +- .../common/entity/EntityThornChakram.java | 22 +- .../common/entity/EntityThrowableCopy.java | 226 ++++-------------- .../common/entity/EntityThrownItem.java | 1 + .../botania/common/impl/BotaniaAPIImpl.java | 13 +- .../botania/common/item/ItemAncientWill.java | 4 +- .../botania/common/item/ItemAstrolabe.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 15 +- .../botania/common/item/ItemBlackLotus.java | 2 +- .../botania/common/item/ItemBottledMana.java | 6 +- .../botania/common/item/ItemCacophonium.java | 10 +- .../botania/common/item/ItemCraftingHalo.java | 6 +- .../botania/common/item/ItemEnderHand.java | 7 +- .../botania/common/item/ItemFertilizer.java | 2 +- .../botania/common/item/ItemLaputaShard.java | 8 +- .../botania/common/item/ItemLexicon.java | 2 +- .../botania/common/item/ItemManaGun.java | 19 +- .../botania/common/item/ItemManaMirror.java | 2 +- .../botania/common/item/ItemManaTablet.java | 2 +- .../botania/common/item/ItemPinkinator.java | 4 +- .../botania/common/item/ItemSlimeBottle.java | 2 +- .../botania/common/item/ItemSlingshot.java | 2 +- .../botania/common/item/ItemSpawnerMover.java | 2 +- .../botania/common/item/ItemThornChakram.java | 2 +- .../botania/common/item/ItemTwigWand.java | 17 +- .../botania/common/item/ItemVineBall.java | 2 +- .../vazkii/botania/common/item/ItemVirus.java | 37 ++- .../botania/common/item/ItemWorldSeed.java | 2 +- .../common/item/block/ItemBlockPool.java | 2 +- .../item/block/ItemBlockSpecialFlower.java | 17 +- .../item/block/ItemBlockTinyPotato.java | 3 +- .../common/item/brew/ItemBrewBase.java | 13 +- .../common/item/brew/ItemIncenseStick.java | 4 +- .../armor/elementium/ItemElementiumArmor.java | 5 +- .../armor/elementium/ItemElementiumBoots.java | 7 +- .../armor/elementium/ItemElementiumChest.java | 7 +- .../armor/elementium/ItemElementiumHelm.java | 7 +- .../armor/elementium/ItemElementiumLegs.java | 7 +- .../armor/manasteel/ItemManasteelArmor.java | 23 +- .../armor/manaweave/ItemManaweaveArmor.java | 11 +- .../armor/terrasteel/ItemTerrasteelArmor.java | 18 +- .../armor/terrasteel/ItemTerrasteelHelm.java | 4 +- .../item/equipment/bauble/ItemBauble.java | 3 +- .../equipment/bauble/ItemBaubleCosmetic.java | 6 +- .../equipment/bauble/ItemBloodPendant.java | 13 +- .../equipment/bauble/ItemCloudPendant.java | 2 +- .../item/equipment/bauble/ItemDodgeRing.java | 2 +- .../equipment/bauble/ItemFlightTiara.java | 8 +- .../equipment/bauble/ItemGoddessCharm.java | 4 +- .../item/equipment/bauble/ItemIcePendant.java | 8 +- .../item/equipment/bauble/ItemItemFinder.java | 2 +- .../equipment/bauble/ItemKnockbackBelt.java | 9 +- .../item/equipment/bauble/ItemMagnetRing.java | 8 +- .../item/equipment/bauble/ItemPixieRing.java | 7 +- .../item/equipment/bauble/ItemReachRing.java | 3 +- .../item/equipment/bauble/ItemTravelBelt.java | 4 +- .../item/equipment/tool/ItemEnderDagger.java | 9 +- .../item/equipment/tool/ItemGlassPick.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 11 +- .../item/equipment/tool/ToolCommons.java | 4 +- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/elementium/ItemElementiumPick.java | 4 +- .../tool/elementium/ItemElementiumShovel.java | 6 +- .../tool/elementium/ItemElementiumSword.java | 7 +- .../tool/manasteel/ItemManasteelShears.java | 59 ----- .../tool/terrasteel/ItemTerraAxe.java | 12 +- .../tool/terrasteel/ItemTerraPick.java | 8 +- .../tool/terrasteel/ItemTerraSword.java | 2 +- .../botania/common/item/lens/ItemLens.java | 2 +- .../botania/common/item/lens/LensDamage.java | 4 +- .../common/item/lens/LensExplosive.java | 2 +- .../common/item/lens/LensFirework.java | 2 +- .../botania/common/item/lens/LensMagnet.java | 2 +- .../botania/common/item/material/ItemDye.java | 6 +- .../common/item/material/ItemEnderAir.java | 2 +- .../botania/common/item/relic/ItemDice.java | 4 +- .../common/item/relic/ItemFlugelEye.java | 6 +- .../common/item/relic/ItemLokiRing.java | 1 + .../common/item/relic/ItemOdinRing.java | 9 +- .../botania/common/item/relic/ItemRelic.java | 2 +- .../common/item/rod/ItemDiviningRod.java | 4 +- .../common/item/rod/ItemExchangeRod.java | 10 +- .../common/item/rod/ItemGravityRod.java | 2 +- .../common/item/rod/ItemRainbowRod.java | 2 +- .../common/item/rod/ItemSkyDirtRod.java | 1 + .../common/item/rod/ItemTerraformRod.java | 4 +- .../common/item/rod/ItemTornadoRod.java | 2 +- .../vazkii/botania/common/lib/ModTags.java | 199 ++++++++------- .../botania/common/network/PacketHandler.java | 2 +- .../common/world/MysticalFlowerFeature.java | 5 +- .../botania/data/BlockLootProvider.java | 16 +- .../data/recipes/ManaInfusionProvider.java | 4 +- .../botania/data/recipes/RecipeProvider.java | 9 +- 236 files changed, 839 insertions(+), 1015 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index b575ad964..994d5e854 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -9,7 +9,7 @@ package vazkii.botania.api; import net.minecraft.block.Block; -import net.minecraft.entity.ai.attributes.IAttribute; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.RangedAttribute; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.DyeColor; @@ -128,6 +128,11 @@ public interface BotaniaAPI { public float getToughness() { return 0; } + + @Override + public float func_230304_f_() { + return 0; + } }; IItemTier DUMMY_ITEM_TIER = new IItemTier() { @@ -200,7 +205,4 @@ public interface BotaniaAPI { return new DummyMethodHandler(); } - default IAttribute getPixieSpawnChanceAttribute() { - return new RangedAttribute(null, "missingno", 0, 0, 0); - } } diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java index ffcc97ed4..4a33fa98e 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java @@ -10,8 +10,8 @@ package vazkii.botania.api.item; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.entity.LivingEntity; +import net.minecraft.util.math.vector.Vector3f; /** * A few helper methods for the render. diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 9f8cf45ae..d57f1a838 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -18,7 +18,7 @@ public enum AlfPortalState implements IStringSerializable { ON_X; @Override - public String getName() { + public String func_176610_l() { return name().toLowerCase(Locale.ROOT); } diff --git a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java index 4e51f9153..d6ab88646 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CratePattern.java +++ b/src/main/java/vazkii/botania/api/state/enums/CratePattern.java @@ -56,7 +56,7 @@ public enum CratePattern implements IStringSerializable { } @Override - public String getName() { + public String func_176610_l() { return name().toLowerCase(Locale.ROOT); } } diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 37943e2f8..a7223410c 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -19,7 +19,7 @@ public enum LuminizerVariant implements IStringSerializable { TOGGLE; @Override - public String getName() { + public String func_176610_l() { return name().toLowerCase(Locale.ROOT); } diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index 312d3998b..e44c21590 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -18,7 +18,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index 862b5aec8..b0b7eba7b 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -15,6 +15,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; @@ -29,7 +30,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; -import net.minecraft.world.storage.loot.LootContext; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.model.ModelDataManager; @@ -122,7 +122,7 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile @Override public LazyOptional getCapability(@Nonnull Capability cap, @Nullable Direction side) { if (cap == FLOATING_FLOWER_CAP) { - if (hasWorld() && getBlockState().isIn(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) { + if (hasWorld() && getBlockState().func_235714_a_(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS)) { return floatingDataCap.cast(); } } @@ -155,8 +155,8 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile } @Override - public final void read(CompoundNBT cmp) { - super.read(cmp); + public final void func_230337_a_(BlockState state, CompoundNBT cmp) { + super.func_230337_a_(state, cmp); if (cmp.contains(TAG_TICKS_EXISTED)) { ticksExisted = cmp.getInt(TAG_TICKS_EXISTED); } diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index bdb96ab4c..64fb657a9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -13,7 +13,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.IEntityRenderer; import net.minecraft.client.renderer.entity.layers.LayerRenderer; import net.minecraft.client.renderer.entity.model.PlayerModel; @@ -25,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Effects; +import net.minecraft.util.math.vector.Vector3f; import top.theillusivec4.curios.api.CuriosAPI; import top.theillusivec4.curios.api.capability.CuriosCapability; import top.theillusivec4.curios.api.inventory.CurioStackHandler; diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index c241c4084..46fd4b1e9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.Tessellator; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraftforge.client.event.RenderWorldLastEvent; import vazkii.botania.api.subtile.RadiusDescriptor; diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index ae708815d..31c8e8fc8 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -24,6 +24,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index a9e9ed9cb..ee3e30a4d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -110,7 +110,7 @@ public final class ContributorFancinessHandler extends LayerRenderer Registry.ITEM.getKey(flower).getPath().equals(flowerName)) .findFirst().orElse(Items.POPPY); m.put(key, new ItemStack(item)); @@ -124,7 +124,7 @@ public final class ContributorFancinessHandler extends LayerRenderer dim = Minecraft.getInstance().world.func_234923_W_(); + ResourceLocation dimName = dim.func_240901_a_(); if (ServerLifecycleHooks.getCurrentServer() != null) { World serverWorld = ServerLifecycleHooks.getCurrentServer().getWorld(dim); event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER %s) netColl : %d, netPool: %d", dimName, ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } - if (Screen.hasControlDown() && Screen.hasShiftDown()) { + if (Screen.func_231172_r_() && Screen.func_231173_s_()) { event.getLeft().add(PREFIX + "Config Context"); event.getLeft().add(" shaders.enabled: " + ConfigHandler.CLIENT.useShaders.get()); diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index ebe53c92c..77e5fab82 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -10,9 +10,9 @@ package vazkii.botania.client.core.handler; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.model.ModelResourceLocation; +import net.minecraft.client.renderer.model.RenderMaterial; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.tileentity.BannerPattern; @@ -86,9 +86,9 @@ public class MiscellaneousIcons { public final IBakedModel[] kingKeyWeaponModels = new IBakedModel[ItemKingKey.WEAPON_TYPES]; public void onModelRegister(ModelRegistryEvent evt) { - Set materials; + Set materials; try { - materials = (Set) MATERIALS.invokeExact(); + materials = (Set) MATERIALS.invokeExact(); } catch (Throwable throwable) { throw new RuntimeException(throwable); } @@ -97,8 +97,8 @@ public class MiscellaneousIcons { materials.add(RenderLexicon.ELVEN_TEXTURE); for (BannerPattern pattern : BannerPattern.values()) { if (pattern.getFileName().startsWith(LibMisc.MOD_ID)) { - materials.add(new Material(Atlases.SHIELD_ATLAS, pattern.func_226957_a_(false))); - materials.add(new Material(Atlases.BANNER_ATLAS, pattern.func_226957_a_(true))); + materials.add(new RenderMaterial(Atlases.SHIELD_ATLAS, pattern.func_226957_a_(false))); + materials.add(new RenderMaterial(Atlases.BANNER_ATLAS, pattern.func_226957_a_(true))); } } ModelLoader.addSpecialModel(prefix("icon/goldfish")); diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 84b2174c7..b7d1e7a2f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -16,7 +16,7 @@ import net.minecraft.client.entity.player.AbstractClientPlayerEntity; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.*; import net.minecraft.client.renderer.entity.model.BookModel; -import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.RenderMaterial; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.I18n; @@ -25,6 +25,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.HandSide; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.client.event.RenderHandEvent; @@ -46,8 +47,8 @@ public class RenderLexicon { private static final MethodHandle APPLY_SWING_OFFSET = LibObfuscation.getMethod(FirstPersonRenderer.class, "func_228399_a_", MatrixStack.class, HandSide.class, float.class); private static final BookModel model = new BookModel(); private static final boolean SHOULD_MISSPELL = Math.random() < 0.0004; - public static final Material TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT)); - public static final Material ELVEN_TEXTURE = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN)); + public static final RenderMaterial TEXTURE = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_DEFAULT)); + public static final RenderMaterial ELVEN_TEXTURE = new RenderMaterial(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(LibResources.MODEL_LEXICA_ELVEN)); private static final String[] QUOTES = new String[] { "\"Neat!\" - Direwolf20", @@ -145,7 +146,7 @@ public class RenderLexicon { float rightPageAngle = MathHelper.frac(pageFlip + 0.75F) * 1.6F - 0.3F; model.func_228247_a_(ClientTickHandler.total, MathHelper.clamp(leftPageAngle, 0.0F, 1.0F), MathHelper.clamp(rightPageAngle, 0.0F, 1.0F), opening); - Material mat = ((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? ELVEN_TEXTURE : TEXTURE; + RenderMaterial mat = ((ItemLexicon) ModItems.lexicon).isElvenItem(stack) ? ELVEN_TEXTURE : TEXTURE; IVertexBuilder buffer = mat.getBuffer(buffers, RenderType::getEntitySolid); model.render(ms, buffer, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 31f8411bb..3e3e12add 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -28,12 +28,12 @@ public final class TooltipHandler { } public static ITextComponent getShiftInfoTooltip() { - ITextComponent shift = new StringTextComponent("SHIFT").applyTextStyle(TextFormatting.AQUA); - return new TranslationTextComponent("botaniamisc.shiftinfo", shift).applyTextStyle(TextFormatting.GRAY); + ITextComponent shift = new StringTextComponent("SHIFT").func_240699_a_(TextFormatting.AQUA); + return new TranslationTextComponent("botaniamisc.shiftinfo", shift).func_240699_a_(TextFormatting.GRAY); } public static void addOnShift(List tooltip, Runnable lambda) { - if (Screen.hasShiftDown()) { + if (Screen.func_231173_s_()) { lambda.run(); } else { tooltip.add(getShiftInfoTooltip()); diff --git a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java index c98824a90..1aa71024b 100644 --- a/src/main/java/vazkii/botania/client/core/helper/IconHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/IconHelper.java @@ -11,8 +11,8 @@ package vazkii.botania.client.core.helper; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.math.vector.Matrix4f; public final class IconHelper { /** diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index e2eb6f3c7..a69a76990 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -28,6 +28,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.World; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; @@ -86,7 +88,7 @@ public final class RenderHelper { RenderState.DiffuseLightingState enableDiffuse = new RenderState.DiffuseLightingState(true); RenderState.AlphaState zeroAlpha = new RenderState.AlphaState(0); RenderState.AlphaState oneTenthAlpha = new RenderState.AlphaState(0.004F); - RenderState.DepthTestState noDepth = new RenderState.DepthTestState(GL11.GL_ALWAYS); + RenderState.DepthTestState noDepth = new RenderState.DepthTestState("always", GL11.GL_ALWAYS); boolean useShaders = ShaderHelper.useShaders(); RenderType.State glState = RenderType.State.getBuilder().shadeModel(smoothShade) @@ -161,7 +163,7 @@ public final class RenderHelper { GAIA_PYLON_GLOW = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.PYLON_GLOW, null, gaiaPylonGlow) : gaiaPylonGlow; // Same as entity_translucent, with no depth test and a shader - glState = RenderType.State.getBuilder().depthTest(new RenderState.DepthTestState(GL11.GL_ALWAYS)).texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(TRANSLUCENT_TRANSPARENCY).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true); + glState = RenderType.State.getBuilder().depthTest(new RenderState.DepthTestState("always", GL11.GL_ALWAYS)).texture(new RenderState.TextureState(AtlasTexture.LOCATION_BLOCKS_TEXTURE, false, false)).transparency(TRANSLUCENT_TRANSPARENCY).diffuseLighting(enableDiffuse).alpha(oneTenthAlpha).cull(disableCull).lightmap(enableLightmap).overlay(enableOverlay).build(true); ShaderCallback cb = shader -> { int alpha = GlStateManager.getUniformLocation(shader, "alpha"); ShaderHelper.FLOAT_BUF.position(0); diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 0d3d55560..275baaa5f 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -17,12 +17,12 @@ import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceContext; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; import vazkii.botania.client.core.handler.LightningHandler; import vazkii.botania.common.core.helper.Vector3; @@ -46,7 +46,7 @@ public class FXLightning extends Particle { private int splitCount; private float speed = 1.5F; - public FXLightning(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { + public FXLightning(ClientWorld world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) { super(world, sourcevec.x, sourcevec.y, sourcevec.z); rand = new Random(seed); speed = ticksPerMeter; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index 1cc6d1786..4f528d748 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -22,7 +22,7 @@ import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java index c7de1081f..773c963f3 100644 --- a/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java +++ b/src/main/java/vazkii/botania/client/fx/SparkleParticleType.java @@ -11,8 +11,8 @@ package vazkii.botania.client.fx; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; +import net.minecraft.client.world.ClientWorld; import net.minecraft.particles.ParticleType; -import net.minecraft.world.World; public class SparkleParticleType extends ParticleType { public SparkleParticleType() { @@ -27,7 +27,7 @@ public class SparkleParticleType extends ParticleType { } @Override - public Particle makeParticle(SparkleParticleData data, World world, double x, double y, double z, double mx, double my, double mz) { + public Particle makeParticle(SparkleParticleData data, ClientWorld world, double x, double y, double z, double mx, double my, double mz) { return new FXSparkle(world, x, y, z, data.size, data.r, data.g, data.b, data.m, data.fake, data.noClip, data.corrupt, sprite); } } diff --git a/src/main/java/vazkii/botania/client/fx/WispParticleType.java b/src/main/java/vazkii/botania/client/fx/WispParticleType.java index 6510fc1ec..a8672c6c9 100644 --- a/src/main/java/vazkii/botania/client/fx/WispParticleType.java +++ b/src/main/java/vazkii/botania/client/fx/WispParticleType.java @@ -11,8 +11,8 @@ package vazkii.botania.client.fx; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; +import net.minecraft.client.world.ClientWorld; import net.minecraft.particles.ParticleType; -import net.minecraft.world.World; public class WispParticleType extends ParticleType { public WispParticleType() { @@ -27,7 +27,7 @@ public class WispParticleType extends ParticleType { } @Override - public Particle makeParticle(WispParticleData data, World world, double x, double y, double z, double mx, double my, double mz) { + public Particle makeParticle(WispParticleData data, ClientWorld world, double x, double y, double z, double mx, double my, double mz) { FXWisp ret = new FXWisp(world, x, y, z, mx, my, mz, data.size, data.r, data.g, data.b, data.depthTest, data.maxAgeMul, data.noClip); ret.selectSpriteRandomly(sprite); return ret; diff --git a/src/main/java/vazkii/botania/client/model/DelegatedModel.java b/src/main/java/vazkii/botania/client/model/DelegatedModel.java index 057ec706b..6daeebfdd 100644 --- a/src/main/java/vazkii/botania/client/model/DelegatedModel.java +++ b/src/main/java/vazkii/botania/client/model/DelegatedModel.java @@ -18,7 +18,7 @@ import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ILightReader; +import net.minecraft.world.IBlockDisplayReader; import net.minecraftforge.client.model.data.IModelData; import javax.annotation.Nonnull; @@ -97,7 +97,7 @@ public class DelegatedModel implements IBakedModel { @Nonnull @Override - public IModelData getModelData(@Nonnull ILightReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) { + public IModelData getModelData(@Nonnull IBlockDisplayReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) { return originalModel.getModelData(world, pos, state, tileData); } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index c32cde457..f8f81c991 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -14,13 +14,13 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.datafixers.util.Pair; import net.minecraft.block.BlockState; -import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.resources.IResourceManager; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.TransformationMatrix; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.client.model.*; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; @@ -48,8 +48,8 @@ public class FloatingFlowerModel implements IModelGeometry @Nonnull @Override - public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { - Set ret = new HashSet<>(); + public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { + Set ret = new HashSet<>(); for (Map.Entry e : BotaniaAPIClient.instance().getRegisteredIslandTypeModels().entrySet()) { IUnbakedModel unbakedIsland = modelGetter.apply(e.getValue()); ret.addAll(unbakedIsland.getTextures(modelGetter, missingTextureErrors)); @@ -61,7 +61,7 @@ public class FloatingFlowerModel implements IModelGeometry @Nullable @Override - public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation name) { + public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform transform, ItemOverrideList overrides, ResourceLocation name) { final TransformationMatrix moveFlower = new TransformationMatrix(new Vector3f(0F, 0.2F, 0F), null, new Vector3f(0.5F, 0.5F, 0.5F), null); IModelTransform comp = new ModelTransformComposition(new SimpleModelTransform(moveFlower), transform); IBakedModel bakedFlower = unbakedFlower.bakeModel(bakery, spriteGetter, comp, name); diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index efecb80ba..bafe1b7dc 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -13,15 +13,16 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.*; import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.world.ClientWorld; import net.minecraft.entity.LivingEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.TransformationMatrix; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.registry.Registry; import net.minecraft.world.World; import net.minecraftforge.client.model.BakedModelWrapper; @@ -58,7 +59,7 @@ public class GunModel implements IBakedModel { private final ItemOverrideList itemHandler = new ItemOverrideList() { @Nonnull @Override - public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable LivingEntity entityIn) { + public IBakedModel func_239290_a_(IBakedModel model, ItemStack stack, @Nullable ClientWorld worldIn, @Nullable LivingEntity entityIn) { boolean clip = ItemManaGun.hasClip(stack); if (ItemManaGun.isSugoiKawaiiDesuNe(stack)) { diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 1ee3242ae..ddb589950 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -12,9 +12,9 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; +import net.minecraft.util.math.vector.Vector3f; public class ModelBellows extends Model { diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index f7d044375..840dafec3 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -14,13 +14,13 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.block.tile.TileBrewery; diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index d46e5ad26..e49c9e034 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -12,9 +12,9 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.Model; import net.minecraft.client.renderer.model.ModelRenderer; +import net.minecraft.util.math.vector.Vector3f; public class ModelHourglass extends Model { diff --git a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java index 1f2688c72..8075763a4 100644 --- a/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java +++ b/src/main/java/vazkii/botania/client/patchouli/processor/ManaInfusionProcessor.java @@ -92,7 +92,7 @@ public class ManaInfusionProcessor implements IComponentProcessor { return I18n.format("botaniamisc.drop") + TextFormatting.BOLD + " (?)"; case "dropTip0": case "dropTip1": { - String drop = new KeybindTextComponent("key.drop").applyTextStyle(TextFormatting.GREEN).getFormattedText(); + String drop = new KeybindTextComponent("key.drop").func_240699_a_(TextFormatting.GREEN).getFormattedText(); return I18n.format("botaniamisc.dropTip" + key.substring(7), drop); } } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java index 8505c6f06..abc8d1adb 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -14,8 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.model.IBakedModel; @@ -23,6 +21,8 @@ import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.entity.EntityBabylonWeapon; @@ -57,7 +57,7 @@ public class RenderBabylonWeapon extends EntityRenderer { // GlStateManager.color4f(1F, 1F, 1F, chargeMul); IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()]; - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY); ms.pop(); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 2a5b26d5d..f9a754120 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -12,11 +12,11 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.entity.EntityCorporeaSpark; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderNoop.java b/src/main/java/vazkii/botania/client/render/entity/RenderNoop.java index 2b72581af..e1ccc0a69 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderNoop.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderNoop.java @@ -8,7 +8,7 @@ */ package vazkii.botania.client.render.entity; -import net.minecraft.client.renderer.culling.ClippingHelperImpl; +import net.minecraft.client.renderer.culling.ClippingHelper; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.AtlasTexture; @@ -23,7 +23,7 @@ public class RenderNoop extends EntityRenderer { } @Override - public boolean shouldRender(T entity, @Nonnull ClippingHelperImpl clipping, double x, double y, double z) { + public boolean shouldRender(T entity, @Nonnull ClippingHelper clipping, double x, double y, double z) { return false; } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 631b221db..b7c84645f 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -12,14 +12,14 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.EntityRenderer; import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.RenderHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index e16b72272..383b13810 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -16,6 +16,9 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.math.vector.Matrix3f; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; @@ -55,7 +58,7 @@ public class RenderTileAlfPortal extends TileEntityRenderer { } public void renderIcon(MatrixStack ms, IRenderTypeBuffer buffers, TextureAtlasSprite icon, int x, int y, int width, int height, float alpha, int overlay) { - IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentCullBlockType()); Matrix4f model = ms.getLast().getMatrix(); Matrix3f normal = ms.getLast().getNormal(); buffer.pos(model, x, y + height, 0).color(1, 1, 1, alpha).tex(icon.getMinU(), icon.getMaxV()).overlay(overlay).lightmap(0xF000F0).normal(normal, 1, 0, 0).endVertex(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java index 37927a26e..ac7cc6ae3 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -15,8 +15,6 @@ import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -24,6 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.TileAltar; @@ -115,7 +115,7 @@ public class RenderTileAltar extends TileEntityRenderer { : Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.WATER.getDefaultState()).getParticleTexture(); int color = lava ? Fluids.LAVA.getAttributes().getColor(altar.getWorld(), altar.getPos()) : Fluids.WATER.getAttributes().getColor(altar.getWorld(), altar.getPos()); - IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentCullBlockType()); renderIcon(ms, buffer, sprite, color, alpha, overlay, lava ? 0xF000F0 : light); ms.pop(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java index fd764287a..3e31fb19a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -13,12 +13,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.TileAnimatedTorch; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index fa1f3347c..f5fe5ecef 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -14,7 +14,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -23,6 +22,7 @@ import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index efbcb8bc2..3973f269d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelBellows; import vazkii.botania.common.block.tile.mana.TileBellows; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java index 3d329fb53..2be94aa75 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -15,11 +15,11 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.common.block.tile.TileCocoon; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index c8f59f554..8b1495e75 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -15,7 +15,6 @@ import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.entity.ItemRenderer; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -24,6 +23,7 @@ import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube; @@ -83,7 +83,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer { BlockState state = tile.getBlockState(); IBakedModel ibakedmodel = brd.getModelForState(state); - brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.getRenderType(state)), state, ibakedmodel, 1, 1, 1, light, overlay, data); + brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.func_239220_a_(state, false)), state, ibakedmodel, 1, 1, 1, light, overlay, data); ms.pop(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java index f0b263923..2049e96bd 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelHourglass; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java index ff3fef6cb..9beb8c89b 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -13,7 +13,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -21,6 +20,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.Direction; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.common.block.tile.TileIncensePlate; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java index cb25ccb70..66ce32fab 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index 0c82f4f04..d7c6ad8b8 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -16,13 +16,13 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 93987ab96..626b3437e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -12,13 +12,13 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.block.tile.mana.TilePrism; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java index 70eabc992..9c57b91c4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -14,12 +14,12 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.common.block.tile.mana.TilePump; public class RenderTilePump extends TileEntityRenderer { diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java index eedffedf4..89916552d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -14,7 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.Block; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.client.lib.LibResources; @@ -136,7 +137,7 @@ public class RenderTilePylon extends TileEntityRenderer { private static final LazyValue DUMMY = new LazyValue<>(TilePylon::new); @Override - public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType type, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { if (Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) { RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant; TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(DUMMY.getValue()); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index ef2e86ac2..163ef5de5 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -13,13 +13,13 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ModelRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.block.tile.TileRuneAltar; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java index 7b72dc29d..598d4be54 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.common.block.tile.TileSparkChanger; import javax.annotation.Nonnull; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java index 5a2086d09..7b9914f41 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -14,9 +14,7 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -24,6 +22,8 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Quaternion; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.common.block.mana.BlockSpreader; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index aaf67ea11..2991d3b8f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -12,7 +12,6 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.tileentity.EndPortalTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; @@ -20,6 +19,7 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; import net.minecraft.util.Util; import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.vector.Matrix4f; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import vazkii.botania.common.block.tile.TileStarfield; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 060808237..10582432f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -12,10 +12,10 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java index 35fc1df2d..a4a3d0521 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -12,11 +12,11 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.vector.Vector3f; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelTeruTeruBozu; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 93db805d9..188123bc2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ModelRenderer; @@ -32,6 +31,7 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.common.MinecraftForge; @@ -380,7 +380,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } private void renderModel(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, IBakedModel model) { - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentCullBlockType()), null, model, 1, 1, 1, light, overlay); } private void renderItem(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, ItemStack stack) { 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 209abf6e9..7789e3f9c 100644 --- a/src/main/java/vazkii/botania/client/render/tile/TEISR.java +++ b/src/main/java/vazkii/botania/client/render/tile/TEISR.java @@ -13,6 +13,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.Block; import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.item.ItemStack; @@ -34,7 +35,7 @@ public class TEISR extends ItemStackTileEntityRenderer { } @Override - public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { + public void func_239207_a_(ItemStack stack, ItemCameraTransforms.TransformType transform, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { if (stack.getItem() == block.asItem()) { TileEntityRendererDispatcher.instance.getRenderer(dummy.getValue()) .render(null, 0, ms, buffers, light, overlay); diff --git a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java index 7a6a64c3c..f5be4312b 100644 --- a/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java +++ b/src/main/java/vazkii/botania/client/render/world/SkyblockSkyRenderer.java @@ -20,7 +20,9 @@ import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.world.ClientWorld; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraftforge.client.SkyRenderHandler; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 81c9f4182..441a5d2a6 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -13,9 +13,12 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.loot.conditions.LootConditionManager; +import net.minecraft.loot.functions.LootFunctionManager; import net.minecraft.particles.ParticleType; import net.minecraft.potion.Effect; import net.minecraft.tileentity.TileEntity; @@ -23,10 +26,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; import net.minecraft.util.registry.Registry; -import net.minecraft.world.gen.ChunkGeneratorType; import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.storage.loot.conditions.LootConditionManager; -import net.minecraft.world.storage.loot.functions.LootFunctionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; @@ -157,6 +157,7 @@ public class Botania { modBus.addGenericListener(Item.class, ModSubtiles::registerItemBlocks); modBus.addGenericListener(TileEntityType.class, ModSubtiles::registerTEs); modBus.addGenericListener(GlobalLootModifierSerializer.class, DisposeModifier::register); + modBus.addGenericListener(Attribute.class, PixieHandler::registerAttribute); IEventBus forgeBus = MinecraftForge.EVENT_BUS; forgeBus.addListener(this::serverAboutToStart); @@ -172,7 +173,7 @@ public class Botania { forgeBus.addListener(ItemVirus::onLivingHurt); forgeBus.addListener(SleepingHandler::trySleep); forgeBus.addListener(PixieHandler::onDamageTaken); - forgeBus.addGenericListener(Entity.class, PixieHandler::registerAttribute); + forgeBus.addGenericListener(Entity.class, PixieHandler::attachAttribute); forgeBus.addGenericListener(TileEntity.class, ExoflameFurnaceHandler::attachFurnaceCapability); forgeBus.addListener(CommonTickHandler::onTick); forgeBus.addListener(PotionBloodthirst::onSpawn); @@ -281,10 +282,6 @@ public class Botania { ); PatchouliAPI.instance.registerMultiblock(new ResourceLocation(LibMisc.MOD_ID, "gaia_ritual"), mb); - LootConditionManager.registerCondition(new TrueGuardianKiller.Serializer()); - LootConditionManager.registerCondition(new EnableRelics.Serializer()); - LootFunctionManager.registerFunction(new BindUuid.Serializer()); - CriteriaTriggers.register(AlfPortalTrigger.INSTANCE); CriteriaTriggers.register(CorporeaRequestTrigger.INSTANCE); CriteriaTriggers.register(DopplegangerNoArmorTrigger.INSTANCE); diff --git a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java index 0c85bcdbd..1dde634b8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/BlockAlfPortal.java @@ -57,10 +57,4 @@ public class BlockAlfPortal extends BlockMod implements ITileEntityProvider, IWa } return did; } - - @Override - public int getLightValue(@Nonnull BlockState state) { - return state.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : super.getLightValue(state); - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index c3737695c..0197fc200 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -87,7 +87,7 @@ public class BlockAltGrass extends BlockMod { @Override public boolean canSustainPlant(@Nonnull BlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull Direction direction, IPlantable plantable) { PlantType type = plantable.getPlantType(world, pos.down()); - return type == PlantType.Plains || type == PlantType.Beach || plantable instanceof StemBlock; + return type == PlantType.PLAINS || type == PlantType.BEACH || plantable instanceof StemBlock; } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 98bd7d970..3c62852d1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -131,7 +131,7 @@ public class BlockAnimatedTorch extends BlockModWaterloggable implements ITileEn @Override public void onPlayerDestroy(IWorld world, BlockPos pos, BlockState state) { // TE is already gone so best we can do is just notify everyone - world.notifyNeighbors(pos, this); + world.func_230547_a_(pos, this); super.onPlayerDestroy(world, pos, state); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java index 12c47e31f..9ec468de8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java @@ -37,7 +37,7 @@ public class BlockBifrostPerm extends BlockModGlass { @Override public float[] getBeaconColorMultiplier(BlockState state, IWorldReader world, BlockPos pos, BlockPos beaconPos) { - int rgb = MathHelper.hsvToRGB(world.getDimension().getWorld().getGameTime() * 5 % 360 / 360F, 0.4F, 0.9F); + int rgb = MathHelper.hsvToRGB(((World) world).getGameTime() * 5 % 360 / 360F, 0.4F, 0.9F); float[] ret = new float[3]; ret[0] = ((rgb >> 16) & 0xFF) / 255.0F; ret[1] = ((rgb >> 8) & 0xFF) / 255.0F; diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 3c9132212..41457221f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -25,7 +25,7 @@ public class BlockEnchantedSoil extends BlockMod { @Override public boolean canSustainPlant(@Nonnull BlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull Direction direction, IPlantable plantable) { - return plantable.getPlantType(world, pos.down()) == PlantType.Plains; + return plantable.getPlantType(world, pos.down()) == PlantType.PLAINS; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 7bddcf05e..af05a6467 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -31,7 +31,7 @@ public class BlockFakeAir extends AirBlock implements ITileEntityProvider { @Override public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos, boolean isMoving) { if (shouldRemove(world, pos)) { - world.getPendingBlockTicks().scheduleTick(pos, this, tickRate(world)); + world.getPendingBlockTicks().scheduleTick(pos, this, 4); } } @@ -46,11 +46,6 @@ public class BlockFakeAir extends AirBlock implements ITileEntityProvider { } } - @Override - public int tickRate(IWorldReader world) { - return 4; - } - @Nonnull @Override public TileEntity createNewTileEntity(@Nonnull IBlockReader world) { diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 0f9df6608..14d7f9c9d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -14,6 +14,8 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DyeColor; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; @@ -22,8 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 28ef84d4c..cc507554b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -14,14 +14,14 @@ import net.minecraft.block.AbstractRailBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.item.minecart.AbstractMinecartEntity; -import net.minecraft.state.IProperty; +import net.minecraft.state.Property; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.state.properties.RailShape; import net.minecraft.tags.BlockTags; +import net.minecraft.util.RegistryKey; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; import net.minecraftforge.event.entity.EntityJoinWorldEvent; @@ -51,12 +51,12 @@ public class BlockGhostRail extends AbstractRailBlock { int floatTicks = cart.getPersistentData().getInt(TAG_FLOAT_TICKS); Preconditions.checkState(floatTicks > 0); - BlockPos entPos = new BlockPos(cart); + BlockPos entPos = cart.func_233580_cy_(); BlockState state = cart.world.getBlockState(entPos); boolean air = state.isAir(cart.world, entPos); if (state.getBlock() == ModBlocks.dreamwood - || (state.getBlock() != ModBlocks.ghostRail && state.isIn(BlockTags.RAILS))) { + || (state.getBlock() != ModBlocks.ghostRail && state.func_235714_a_(BlockTags.RAILS))) { cart.world.playEvent(2003, entPos, 0); cart.getPersistentData().putInt(TAG_FLOAT_TICKS, 0); } else { @@ -84,11 +84,11 @@ public class BlockGhostRail extends AbstractRailBlock { } } - private final Map> floatingCarts = new HashMap<>(); + private final Map, Set> floatingCarts = new HashMap<>(); private void addFloatingCart(AbstractMinecartEntity cart) { if (cart.isAlive() && cart.getPersistentData().getInt(TAG_FLOAT_TICKS) > 0) { - floatingCarts.computeIfAbsent(cart.world.getDimension().getType(), t -> Collections.newSetFromMap(new WeakHashMap<>())) + floatingCarts.computeIfAbsent(cart.world.func_234923_W_(), t -> Collections.newSetFromMap(new WeakHashMap<>())) .add(cart); } } @@ -102,10 +102,10 @@ public class BlockGhostRail extends AbstractRailBlock { private void worldTick(TickEvent.WorldTickEvent evt) { if (!evt.world.isRemote() && evt.phase == TickEvent.Phase.END) { evt.world.getProfiler().startSection("cartFloatingIter"); - Iterator iter = floatingCarts.getOrDefault(evt.world.getDimension().getType(), Collections.emptySet()).iterator(); + Iterator iter = floatingCarts.getOrDefault(evt.world.func_234923_W_(), Collections.emptySet()).iterator(); while (iter.hasNext()) { AbstractMinecartEntity c = iter.next(); - BlockPos entPos = new BlockPos(c); + BlockPos entPos = c.func_233580_cy_(); if (!c.isAlive() || !c.isAddedToWorld() || !c.world.isBlockLoaded(entPos) || c.getPersistentData().getInt(TAG_FLOAT_TICKS) <= 0) { @@ -127,7 +127,7 @@ public class BlockGhostRail extends AbstractRailBlock { @Nonnull @Override - public IProperty getShapeProperty() { + public Property getShapeProperty() { return BlockStateProperties.RAIL_SHAPE_STRAIGHT; } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 86fb95289..ebdf8cced 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -21,6 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; +import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.ISelectionContext; @@ -80,7 +81,7 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge if (hourglass.lock) { if (!player.world.isRemote) { - player.sendMessage(new TranslationTextComponent("botaniamisc.hourglassLock")); + player.sendMessage(new TranslationTextComponent("botaniamisc.hourglassLock"), Util.field_240973_b_); } return ActionResultType.FAIL; } @@ -108,11 +109,6 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge return state.get(BlockStateProperties.POWERED) ? 15 : 0; } - @Override - public int tickRate(IWorldReader world) { - return 4; - } - @Override public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { if (state.get(BlockStateProperties.POWERED)) { diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 45b761026..6ed03953d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -66,11 +66,6 @@ public class BlockLightRelay extends BlockModWaterloggable implements ITileEntit return ActionResultType.SUCCESS; } - @Override - public int tickRate(IWorldReader world) { - return 2; - } - @Override public void neighborChanged(BlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos, boolean isMoving) { if (!worldIn.isRemote && variant == LuminizerVariant.TOGGLE) { diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index 498bdd547..e3c975345 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -13,7 +13,7 @@ import net.minecraft.item.DyeColor; import net.minecraft.potion.Effect; import net.minecraft.potion.Effects; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/vazkii/botania/common/block/BlockModWaterloggable.java b/src/main/java/vazkii/botania/common/block/BlockModWaterloggable.java index 400d1d87f..19957f3eb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModWaterloggable.java +++ b/src/main/java/vazkii/botania/common/block/BlockModWaterloggable.java @@ -11,8 +11,8 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; +import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; -import net.minecraft.fluid.IFluidState; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; @@ -37,14 +37,14 @@ public abstract class BlockModWaterloggable extends BlockMod implements IWaterLo } @Override - public IFluidState getFluidState(BlockState state) { + public FluidState getFluidState(BlockState state) { return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : Fluids.EMPTY.getDefaultState(); } @Nonnull @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - IFluidState fluidState = context.getWorld().getFluidState(context.getPos()); + FluidState fluidState = context.getWorld().getFluidState(context.getPos()); return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index f968c4101..f7f0d2aa2 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -8,8 +8,6 @@ */ package vazkii.botania.common.block; -import com.mojang.datafixers.Dynamic; - import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.MovingPistonBlock; @@ -28,12 +26,12 @@ import net.minecraft.state.properties.PistonType; import net.minecraft.tileentity.PistonTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; +import net.minecraft.util.RegistryKey; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.GlobalPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.server.ServerWorld; import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.MinecraftForge; @@ -74,12 +72,12 @@ public class BlockPistonRelay extends BlockMod implements IWandable { @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { if (!world.isRemote) { - mapCoords(world.getDimension().getType(), pos, 2); + mapCoords(world.func_234923_W_(), pos, 2); } } - private void mapCoords(DimensionType type, BlockPos pos, int time) { - coordsToCheck.put(GlobalPos.of(type, pos), time); + private void mapCoords(RegistryKey type, BlockPos pos, int time) { + coordsToCheck.put(GlobalPos.func_239648_a_(type, pos), time); } private void decrCoords(GlobalPos key) { @@ -101,7 +99,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable { if (server == null) { return null; } - return server.getWorld(key.getDimension()).getTileEntity(key.getPos()); + return server.getWorld(key.func_239646_a_()).getTileEntity(key.getPos()); } private BlockState getStateAt(GlobalPos key) { @@ -109,7 +107,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable { if (server == null) { return Blocks.AIR.getDefaultState(); } - return server.getWorld(key.getDimension()).getBlockState(key.getPos()); + return server.getWorld(key.func_239646_a_()).getBlockState(key.getPos()); } @Override @@ -122,7 +120,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable { spawnAsEntity(world, pos, new ItemStack(this)); world.destroyBlock(pos, false); } else { - GlobalPos clicked = GlobalPos.of(world.getDimension().getType(), pos.toImmutable()); + GlobalPos clicked = GlobalPos.func_239648_a_(world.func_234923_W_(), pos.toImmutable()); if (ItemTwigWand.getBindMode(stack)) { activeBindingAttempts.put(player.getUniqueID(), clicked); world.playSound(null, pos, ModSounds.ding, SoundCategory.BLOCKS, 0.5F, 1F); @@ -191,7 +189,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable { if (event.type == TickEvent.Type.SERVER && event.phase == TickEvent.Phase.END) { MinecraftServer server = ServerLifecycleHooks.getCurrentServer(); for (GlobalPos s : coordsToCheck.keySet()) { - ServerWorld world = server.getWorld(s.getDimension()); + ServerWorld world = server.getWorld(s.func_239646_a_()); WorldData data = WorldData.get(world); decrCoords(s); diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index f1765170a..9656f7506 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -34,11 +34,6 @@ public class BlockSolidVines extends VineBlock { @Override public void tick(@Nonnull BlockState state, ServerWorld world, @Nonnull BlockPos pos, @Nonnull Random rand) {} - @Override - public boolean isShearable(ItemStack item, IWorldReader world, BlockPos pos) { - return false; - } - @Nonnull @Override public ItemStack getItem(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 1e026e258..a77fd8789 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -16,6 +16,8 @@ import net.minecraft.client.Minecraft; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; @@ -23,13 +25,11 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index 18baf0d92..129712805 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -48,7 +48,7 @@ public final class ModBanners { private static void addPattern(String name, String id, IItemProvider craftingItem) { name = "botania_" + name; id = "bt_" + id; - BannerPattern pattern = BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, new ItemStack(craftingItem)); + BannerPattern pattern = BannerPattern.create(name.toUpperCase(Locale.ROOT), name, id, false); PATTERNS.put(craftingItem.asItem().delegate, pattern); } } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index f1f462d35..53bdf8dac 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -8,11 +8,9 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.DispenserBlock; -import net.minecraft.block.SoundType; +import net.minecraft.block.*; import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityType; import net.minecraft.item.BlockItem; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; @@ -26,6 +24,8 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.registries.IForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; +import vazkii.botania.api.state.BotaniaStateProps; +import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.client.render.tile.RenderTilePylon; import vazkii.botania.client.render.tile.TEISR; @@ -88,12 +88,13 @@ public final class ModBlocks { public static Block livingwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood)); public static Block livingwoodFramed = new BlockMod(Block.Properties.from(livingwood)); public static Block livingwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood)); - public static Block livingwoodGlimmering = new BlockMod(Block.Properties.from(livingwood).lightValue(12)); + public static Block livingwoodGlimmering = new BlockMod(Block.Properties.from(livingwood).func_235838_a_(s -> 12)); - public static Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA, Block.Properties.from(livingwood)); - public static Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE, Block.Properties.from(livingwood)); - public static Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN, Block.Properties.from(livingwood)); - public static Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA, Block.Properties.from(livingwood)); + private static final AbstractBlock.IExtendedPositionPredicate> NO_SPAWN = (state, world, pos, et) -> false; + public static Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN)); + public static Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN)); + public static Block elvenSpreader = new BlockSpreader(BlockSpreader.Variant.ELVEN, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN)); + public static Block gaiaSpreader = new BlockSpreader(BlockSpreader.Variant.GAIA, Block.Properties.from(livingwood).func_235827_a_(NO_SPAWN)); public static Block manaPool = new BlockPool(BlockPool.Variant.DEFAULT, Block.Properties.from(livingrock)); public static Block creativePool = new BlockPool(BlockPool.Variant.CREATIVE, Block.Properties.from(livingrock)); @@ -101,7 +102,7 @@ public final class ModBlocks { public static Block fabulousPool = new BlockPool(BlockPool.Variant.FABULOUS, Block.Properties.from(livingrock)); public static Block runeAltar = new BlockRuneAltar(Block.Properties.from(livingrock)); - public static Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA, Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7)); + public static Block manaPylon = new BlockPylon(BlockPylon.Variant.MANA, Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).func_235838_a_(s -> 7)); public static Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA, Block.Properties.from(manaPylon)); public static Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA, Block.Properties.from(manaPylon)); @@ -109,7 +110,7 @@ public final class ModBlocks { public static Block distributor = new BlockDistributor(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)); public static Block manaVoid = new BlockManaVoid(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE)); public static Block manaDetector = new BlockManaDetector(Block.Properties.from(livingrock)); - public static Block enchanter = new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE)); + public static Block enchanter = new BlockEnchanter(Block.Properties.create(Material.ROCK).hardnessAndResistance(3, 5).func_235838_a_(s -> 15).sound(SoundType.STONE)); public static Block turntable = new BlockTurntable(Block.Properties.from(livingwood)); public static Block tinyPlanet = new BlockTinyPlanet(Block.Properties.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE)); public static Block alchemyCatalyst = new BlockAlchemyCatalyst(Block.Properties.from(livingrock)); @@ -125,7 +126,7 @@ public final class ModBlocks { public static Block gatheringDrum = new BlockForestDrum(BlockForestDrum.Variant.GATHERING, Block.Properties.from(livingwood)); public static Block canopyDrum = new BlockForestDrum(BlockForestDrum.Variant.CANOPY, Block.Properties.from(livingwood)); - public static Block whiteShinyFlower = new BlockShinyFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(15)); + public static Block whiteShinyFlower = new BlockShinyFlower(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 15)); public static Block orangeShinyFlower = new BlockShinyFlower(DyeColor.ORANGE, Block.Properties.from(whiteShinyFlower)); public static Block magentaShinyFlower = new BlockShinyFlower(DyeColor.MAGENTA, Block.Properties.from(whiteShinyFlower)); public static Block lightBlueShinyFlower = new BlockShinyFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteShinyFlower)); @@ -145,7 +146,8 @@ public final class ModBlocks { public static Block abstrusePlatform = new BlockPlatform(BlockPlatform.Variant.ABSTRUSE, Block.Properties.create(Material.WOOD).hardnessAndResistance(2, 5).sound(SoundType.WOOD)); public static Block spectralPlatform = new BlockPlatform(BlockPlatform.Variant.SPECTRAL, Block.Properties.from(abstrusePlatform)); public static Block infrangiblePlatform = new BlockPlatform(BlockPlatform.Variant.INFRANGIBLE, Block.Properties.create(Material.WOOD).hardnessAndResistance(-1, Float.MAX_VALUE).sound(SoundType.WOOD)); - public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD)); + public static Block alfPortal = new BlockAlfPortal(Block.Properties.create(Material.WOOD).hardnessAndResistance(10).sound(SoundType.WOOD) + .func_235838_a_(s -> s.get(BotaniaStateProps.ALFPORTAL_STATE) != AlfPortalState.OFF ? 15 : 0)); public static Block dreamwood = new BlockMod(Block.Properties.from(livingwood)); public static Block dreamwoodPlanks = new BlockMod(Block.Properties.from(livingwood)); public static Block dreamwoodPlanksMossy = new BlockMod(Block.Properties.from(livingwood)); @@ -153,10 +155,10 @@ public final class ModBlocks { public static Block dreamwoodPatternFramed = new BlockMod(Block.Properties.from(livingwood)); public static Block dreamwoodGlimmering = new BlockMod(Block.Properties.from(livingwoodGlimmering)); public static Block conjurationCatalyst = new BlockConjurationCatalyst(Block.Properties.from(livingrock)); - public static Block bifrost = new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()); + public static Block bifrost = new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).func_235838_a_(s -> 15).sound(SoundType.GLASS).notSolid()); public static Block solidVines = new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).notSolid()); - public static Block whiteBuriedPetals = new BlockBuriedPetals(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(4)); + public static Block whiteBuriedPetals = new BlockBuriedPetals(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 4)); public static Block orangeBuriedPetals = new BlockBuriedPetals(DyeColor.ORANGE, Block.Properties.from(whiteBuriedPetals)); public static Block magentaBuriedPetals = new BlockBuriedPetals(DyeColor.MAGENTA, Block.Properties.from(whiteBuriedPetals)); public static Block lightBlueBuriedPetals = new BlockBuriedPetals(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteBuriedPetals)); @@ -173,7 +175,7 @@ public final class ModBlocks { public static Block redBuriedPetals = new BlockBuriedPetals(DyeColor.RED, Block.Properties.from(whiteBuriedPetals)); public static Block blackBuriedPetals = new BlockBuriedPetals(DyeColor.BLACK, Block.Properties.from(whiteBuriedPetals)); - public static Block whiteFloatingFlower = new BlockFloatingFlower(DyeColor.WHITE, Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15)); + public static Block whiteFloatingFlower = new BlockFloatingFlower(DyeColor.WHITE, Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).func_235838_a_(s -> 15)); public static Block orangeFloatingFlower = new BlockFloatingFlower(DyeColor.ORANGE, Block.Properties.from(whiteFloatingFlower)); public static Block magentaFloatingFlower = new BlockFloatingFlower(DyeColor.MAGENTA, Block.Properties.from(whiteFloatingFlower)); public static Block lightBlueFloatingFlower = new BlockFloatingFlower(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteFloatingFlower)); @@ -212,7 +214,7 @@ public final class ModBlocks { public static Block enderEye = new BlockEnderEye(Block.Properties.from(manasteelBlock)); public static Block starfield = new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)); public static Block rfGenerator = new BlockRFGenerator(Block.Properties.from(livingrock)); - public static Block elfGlass = new BlockElfGlass(Block.Properties.from(Blocks.GLASS).lightValue(15)); + public static Block elfGlass = new BlockElfGlass(Block.Properties.from(Blocks.GLASS).func_235838_a_(s -> 15)); public static Block brewery = new BlockBrewery(Block.Properties.from(livingrock)); public static Block manaGlass = new BlockModGlass(Block.Properties.from(elfGlass)); public static Block terraPlate = new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)); @@ -222,7 +224,7 @@ public final class ModBlocks { public static Block redStringComparator = new BlockRedStringComparator(Block.Properties.from(livingrock)); public static Block redStringRelay = new BlockRedStringRelay(Block.Properties.from(livingrock)); public static Block redStringInterceptor = new BlockRedStringInterceptor(Block.Properties.from(livingrock)); - public static Block manaFlame = new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement()); + public static Block manaFlame = new BlockManaFlame(Block.Properties.create(Material.WOOL).sound(SoundType.CLOTH).func_235838_a_(s -> 15).doesNotBlockMovement()); public static Block prism = new BlockPrism(Block.Properties.from(elfGlass).doesNotBlockMovement()); public static Block enchantedSoil = new BlockEnchantedSoil(Block.Properties.create(Material.ORGANIC).hardnessAndResistance(0.6F).sound(SoundType.PLANT)); @@ -246,7 +248,7 @@ public final class ModBlocks { public static Block corporeaIndex = new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).notSolid()); public static Block corporeaFunnel = new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)); - public static Block whiteMushroom = new BlockModMushroom(DyeColor.WHITE, Block.Properties.from(whiteFlower).lightValue(3)); + public static Block whiteMushroom = new BlockModMushroom(DyeColor.WHITE, Block.Properties.from(whiteFlower).func_235838_a_(s -> 3)); public static Block orangeMushroom = new BlockModMushroom(DyeColor.ORANGE, Block.Properties.from(whiteMushroom)); public static Block magentaMushroom = new BlockModMushroom(DyeColor.MAGENTA, Block.Properties.from(whiteMushroom)); public static Block lightBlueMushroom = new BlockModMushroom(DyeColor.LIGHT_BLUE, Block.Properties.from(whiteMushroom)); @@ -283,7 +285,7 @@ public final class ModBlocks { public static Block doubleFlowerBlack = new BlockModDoubleFlower(DyeColor.BLACK, Block.Properties.from(doubleFlowerWhite)); public static Block fakeAir = new BlockFakeAir(Block.Properties.create(Material.STRUCTURE_VOID).tickRandomly()); - public static Block blazeBlock = new BlockMod(Block.Properties.from(manasteelBlock).lightValue(15)); + public static Block blazeBlock = new BlockMod(Block.Properties.from(manasteelBlock).func_235838_a_(s -> 15)); public static Block corporeaInterceptor = new BlockCorporeaInterceptor(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)); public static Block corporeaCrystalCube = new BlockCorporeaCrystalCube(Block.Properties.from(corporeaInterceptor)); public static Block incensePlate = new BlockIncensePlate(Block.Properties.from(livingwood)); @@ -301,7 +303,7 @@ public final class ModBlocks { public static Block manaBomb = new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD)); public static Block cacophonium = new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F)); public static Block bellows = new BlockBellows(Block.Properties.from(livingwood)); - public static Block bifrostPerm = new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()); + public static Block bifrostPerm = new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).func_235838_a_(s -> 15).sound(SoundType.GLASS).notSolid()); public static Block cellBlock = new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH)); public static Block gaiaHeadWall = new BlockGaiaHeadWall(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)); public static Block gaiaHead = new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)); @@ -316,7 +318,7 @@ public final class ModBlocks { public static Block scorchedGrass = new BlockAltGrass(BlockAltGrass.Variant.SCORCHED, Block.Properties.from(dryGrass)); public static Block infusedGrass = new BlockAltGrass(BlockAltGrass.Variant.INFUSED, Block.Properties.from(dryGrass)); public static Block mutatedGrass = new BlockAltGrass(BlockAltGrass.Variant.MUTATED, Block.Properties.from(dryGrass)); - public static Block animatedTorch = new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid()); + public static Block animatedTorch = new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).func_235838_a_(s -> 7).notSolid()); public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); diff --git a/src/main/java/vazkii/botania/common/block/ModSubtiles.java b/src/main/java/vazkii/botania/common/block/ModSubtiles.java index 3920e7cc8..7abd90b29 100644 --- a/src/main/java/vazkii/botania/common/block/ModSubtiles.java +++ b/src/main/java/vazkii/botania/common/block/ModSubtiles.java @@ -39,7 +39,7 @@ import static vazkii.botania.common.block.ModBlocks.register; @ObjectHolder(LibMisc.MOD_ID) public class ModSubtiles { public static final Block pureDaisy = new BlockSpecialFlower(Block.Properties.from(Blocks.POPPY), SubTilePureDaisy::new); - public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).lightValue(15), SubTilePureDaisy::new); + public static final Block pureDaisyFloating = new BlockFloatingSpecialFlower(Block.Properties.create(Material.EARTH).hardnessAndResistance(0.5F).sound(SoundType.GROUND).func_235838_a_(s -> 15), SubTilePureDaisy::new); public static final Block manastar = new BlockSpecialFlower(Block.Properties.from(pureDaisy), SubTileManastar::new); public static final Block manastarFloating = new BlockFloatingSpecialFlower(Block.Properties.from(pureDaisyFloating), SubTileManastar::new); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBaseWaterloggable.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBaseWaterloggable.java index 770ae0fdf..251dbc57d 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBaseWaterloggable.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBaseWaterloggable.java @@ -11,8 +11,8 @@ package vazkii.botania.common.block.corporea; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IWaterLoggable; +import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; -import net.minecraft.fluid.IFluidState; import net.minecraft.item.BlockItemUseContext; import net.minecraft.state.StateContainer; import net.minecraft.state.properties.BlockStateProperties; @@ -37,14 +37,14 @@ public abstract class BlockCorporeaBaseWaterloggable extends BlockCorporeaBase i } @Override - public IFluidState getFluidState(BlockState state) { + public FluidState getFluidState(BlockState state) { return state.get(WATERLOGGED) ? Fluids.WATER.getStillFluidState(false) : Fluids.EMPTY.getDefaultState(); } @Nonnull @Override public BlockState getStateForPlacement(BlockItemUseContext context) { - IFluidState fluidState = context.getWorld().getFluidState(context.getPos()); + FluidState fluidState = context.getWorld().getFluidState(context.getPos()); return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java index 213235bae..c0e664836 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -52,11 +52,6 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase { return state.get(BlockStateProperties.POWERED) ? 15 : 0; } - @Override - public int tickRate(IWorldReader world) { - return 2; - } - @Nonnull @Override public TileCorporeaBase createNewTileEntity(@Nonnull IBlockReader world) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index 2a85f532d..9658c96b1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -56,7 +56,7 @@ public class BlockManaFlame extends BlockMod implements ITileEntityProvider { public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (Botania.gardenOfGlassLoaded) { ItemStack stack = player.getHeldItem(hand); - if (!stack.isEmpty() && ItemTags.SAPLINGS.contains(stack.getItem()) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { + if (!stack.isEmpty() && ItemTags.SAPLINGS.func_230235_a_(stack.getItem()) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { if (!world.isRemote) { stack.shrink(1); ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.lexicon)); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java index c98a5ea1b..649c8f0a1 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModGlass.java @@ -10,17 +10,10 @@ package vazkii.botania.common.block.decor; import net.minecraft.block.AbstractGlassBlock; import net.minecraft.block.BlockState; -import net.minecraft.fluid.IFluidState; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ILightReader; public class BlockModGlass extends AbstractGlassBlock { public BlockModGlass(Properties props) { super(props); } - - @Override - public boolean shouldDisplayFluidOverlay(BlockState state, ILightReader world, BlockPos pos, IFluidState fluidState) { - return true; - } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index 19c8f7bbf..54ad3709c 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -29,7 +29,7 @@ public class BehaviourFelPumpkin extends OptionalDispenseBehavior { World world = source.getWorld(); BlockPos blockpos = source.getBlockPos().offset(source.getBlockState().get(DispenserBlock.FACING)); Block blockcarvedpumpkin = ModBlocks.felPumpkin; - this.successful = true; + this.func_239796_a_(true); if (world.isAirBlock(blockpos) && world.getBlockState(blockpos.down()).getBlock() == Blocks.IRON_BARS && world.getBlockState(blockpos.down(2)).getBlock() == Blocks.IRON_BARS) // Botania - Check for iron bars { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 52b2c9d9a..3f67d2907 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -41,14 +41,14 @@ public class BehaviourPoolMinecart extends DefaultDispenseItemBehavior { BlockState iblockstate = world.getBlockState(blockpos); RailShape railshape = iblockstate.getBlock() instanceof AbstractRailBlock ? ((AbstractRailBlock) iblockstate.getBlock()).getRailDirection(iblockstate, world, blockpos, null) : RailShape.NORTH_SOUTH; double d3; - if (iblockstate.isIn(BlockTags.RAILS)) { + if (iblockstate.func_235714_a_(BlockTags.RAILS)) { if (railshape.isAscending()) { d3 = 0.6D; } else { d3 = 0.1D; } } else { - if (!iblockstate.isAir() || !world.getBlockState(blockpos.down()).isIn(BlockTags.RAILS)) { + if (!iblockstate.isAir() || !world.getBlockState(blockpos.down()).func_235714_a_(BlockTags.RAILS)) { return this.behaviourDefaultDispenseItem.dispense(source, stack); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 347d7a2fa..51af305fd 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.Block; import net.minecraft.block.BlockState; +import net.minecraft.entity.IShearable; import net.minecraft.entity.MobEntity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.passive.CowEntity; @@ -24,8 +25,8 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; +import net.minecraftforge.common.IForgeShearable; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.common.block.BlockModWaterloggable; @@ -81,7 +82,8 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg ItemStack stack = new ItemStack(ModBlocks.gatheringDrum); for (MobEntity entity : entities) { - if (entity instanceof IShearable && ((IShearable) entity).isShearable(stack, world, new BlockPos(entity))) { + if (entity instanceof IShearable && ((IShearable) entity).func_230262_K__() + || entity instanceof IForgeShearable && ((IForgeShearable) entity).isShearable(stack, world, entity.func_233580_cy_()) ) { shearables.add(entity); } else if (entity instanceof CowEntity) { List items = world.getEntitiesWithinAABB(ItemEntity.class, entity.getBoundingBox()); @@ -111,15 +113,20 @@ public class BlockForestDrum extends BlockModWaterloggable implements IManaTrigg break; } - List stacks = ((IShearable) entity).onSheared(stack, world, new BlockPos(entity), 0); - for (ItemStack wool : stacks) { - ItemEntity ent = entity.entityDropItem(wool, 1.0F); - ent.setMotion(ent.getMotion().add( - world.rand.nextFloat() * 0.05F, - (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, - (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F - )); + if (entity instanceof IShearable) { + ((IShearable) entity).func_230263_a_(SoundCategory.BLOCKS); + } else { + List stacks = ((IForgeShearable) entity).onSheared(null, stack, world, entity.func_233580_cy_(), 0); + for (ItemStack wool : stacks) { + ItemEntity ent = entity.entityDropItem(wool, 1.0F); + ent.setMotion(ent.getMotion().add( + world.rand.nextFloat() * 0.05F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F, + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F + )); + } } + ++sheared; } } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 1c7edc91b..cf2bbab0a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -16,6 +16,8 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; @@ -25,8 +27,6 @@ import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameters; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index 79036b595..ed5fad5c1 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -90,11 +90,6 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP return RENDER_SHAPE; } - @Override - public boolean canEntitySpawn(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityType type) { - return false; - } - @Override public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) { Direction orientation = placer == null ? Direction.WEST : Direction.getFacingDirections(placer)[0].getOpposite(); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 108b79485..07cc5114c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -19,7 +19,7 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java index 24e02d41b..a4f436a72 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -58,11 +58,6 @@ public class BlockRedStringInterceptor extends BlockRedString { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false)); } - @Override - public int tickRate(IWorldReader world) { - return 2; - } - @Nonnull @Override public TileRedString createNewTileEntity(@Nonnull IBlockReader world) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 0342f9b33..bf73e6214 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -124,17 +124,17 @@ public class BergamuteEventHandler { } @Override - public float getX() { + public double getX() { return compose.getX(); } @Override - public float getY() { + public double getY() { return compose.getY(); } @Override - public float getZ() { + public double getZ() { return compose.getZ(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java index 8d62433ee..d93c861d1 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBergamute.java @@ -40,7 +40,7 @@ public class SubTileBergamute extends TileEntityFunctionalFlower { } // todo seems expensive when we have lots of sounds cache maybe? - protected static SubTileBergamute getBergamuteNearby(float x, float y, float z) { + protected static SubTileBergamute getBergamuteNearby(double x, double y, double z) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) .filter(f -> f.getEffectivePos().distanceSq(x, y, z, false) <= RANGE * RANGE) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java index 707cb8218..7fdb1df43 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileFallenKanade.java @@ -13,7 +13,7 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.world.dimension.EndDimension; +import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.subtile.RadiusDescriptor; @@ -35,7 +35,7 @@ public class SubTileFallenKanade extends TileEntityFunctionalFlower { public void tickFlower() { super.tickFlower(); - if (!getWorld().isRemote && !(getWorld().getDimension() instanceof EndDimension)) { + if (!getWorld().isRemote && getWorld().func_234923_W_() != World.field_234920_i_) { boolean did = false; List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for (PlayerEntity player : players) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index f32f269e6..394a61858 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -13,24 +13,24 @@ import com.google.common.collect.Multimap; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.SpawnReason; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.monster.*; import net.minecraft.item.ItemStack; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameterSets; import net.minecraft.nbt.CompoundNBT; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.Difficulty; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameterSets; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.registries.ObjectHolder; @@ -76,7 +76,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { Collections.shuffle(stacks); stack = stacks.get(0); } - } while (stack.isEmpty() || ModTags.Items.LOONIUM_BLACKLIST.contains(stack.getItem())); + } while (stack.isEmpty() || ModTags.Items.LOONIUM_BLACKLIST.func_230235_a_(stack.getItem())); int bound = RANGE * 2 + 1; int xp = getEffectivePos().getX() - RANGE + rand.nextInt(bound); @@ -135,12 +135,8 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { entity.setPositionAndRotation(x, y, z, world.rand.nextFloat() * 360F, 0); entity.setMotion(Vector3d.ZERO); - Multimap map = HashMultimap.create(); - map.put(SharedMonsterAttributes.MAX_HEALTH.getName(), - new AttributeModifier("Loonium Modififer Health", 2, AttributeModifier.Operation.MULTIPLY_BASE)); - map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), - new AttributeModifier("Loonium Modififer Damage", 1.5, AttributeModifier.Operation.MULTIPLY_BASE)); - entity.getAttributes().applyAttributeModifiers(map); + entity.getAttribute(Attributes.field_233818_a_).func_233769_c_(new AttributeModifier("Loonium Modififer Health", 2, AttributeModifier.Operation.MULTIPLY_BASE)); + entity.getAttribute(Attributes.field_233823_f_).func_233769_c_(new AttributeModifier("Loonium Modififer Damage", 1.5, AttributeModifier.Operation.MULTIPLY_BASE)); entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, entity instanceof CreeperEntity ? 100 : Integer.MAX_VALUE, 0)); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 15301dd19..7b7dba92f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -12,6 +12,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; @@ -86,8 +87,8 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { Map map = getOreMap(); List values = map.entrySet().stream() .flatMap(e -> { - Tag tag = BlockTags.getCollection().get(e.getKey()); - if (tag != null && !tag.getAllElements().isEmpty()) { + ITag tag = BlockTags.getCollection().get(e.getKey()); + if (tag != null && !tag.func_230236_b_().isEmpty()) { return Stream.of(new TagRandomItem(e.getValue(), tag)); } else { return Stream.empty(); @@ -99,7 +100,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { return null; } - Tag ore = WeightedRandom.getRandomItem(getWorld().rand, values).tag; + ITag ore = WeightedRandom.getRandomItem(getWorld().rand, values).tag; return ore.getRandomElement(getWorld().getRandom()).getDefaultState(); } @@ -162,9 +163,9 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { private static class TagRandomItem extends WeightedRandom.Item { - public final Tag tag; + public final ITag tag; - public TagRandomItem(int weight, Tag tag) { + public TagRandomItem(int weight, ITag tag) { super(weight); this.tag = tag; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java index e0264ed06..a9a60083a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechidIgnem.java @@ -30,7 +30,7 @@ public class SubTileOrechidIgnem extends SubTileOrechid { @Override public boolean canOperate() { - return getWorld().getDimension().isNether(); + return getWorld().func_230315_m_().func_236037_d_(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 4fff57438..ef6681b39 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -23,7 +23,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -152,11 +152,11 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { if (!recieverStack.isEmpty()) { ITextComponent stackName = recieverStack.getDisplayName(); - int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2; + int width = 16 + mc.fontRenderer.func_238414_a_(stackName) / 2; int x = mc.getMainWindow().getScaledWidth() / 2 - width; int y = mc.getMainWindow().getScaledHeight() / 2 + 30; - mc.fontRenderer.drawStringWithShadow(stackName.getFormattedText(), x + 20, y + 5, color); + mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color); mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index 7e537f59c..c20851bb4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -19,7 +19,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.registries.ObjectHolder; @@ -95,7 +95,7 @@ public class SubTileSpectranthemum extends TileEntityFunctionalFlower { } static void spawnExplosionParticles(Entity item, int p) { - PacketHandler.sendToNearby(item.world, new BlockPos(item), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.getPosX(), item.getPosY(), item.getPosZ(), item.getEntityId(), p)); + PacketHandler.sendToNearby(item.world, item.func_233580_cy_(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.getPosX(), item.getPosY(), item.getPosZ(), item.getEntityId(), p)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java index 63e683286..5b9953757 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileArcaneRose.java @@ -40,7 +40,7 @@ public class SubTileArcaneRose extends TileEntityGeneratingFlower { List players = getWorld().getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for (PlayerEntity player : players) { - if (ExperienceHelper.getPlayerXP(player) >= 1 && player.onGround) { + if (ExperienceHelper.getPlayerXP(player) >= 1 && player.func_233570_aj_()) { ExperienceHelper.drainPlayerXP(player, 1); addMana(50); return; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index 0f28aae37..de3f86c97 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -17,7 +17,7 @@ import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java index 02f46905d..85608a2dd 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEntropinnyum.java @@ -10,7 +10,7 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.entity.Entity; import net.minecraft.entity.item.TNTEntity; -import net.minecraft.fluid.IFluidState; +import net.minecraft.fluid.FluidState; import net.minecraft.particles.ParticleTypes; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundEvents; @@ -42,7 +42,7 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { if (!getWorld().isRemote && getMana() == 0) { List tnts = getWorld().getEntitiesWithinAABB(TNTEntity.class, new AxisAlignedBB(getEffectivePos().add(-RANGE, -RANGE, -RANGE), getEffectivePos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for (TNTEntity tnt : tnts) { - IFluidState fluid = getWorld().getFluidState(new BlockPos(tnt)); + FluidState fluid = getWorld().getFluidState(tnt.func_233580_cy_()); if (tnt.getFuse() == 1 && tnt.isAlive() && fluid.isEmpty()) { tnt.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 0.2F, (1F + (getWorld().rand.nextFloat() - getWorld().rand.nextFloat()) * 0.2F) * 0.7F); tnt.remove(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 0135d93c1..7eb04b4b2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -18,7 +18,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.common.util.Constants; import net.minecraftforge.items.ItemHandlerHelper; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index dc2911738..35dd125f4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -11,10 +11,10 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.IFluidState; +import net.minecraft.fluid.FluidState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.FluidTags; -import net.minecraft.tags.Tag; +import net.minecraft.tags.ITag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.SoundCategory; @@ -70,8 +70,8 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { for (BlockPos offset : offsets) { BlockPos pos = getEffectivePos().add(offset); - IFluidState fstate = getWorld().getFluidState(pos); - Tag search = getMaterialToSearchFor(); + FluidState fstate = getWorld().getFluidState(pos); + ITag search = getMaterialToSearchFor(); if (fstate.isTagged(search) && (getBlockToSearchBelow() == null || getWorld().getBlockState(pos.down()).getBlock() == getBlockToSearchBelow()) @@ -120,7 +120,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower { world.addParticle(data, getEffectivePos().getX() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getY() + 0.55 + Math.random() * 0.2 - 0.1, getEffectivePos().getZ() + 0.5, 0, (float) Math.random() / 60, 0); } - public Tag getMaterialToSearchFor() { + public ITag getMaterialToSearchFor() { return FluidTags.WATER; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java index e129d0301..17df1e930 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileRafflowsia.java @@ -53,7 +53,7 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower { BlockPos pos = getEffectivePos().add(i - RANGE, j - RANGE, k - RANGE); BlockState state = getWorld().getBlockState(pos); - if (state.isIn(ModTags.Blocks.SPECIAL_FLOWERS) && state.getBlock() != ModSubtiles.rafflowsia) { + if (state.func_235714_a_(ModTags.Blocks.SPECIAL_FLOWERS) && state.getBlock() != ModSubtiles.rafflowsia) { if (state.getBlock() == lastFlower) { lastFlowerTimes++; } else { diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java index e8ce83667..f235fd009 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileShulkMeNot.java @@ -19,7 +19,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java index ba14c5dc4..8bf592a44 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileThermalily.java @@ -10,6 +10,7 @@ package vazkii.botania.common.block.subtile.generating; import net.minecraft.fluid.Fluid; import net.minecraft.tags.FluidTags; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.SoundCategory; @@ -38,7 +39,7 @@ public class SubTileThermalily extends SubTileHydroangeas { } @Override - public Tag getMaterialToSearchFor() { + public ITag getMaterialToSearchFor() { return FluidTags.LAVA; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 2824d81a8..e9eea6ce3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -317,8 +317,8 @@ public class TileAlfPortal extends TileMod implements ITickableTileEntity { } @Override - public void read(CompoundNBT cmp) { - super.read(cmp); + public void func_230337_a_(BlockState state, CompoundNBT cmp) { + super.func_230337_a_(state, cmp); int count = cmp.getInt(TAG_STACK_COUNT); stacksIn.clear(); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index b10960648..1736cd80d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; @@ -47,8 +48,8 @@ public class TileBifrost extends TileMod implements ITickableTileEntity { } @Override - public void read(CompoundNBT tag) { - super.read(tag); + public void func_230337_a_(BlockState state, CompoundNBT tag) { + super.func_230337_a_(state, tag); ticks = tag.getInt(TAG_TICKS); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 31c6f1ee6..8b0f0469e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; @@ -51,8 +52,8 @@ public class TileFakeAir extends TileMod { } @Override - public void read(CompoundNBT tag) { - super.read(tag); + public void func_230337_a_(BlockState state, CompoundNBT tag) { + super.func_230337_a_(state, tag); flowerPos = new BlockPos( tag.getInt(TAG_FLOWER_X), tag.getInt(TAG_FLOWER_Y), diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index c1689775c..5d6cbe985 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -73,7 +73,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE flipTicks = 4; if (!world.isRemote) { world.setBlockState(getPos(), getBlockState().with(BlockStateProperties.POWERED, true), 1); - world.getPendingBlockTicks().scheduleTick(pos, getBlockState().getBlock(), getBlockState().getBlock().tickRate(world)); + world.getPendingBlockTicks().scheduleTick(pos, getBlockState().getBlock(), 4); } for (Direction facing : Direction.values()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 2bc8c39a6..343333616 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -290,7 +290,7 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan playSound(ModSounds.lightRelay, 0.05F, (float) Math.random() * 0.3F + 0.7F); } - BlockPos pos = new BlockPos(this); + BlockPos pos = func_233580_cy_(); BlockPos exitPos = getExitPos(); if (pos.equals(exitPos)) { @@ -299,7 +299,7 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan BlockState state = world.getBlockState(pos); if (state.getBlock() == ModBlocks.lightRelayDetector) { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, true)); - world.getPendingBlockTicks().scheduleTick(pos, state.getBlock(), state.getBlock().tickRate(world)); + world.getPendingBlockTicks().scheduleTick(pos, state.getBlock(), 2); } TileLightRelay relay = (TileLightRelay) tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileMod.java b/src/main/java/vazkii/botania/common/block/tile/TileMod.java index fe02fc39a..943c2ed65 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileMod.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileMod.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.tile; +import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; @@ -36,8 +37,8 @@ public class TileMod extends TileEntity { } @Override - public void read(CompoundNBT tag) { - super.read(tag); + public void func_230337_a_(BlockState state, CompoundNBT tag) { + super.func_230337_a_(state, tag); readPacketNBT(tag); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 59228807a..b8f6b3409 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -16,7 +16,7 @@ import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 39b2c64b8..5283f2df9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -22,7 +22,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.items.wrapper.RecipeWrapper; import net.minecraftforge.registries.ObjectHolder; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 9178a3c97..8704a63ed 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -114,7 +114,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable } if (logic.spawnData.getNbt().size() == 1 && logic.spawnData.getNbt().contains("id", 8)) { - ((MobEntity) entity).onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(entity)), SpawnReason.SPAWNER, (ILivingEntityData) null, (CompoundNBT) null); + ((MobEntity) entity).onInitialSpawn(world, world.getDifficultyForLocation(entity.func_233580_cy_()), SpawnReason.SPAWNER, (ILivingEntityData) null, (CompoundNBT) null); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index b1175664d..34609fe52 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block.tile; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.world.World; +import net.minecraft.world.server.ServerWorld; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.lib.LibBlockNames; @@ -42,6 +43,7 @@ public class TileTeruTeruBozu extends TileMod implements ITickableTileEntity { } public static void resetRainTime(World w) { - w.getWorldInfo().setRainTime(w.rand.nextInt(w.getWorldInfo().isRaining() ? 12000 : 168000) + 12000); + int time = w.rand.nextInt(w.getWorldInfo().isRaining() ? 12000 : 168000) + 12000; + ((ServerWorld) w).getServer().func_240793_aU_().func_230407_G_().setRainTime(time); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 45c475143..40b182815 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -74,7 +74,7 @@ public class TileTinyPotato extends TileSimpleInventory implements ITickableTile for (int i = 0; i < getSizeInventory(); i++) { ItemStack stackAt = getItemHandler().getStackInSlot(i); if (!stackAt.isEmpty() && stackAt.getItem() == ModBlocks.tinyPotato.asItem()) { - player.sendMessage(new StringTextComponent("Don't talk to me or my son ever again.")); + player.sendMessage(new StringTextComponent("Don't talk to me or my son ever again."), Util.field_240973_b_); return; } } @@ -130,7 +130,7 @@ public class TileTinyPotato extends TileSimpleInventory implements ITickableTile @Override public void readPacketNBT(CompoundNBT cmp) { super.readPacketNBT(cmp); - name = ITextComponent.Serializer.fromJson(cmp.getString(TAG_NAME)); + name = ITextComponent.Serializer.func_240643_a_(cmp.getString(TAG_NAME)); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index f06d4d281..3d9a52578 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -14,6 +14,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntityType; +import net.minecraft.util.Util; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -329,7 +330,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ } public static boolean isInRangeOfIndex(PlayerEntity player, TileCorporeaIndex index) { - return player.dimension == index.world.getDimension().getType() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.getPosX(), player.getPosZ()) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.getPosY() + (player.world.isRemote ? 0 : 1.6)) < 5; + return player.world.func_234923_W_() == index.world.func_234923_W_() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.getPosX(), player.getPosZ()) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.getPosY() + (player.world.isRemote ? 0 : 1.6)) < 5; } public static void addPattern(String pattern, IRegexStacker stacker) { @@ -367,7 +368,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ if (!MinecraftForge.EVENT_BUS.post(indexReqEvent)) { ICorporeaResult res = this.doRequest(request, count, this.getSpark()); - player.sendMessage(new TranslationTextComponent("botaniamisc.requestMsg", count, request.getRequestName(), res.getMatchedCount(), res.getExtractedCount()).applyTextStyle(TextFormatting.LIGHT_PURPLE)); + player.sendMessage(new TranslationTextComponent("botaniamisc.requestMsg", count, request.getRequestName(), res.getMatchedCount(), res.getExtractedCount()).func_240699_a_(TextFormatting.LIGHT_PURPLE), Util.field_240973_b_); CorporeaRequestTrigger.INSTANCE.trigger(player, player.getServerWorld(), this.getPos(), res.getExtractedCount()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index cdbe65db1..b9a1c503a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -48,7 +48,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor if (missing > 0 && !getBlockState().get(BlockStateProperties.POWERED)) { world.setBlockState(getPos(), getBlockState().with(BlockStateProperties.POWERED, true)); - world.getPendingBlockTicks().scheduleTick(getPos(), getBlockState().getBlock(), getBlockState().getBlock().tickRate(world)); + world.getPendingBlockTicks().scheduleTick(getPos(), getBlockState().getBlock(), 2); TileEntity requestor = source.getSparkInventory().getWorld().getTileEntity(source.getSparkInventory().getPos()); for (Direction dir : Direction.values()) { diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 8a807148e..8a67e9568 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -188,7 +188,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt receiveMana(-mana); stack.shrink(1); - item.onGround = false; //Force entity collision update to run every tick if crafting is in progress + item.func_230245_c_(false); //Force entity collision update to run every tick if crafting is in progress ItemStack output = recipe.getRecipeOutput().copy(); ItemEntity outputItem = new ItemEntity(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index 0d3d65287..715ec8244 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -71,7 +71,7 @@ public class TileRedStringInterceptor extends TileRedString { if (coords != null && coords.equals(pos)) { Block block = inter.getBlockState().getBlock(); world.setBlockState(inter.getPos(), world.getBlockState(inter.getPos()).with(BlockStateProperties.POWERED, true)); - world.getPendingBlockTicks().scheduleTick(inter.getPos(), block, block.tickRate(world)); + world.getPendingBlockTicks().scheduleTick(inter.getPos(), block, 2); did = true; } } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index b4ed78643..86ef11b15 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -708,7 +708,7 @@ public final class BotaniaCreativeTab extends ItemGroup { } private void addTag(ResourceLocation tagId) { - ItemTags.getCollection().getOrCreate(tagId).getAllElements().stream() + ItemTags.getCollection().getOrCreate(tagId).func_230236_b_().stream() .sorted(Comparator.comparing(Registry.ITEM::getKey)) .forEach(this::addItem); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index 43d928429..162757cf6 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -19,6 +19,7 @@ import net.minecraft.command.arguments.EntityArgument; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.server.ServerWorld; import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.world.SkyblockWorldEvents; @@ -39,7 +40,7 @@ public class CommandSkyblockSpread { private static int run(CommandContext ctx, int range) throws CommandSyntaxException { PlayerEntity player = EntityArgument.getPlayer(ctx, "player"); int minDist = 100; - BlockPos spawn = player.world.getSpawnPoint(); + BlockPos spawn = ((ServerWorld) player.world).func_241135_u_(); int x, z; do { diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 47278e564..eebb48450 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -114,6 +114,7 @@ public final class ConfigHandler { public final ForgeConfigSpec.BooleanValue enchanterEnabled; public final ForgeConfigSpec.BooleanValue fluxfieldEnabled; public final ForgeConfigSpec.BooleanValue relicsEnabled; + // todo 1.16 remove public final ForgeConfigSpec.BooleanValue ringOfOdinFireResist; public final ForgeConfigSpec.BooleanValue invertMagnetRing; public final ForgeConfigSpec.BooleanValue enableThaumcraftStablizers; diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index 87666f810..650c5e392 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -11,9 +11,8 @@ package vazkii.botania.common.core.handler; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.SpawnReason; -import net.minecraft.entity.ai.attributes.AbstractAttributeMap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.ai.attributes.RangedAttribute; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -22,10 +21,11 @@ import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.Util; -import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.AttachCapabilitiesEvent; +import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.event.entity.living.LivingHurtEvent; +import net.minecraftforge.registries.IForgeRegistry; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; import vazkii.botania.common.item.ModItems; @@ -35,11 +35,14 @@ import java.util.EnumMap; import java.util.Map; import java.util.UUID; +import static vazkii.botania.common.block.ModBlocks.register; +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + public final class PixieHandler { private PixieHandler() {} - public static final IAttribute PIXIE_SPAWN_CHANCE = new RangedAttribute(null, "botania.pixieSpawnChance", 0, 0, 1); + public static final Attribute PIXIE_SPAWN_CHANCE = new RangedAttribute("botania.pixieSpawnChance", 0, 0, 1); private static final Map DEFAULT_MODIFIER_UUIDS = Util.make(new EnumMap<>(EquipmentSlotType.class), m -> { m.put(EquipmentSlotType.HEAD, UUID.fromString("3c1f559c-9ec4-412d-ada0-dbf3e714088e")); m.put(EquipmentSlotType.CHEST, UUID.fromString("9631121c-16f0-4ed4-ba0a-0e7a063cb71c")); @@ -56,12 +59,17 @@ public final class PixieHandler { Effects.WEAKNESS }; + public static void registerAttribute(RegistryEvent.Register evt) { + IForgeRegistry r = evt.getRegistry(); + register(r, prefix("pixie_spawn_chance"), PIXIE_SPAWN_CHANCE); + } + public static AttributeModifier makeModifier(EquipmentSlotType slot, String name, double amount) { return new AttributeModifier(DEFAULT_MODIFIER_UUIDS.get(slot), name, amount, AttributeModifier.Operation.ADDITION); } // Want to do this as early as possible -- doing it at entity join world means attribute modifiers are ignored when loading - public static void registerAttribute(AttachCapabilitiesEvent evt) { + public static void attachAttribute(AttachCapabilitiesEvent evt) { if (evt.getObject() instanceof PlayerEntity) { AbstractAttributeMap attributes = ((PlayerEntity) evt.getObject()).getAttributes(); if (attributes.getAttributeInstance(PIXIE_SPAWN_CHANCE) == null) { @@ -90,7 +98,7 @@ public final class PixieHandler { } pixie.setProps((LivingEntity) event.getSource().getTrueSource(), player, 0, dmg); - pixie.onInitialSpawn(player.world, player.world.getDifficultyForLocation(new BlockPos(pixie)), + pixie.onInitialSpawn(player.world, player.world.getDifficultyForLocation(pixie.func_233580_cy_()), SpawnReason.EVENT, null, null); player.world.addEntity(pixie); } diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index fdfc3c5f1..80514a5ee 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -9,9 +9,9 @@ package vazkii.botania.common.core.helper; import com.google.gson.JsonObject; -import com.mojang.datafixers.Dynamic; -import com.mojang.datafixers.types.JsonOps; +import com.mojang.serialization.Dynamic; +import com.mojang.serialization.JsonOps; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.INBT; diff --git a/src/main/java/vazkii/botania/common/core/helper/Vector3.java b/src/main/java/vazkii/botania/common/core/helper/Vector3.java index 3618bb173..03298b198 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -8,13 +8,13 @@ */ package vazkii.botania.common.core.helper; -import net.minecraft.client.renderer.Vector3f; -import net.minecraft.client.renderer.Vector4f; import net.minecraft.entity.Entity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; +import net.minecraft.util.math.vector.Vector4f; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java index ce0ead7d8..94ccc9dec 100644 --- a/src/main/java/vazkii/botania/common/core/loot/BindUuid.java +++ b/src/main/java/vazkii/botania/common/core/loot/BindUuid.java @@ -14,11 +14,9 @@ import com.google.gson.JsonSerializationContext; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.*; +import net.minecraft.loot.conditions.ILootCondition; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootFunction; -import net.minecraft.world.storage.loot.LootParameters; -import net.minecraft.world.storage.loot.conditions.ILootCondition; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.relic.ItemRelic; @@ -42,14 +40,12 @@ public class BindUuid extends LootFunction { return stack; } + @Override + public LootFunctionType func_230425_b_() { + return ModLootModifiers.BIND_UUID; + } + public static class Serializer extends LootFunction.Serializer { - public Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "bind_uuid"), BindUuid.class); - } - - @Override - public void serialize(@Nonnull JsonObject object, @Nonnull BindUuid functionClazz, @Nonnull JsonSerializationContext serializationContext) {} - @Nonnull @Override public BindUuid deserialize(@Nonnull JsonObject object, @Nonnull JsonDeserializationContext deserializationContext, @Nonnull ILootCondition[] conditionsIn) { diff --git a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java index a40f8c7dd..4d6a8199c 100644 --- a/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java +++ b/src/main/java/vazkii/botania/common/core/loot/EnableRelics.java @@ -12,12 +12,12 @@ import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.conditions.ILootCondition; +import net.minecraft.loot.ILootSerializer; +import net.minecraft.loot.LootConditionType; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.conditions.ILootCondition; import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -28,17 +28,18 @@ public class EnableRelics implements ILootCondition { return ConfigHandler.COMMON.relicsEnabled.get(); } - public static class Serializer extends ILootCondition.AbstractSerializer { - public Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "enable_relics"), EnableRelics.class); - } + @Override + public LootConditionType func_230419_b_() { + return ModLootModifiers.ENABLE_RELICS; + } + public static class Serializer implements ILootSerializer { @Override - public void serialize(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} + public void func_230424_a_(@Nonnull JsonObject json, @Nonnull EnableRelics value, @Nonnull JsonSerializationContext context) {} @Nonnull @Override - public EnableRelics deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + public EnableRelics func_230423_a_(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { return new EnableRelics(); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java b/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java new file mode 100644 index 000000000..c11850d79 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/ModLootModifiers.java @@ -0,0 +1,19 @@ +package vazkii.botania.common.core.loot; + +import net.minecraft.loot.LootConditionType; +import net.minecraft.loot.LootFunctionType; +import net.minecraft.util.registry.Registry; + +import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; + +public class ModLootModifiers { + public static final LootConditionType TRUE_GUARDIAN_KILLER = new LootConditionType(new TrueGuardianKiller.Serializer()); + public static final LootConditionType ENABLE_RELICS = new LootConditionType(new EnableRelics.Serializer()); + public static final LootFunctionType BIND_UUID = new LootFunctionType(new BindUuid.Serializer()); + + public static void init() { + Registry.register(Registry.field_239704_ba_, prefix("true_guardian_killer"), TRUE_GUARDIAN_KILLER); + Registry.register(Registry.field_239704_ba_, prefix("enable_relics"), ENABLE_RELICS); + Registry.register(Registry.field_239694_aZ_, prefix("bind_uuid"), BIND_UUID); + } +} diff --git a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java index c4f31d36d..c98983188 100644 --- a/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java +++ b/src/main/java/vazkii/botania/common/core/loot/TrueGuardianKiller.java @@ -13,13 +13,13 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootContext; -import net.minecraft.world.storage.loot.LootParameters; -import net.minecraft.world.storage.loot.conditions.ILootCondition; +import net.minecraft.loot.ILootSerializer; +import net.minecraft.loot.LootConditionType; +import net.minecraft.loot.LootContext; +import net.minecraft.loot.LootParameters; +import net.minecraft.loot.conditions.ILootCondition; import vazkii.botania.common.entity.EntityDoppleganger; -import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; @@ -32,17 +32,18 @@ public class TrueGuardianKiller implements ILootCondition { && context.get(LootParameters.KILLER_ENTITY) == ((EntityDoppleganger) victim).trueKiller; } - public static class Serializer extends ILootCondition.AbstractSerializer { - public Serializer() { - super(new ResourceLocation(LibMisc.MOD_ID, "true_guardian_killer"), TrueGuardianKiller.class); + @Override + public LootConditionType func_230419_b_() { + return ModLootModifiers.TRUE_GUARDIAN_KILLER; + } + + public static class Serializer implements ILootSerializer { + @Override + public void func_230424_a_(JsonObject json, TrueGuardianKiller condition, JsonSerializationContext ctx) { } @Override - public void serialize(@Nonnull JsonObject json, @Nonnull TrueGuardianKiller value, @Nonnull JsonSerializationContext context) {} - - @Nonnull - @Override - public TrueGuardianKiller deserialize(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + public TrueGuardianKiller func_230423_a_(JsonObject json, JsonDeserializationContext ctx) { return new TrueGuardianKiller(); } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index 75ad6b3fc..e1fc2be6f 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -10,7 +10,7 @@ package vazkii.botania.common.core.proxy; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.world.dimension.DimensionType; +import net.minecraft.world.World; import net.minecraftforge.fml.server.ServerLifecycleHooks; import vazkii.botania.common.core.helper.Vector3; @@ -35,7 +35,7 @@ public class ServerProxy implements IProxy { @Override public long getWorldElapsedTicks() { - return ServerLifecycleHooks.getCurrentServer().getWorld(DimensionType.OVERWORLD).getGameTime(); + return ServerLifecycleHooks.getCurrentServer().getWorld(World.field_234918_g_).getGameTime(); } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java index 8309d6944..5eb34bd8e 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientBlocks.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.crafting; +import com.google.common.collect.ImmutableSet; import com.google.gson.JsonArray; import com.google.gson.JsonObject; @@ -19,6 +20,7 @@ import net.minecraftforge.registries.ForgeRegistries; import vazkii.botania.api.recipe.StateIngredient; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -26,8 +28,8 @@ import java.util.stream.Collectors; public class StateIngredientBlocks implements StateIngredient { private final Set blocks; - public StateIngredientBlocks(Set blocks) { - this.blocks = blocks; + public StateIngredientBlocks(Collection blocks) { + this.blocks = ImmutableSet.copyOf(blocks); } @Override diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java index 4526bb38f..336ddf424 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientHelper.java @@ -11,9 +11,9 @@ package vazkii.botania.common.crafting; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; -import com.mojang.datafixers.Dynamic; -import com.mojang.datafixers.types.JsonOps; +import com.mojang.serialization.Dynamic; +import com.mojang.serialization.JsonOps; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.nbt.CompoundNBT; @@ -22,6 +22,7 @@ import net.minecraft.nbt.NBTDynamicOps; import net.minecraft.nbt.NBTUtil; import net.minecraft.network.PacketBuffer; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; @@ -42,7 +43,7 @@ public class StateIngredientHelper { return new StateIngredientBlockState(state); } - public static StateIngredient of(Tag tag) { + public static StateIngredient of(ITag.INamedTag tag) { return new StateIngredientTag(tag); } @@ -57,7 +58,7 @@ public class StateIngredientHelper { public static StateIngredient deserialize(JsonObject object) { switch (JSONUtils.getString(object, "type")) { case "tag": - return new StateIngredientTag(new BlockTags.Wrapper(new ResourceLocation(JSONUtils.getString(object, "tag")))); + return new StateIngredientTag(BlockTags.makeWrapperTag(JSONUtils.getString(object, "tag"))); case "block": return new StateIngredientBlock(ForgeRegistries.BLOCKS.getValue(new ResourceLocation(JSONUtils.getString(object, "block")))); case "state": diff --git a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java index ab9c1b3ce..72ea2b67d 100644 --- a/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java +++ b/src/main/java/vazkii/botania/common/crafting/StateIngredientTag.java @@ -14,6 +14,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.network.PacketBuffer; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.util.ResourceLocation; @@ -23,27 +24,27 @@ import java.util.Set; import java.util.stream.Collectors; public class StateIngredientTag extends StateIngredientBlocks { - private final Tag tag; + private final ITag.INamedTag tag; - public StateIngredientTag(Tag tag) { - super(tag.getAllElements() instanceof Set ? (Set) tag.getAllElements() : new HashSet<>(tag.getAllElements())); + public StateIngredientTag(ITag.INamedTag tag) { + super(tag.func_230236_b_()); this.tag = tag; } public StateIngredientTag(ResourceLocation id) { - this(new BlockTags.Wrapper(id)); + this(BlockTags.makeWrapperTag(id.toString())); } @Override public boolean test(BlockState state) { - return tag.contains(state.getBlock()); + return tag.func_230235_a_(state.getBlock()); } @Override public JsonObject serialize() { JsonObject object = new JsonObject(); object.addProperty("type", "tag"); - object.addProperty("tag", tag.getId().toString()); + object.addProperty("tag", tag.func_230234_a_().toString()); return object; } @@ -54,7 +55,7 @@ public class StateIngredientTag extends StateIngredientBlocks { @Override public List getDisplayed() { - return tag.getAllElements().stream().map(Block::getDefaultState).collect(Collectors.toList()); + return tag.func_230236_b_().stream().map(Block::getDefaultState).collect(Collectors.toList()); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java index adedf99e7..148a2644f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BannerRecipe.java @@ -50,7 +50,7 @@ public class BannerRecipe extends SpecialRecipe { if (ModBanners.PATTERNS.containsKey(item.delegate) && !foundItem) { foundItem = true; - } else if (ItemTags.BANNERS.contains(item) && !foundBanner && BannerTileEntity.getPatterns(stack) < 6) { + } else if (ItemTags.BANNERS.func_230235_a_(item) && !foundBanner && BannerTileEntity.getPatterns(stack) < 6) { foundBanner = true; } else if (item instanceof DyeItem && !foundDye) { foundDye = true; @@ -73,7 +73,7 @@ public class BannerRecipe extends SpecialRecipe { Item item = stack.getItem(); if (ModBanners.PATTERNS.containsKey(item.delegate)) { pattern = ModBanners.PATTERNS.get(item.delegate); - } else if (ItemTags.BANNERS.contains(item)) { + } else if (ItemTags.BANNERS.func_230235_a_(item)) { banner = stack; } else if (item instanceof DyeItem) { dye = stack; diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 9bfc254ea..1160a595e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -20,6 +20,7 @@ import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; @@ -86,7 +87,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { @Override public void tick() { - LivingEntity thrower = getThrower(); + LivingEntity thrower = func_234616_v_(); if (!world.isRemote && (thrower == null || !(thrower instanceof PlayerEntity) || thrower.removed)) { remove(); return; @@ -174,7 +175,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { @Override protected void onImpact(RayTraceResult pos) { - LivingEntity thrower = getThrower(); + LivingEntity thrower = func_234616_v_(); if (pos.getType() != RayTraceResult.Type.ENTITY || ((EntityRayTraceResult) pos).getEntity() != thrower) { world.createExplosion(this, getPosX(), getPosY(), getPosZ(), 3F, Explosion.Mode.NONE); remove(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 971064592..3cec33366 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -20,6 +20,7 @@ import net.minecraft.network.IPacket; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.AxisAlignedBB; @@ -254,7 +255,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa } @Override - public boolean processInitialInteract(PlayerEntity player, Hand hand) { + public ActionResultType processInitialInteract(PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (!removed && !stack.isEmpty()) { if (player.world.isRemote) { @@ -262,7 +263,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa if (valid) { player.swingArm(hand); } - return valid; + return valid ? ActionResultType.SUCCESS : ActionResultType.PASS; } if (stack.getItem() == ModItems.twigWand) { @@ -274,7 +275,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa } else { displayRelatives(player, new ArrayList<>(), master); } - return true; + return ActionResultType.SUCCESS; } else if (stack.getItem() instanceof ItemDye) { DyeColor color = ((ItemDye) stack.getItem()).color; if (color != getNetwork()) { @@ -287,15 +288,15 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa } stack.shrink(1); - return true; + return ActionResultType.SUCCESS; } } else if (stack.getItem() == ModItems.phantomInk) { setInvisible(true); - return true; + return ActionResultType.SUCCESS; } } - return false; + return ActionResultType.PASS; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 6807f42a2..e1846d9f2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -39,6 +39,7 @@ import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectType; import net.minecraft.potion.Effects; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.tileentity.BeaconTileEntity; import net.minecraft.util.*; @@ -107,7 +108,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp private static final String TAG_MOB_SPAWN_TICKS = "mobSpawnTicks"; private static final String TAG_HARD_MODE = "hardMode"; private static final String TAG_PLAYER_COUNT = "playerCount"; - private static final Tag BLACKLIST = ModTags.Blocks.GAIA_BREAK_BLACKLIST; + private static final ITag.INamedTag BLACKLIST = ModTags.Blocks.GAIA_BREAK_BLACKLIST; private static final DataParameter INVUL_TIME = EntityDataManager.createKey(EntityDoppleganger.class, DataSerializers.VARINT); @@ -167,7 +168,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp if (world.isRemote) { warnInvalidBlocks(world, invalidPylonBlocks); } else { - player.sendMessage(new TranslationTextComponent("botaniamisc.needsCatalysts").applyTextStyle(TextFormatting.RED)); + player.sendMessage(new TranslationTextComponent("botaniamisc.needsCatalysts").func_240699_a_(TextFormatting.RED), Util.field_240973_b_); } return false; @@ -265,7 +266,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp trippedPositions.add(pos.down()); } - if (!allowBlockHere && isBlockHere && !BLACKLIST.contains(state.getBlock())) //ceiling is obstructed in this column + if (!allowBlockHere && isBlockHere && !BLACKLIST.func_230235_a_(state.getBlock())) //ceiling is obstructed in this column { trippedPositions.add(pos); } @@ -561,7 +562,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp world.destroyBlock(pos, true); } else { //don't break blacklisted blocks - if (BLACKLIST.contains(block)) { + if (BLACKLIST.func_230235_a_(block)) { continue; } //don't break the floor @@ -781,7 +782,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp EntityPixie pixie = new EntityPixie(world); pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); pixie.setPosition(getPosX() + getWidth() / 2, getPosY() + 2, getPosZ() + getWidth() / 2); - pixie.onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(pixie)), + pixie.onInitialSpawn(world, world.getDifficultyForLocation(pixie.func_233580_cy_()), SpawnReason.MOB_SUMMONED, null, null); world.addEntity(pixie); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index f05703126..43430be61 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -52,7 +52,7 @@ public class EntityEnderAirBottle extends ThrowableEntity implements IRendersAsI protected void onImpact(@Nonnull RayTraceResult pos) { if (pos.getType() == RayTraceResult.Type.BLOCK && !world.isRemote) { List coordsList = getCoordsToPut(((BlockRayTraceResult) pos).getPos()); - world.playEvent(2002, new BlockPos(this), 8); + world.playEvent(2002, func_233580_cy_(), 8); for (BlockPos coords : coordsList) { world.setBlockState(coords, Blocks.END_STONE.getDefaultState()); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 42bd4aaa7..d44e5d00d 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -55,7 +55,7 @@ public class EntityFallingStar extends EntityThrowableCopy { world.addParticle(data, getPosX() + xs, getPosY() + ys, getPosZ() + zs, 0, 0, 0); } - LivingEntity thrower = getThrower(); + LivingEntity thrower = func_234616_v_(); if (!world.isRemote && thrower != null) { AxisAlignedBB axis = new AxisAlignedBB(getPosX(), getPosY(), getPosZ(), lastTickPosX, lastTickPosY, lastTickPosZ).grow(2); List entities = world.getEntitiesWithinAABB(LivingEntity.class, axis); @@ -82,7 +82,7 @@ public class EntityFallingStar extends EntityThrowableCopy { return; } - LivingEntity thrower = getThrower(); + LivingEntity thrower = func_234616_v_(); if (pos.getType() == RayTraceResult.Type.ENTITY && thrower != null) { Entity e = ((EntityRayTraceResult) pos).getEntity(); if (e != thrower && e.isAlive()) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index ffd428ca7..a58fd8dfa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -141,10 +141,10 @@ public class EntityMagicMissile extends ThrowableEntity { List targetList = world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getPosX() - 0.5, getPosY() - 0.5, getPosZ() - 0.5, getPosX() + 0.5, getPosY() + 0.5, getPosZ() + 0.5)); if (targetList.contains(target)) { - LivingEntity thrower = getThrower(); - if (thrower != null) { + Entity thrower = func_234616_v_(); + if (thrower instanceof LivingEntity) { PlayerEntity player = thrower instanceof PlayerEntity ? (PlayerEntity) thrower : null; - target.attackEntityFrom(player == null ? DamageSource.causeMobDamage(thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); + target.attackEntityFrom(player == null ? DamageSource.causeMobDamage((LivingEntity) thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); } else { target.attackEntityFrom(DamageSource.GENERIC, evil ? 12 : 7); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 86c9b9266..d257c9d07 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.IPacket; import net.minecraft.particles.ParticleTypes; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; @@ -58,12 +59,12 @@ public class EntityPinkWither extends WitherEntity { } @Override - protected boolean processInteract(PlayerEntity player, Hand hand) { + protected ActionResultType func_230254_b_(PlayerEntity player, Hand hand) { if (!player.isSneaking()) { player.startRiding(this); - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 4dc524cba..647c99ff3 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -11,7 +11,6 @@ package vazkii.botania.common.entity; import net.minecraft.entity.EntityType; import net.minecraft.entity.FlyingEntity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; import net.minecraft.network.datasync.DataParameter; diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index 46553c625..51ee70ba4 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -20,6 +20,7 @@ import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; import net.minecraft.network.datasync.EntityDataManager; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; @@ -235,7 +236,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { } @Override - public boolean processInitialInteract(PlayerEntity player, Hand hand) { + public ActionResultType processInitialInteract(PlayerEntity player, Hand hand) { ItemStack stack = player.getHeldItem(hand); if (isAlive() && !stack.isEmpty()) { if (world.isRemote) { @@ -244,7 +245,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { if (valid) { player.swingArm(hand); } - return valid; + return valid ? ActionResultType.SUCCESS : ActionResultType.PASS; } SparkUpgradeType upgrade = getUpgrade(); @@ -259,30 +260,30 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { } else { dropAndKill(); } - return true; + return ActionResultType.SUCCESS; } else { SparkHelper.getSparksAround(world, getPosX(), getPosY() + (getHeight() / 2), getPosZ(), getNetwork()) .forEach(s -> particleBeam(player, this, (Entity) s)); - return true; + return ActionResultType.SUCCESS; } } else if (stack.getItem() instanceof ItemSparkUpgrade && upgrade == SparkUpgradeType.NONE) { setUpgrade(((ItemSparkUpgrade) stack.getItem()).type); stack.shrink(1); - return true; + return ActionResultType.SUCCESS; } else if (stack.getItem() == ModItems.phantomInk) { setInvisible(true); - return true; + return ActionResultType.SUCCESS; } else if (stack.getItem() instanceof ItemDye) { DyeColor color = ((ItemDye) stack.getItem()).color; if (color != getNetwork()) { setNetwork(color); stack.shrink(1); - return true; + return ActionResultType.SUCCESS; } } } - return false; + return ActionResultType.PASS; } @Nonnull diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index cf2f8e823..2630bcdca 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -32,7 +32,7 @@ import net.minecraft.util.Direction; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.EntityRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -98,7 +98,7 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte // Returning motion if (isReturning()) { - Entity thrower = getThrower(); + Entity thrower = func_234616_v_(); if (thrower != null) { Vector3 motion = Vector3.fromEntityCenter(thrower).subtract(Vector3.fromEntityCenter(this)).normalize(); setMotion(motion.toVector3d()); @@ -116,7 +116,7 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte // Server state control if (!world.isRemote && (getTimesBounced() >= MAX_BOUNCES || ticksExisted > 60)) { - LivingEntity thrower = getThrower(); + Entity thrower = func_234616_v_(); if (thrower == null) { dropAndKill(); } else { @@ -174,13 +174,15 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte } case ENTITY: { EntityRayTraceResult rtr = (EntityRayTraceResult) pos; - if (!world.isRemote && rtr.getEntity() instanceof LivingEntity && rtr.getEntity() != getThrower()) { - LivingEntity thrower = getThrower(); - rtr.getEntity().attackEntityFrom(thrower != null - ? thrower instanceof PlayerEntity - ? DamageSource.causeThrownDamage(this, thrower) - : DamageSource.causeMobDamage(thrower) - : DamageSource.GENERIC, 12); + if (!world.isRemote && rtr.getEntity() instanceof LivingEntity && rtr.getEntity() != func_234616_v_()) { + Entity thrower = func_234616_v_(); + DamageSource src = DamageSource.GENERIC; + if (thrower instanceof PlayerEntity) { + src = DamageSource.causeThrownDamage(this, thrower); + } else if (thrower instanceof LivingEntity) { + src = DamageSource.causeMobDamage((LivingEntity) thrower); + } + rtr.getEntity().attackEntityFrom(src, 12); if (isFire()) { rtr.getEntity().setFire(5); } else if (world.rand.nextInt(3) == 0) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index f49dcb359..eb904a3ec 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -8,18 +8,22 @@ */ package vazkii.botania.common.entity; +import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; -import net.minecraft.entity.IProjectile; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.entity.projectile.ProjectileHelper; import net.minecraft.nbt.CompoundNBT; import net.minecraft.nbt.NBTUtil; import net.minecraft.network.IPacket; import net.minecraft.network.play.server.SSpawnObjectPacket; import net.minecraft.particles.ParticleTypes; +import net.minecraft.tileentity.EndGatewayTileEntity; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; import net.minecraftforge.api.distmarker.Dist; @@ -29,85 +33,33 @@ import javax.annotation.Nullable; import java.util.UUID; -public abstract class EntityThrowableCopy extends Entity implements IProjectile { - private int xTile = -1; - private int yTile = -1; - private int zTile = -1; - protected boolean inGround; - public int throwableShake; - protected LivingEntity owner; - private UUID ownerId; - private Entity ignoreEntity; - private int ignoreTime; - - protected EntityThrowableCopy(EntityType p_i48540_1_, World p_i48540_2_) { - super(p_i48540_1_, p_i48540_2_); +public abstract class EntityThrowableCopy extends ProjectileEntity { + protected EntityThrowableCopy(EntityType type, World worldIn) { + super(type, worldIn); } - protected EntityThrowableCopy(EntityType p_i48541_1_, double p_i48541_2_, double p_i48541_4_, double p_i48541_6_, World p_i48541_8_) { - this(p_i48541_1_, p_i48541_8_); - this.setPosition(p_i48541_2_, p_i48541_4_, p_i48541_6_); + protected EntityThrowableCopy(EntityType type, double x, double y, double z, World worldIn) { + this(type, worldIn); + this.setPosition(x, y, z); } - protected EntityThrowableCopy(EntityType p_i48542_1_, LivingEntity p_i48542_2_, World p_i48542_3_) { - this(p_i48542_1_, p_i48542_2_.getPosX(), p_i48542_2_.getPosYEye() - (double) 0.1F, p_i48542_2_.getPosZ(), p_i48542_3_); - this.owner = p_i48542_2_; - this.ownerId = p_i48542_2_.getUniqueID(); + protected EntityThrowableCopy(EntityType type, LivingEntity livingEntityIn, World worldIn) { + this(type, livingEntityIn.getPosX(), livingEntityIn.getPosYEye() - (double) 0.1F, livingEntityIn.getPosZ(), worldIn); + this.setShooter(livingEntityIn); } /** * Checks if the entity is in range to render. */ @OnlyIn(Dist.CLIENT) - public boolean isInRangeToRenderDist(double p_70112_1_) { + public boolean isInRangeToRenderDist(double distance) { double d0 = this.getBoundingBox().getAverageEdgeLength() * 4.0D; if (Double.isNaN(d0)) { d0 = 4.0D; } d0 = d0 * 64.0D; - return p_70112_1_ < d0 * d0; - } - - /** - * Sets throwable heading based on an entity that's throwing it - */ - public void shoot(Entity p_184538_1_, float p_184538_2_, float p_184538_3_, float p_184538_4_, float p_184538_5_, float p_184538_6_) { - float f = -MathHelper.sin(p_184538_3_ * ((float) Math.PI / 180F)) * MathHelper.cos(p_184538_2_ * ((float) Math.PI / 180F)); - float f1 = -MathHelper.sin((p_184538_2_ + p_184538_4_) * ((float) Math.PI / 180F)); - float f2 = MathHelper.cos(p_184538_3_ * ((float) Math.PI / 180F)) * MathHelper.cos(p_184538_2_ * ((float) Math.PI / 180F)); - this.shoot((double) f, (double) f1, (double) f2, p_184538_5_, p_184538_6_); - Vector3d Vector3d = p_184538_1_.getMotion(); - this.setMotion(this.getMotion().add(Vector3d.x, p_184538_1_.onGround ? 0.0D : Vector3d.y, Vector3d.z)); - } - - /** - * Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. - */ - public void shoot(double p_70186_1_, double p_70186_3_, double p_70186_5_, float p_70186_7_, float p_70186_8_) { - Vector3d Vector3d = (new Vector3d(p_70186_1_, p_70186_3_, p_70186_5_)).normalize().add(this.rand.nextGaussian() * (double) 0.0075F * (double) p_70186_8_, this.rand.nextGaussian() * (double) 0.0075F * (double) p_70186_8_, this.rand.nextGaussian() * (double) 0.0075F * (double) p_70186_8_).scale((double) p_70186_7_); - this.setMotion(Vector3d); - float f = MathHelper.sqrt(horizontalMag(Vector3d)); - this.rotationYaw = (float) (MathHelper.atan2(Vector3d.x, Vector3d.z) * (double) (180F / (float) Math.PI)); - this.rotationPitch = (float) (MathHelper.atan2(Vector3d.y, (double) f) * (double) (180F / (float) Math.PI)); - this.prevRotationYaw = this.rotationYaw; - this.prevRotationPitch = this.rotationPitch; - } - - /** - * Updates the entity motion clientside, called by packets from the server - */ - @OnlyIn(Dist.CLIENT) - public void setVelocity(double p_70016_1_, double p_70016_3_, double p_70016_5_) { - this.setMotion(p_70016_1_, p_70016_3_, p_70016_5_); - if (this.prevRotationPitch == 0.0F && this.prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt(p_70016_1_ * p_70016_1_ + p_70016_5_ * p_70016_5_); - this.rotationYaw = (float) (MathHelper.atan2(p_70016_1_, p_70016_5_) * (double) (180F / (float) Math.PI)); - this.rotationPitch = (float) (MathHelper.atan2(p_70016_3_, (double) f) * (double) (180F / (float) Math.PI)); - this.prevRotationYaw = this.rotationYaw; - this.prevRotationPitch = this.rotationPitch; - } - + return distance < d0 * d0; } /** @@ -115,91 +67,52 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile */ public void tick() { super.tick(); - if (this.throwableShake > 0) { - --this.throwableShake; - } + RayTraceResult raytraceresult = ProjectileHelper.func_234618_a_(this, this::func_230298_a_, RayTraceContext.BlockMode.OUTLINE); + boolean flag = false; + if (raytraceresult.getType() == RayTraceResult.Type.BLOCK) { + BlockPos blockpos = ((BlockRayTraceResult) raytraceresult).getPos(); + BlockState blockstate = this.world.getBlockState(blockpos); + if (blockstate.isIn(Blocks.NETHER_PORTAL)) { + this.setPortal(blockpos); + flag = true; + } else if (blockstate.isIn(Blocks.END_GATEWAY)) { + TileEntity tileentity = this.world.getTileEntity(blockpos); + if (tileentity instanceof EndGatewayTileEntity) { + ((EndGatewayTileEntity) tileentity).teleportEntity(this); + } - if (this.inGround) { - this.inGround = false; - this.setMotion(this.getMotion().mul((double) (this.rand.nextFloat() * 0.2F), (double) (this.rand.nextFloat() * 0.2F), (double) (this.rand.nextFloat() * 0.2F))); - } - - AxisAlignedBB axisalignedbb = this.getBoundingBox().expand(this.getMotion()).grow(1.0D); - - for (Entity entity : this.world.getEntitiesInAABBexcluding(this, axisalignedbb, (p_213881_0_) -> { - return !p_213881_0_.isSpectator() && p_213881_0_.canBeCollidedWith(); - })) { - if (entity == this.ignoreEntity) { - ++this.ignoreTime; - break; - } - - if (this.owner != null && this.ticksExisted < 2 && this.ignoreEntity == null) { - this.ignoreEntity = entity; - this.ignoreTime = 3; - break; + flag = true; } } - RayTraceResult raytraceresult = ProjectileHelper.rayTrace(this, axisalignedbb, (p_213880_1_) -> { - return !p_213880_1_.isSpectator() && p_213880_1_.canBeCollidedWith() && p_213880_1_ != this.ignoreEntity; - }, RayTraceContext.BlockMode.OUTLINE, true); - if (this.ignoreEntity != null && this.ignoreTime-- <= 0) { - this.ignoreEntity = null; + if (raytraceresult.getType() != RayTraceResult.Type.MISS && !flag && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) { + this.onImpact(raytraceresult); } - if (raytraceresult.getType() != RayTraceResult.Type.MISS) { - if (raytraceresult.getType() == RayTraceResult.Type.BLOCK && this.world.getBlockState(((BlockRayTraceResult) raytraceresult).getPos()).getBlock() == Blocks.NETHER_PORTAL) { - this.setPortal(((BlockRayTraceResult) raytraceresult).getPos()); - } else if (!net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) { - this.onImpact(raytraceresult); - } - } - - Vector3d Vector3d = this.getMotion(); - double d0 = this.getPosX() + Vector3d.x; - double d1 = this.getPosY() + Vector3d.y; - double d2 = this.getPosZ() + Vector3d.z; - float f = MathHelper.sqrt(horizontalMag(Vector3d)); - this.rotationYaw = (float) (MathHelper.atan2(Vector3d.x, Vector3d.z) * (double) (180F / (float) Math.PI)); - - for (this.rotationPitch = (float) (MathHelper.atan2(Vector3d.y, (double) f) * (double) (180F / (float) Math.PI)); this.rotationPitch - this.prevRotationPitch < -180.0F; this.prevRotationPitch -= 360.0F) { - ; - } - - while (this.rotationPitch - this.prevRotationPitch >= 180.0F) { - this.prevRotationPitch += 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw < -180.0F) { - this.prevRotationYaw -= 360.0F; - } - - while (this.rotationYaw - this.prevRotationYaw >= 180.0F) { - this.prevRotationYaw += 360.0F; - } - - this.rotationPitch = MathHelper.lerp(0.2F, this.prevRotationPitch, this.rotationPitch); - this.rotationYaw = MathHelper.lerp(0.2F, this.prevRotationYaw, this.rotationYaw); - float f1; + Vector3d vector3d = this.getMotion(); + double d2 = this.getPosX() + vector3d.x; + double d0 = this.getPosY() + vector3d.y; + double d1 = this.getPosZ() + vector3d.z; + this.func_234617_x_(); + float f; if (this.isInWater()) { for (int i = 0; i < 4; ++i) { - float f2 = 0.25F; - this.world.addParticle(ParticleTypes.BUBBLE, d0 - Vector3d.x * 0.25D, d1 - Vector3d.y * 0.25D, d2 - Vector3d.z * 0.25D, Vector3d.x, Vector3d.y, Vector3d.z); + float f1 = 0.25F; + this.world.addParticle(ParticleTypes.BUBBLE, d2 - vector3d.x * 0.25D, d0 - vector3d.y * 0.25D, d1 - vector3d.z * 0.25D, vector3d.x, vector3d.y, vector3d.z); } - f1 = 0.8F; + f = 0.8F; } else { - f1 = 0.99F; + f = 0.99F; } - this.setMotion(Vector3d.scale((double) f1)); + this.setMotion(vector3d.scale((double) f)); if (!this.hasNoGravity()) { - Vector3d Vector3d1 = this.getMotion(); - this.setMotion(Vector3d1.x, Vector3d1.y - (double) this.getGravityVelocity(), Vector3d1.z); + Vector3d vector3d1 = this.getMotion(); + this.setMotion(vector3d1.x, vector3d1.y - (double) this.getGravityVelocity(), vector3d1.z); } - this.setPosition(d0, d1, d2); + this.setPosition(d2, d0, d1); } /** @@ -209,53 +122,6 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile return 0.03F; } - /** - * Called when this EntityThrowable hits a block or entity. - */ - protected abstract void onImpact(RayTraceResult p_70184_1_); - - public void writeAdditional(CompoundNBT p_213281_1_) { - p_213281_1_.putInt("xTile", this.xTile); - p_213281_1_.putInt("yTile", this.yTile); - p_213281_1_.putInt("zTile", this.zTile); - p_213281_1_.putByte("shake", (byte) this.throwableShake); - p_213281_1_.putBoolean("inGround", this.inGround); - if (this.ownerId != null) { - p_213281_1_.put("owner", NBTUtil.writeUniqueId(this.ownerId)); - } - - } - - /** - * (abstract) Protected helper method to read subclass entity data from NBT. - */ - public void readAdditional(CompoundNBT p_70037_1_) { - this.xTile = p_70037_1_.getInt("xTile"); - this.yTile = p_70037_1_.getInt("yTile"); - this.zTile = p_70037_1_.getInt("zTile"); - this.throwableShake = p_70037_1_.getByte("shake") & 255; - this.inGround = p_70037_1_.getBoolean("inGround"); - this.owner = null; - if (p_70037_1_.contains("owner", 10)) { - this.ownerId = NBTUtil.readUniqueId(p_70037_1_.getCompound("owner")); - } - - } - - @Nullable - public LivingEntity getThrower() { - if ((this.owner == null || this.owner.removed) && this.ownerId != null && this.world instanceof ServerWorld) { - Entity entity = ((ServerWorld) this.world).getEntityByUuid(this.ownerId); - if (entity instanceof LivingEntity) { - this.owner = (LivingEntity) entity; - } else { - this.owner = null; - } - } - - return this.owner; - } - public IPacket createSpawnPacket() { return new SSpawnObjectPacket(this); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index d26589eb7..3617198df 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -16,6 +16,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.IPacket; import net.minecraft.util.DamageSource; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java index 643a3756d..30791808f 100644 --- a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java +++ b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -9,7 +9,7 @@ package vazkii.botania.common.impl; import net.minecraft.block.Block; -import net.minecraft.entity.ai.attributes.IAttribute; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.*; import net.minecraft.item.crafting.Ingredient; @@ -102,6 +102,12 @@ public class BotaniaAPIImpl implements BotaniaAPI { public float getToughness() { return toughness; } + + @Override + public float func_230304_f_() { + // todo 1.16 armor toughness. move terrasteel's bonus here? + return 0; + } } private enum ItemTier implements IItemTier { @@ -213,11 +219,6 @@ public class BotaniaAPIImpl implements BotaniaAPI { return tmp; } - @Override - public IAttribute getPixieSpawnChanceAttribute() { - return PixieHandler.PIXIE_SPAWN_CHANCE; - } - public Map oreWeights = Collections.emptyMap(); public Map netherOreWeights = Collections.emptyMap(); private final Map, Function> paintableBlocks = new ConcurrentHashMap<>(); diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index dfdd51e90..fe048b0b4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -34,7 +34,7 @@ public class ItemAncientWill extends Item { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flag) { - list.add(new TranslationTextComponent("botaniamisc.craftToAddWill").applyTextStyle(TextFormatting.GREEN)); - list.add(new TranslationTextComponent("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".shortDesc").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botaniamisc.craftToAddWill").func_240699_a_(TextFormatting.GREEN)); + list.add(new TranslationTextComponent("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".shortDesc").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index e22fa6ba4..e9f409c12 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -278,7 +278,7 @@ public class ItemAstrolabe extends Item { tip.add(new StringTextComponent(size + " x " + size)); if (block != Blocks.AIR) { - tip.add(new ItemStack(block).getDisplayName().applyTextStyle(TextFormatting.GRAY)); + tip.add(new ItemStack(block).getDisplayName().func_230531_f_().func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 6b6c49386..a2274fed1 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -21,10 +21,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.Registry; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -181,12 +178,12 @@ public class ItemBlackHoleTalisman extends Item implements IBlockProvider { public ITextComponent getDisplayName(@Nonnull ItemStack stack) { Block block = getBlock(stack); ItemStack bstack = new ItemStack(block); - ITextComponent cand = super.getDisplayName(stack); + IFormattableTextComponent cand = super.getDisplayName(stack).func_230532_e_(); if (!bstack.isEmpty()) { - cand.appendText(" ("); - cand.appendSibling(bstack.getDisplayName().applyTextStyle(TextFormatting.GREEN)); - cand.appendText(")"); + cand.func_240702_b_(" ("); + cand.func_230529_a_(bstack.getDisplayName().func_230532_e_().func_240699_a_(TextFormatting.GREEN)); + cand.func_240702_b_(")"); } return cand; @@ -232,7 +229,7 @@ public class ItemBlackHoleTalisman extends Item implements IBlockProvider { Block block = getBlock(stack); if (block != null) { int count = getBlockCount(stack); - stacks.add(new StringTextComponent(Integer.toString(count) + " ").appendSibling(new ItemStack(block).getDisplayName()).applyTextStyle(TextFormatting.GRAY)); + stacks.add(new StringTextComponent(count + " ").func_230529_a_(new ItemStack(block).getDisplayName()).func_240699_a_(TextFormatting.GRAY)); } if (ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 73dd32c45..f815c8ded 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -63,7 +63,7 @@ public class ItemBlackLotus extends Item implements IManaDissolvable { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - list.add(new TranslationTextComponent("botaniamisc.lotusDesc").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botaniamisc.lotusDesc").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index f20a9e0d3..e427fef85 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -60,8 +60,8 @@ public class ItemBottledMana extends Item { break; } case 1: { // Water - if (!living.world.isRemote && !living.world.getDimension().doesWaterVaporize()) { - living.world.setBlockState(new BlockPos(living), Blocks.WATER.getDefaultState()); + if (!living.world.isRemote && !living.world.func_230315_m_().func_236040_e_()) { + living.world.setBlockState(living.func_233580_cy_(), Blocks.WATER.getDefaultState()); } break; } @@ -79,7 +79,7 @@ public class ItemBottledMana extends Item { break; } case 4: { // Mega Jump - if (!living.world.getDimension().isNether()) { + if (!living.world.func_230315_m_().func_236040_e_()) { if (!living.world.isRemote) { living.addPotionEffect(new EffectInstance(Effects.RESISTANCE, 300, 5)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 8cb958968..e8a603356 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -53,7 +53,7 @@ public class ItemCacophonium extends Item { } @Override - public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { + public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { if (entity instanceof MobEntity) { MobEntity living = (MobEntity) entity; SoundEvent sound = null; @@ -79,11 +79,11 @@ public class ItemCacophonium extends Item { player.swingArm(hand); } - return true; + return ActionResultType.SUCCESS; } } - return false; + return ActionResultType.PASS; } @Nonnull @@ -110,9 +110,9 @@ public class ItemCacophonium extends Item { @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { if (isDOIT(stack)) { - list.add(new TranslationTextComponent("botaniamisc.justDoIt").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botaniamisc.justDoIt").func_240699_a_(TextFormatting.GRAY)); } else if (getSound(stack) != null) { - list.add(new TranslationTextComponent(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, "")).applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent(ItemNBTHelper.getString(stack, TAG_SOUND_NAME, "")).func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 8fed53e79..62164b013 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -15,9 +15,7 @@ import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.resources.I18n; @@ -34,7 +32,9 @@ import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index ffdc29cbd..834c911f4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -17,6 +17,7 @@ import net.minecraft.inventory.container.SimpleNamedContainerProvider; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.world.World; @@ -58,7 +59,7 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide } @Override - public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { + public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity entity, Hand hand) { if (ConfigHandler.COMMON.enderPickpocketEnabled.get() && entity instanceof PlayerEntity && ManaItemHandler.instance().requestManaExact(stack, player, COST_OTHER, false)) { if (!player.world.isRemote) { PlayerEntity other = (PlayerEntity) entity; @@ -68,10 +69,10 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide } ManaItemHandler.instance().requestManaExact(stack, player, COST_OTHER, true); player.playSound(SoundEvents.BLOCK_ENDER_CHEST_OPEN, 1F, 1F); - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index 18aa88909..e33306e71 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -42,7 +42,7 @@ public class ItemFertilizer extends Item { for (int j = -range - 1; j < range; j++) { for (int k = 2; k >= -2; k--) { BlockPos pos_ = pos.add(i + 1, k + 1, j + 1); - if (world.isAirBlock(pos_) && (!world.getDimension().isNether() || pos_.getY() < 255) + if (world.isAirBlock(pos_) && (!world.func_230315_m_().func_236040_e_() || pos_.getY() < 255) && ModBlocks.whiteFlower.getDefaultState().isValidPosition(world, pos_)) { validCoords.add(pos_); } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index cde4a15e0..89f5fb863 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -92,7 +92,7 @@ public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExc public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { int level = getShardLevel(stack); ITextComponent levelLoc = new TranslationTextComponent("botania.roman" + (level + 1)); - list.add(new TranslationTextComponent("botaniamisc.shardLevel", levelLoc).applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botaniamisc.shardLevel", levelLoc).func_240699_a_(TextFormatting.GRAY)); } @Nonnull @@ -100,7 +100,7 @@ public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExc public ActionResultType onItemUse(ItemUseContext ctx) { World world = ctx.getWorld(); BlockPos pos = ctx.getPos(); - if (!world.isRemote && pos.getY() < 160 && !world.getDimension().isNether()) { + if (!world.isRemote && pos.getY() < 160 && !world.func_230315_m_().func_236040_e_()) { world.playSound(null, pos, ModSounds.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F); ItemStack stack = ctx.getItem(); spawnBurstFirst(world, pos, stack); @@ -263,14 +263,14 @@ public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExc state = NBTUtil.readBlockState(lens.getTag().getCompound(TAG_STATE)); } - if (entity.world.getDimension().doesWaterVaporize() && state.has(BlockStateProperties.WATERLOGGED)) { + if (entity.world.func_230315_m_().func_236040_e_() && state.func_235901_b_(BlockStateProperties.WATERLOGGED)) { state = state.with(BlockStateProperties.WATERLOGGED, false); } TileEntity tile = null; CompoundNBT tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false); if (tilecmp.contains("id")) { - tile = TileEntity.create(tilecmp); + tile = TileEntity.func_235657_b_(state, tilecmp); } entity.world.setBlockState(pos, state); diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index bf8a0c5c6..ef80efcff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -63,7 +63,7 @@ public class ItemLexicon extends Item implements IElvenItem { super.addInformation(stack, worldIn, tooltip, flagIn); TooltipHandler.addOnShift(tooltip, () -> { - tooltip.add(getEdition().applyTextStyle(TextFormatting.GRAY)); + tooltip.add(getEdition().func_230532_e_().func_240699_a_(TextFormatting.GRAY)); }); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index b7e679b03..f73f1027c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -23,10 +23,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -179,7 +176,7 @@ public class ItemManaGun extends Item implements IManaUsingItem { @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { boolean clip = hasClip(stack); - if (clip && !Screen.hasShiftDown()) { + if (clip && !Screen.func_231173_s_()) { tooltip.add(TooltipHandler.getShiftInfoTooltip()); return; } @@ -205,8 +202,8 @@ public class ItemManaGun extends Item implements IManaUsingItem { name = lensAt.getDisplayName(); } - ITextComponent tip = new StringTextComponent(" - ").appendSibling(name); - tip.getStyle().setColor(i == pos ? TextFormatting.GREEN : TextFormatting.GRAY); + IFormattableTextComponent tip = new StringTextComponent(" - ").func_230529_a_(name); + tip.func_240699_a_(i == pos ? TextFormatting.GREEN : TextFormatting.GRAY); tooltip.add(tip); } } @@ -216,11 +213,11 @@ public class ItemManaGun extends Item implements IManaUsingItem { @Override public ITextComponent getDisplayName(@Nonnull ItemStack stack) { ItemStack lens = getLens(stack); - ITextComponent cmp = super.getDisplayName(stack); + IFormattableTextComponent cmp = super.getDisplayName(stack).func_230532_e_(); if (!lens.isEmpty()) { - cmp.appendText(" ("); - cmp.appendSibling(lens.getDisplayName().applyTextStyle(TextFormatting.GREEN)); - cmp.appendText(")"); + cmp.func_240702_b_(" ("); + cmp.func_230529_a_(lens.getDisplayName().func_230532_e_().func_240699_a_(TextFormatting.GREEN)); + cmp.func_240702_b_(")"); } return cmp; } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index f28732d6b..827f7c529 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -128,7 +128,7 @@ public class ItemManaMirror extends Item implements IManaItem, ICoordBoundItem, ItemNBTHelper.setInt(stack, TAG_POS_X, pool == null ? 0 : pool.getPos().getX()); ItemNBTHelper.setInt(stack, TAG_POS_Y, pool == null ? -1 : pool.getPos().getY()); ItemNBTHelper.setInt(stack, TAG_POS_Z, pool == null ? 0 : pool.getPos().getZ()); - ItemNBTHelper.setString(stack, TAG_DIM, pool == null ? "" : DimensionType.getKey(pool.getWorld().getDimension().getType()).toString()); + ItemNBTHelper.setString(stack, TAG_DIM, pool == null ? "" : pool.getWorld().func_234923_W_().func_240901_a_().toString()); } public BlockPos getPoolCoords(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index ccc3be433..2ee6f2efe 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -63,7 +63,7 @@ public class ItemManaTablet extends Item implements IManaItem, ICreativeManaProv @Override public void addInformation(ItemStack stack, World world, List stacks, ITooltipFlag flags) { if (isStackCreative(stack)) { - stacks.add(new TranslationTextComponent("botaniamisc.creative").applyTextStyle(TextFormatting.GRAY)); + stacks.add(new TranslationTextComponent("botaniamisc.creative").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 703445b3f..c261a63ce 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -58,7 +58,7 @@ public class ItemPinkinator extends Item { pink.setCustomName(wither.getCustomName()); pink.setCustomNameVisible(wither.isCustomNameVisible()); } - pink.onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(pink)), SpawnReason.CONVERSION, null, null); + pink.onInitialSpawn(world, world.getDifficultyForLocation(pink.func_233580_cy_()), SpawnReason.CONVERSION, null, null); world.addEntity(pink); pink.spawnExplosionParticle(); pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); @@ -74,7 +74,7 @@ public class ItemPinkinator extends Item { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { - tooltip.add(new TranslationTextComponent("botaniamisc.pinkinatorDesc").applyTextStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("botaniamisc.pinkinatorDesc").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index c2dcdde15..d77ed0b0c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -30,7 +30,7 @@ public class ItemSlimeBottle extends Item { @Override public void inventoryTick(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { if (!world.isRemote) { - boolean slime = SubTileNarslimmus.isSlimeChunk(world, new BlockPos(entity)); + boolean slime = SubTileNarslimmus.isSlimeChunk(world, entity.func_233580_cy_()); ItemNBTHelper.setBoolean(stack, TAG_ACTIVE, slime); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 0d5aec846..22184cb25 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -51,7 +51,7 @@ public class ItemSlingshot extends Item { } EntityVineBall ball = new EntityVineBall(living, false); - ball.shoot(living, living.rotationPitch, living.rotationYaw, 0F, 1.5F, 1F); + ball.func_234612_a_(living, living.rotationPitch, living.rotationYaw, 0F, 1.5F, 1F); ball.setMotion(ball.getMotion().scale(1.6)); world.addEntity(ball); world.playSound(null, living.getPosX(), living.getPosY(), living.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 27285365e..5a5e46252 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -108,7 +108,7 @@ public class ItemSpawnerMover extends Item { spawnerTag.putInt("x", pos.getX()); spawnerTag.putInt("y", pos.getY()); spawnerTag.putInt("z", pos.getZ()); - te.read(spawnerTag); + te.func_230337_a_(world.getBlockState(pos), spawnerTag); } } else { for (int i = 0; i < 100; i++) { diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 935619870..f1830851e 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -36,7 +36,7 @@ public class ItemThornChakram extends Item { ItemStack copy = stack.copy(); copy.setCount(1); EntityThornChakram c = new EntityThornChakram(player, world, copy); - c.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + c.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); if (stack.getItem() == ModItems.flareChakram) { c.setFire(true); } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 0057429c4..ab1590654 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -21,10 +21,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; -import net.minecraft.state.IProperty; +import net.minecraft.state.Property; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -214,10 +215,10 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { } private static BlockState rotate(BlockState old, Direction.Axis axis) { - for (IProperty prop : old.getProperties()) { + for (Property prop : old.func_235904_r_()) { if (prop.getName().equals("facing") && prop.getValueClass() == Direction.class) { @SuppressWarnings("unchecked") - IProperty facingProp = (IProperty) prop; + Property facingProp = (Property) prop; Direction oldDir = old.get(facingProp); Direction newDir = rotateAround(oldDir, axis); @@ -346,15 +347,15 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { @OnlyIn(Dist.CLIENT) @Override public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { - list.add(new TranslationTextComponent(getModeString(stack)).applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent(getModeString(stack)).func_240699_a_(TextFormatting.GRAY)); } @Override - public String getHighlightTip(ItemStack stack, String displayName) { + public ITextComponent getHighlightTip(ItemStack stack, ITextComponent displayName) { ITextComponent mode = new StringTextComponent(" (") - .appendSibling(new TranslationTextComponent(getModeString(stack)).applyTextStyle(TextFormatting.DARK_GREEN)) - .appendText(")"); - return displayName + mode.getFormattedText(); + .func_230529_a_(new TranslationTextComponent(getModeString(stack)).func_240699_a_(TextFormatting.DARK_GREEN)) + .func_240702_b_(")"); + return displayName.func_230532_e_().func_230529_a_(mode); } public static ItemStack forColors(int color1, int color2) { diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 97ee9af41..d70c8e057 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -38,7 +38,7 @@ public class ItemVineBall extends Item { if (!world.isRemote) { EntityVineBall ball = new EntityVineBall(player, true); - ball.shoot(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); + ball.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); world.addEntity(ball); } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 88a2c3e4f..1e78703a2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -11,16 +11,16 @@ package vazkii.botania.common.item; import net.minecraft.block.Blocks; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.SpawnReason; -import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.ai.attributes.Attributes; +import net.minecraft.entity.ai.attributes.ModifiableAttributeInstance; import net.minecraft.entity.passive.horse.*; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; +import net.minecraft.util.ActionResultType; import net.minecraft.util.DamageSource; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; @@ -35,10 +35,10 @@ public class ItemVirus extends Item { } @Override - public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity living, Hand hand) { + public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity living, Hand hand) { if (living instanceof AbstractHorseEntity && !(living instanceof LlamaEntity)) { if (player.world.isRemote) { - return true; + return ActionResultType.SUCCESS; } AbstractHorseEntity horse = (AbstractHorseEntity) living; if (horse.isTame()) { @@ -74,32 +74,29 @@ public class ItemVirus extends Item { newHorse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElseThrow(NullPointerException::new).insertItem(0, saddle, false); } - AbstractAttributeMap oldAttributes = horse.getAttributes(); - AbstractAttributeMap attributes = newHorse.getAttributes(); + ModifiableAttributeInstance movementSpeed = newHorse.getAttribute(Attributes.field_233821_d_); + movementSpeed.setBaseValue(horse.getAttribute(Attributes.field_233821_d_).getBaseValue()); + movementSpeed.func_233769_c_(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), AttributeModifier.Operation.ADDITION)); - IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED); - movementSpeed.setBaseValue(oldAttributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED).getBaseValue()); - movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), AttributeModifier.Operation.ADDITION)); + ModifiableAttributeInstance health = newHorse.getAttribute(Attributes.field_233818_a_); + health.setBaseValue(horse.getAttribute(Attributes.field_233818_a_).getBaseValue()); + health.func_233769_c_(new AttributeModifier("Ermergerd Virus D:", health.getBaseValue(), AttributeModifier.Operation.ADDITION)); - IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH); - health.setBaseValue(oldAttributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH).getBaseValue()); - health.applyModifier(new AttributeModifier("Ermergerd Virus D:", health.getBaseValue(), AttributeModifier.Operation.ADDITION)); - - IAttributeInstance jumpHeight = attributes.getAttributeInstance(AbstractHorseEntity.JUMP_STRENGTH); - jumpHeight.setBaseValue(oldAttributes.getAttributeInstance(AbstractHorseEntity.JUMP_STRENGTH).getBaseValue()); - jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, AttributeModifier.Operation.ADDITION)); + ModifiableAttributeInstance jumpHeight = newHorse.getAttribute(Attributes.field_233830_m_); + jumpHeight.setBaseValue(horse.getAttribute(Attributes.field_233830_m_).getBaseValue()); + jumpHeight.func_233769_c_(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, AttributeModifier.Operation.ADDITION)); newHorse.playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0F + living.world.rand.nextFloat(), living.world.rand.nextFloat() * 0.7F + 1.3F); - newHorse.onInitialSpawn(player.world, player.world.getDifficultyForLocation(new BlockPos(newHorse)), SpawnReason.CONVERSION, null, null); + newHorse.onInitialSpawn(player.world, player.world.getDifficultyForLocation(newHorse.func_233580_cy_()), SpawnReason.CONVERSION, null, null); newHorse.setGrowingAge(horse.getGrowingAge()); player.world.addEntity(newHorse); newHorse.spawnExplosionParticle(); stack.shrink(1); - return true; + return ActionResultType.SUCCESS; } } - return false; + return ActionResultType.PASS; } public static void onLivingHurt(LivingHurtEvent event) { diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 6815b00a6..5fbae3bc5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -35,7 +35,7 @@ public class ItemWorldSeed extends Item { return new ActionResult<>(ActionResultType.SUCCESS, stack); } - BlockPos coords = world.getSpawnPoint(); + BlockPos coords = ((ServerWorld) world).func_241135_u_(); if (world.getDimension().canRespawnHere() && MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.getPosX(), player.getPosY(), player.getPosZ()) > 24) { player.rotationPitch = 0F; player.rotationYaw = 0F; diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java index 5692acd98..c5a6b745d 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java @@ -42,7 +42,7 @@ public class ItemBlockPool extends BlockItem { public void addInformation(@Nonnull ItemStack stack, World world, @Nonnull List stacks, @Nonnull ITooltipFlag flag) { if (((BlockPool) getBlock()).variant == BlockPool.Variant.CREATIVE) { for (int i = 0; i < 2; i++) { - stacks.add(new TranslationTextComponent("botaniamisc.creativePool" + i).applyTextStyle(TextFormatting.GRAY)); + stacks.add(new TranslationTextComponent("botaniamisc.creativePool" + i).func_240699_a_(TextFormatting.GRAY)); } } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 95e3e97a0..9bad281d0 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -15,6 +15,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tags.Tag; +import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -44,20 +45,20 @@ public class ItemBlockSpecialFlower extends BlockItem { @OnlyIn(Dist.CLIENT) @Override public void addInformation(@Nonnull ItemStack stack, World world, @Nonnull List tooltip, @Nonnull ITooltipFlag flag) { - if (GENERATING.contains(this)) { - tooltip.add(new TranslationTextComponent("botania.flowerType.generating").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); - } else if (FUNCTIONAL.contains(this)) { - tooltip.add(new TranslationTextComponent("botania.flowerType.functional").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); - } else if (MISC.contains(this)) { - tooltip.add(new TranslationTextComponent("botania.flowerType.misc").applyTextStyles(TextFormatting.ITALIC, TextFormatting.BLUE)); + if (GENERATING.func_230235_a_(this)) { + tooltip.add(new TranslationTextComponent("botania.flowerType.generating").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE)); + } else if (FUNCTIONAL.func_230235_a_(this)) { + tooltip.add(new TranslationTextComponent("botania.flowerType.functional").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE)); + } else if (MISC.func_230235_a_(this)) { + tooltip.add(new TranslationTextComponent("botania.flowerType.misc").func_240701_a_(TextFormatting.ITALIC, TextFormatting.BLUE)); } // Prevent crash when tooltips queried before configs load if (Botania.finishedLoading && ConfigHandler.CLIENT.referencesEnabled.get()) { String key = getTranslationKey() + ".reference"; - ITextComponent lore = new TranslationTextComponent(key); + IFormattableTextComponent lore = new TranslationTextComponent(key); if (!lore.getString().equals(key)) { - tooltip.add(lore.applyTextStyles(TextFormatting.ITALIC, TextFormatting.GRAY)); + tooltip.add(lore.func_240701_a_(TextFormatting.ITALIC, TextFormatting.GRAY)); } } } diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index f87d750cb..5a66ce0a2 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -13,6 +13,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.Util; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -58,7 +59,7 @@ public class ItemBlockTinyPotato extends BlockItem { PlayerEntity player = (PlayerEntity) e; int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); if (ticks < NOT_MY_NAME.length) { - player.sendMessage(new StringTextComponent(TextFormatting.RED + NOT_MY_NAME[ticks])); + player.sendMessage(new StringTextComponent(NOT_MY_NAME[ticks]).func_240699_a_(TextFormatting.RED), Util.field_240973_b_); ItemNBTHelper.setInt(stack, TAG_TICKS, ticks + 1); } } 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 249f9b124..9acf1cb5b 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -13,7 +13,6 @@ import com.google.common.collect.Lists; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.attributes.AttributeModifier; -import net.minecraft.entity.ai.attributes.IAttribute; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; @@ -129,7 +128,7 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public ITextComponent getDisplayName(@Nonnull ItemStack stack) { return new TranslationTextComponent(getTranslationKey(), new TranslationTextComponent(getBrew(stack).getTranslationKey(stack)), - new StringTextComponent(Integer.toString(getSwigsLeft(stack))).applyTextStyle(TextFormatting.BOLD)); + new StringTextComponent(Integer.toString(getSwigsLeft(stack))).func_240699_a_(TextFormatting.BOLD)); } // [VanillaCopy] PotionUtils.addPotionTooltip, with custom effect list @@ -137,7 +136,7 @@ public class ItemBrewBase extends Item implements IBrewItem { public static void addPotionTooltip(List list, List lores, float durationFactor) { List> list1 = Lists.newArrayList(); if (list.isEmpty()) { - lores.add((new TranslationTextComponent("effect.none")).applyTextStyle(TextFormatting.GRAY)); + lores.add((new TranslationTextComponent("effect.none")).func_240699_a_(TextFormatting.GRAY)); } else { for (EffectInstance effectinstance : list) { ITextComponent itextcomponent = new TranslationTextComponent(effectinstance.getEffectName()); @@ -159,13 +158,13 @@ public class ItemBrewBase extends Item implements IBrewItem { itextcomponent.appendText(" (").appendText(EffectUtils.getPotionDurationString(effectinstance, durationFactor)).appendText(")"); } - lores.add(itextcomponent.applyTextStyle(effect.getEffectType().getColor())); + lores.add(itextcomponent.func_240699_a_(effect.getEffectType().getColor())); } } if (!list1.isEmpty()) { lores.add(new StringTextComponent("")); - lores.add((new TranslationTextComponent("potion.whenDrank")).applyTextStyle(TextFormatting.DARK_PURPLE)); + lores.add((new TranslationTextComponent("potion.whenDrank")).func_240699_a_(TextFormatting.DARK_PURPLE)); for (Tuple tuple : list1) { AttributeModifier attributemodifier2 = tuple.getB(); @@ -178,10 +177,10 @@ public class ItemBrewBase extends Item implements IBrewItem { } if (d0 > 0.0D) { - lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).applyTextStyle(TextFormatting.BLUE)); + lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).func_240699_a_(TextFormatting.BLUE)); } else if (d0 < 0.0D) { d1 = d1 * -1.0D; - lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).applyTextStyle(TextFormatting.RED)); + lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).func_240699_a_(TextFormatting.RED)); } } } 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 c53cdf0f0..a84717ff7 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -59,11 +59,11 @@ public class ItemIncenseStick extends Item implements IBrewItem, IBrewContainer public void addInformation(ItemStack stack, World world, List list, ITooltipFlag flags) { Brew brew = getBrew(stack); if (brew == ModBrews.fallbackBrew) { - list.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); + list.add(new TranslationTextComponent("botaniamisc.notInfused").func_240699_a_(TextFormatting.LIGHT_PURPLE)); return; } - list.add(new TranslationTextComponent("botaniamisc.brewOf", new TranslationTextComponent(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE)); + list.add(new TranslationTextComponent("botaniamisc.brewOf", new TranslationTextComponent(brew.getTranslationKey(stack))).func_240699_a_(TextFormatting.LIGHT_PURPLE)); ItemBrewBase.addPotionTooltip(brew.getPotionEffects(stack), list, TIME_MULTIPLIER); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 9e674ae12..34bbae73f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -13,6 +13,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; +import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -83,7 +84,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor { } @Override - public ITextComponent getArmorSetName() { + public IFormattableTextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.elementium.name"); } @@ -91,7 +92,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor { @Override public void addArmorSetDescription(ItemStack stack, List list) { super.addArmorSetDescription(stack, list); - list.add(new TranslationTextComponent("botania.armorset.elementium.desc").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.elementium.desc").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java index 1efb6f995..331f58234 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumBoots.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EquipmentSlotType; @@ -25,10 +26,10 @@ public class ItemElementiumBoots extends ItemElementiumArmor { @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { - Multimap ret = super.getAttributeModifiers(slot); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { + Multimap ret = super.getAttributeModifiers(slot); if (slot == getEquipmentSlot()) { - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), PixieHandler.makeModifier(slot, "Armor modifier", 0.09)); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.09)); } return ret; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java index 326d84574..dba3b8ce9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumChest.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EquipmentSlotType; @@ -25,10 +26,10 @@ public class ItemElementiumChest extends ItemElementiumArmor { @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { - Multimap ret = super.getAttributeModifiers(slot); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { + Multimap ret = super.getAttributeModifiers(slot); if (slot == getEquipmentSlot()) { - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), PixieHandler.makeModifier(slot, "Armor modifier", 0.17)); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.17)); } return ret; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java index ddbc2df32..e8604a92b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumHelm.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -28,10 +29,10 @@ public class ItemElementiumHelm extends ItemElementiumArmor implements IManaDisc @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { - Multimap ret = super.getAttributeModifiers(slot); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { + Multimap ret = super.getAttributeModifiers(slot); if (slot == getEquipmentSlot()) { - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), PixieHandler.makeModifier(slot, "Armor modifier", 0.11)); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.11)); } return ret; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java index b193832d0..bb488760d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumLegs.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.armor.elementium; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EquipmentSlotType; @@ -25,10 +26,10 @@ public class ItemElementiumLegs extends ItemElementiumArmor { @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { - Multimap ret = super.getAttributeModifiers(slot); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { + Multimap ret = super.getAttributeModifiers(slot); if (slot == getEquipmentSlot()) { - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), PixieHandler.makeModifier(slot, "Armor modifier", 0.15)); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Armor modifier", 0.15)); } return ret; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index d438c7030..9e086ae63 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -19,10 +19,7 @@ import net.minecraft.item.ArmorItem; import net.minecraft.item.IArmorMaterial; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -128,13 +125,13 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh addArmorSetDescription(stack, list); ItemStack[] stacks = getArmorSetStacks(); for (ItemStack armor : stacks) { - ITextComponent cmp = new StringTextComponent(" - ").appendSibling(armor.getDisplayName()); + IFormattableTextComponent cmp = new StringTextComponent(" - ").func_230529_a_(armor.getDisplayName()); EquipmentSlotType slot = ((ArmorItem) armor.getItem()).getEquipmentSlot(); - cmp.applyTextStyle(hasArmorSetItem(player, slot) ? TextFormatting.GREEN : TextFormatting.GRAY); + cmp.func_240699_a_(hasArmorSetItem(player, slot) ? TextFormatting.GREEN : TextFormatting.GRAY); list.add(cmp); } if (hasPhantomInk(stack)) { - list.add(new TranslationTextComponent("botaniamisc.hasPhantomInk").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botaniamisc.hasPhantomInk").func_240699_a_(TextFormatting.GRAY)); } } @@ -188,22 +185,22 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh return pieces; } - public ITextComponent getArmorSetName() { + public IFormattableTextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.manasteel.name"); } private ITextComponent getArmorSetTitle(PlayerEntity player) { ITextComponent end = getArmorSetName() - .appendText(" (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")") - .applyTextStyle(TextFormatting.GRAY); + .func_240702_b_(" (" + getSetPiecesEquipped(player) + "/" + getArmorSetStacks().length + ")") + .func_240699_a_(TextFormatting.GRAY); return new TranslationTextComponent("botaniamisc.armorset") - .appendText(" ") - .appendSibling(end); + .func_240702_b_(" ") + .func_230529_a_(end); } @OnlyIn(Dist.CLIENT) public void addArmorSetDescription(ItemStack stack, List list) { - list.add(new TranslationTextComponent("botania.armorset.manasteel.desc").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.manasteel.desc").func_240699_a_(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index f022b6cfc..b474fd722 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -15,10 +15,7 @@ import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -102,7 +99,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { } @Override - public ITextComponent getArmorSetName() { + public IFormattableTextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.manaweave.name"); } @@ -120,7 +117,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor { @OnlyIn(Dist.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - list.add(new TranslationTextComponent("botania.armorset.manaweave.desc0").applyTextStyle(TextFormatting.GRAY)); - list.add(new TranslationTextComponent("botania.armorset.manaweave.desc1").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.manaweave.desc0").func_240699_a_(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.manaweave.desc1").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 1a9f380b1..4abeb3fcf 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -11,12 +11,14 @@ package vazkii.botania.common.item.equipment.armor.terrasteel; import com.google.common.collect.Multimap; import net.minecraft.client.renderer.entity.model.BipedModel; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; import net.minecraft.item.ItemStack; import net.minecraft.util.LazyValue; +import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -54,12 +56,12 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot, ItemStack stack) { - Multimap multimap = super.getAttributeModifiers(slot, stack); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot, ItemStack stack) { + Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getTranslationKey(stack) + slot.toString()).hashCode(), 0); if (slot == getEquipmentSlot()) { int reduction = material.getDamageReductionAmount(slot); - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), + multimap.put(Attributes.field_233820_c_, new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) reduction / 20, AttributeModifier.Operation.ADDITION)); } return multimap; @@ -103,16 +105,16 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public ITextComponent getArmorSetName() { + public IFormattableTextComponent getArmorSetName() { return new TranslationTextComponent("botania.armorset.terrasteel.name"); } @OnlyIn(Dist.CLIENT) @Override public void addArmorSetDescription(ItemStack stack, List list) { - list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc0").applyTextStyle(TextFormatting.GRAY)); - list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc1").applyTextStyle(TextFormatting.GRAY)); - list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc2").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc0").func_240699_a_(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc1").func_240699_a_(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.terrasteel.desc2").func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index f3f8637e0..8451df2b8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -80,7 +80,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc super.addArmorSetDescription(stack, list); for (AncientWillType type : AncientWillType.values()) { if (hasAncientWill(stack, type)) { - list.add(new TranslationTextComponent("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc").applyTextStyle(TextFormatting.GRAY)); + list.add(new TranslationTextComponent("botania.armorset.will_" + type.name().toLowerCase(Locale.ROOT) + ".desc").func_240699_a_(TextFormatting.GRAY)); } } } @@ -102,7 +102,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc if (hasArmorSet(player)) { // [VanillaCopy] crit logic from PlayerEntity.attackTargetEntityWithCurrentItem boolean strong = player.getCooledAttackStrength(0.5F) > 0.9F; - boolean crit = strong && player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isPassenger(); + boolean crit = strong && player.fallDistance > 0.0F && !player.func_233570_aj_() && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Effects.BLINDNESS) && !player.isPassenger(); crit = crit && !player.isSprinting(); ItemStack stack = player.getItemStackFromSlot(EquipmentSlotType.HEAD); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index 09a2ac348..4f724fd12 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -15,6 +15,7 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.Item; @@ -150,7 +151,7 @@ public abstract class ItemBauble extends Item implements ICosmeticAttachable, IP return true; } - public Multimap getEquippedAttributeModifiers(ItemStack stack) { + public Multimap getEquippedAttributeModifiers(ItemStack stack) { return HashMultimap.create(); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 8fc3f7009..39babfa97 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -12,12 +12,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -67,9 +67,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override public void addHiddenTooltip(ItemStack stack, World world, List tooltip, ITooltipFlag flags) { if (variant == Variant.THINKING_HAND) { - tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").func_240699_a_(TextFormatting.GRAY)); } else { - tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").func_240699_a_(TextFormatting.GRAY)); } super.addHiddenTooltip(stack, world, tooltip, flags); } 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 cb66454b6..813fa803b 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 @@ -27,6 +27,7 @@ import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -75,19 +76,19 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre Brew brew = getBrew(stack); if (brew == ModBrews.fallbackBrew) { - tooltip.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE)); + tooltip.add(new TranslationTextComponent("botaniamisc.notInfused").func_240699_a_(TextFormatting.LIGHT_PURPLE)); return; } - tooltip.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE)); + tooltip.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).func_240699_a_(TextFormatting.LIGHT_PURPLE)); for (EffectInstance effect : brew.getPotionEffects(stack)) { TextFormatting format = effect.getPotion().getEffectType().getColor(); - ITextComponent cmp = new TranslationTextComponent(effect.getEffectName()); + IFormattableTextComponent cmp = new TranslationTextComponent(effect.getEffectName()); if (effect.getAmplifier() > 0) { - cmp.appendText(" "); - cmp.appendSibling(new TranslationTextComponent("botania.roman" + (effect.getAmplifier() + 1))); + cmp.func_240702_b_(" "); + cmp.func_230529_a_(new TranslationTextComponent("botania.roman" + (effect.getAmplifier() + 1))); } - tooltip.add(cmp.applyTextStyle(format)); + tooltip.add(cmp.func_240699_a_(format)); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index 5790991bf..47bf08ed9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -45,7 +45,7 @@ public class ItemCloudPendant extends ItemBauble { if (player == Minecraft.getInstance().player) { ClientPlayerEntity playerSp = (ClientPlayerEntity) player; - if (playerSp.onGround) { + if (playerSp.func_233570_aj_()) { timesJumped = 0; } else { if (playerSp.movementInput.jump) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index 1a315c905..f6f192c35 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -99,7 +99,7 @@ public class ItemDodgeRing extends ItemBauble { } private static void dodge(PlayerEntity player, Direction dir) { - if (player.abilities.isFlying || !player.onGround || dir == Direction.UP || dir == Direction.DOWN) { + if (player.abilities.isFlying || !player.func_233570_aj_() || dir == Direction.UP || dir == Direction.DOWN) { return; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index a940f2e26..d49ddbed4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -15,8 +15,6 @@ import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.client.util.ITooltipFlag; @@ -27,7 +25,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Matrix4f; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; @@ -280,7 +280,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { } } else { boolean wasGliding = ItemNBTHelper.getBoolean(stack, TAG_GLIDING, false); - boolean doGlide = player.isSneaking() && !player.onGround && (player.getMotion().getY() < -.7F || wasGliding); + boolean doGlide = player.isSneaking() && !player.func_233570_aj_() && (player.getMotion().getY() < -.7F || wasGliding); if (time < MAX_FLY_TIME && player.ticksExisted % (doGlide ? 6 : 2) == 0) { newTime++; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 8ade4fe8a..19ccfc7cc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -12,14 +12,14 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3f; import net.minecraft.world.Explosion; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index 836243c70..ba4e00b25 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -41,10 +41,10 @@ public class ItemIcePendant extends ItemBauble { @Override public void onWornTick(ItemStack stack, LivingEntity entity) { if (!entity.world.isRemote && !entity.isSneaking()) { - boolean lastOnGround = entity.onGround; - entity.onGround = true; - FrostWalkerEnchantment.freezeNearby(entity, entity.world, new BlockPos(entity), 8); - entity.onGround = lastOnGround; + boolean lastOnGround = entity.func_233570_aj_(); + entity.func_230245_c_(true); + FrostWalkerEnchantment.freezeNearby(entity, entity.world, entity.func_233580_cy_(), 8); + entity.func_230245_c_(lastOnGround); int x = MathHelper.floor(entity.getPosX()); int y = MathHelper.floor(entity.getPosY()); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 717e041d8..95dc86fe3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -170,7 +170,7 @@ public class ItemItemFinder extends ItemBauble { if (!pstack.isEmpty()) { range = 12; - BlockPos pos = new BlockPos(player); + BlockPos pos = player.func_233580_cy_(); for (BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))) { TileEntity tile = player.world.getTileEntity(pos_); if (tile != null) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 44c170b0f..afaf2a2b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -17,8 +17,9 @@ import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.entity.model.BipedModel; import net.minecraft.client.renderer.texture.OverlayTexture; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; @@ -38,9 +39,9 @@ public class ItemKnockbackBelt extends ItemBauble { } @Override - public Multimap getEquippedAttributeModifiers(ItemStack stack) { - Multimap attributes = HashMultimap.create(); - attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Knockback Belt", 1, AttributeModifier.Operation.ADDITION).setSaved(false)); + public Multimap getEquippedAttributeModifiers(ItemStack stack) { + Multimap attributes = HashMultimap.create(); + attributes.put(Attributes.field_233820_c_, new AttributeModifier(getBaubleUUID(stack), "Knockback Belt", 1, AttributeModifier.Operation.ADDITION)); return attributes; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index 9a56ede9d..99e839c9d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -109,17 +109,17 @@ public class ItemMagnetRing extends ItemBauble { } ItemStack stack = item.getItem(); - if (stack.isEmpty() || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || ModTags.Items.MAGNET_RING_BLACKLIST.contains(stack.getItem())) { + if (stack.isEmpty() || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || ModTags.Items.MAGNET_RING_BLACKLIST.func_230235_a_(stack.getItem())) { return false; } - BlockPos pos = new BlockPos(item); + BlockPos pos = item.func_233580_cy_(); - if (ModTags.Blocks.MAGNET_RING_BLACKLIST.contains(item.world.getBlockState(pos).getBlock())) { + if (ModTags.Blocks.MAGNET_RING_BLACKLIST.func_230235_a_(item.world.getBlockState(pos).getBlock())) { return false; } - if (ModTags.Blocks.MAGNET_RING_BLACKLIST.contains(item.world.getBlockState(pos.down()).getBlock())) { + if (ModTags.Blocks.MAGNET_RING_BLACKLIST.func_230235_a_(item.world.getBlockState(pos.down()).getBlock())) { return false; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java index cfb434e81..ffb90ecf8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemPixieRing.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.bauble; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.item.ItemStack; @@ -21,9 +22,9 @@ public class ItemPixieRing extends ItemBauble { } @Override - public Multimap getEquippedAttributeModifiers(ItemStack stack) { - Multimap ret = super.getEquippedAttributeModifiers(stack); - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Ring modifier", 0.25, AttributeModifier.Operation.ADDITION)); + public Multimap getEquippedAttributeModifiers(ItemStack stack) { + Multimap ret = super.getEquippedAttributeModifiers(stack); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, new AttributeModifier(getBaubleUUID(stack), "Ring modifier", 0.25, AttributeModifier.Operation.ADDITION)); return ret; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java index fcebefd41..990a0dfc3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemReachRing.java @@ -14,6 +14,7 @@ import com.google.common.collect.Multimap; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraftforge.common.ForgeMod; public class ItemReachRing extends ItemBauble { @@ -24,7 +25,7 @@ public class ItemReachRing extends ItemBauble { @Override public Multimap getEquippedAttributeModifiers(ItemStack stack) { Multimap attributes = HashMultimap.create(); - attributes.put(PlayerEntity.REACH_DISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Reach Ring", 3.5, AttributeModifier.Operation.ADDITION)); + attributes.put(ForgeMod.REACH_DISTANCE.get(), new AttributeModifier(getBaubleUUID(stack), "Reach Ring", 3.5, AttributeModifier.Operation.ADDITION)); return attributes; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 077ded5e8..f6e9fd50d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -18,7 +18,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; @@ -76,7 +76,7 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); if (player.world.isRemote) { - if ((player.onGround || player.abilities.isFlying) && player.moveForward > 0F && !player.isInWaterOrBubbleColumn()) { + if ((player.func_233570_aj_() || player.abilities.isFlying) && player.moveForward > 0F && !player.isInWaterOrBubbleColumn()) { float speed = beltItem.getSpeed(belt); player.moveRelative(player.abilities.isFlying ? speed : speed, new Vector3d(0, 0, 1)); beltItem.onMovedTick(belt, player); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index 336a31db4..f06b31b88 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -12,8 +12,9 @@ import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.monster.EndermanEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -62,11 +63,11 @@ public class ItemEnderDagger extends ItemManasteelSword { @Nonnull @Override - public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot) { - Multimap multimap = super.getAttributeModifiers(equipmentSlot); + public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot) { + Multimap multimap = super.getAttributeModifiers(equipmentSlot); if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), + multimap.put(Attributes.field_233825_h_, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.25, AttributeModifier.Operation.ADDITION)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index f6f35a6ef..9c8bcef7c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -75,7 +75,7 @@ public class ItemGlassPick extends ItemManasteelPick { @Override public boolean onBlockStartBreak(ItemStack itemstack, BlockPos pos, PlayerEntity player) { BlockState state = player.world.getBlockState(pos); - boolean isGlass = state.getMaterial() == Material.GLASS || Tags.Blocks.GLASS.contains(state.getBlock()); + boolean isGlass = state.getMaterial() == Material.GLASS || Tags.Blocks.GLASS.func_230235_a_(state.getBlock()); boolean hasSilk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, itemstack) > 0; if (hasSilk || !isGlass) { return super.onBlockStartBreak(itemstack, pos, player); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index de7592d49..5b3ef97b3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -12,8 +12,9 @@ import com.google.common.collect.Multimap; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.EquipmentSlotType; @@ -85,12 +86,12 @@ public class ItemThunderSword extends ItemManasteelSword { @Nonnull @Override - public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot) { - Multimap multimap = super.getAttributeModifiers(equipmentSlot); + public Multimap getAttributeModifiers(EquipmentSlotType equipmentSlot) { + Multimap multimap = super.getAttributeModifiers(equipmentSlot); if (equipmentSlot == EquipmentSlotType.MAINHAND) { - multimap.removeAll(SharedMonsterAttributes.ATTACK_SPEED.getName()); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), + multimap.removeAll(Attributes.field_233825_h_); + multimap.put(Attributes.field_233825_h_, new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.5, AttributeModifier.Operation.ADDITION)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index 9c4bd1713..0205e89dc 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -23,6 +23,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ToolItem; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -73,7 +75,7 @@ public final class ToolCommons { } public static void removeBlocksInIteration(PlayerEntity player, ItemStack stack, World world, BlockPos centerPos, - Vec3i startDelta, Vec3i endDelta, Predicate filter, + Vector3i startDelta, Vector3i endDelta, Predicate filter, boolean dispose) { for (BlockPos iterPos : BlockPos.getAllInBoxMutable(centerPos.add(startDelta), centerPos.add(endDelta))) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 135fc9555..252b2c5a3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -45,7 +45,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { if (event.getEntityLiving() instanceof AbstractSkeletonEntity && rand.nextInt(26) <= 3 + looting) { addDrop(event, new ItemStack(event.getEntity() instanceof WitherSkeletonEntity ? Items.WITHER_SKELETON_SKULL : Items.SKELETON_SKULL)); - } else if (event.getEntityLiving() instanceof ZombieEntity && !(event.getEntityLiving() instanceof ZombiePigmanEntity) && rand.nextInt(26) <= 2 + 2 * looting) { + } else if (event.getEntityLiving() instanceof ZombieEntity && !(event.getEntityLiving() instanceof ZombifiedPiglinEntity) && rand.nextInt(26) <= 2 + 2 * looting) { addDrop(event, new ItemStack(Items.ZOMBIE_HEAD)); } else if (event.getEntityLiving() instanceof CreeperEntity && rand.nextInt(26) <= 2 + 2 * looting) { addDrop(event, new ItemStack(Items.CREEPER_HEAD)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index c6f679fb4..7a81f49a1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -34,7 +34,7 @@ public class ItemElementiumPick extends ItemManasteelPick { } public static boolean isDisposable(Block block) { - return ModTags.Items.DISPOSABLE.contains(block.asItem()); + return ModTags.Items.DISPOSABLE.func_230235_a_(block.asItem()); } private static boolean isDisposable(ItemStack stack) { @@ -42,7 +42,7 @@ public class ItemElementiumPick extends ItemManasteelPick { return false; } - return ModTags.Items.DISPOSABLE.contains(stack.getItem()); + return ModTags.Items.DISPOSABLE.func_230235_a_(stack.getItem()); } private static boolean isSemiDisposable(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index d783ea0b0..e63e072e4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -14,7 +14,7 @@ import net.minecraft.block.material.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.vector.Vector3i; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; @@ -37,8 +37,8 @@ public class ItemElementiumShovel extends ItemManasteelShovel { Block blk = world.getBlockState(pos).getBlock(); if (blk instanceof FallingBlock) { - ToolCommons.removeBlocksInIteration(player, stack, world, pos, new Vec3i(0, -12, 0), - new Vec3i(1, 12, 1), + ToolCommons.removeBlocksInIteration(player, stack, world, pos, new Vector3i(0, -12, 0), + new Vector3i(1, 12, 1), state -> state.getBlock() == blk, false); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java index 03e9e3134..9d4b19855 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumSword.java @@ -10,6 +10,7 @@ package vazkii.botania.common.item.equipment.tool.elementium; import com.google.common.collect.Multimap; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.inventory.EquipmentSlotType; @@ -27,10 +28,10 @@ public class ItemElementiumSword extends ItemManasteelSword { @Nonnull @Override - public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { - Multimap ret = super.getAttributeModifiers(slot); + public Multimap getAttributeModifiers(@Nonnull EquipmentSlotType slot) { + Multimap ret = super.getAttributeModifiers(slot); if (slot == EquipmentSlotType.MAINHAND) { - ret.put(PixieHandler.PIXIE_SPAWN_CHANCE.getName(), PixieHandler.makeModifier(slot, "Sword modifier", 0.05)); + ret.put(PixieHandler.PIXIE_SPAWN_CHANCE, PixieHandler.makeModifier(slot, "Sword modifier", 0.05)); } return ret; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 687526cf5..1ba571e02 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -22,7 +22,6 @@ import net.minecraft.stats.Stats; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -43,64 +42,6 @@ public class ItemManasteelShears extends ShearsItem implements IManaUsingItem { super(props); } - @Override - public boolean itemInteractionForEntity(@Nonnull ItemStack itemstack, PlayerEntity player, LivingEntity entity, Hand hand) { - if (entity.world.isRemote) { - return false; - } - - if (entity instanceof IShearable) { - IShearable target = (IShearable) entity; - if (target.isShearable(itemstack, entity.world, new BlockPos(entity))) { - List drops = target.onSheared(itemstack, entity.world, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); - - for (ItemStack stack : drops) { - entity.entityDropItem(stack, 1.0F); - } - - ToolCommons.damageItem(itemstack, 1, player, MANA_PER_DAMAGE); - } - - return true; - } - - return false; - } - - @Override - public boolean onBlockStartBreak(@Nonnull ItemStack itemstack, @Nonnull BlockPos pos, PlayerEntity player) { - if (player.world.isRemote) { - return false; - } - - Block block = player.world.getBlockState(pos).getBlock(); - if (block instanceof IShearable) { - IShearable target = (IShearable) block; - if (target.isShearable(itemstack, player.world, pos)) { - List drops = target.onSheared(itemstack, player.world, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); - Random rand = new Random(); - - for (ItemStack stack : drops) { - float f = 0.7F; - double d = rand.nextFloat() * f + (1D - f) * 0.5; - double d1 = rand.nextFloat() * f + (1D - f) * 0.5; - double d2 = rand.nextFloat() * f + (1D - f) * 0.5; - - ItemEntity entityitem = new ItemEntity(player.world, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); - entityitem.setPickupDelay(10); - player.world.addEntity(entityitem); - } - - ToolCommons.damageItem(itemstack, 1, player, MANA_PER_DAMAGE); - player.addStat(Stats.BLOCK_MINED.get(block), 1); - player.world.setBlockState(pos, Blocks.AIR.getDefaultState(), 11); - return true; - } - } - - return false; - } - @Override public int damageItem(ItemStack stack, int amount, T entity, Consumer onBroken) { return ToolCommons.damageItemIfPossible(stack, amount, entity, MANA_PER_DAMAGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index ecabf8c8e..3f109afab 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -13,12 +13,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.tags.BlockTags; import net.minecraft.util.Direction; +import net.minecraft.util.RegistryKey; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; -import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; @@ -63,7 +63,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker * Represents a map of dimension IDs to a set of all block swappers * active in that dimension. */ - private static final Map> blockSwappers = new HashMap<>(); + private static final Map, Set> blockSwappers = new HashMap<>(); public ItemTerraAxe(Properties props) { super(BotaniaAPI.instance().getTerrasteelItemTier(), props); @@ -116,7 +116,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker } if (event.phase == TickEvent.Phase.END) { - DimensionType dim = event.world.getDimension().getType(); + RegistryKey dim = event.world.func_234923_W_(); if (blockSwappers.containsKey(dim)) { Set swappers = blockSwappers.get(dim); @@ -149,7 +149,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker return; } - DimensionType dim = world.getDimension().getType(); + RegistryKey dim = world.func_234923_W_(); blockSwappers.computeIfAbsent(dim, d -> new HashSet<>()).add(swapper); } @@ -287,8 +287,8 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker for (BlockPos adj : adjacent(cand.coordinates)) { Block block = world.getBlockState(adj).getBlock(); - boolean isWood = BlockTags.LOGS.contains(block); - boolean isLeaf = BlockTags.LEAVES.contains(block); + boolean isWood = BlockTags.LOGS.func_230235_a_(block); + boolean isLeaf = BlockTags.LEAVES.func_230235_a_(block); // If it's not wood or a leaf, we aren't interested. if (!isWood && !isLeaf) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index 0beff0c3b..de3abb7b8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -21,7 +21,7 @@ import net.minecraft.util.*; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3i; +import net.minecraft.util.math.vector.Vector3i; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; @@ -97,7 +97,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ ITextComponent rankFormat = new TranslationTextComponent("botaniamisc.toolRank", rank); stacks.add(rankFormat); if (getMana(stack) == Integer.MAX_VALUE) { - stacks.add(new TranslationTextComponent("botaniamisc.getALife").applyTextStyle(TextFormatting.RED)); + stacks.add(new TranslationTextComponent("botaniamisc.getALife").func_240699_a_(TextFormatting.RED)); } } @@ -192,8 +192,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ return; } - Vec3i beginDiff = new Vec3i(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0); - Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); + Vector3i beginDiff = new Vector3i(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0); + Vector3i endDiff = new Vector3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, state -> MATERIALS.contains(state.getMaterial()), isTipped(stack)); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index c4ece906d..b09196d35 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -103,7 +103,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { ThrowableEntity entity = (ThrowableEntity) burst; AxisAlignedBB axis = new AxisAlignedBB(entity.getPosX(), entity.getPosY(), entity.getPosZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(1); List entities = entity.world.getEntitiesWithinAABB(LivingEntity.class, axis); - LivingEntity thrower = entity.getThrower(); + LivingEntity thrower = entity.func_234616_v_(); for (LivingEntity living : entities) { if (living == thrower || living instanceof PlayerEntity && thrower instanceof PlayerEntity diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 0c9b3fccf..ddee7b842 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -60,7 +60,7 @@ public class ItemLens extends Item implements ILensControl, ICompositableLens, I int storedColor = getStoredColor(stack); if (storedColor != -1) { TranslationTextComponent colorName = new TranslationTextComponent(storedColor == 16 ? "botania.color.rainbow" : "color.minecraft." + DyeColor.byId(storedColor)); - stacks.add(new TranslationTextComponent("botaniamisc.color", colorName).applyTextStyle(TextFormatting.GRAY)); + stacks.add(new TranslationTextComponent("botaniamisc.color", colorName).func_240699_a_(TextFormatting.GRAY)); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index 11da9e790..9ce699a8e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -38,8 +38,8 @@ public class LensDamage extends Lens { if (mana >= 16) { burst.setMana(mana - 16); if (!burst.isFake()) { - DamageSource src = entity.getThrower() != null - ? DamageSource.causeIndirectMagicDamage(entity, entity.getThrower()) + DamageSource src = entity.func_234616_v_() != null + ? DamageSource.causeIndirectMagicDamage(entity, entity.func_234616_v_()) : DamageSource.MAGIC; living.attackEntityFrom(src, 8); } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index b4e8d8853..292f4bb0a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -25,7 +25,7 @@ public class LensExplosive extends Lens { if (!entity.world.isRemote && !burst.isFake() && pos.getType() == RayTraceResult.Type.BLOCK) { BlockPos coords = burst.getBurstSourceBlockPos(); if (!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos())) { - Entity cause = entity.getThrower() != null ? entity.getThrower() : entity; + Entity cause = entity.func_234616_v_() != null ? entity.func_234616_v_() : entity; entity.world.createExplosion(cause, entity.getPosX(), entity.getPosY(), entity.getPosZ(), burst.getMana() / 50F, Explosion.Mode.BREAK); } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java index 3d8fc4306..a32bb34b1 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -8,7 +8,7 @@ */ package vazkii.botania.common.item.lens; -import net.minecraft.entity.item.FireworkRocketEntity; +import net.minecraft.entity.projectile.FireworkRocketEntity; import net.minecraft.entity.projectile.ThrowableEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index f8de80755..d09ceabdc 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -28,7 +28,7 @@ public class LensMagnet extends Lens { @Override public void updateBurst(IManaBurst burst, ThrowableEntity entity, ItemStack stack) { - BlockPos basePos = new BlockPos(entity); + BlockPos basePos = entity.func_233580_cy_(); boolean magnetized = entity.getPersistentData().contains(TAG_MAGNETIZED); int range = 3; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index f505ba97f..29be333fd 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -62,7 +62,7 @@ public class ItemDye extends Item16Colors { } @Override - public boolean itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity target, Hand hand) { + public ActionResultType itemInteractionForEntity(ItemStack stack, PlayerEntity player, LivingEntity target, Hand hand) { if (target instanceof SheepEntity) { SheepEntity entitysheep = (SheepEntity) target; @@ -71,9 +71,9 @@ public class ItemDye extends Item16Colors { stack.shrink(1); } - return true; + return ActionResultType.SUCCESS; } - return false; + return ActionResultType.PASS; } private boolean shouldRecolor(Block block) { diff --git a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java index cdfd24a72..801375e6e 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -69,7 +69,7 @@ public class ItemEnderAir extends Item { if (!world.isRemote) { EntityEnderAirBottle b = new EntityEnderAirBottle(player, world); - b.shoot(player, player.rotationPitch, player.rotationYaw, 0F, 1.5F, 1F); + b.func_234612_a_(player, player.rotationPitch, player.rotationYaw, 0F, 1.5F, 1F); world.addEntity(b); } else { player.swingArm(hand); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index 990ae922b..439c89e34 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -63,12 +63,12 @@ public class ItemDice extends ItemRelic { } if (possible.isEmpty()) { - player.sendMessage(new TranslationTextComponent("botaniamisc.dudDiceRoll", world.rand.nextInt(6) + 1).applyTextStyle(TextFormatting.DARK_GREEN)); + player.sendMessage(new TranslationTextComponent("botaniamisc.dudDiceRoll", world.rand.nextInt(6) + 1).func_240699_a_(TextFormatting.DARK_GREEN), Util.field_240973_b_); stack.shrink(1); return ActionResult.resultSuccess(stack); } else { int relic = possible.get(world.rand.nextInt(possible.size())); - player.sendMessage(new TranslationTextComponent("botaniamisc.diceRoll", relic + 1).applyTextStyle(TextFormatting.DARK_GREEN)); + player.sendMessage(new TranslationTextComponent("botaniamisc.diceRoll", relic + 1).func_240699_a_(TextFormatting.DARK_GREEN), Util.field_240973_b_); return ActionResult.resultSuccess(new ItemStack(getRelics()[relic])); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 9097a0963..58b0f0690 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -8,8 +8,6 @@ */ package vazkii.botania.common.item.relic; -import com.mojang.datafixers.Dynamic; - import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; @@ -61,7 +59,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } } else { ItemStack stack = ctx.getItem(); - GlobalPos loc = GlobalPos.of(world.getDimension().getType(), pos); + GlobalPos loc = GlobalPos.func_239648_a_(world.func_234923_W_(), pos); ItemNBTHelper.set(stack, TAG_LOCATION, loc.serialize(NBTDynamicOps.INSTANCE)); world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 5F); } @@ -102,7 +100,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, living.getPosX(), living.getPosY(), living.getPosZ()) * 10); - if (loc.getDimension() == world.getDimension().getType() + if (loc.func_239646_a_() == world.func_234923_W_() && (!(living instanceof PlayerEntity) || ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) living, cost, true))) { moveParticlesAndSound(living); living.setPositionAndUpdate(x + 0.5, y + 1.5, z + 0.5); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 27b8a47d6..a85f081fd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -24,6 +24,7 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 5e0945946..b17eef039 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -11,8 +11,9 @@ package vazkii.botania.common.item.relic; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; +import net.minecraft.entity.ai.attributes.Attributes; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; @@ -52,9 +53,9 @@ public class ItemOdinRing extends ItemRelicBauble { } @Override - public Multimap getEquippedAttributeModifiers(ItemStack stack) { - Multimap attributes = HashMultimap.create(); - attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), + public Multimap getEquippedAttributeModifiers(ItemStack stack) { + Multimap attributes = HashMultimap.create(); + attributes.put(Attributes.field_233818_a_, new AttributeModifier(getBaubleUUID(stack), "Odin Ring", 20, AttributeModifier.Operation.ADDITION)); return attributes; } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index 2b6abde98..25d66f0b7 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -75,7 +75,7 @@ public class ItemRelic extends Item implements IRelic { tooltip.add(new StringTextComponent("")); String name = stack.getTranslationKey() + ".poem"; for (int i = 0; i < 4; i++) { - tooltip.add(new TranslationTextComponent(name + i).applyTextStyles(TextFormatting.GRAY, TextFormatting.ITALIC)); + tooltip.add(new TranslationTextComponent(name + i).func_240701_a_(TextFormatting.GRAY, TextFormatting.ITALIC)); } } }); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index 9463ba1b3..91e178c70 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -54,7 +54,7 @@ public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWiel if (world.isRemote) { int range = IManaProficiencyArmor.hasProficiency(p, stack) ? 20 : 15; long seedxor = world.rand.nextLong(); - doHighlight(world, new BlockPos(p), range, seedxor); + doHighlight(world, p.func_233580_cy_(), range, seedxor); p.swingArm(hand); } else { world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), ModSounds.divinationRod, SoundCategory.PLAYERS, 1F, 1F); @@ -71,7 +71,7 @@ public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWiel BlockState state = world.getBlockState(pos_); Block block = state.getBlock(); - if (Tags.Blocks.ORES.contains(block)) { + if (Tags.Blocks.ORES.func_230235_a_(block)) { Random rand = new Random(Registry.BLOCK.getKey(block).hashCode() ^ seedxor); WispParticleData data = WispParticleData.wisp(0.25F, rand.nextFloat(), rand.nextFloat(), rand.nextFloat(), 8, false); world.addParticle(data, pos_.getX() + world.rand.nextFloat(), diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 2df1f21a9..fb872fc9d 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -27,6 +27,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.registry.Registry; +import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; @@ -348,13 +349,12 @@ public class ItemExchangeRod extends Item implements IManaUsingItem, IWireframeC @Override public ITextComponent getDisplayName(@Nonnull ItemStack stack) { BlockState state = getState(stack); - ITextComponent cmp = super.getDisplayName(stack); + IFormattableTextComponent cmp = super.getDisplayName(stack).func_230532_e_(); if (!state.isAir()) { - cmp.appendText(" ("); + cmp.func_240702_b_(" ("); ITextComponent sub = new ItemStack(state.getBlock()).getDisplayName(); - sub.getStyle().setColor(TextFormatting.GREEN); - cmp.appendSibling(sub); - cmp.appendText(")"); + cmp.func_230529_a_(sub.func_230532_e_().func_240699_a_(TextFormatting.GREEN)); + cmp.func_240702_b_(")"); } return cmp; } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index c190ccca3..cdf32f03c 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -150,7 +150,7 @@ public class ItemGravityRod extends Item implements IManaUsingItem { } if (target != null) { - if (BLACKLIST.contains(target.getType())) { + if (BLACKLIST.func_230235_a_(target.getType())) { return ActionResult.resultFail(stack); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index e76d2136e..8e690856b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -21,7 +21,7 @@ import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 9e0ed10ef..ac8334c21 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -17,6 +17,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.*; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import vazkii.botania.api.mana.ManaItemHandler; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index 060db4b2a..2613967a3 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -81,7 +81,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv private void terraform(ItemStack stack, World world, PlayerEntity player) { int range = IManaProficiencyArmor.hasProficiency(player, stack) ? 22 : 16; - BlockPos startCenter = new BlockPos(player).down(); + BlockPos startCenter = player.func_233580_cy_().down(); if (startCenter.getY() < world.getSeaLevel()) // Not below sea level { @@ -96,7 +96,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv continue; } - if (ModTags.Blocks.TERRAFORMABLE.contains(state.getBlock())) { + if (ModTags.Blocks.TERRAFORMABLE.func_230235_a_(state.getBlock())) { List airBlocks = new ArrayList<>(); for (Direction dir : Direction.Plane.HORIZONTAL) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index 856c5c578..e6c182715 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -19,7 +19,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.Vector3d; +import net.minecraft.util.math.vector.Vector3d; import net.minecraft.world.World; import vazkii.botania.api.item.IAvatarTile; diff --git a/src/main/java/vazkii/botania/common/lib/ModTags.java b/src/main/java/vazkii/botania/common/lib/ModTags.java index 07b904fec..c6632d0d5 100644 --- a/src/main/java/vazkii/botania/common/lib/ModTags.java +++ b/src/main/java/vazkii/botania/common/lib/ModTags.java @@ -12,97 +12,94 @@ import net.minecraft.block.Block; import net.minecraft.entity.EntityType; import net.minecraft.item.DyeColor; import net.minecraft.item.Item; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.EntityTypeTags; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; +import net.minecraft.tags.*; import net.minecraft.util.ResourceLocation; public class ModTags { public static class Items { - public static final Tag DUSTS_MANA = forgeTag("dusts/mana"); + public static final ITag.INamedTag DUSTS_MANA = forgeTag("dusts/mana"); - public static final Tag GEMS_DRAGONSTONE = forgeTag("gems/dragonstone"); - public static final Tag GEMS_MANA_DIAMOND = forgeTag("gems/mana_diamond"); + public static final ITag.INamedTag GEMS_DRAGONSTONE = forgeTag("gems/dragonstone"); + public static final ITag.INamedTag GEMS_MANA_DIAMOND = forgeTag("gems/mana_diamond"); - public static final Tag INGOTS_ELEMENTIUM = forgeTag("ingots/elementium"); - public static final Tag INGOTS_MANASTEEL = forgeTag("ingots/manasteel"); - public static final Tag INGOTS_TERRASTEEL = forgeTag("ingots/terrasteel"); + public static final ITag.INamedTag INGOTS_ELEMENTIUM = forgeTag("ingots/elementium"); + public static final ITag.INamedTag INGOTS_MANASTEEL = forgeTag("ingots/manasteel"); + public static final ITag.INamedTag INGOTS_TERRASTEEL = forgeTag("ingots/terrasteel"); - public static final Tag NUGGETS_ELEMENTIUM = forgeTag("nuggets/elementium"); - public static final Tag NUGGETS_MANASTEEL = forgeTag("nuggets/manasteel"); - public static final Tag NUGGETS_TERRASTEEL = forgeTag("nuggets/terrasteel"); + public static final ITag.INamedTag NUGGETS_ELEMENTIUM = forgeTag("nuggets/elementium"); + public static final ITag.INamedTag NUGGETS_MANASTEEL = forgeTag("nuggets/manasteel"); + public static final ITag.INamedTag NUGGETS_TERRASTEEL = forgeTag("nuggets/terrasteel"); - public static final Tag BLOCKS_ELEMENTIUM = forgeTag("storage_blocks/elementium"); - public static final Tag BLOCKS_MANASTEEL = forgeTag("storage_blocks/manasteel"); - public static final Tag BLOCKS_TERRASTEEL = forgeTag("storage_blocks/terrasteel"); - public static final Tag BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); + public static final ITag.INamedTag BLOCKS_ELEMENTIUM = forgeTag("storage_blocks/elementium"); + public static final ITag.INamedTag BLOCKS_MANASTEEL = forgeTag("storage_blocks/manasteel"); + public static final ITag.INamedTag BLOCKS_TERRASTEEL = forgeTag("storage_blocks/terrasteel"); + public static final ITag.INamedTag BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); - public static final Tag MYSTICAL_FLOWERS = tag("mystical_flowers"); - public static final Tag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); + public static final ITag.INamedTag MYSTICAL_FLOWERS = tag("mystical_flowers"); + public static final ITag.INamedTag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); - public static final Tag SPECIAL_FLOWERS = tag("special_flowers"); - public static final Tag MINI_FLOWERS = tag("mini_flowers"); - public static final Tag MISC_SPECIAL_FLOWERS = tag("misc_special_flowers"); - public static final Tag FUNCTIONAL_SPECIAL_FLOWERS = tag("functional_special_flowers"); - public static final Tag GENERATING_SPECIAL_FLOWERS = tag("generating_special_flowers"); + public static final ITag.INamedTag SPECIAL_FLOWERS = tag("special_flowers"); + public static final ITag.INamedTag MINI_FLOWERS = tag("mini_flowers"); + public static final ITag.INamedTag MISC_SPECIAL_FLOWERS = tag("misc_special_flowers"); + public static final ITag.INamedTag FUNCTIONAL_SPECIAL_FLOWERS = tag("functional_special_flowers"); + public static final ITag.INamedTag GENERATING_SPECIAL_FLOWERS = tag("generating_special_flowers"); - public static final Tag FLOATING_FLOWERS = tag("floating_flowers"); - public static final Tag MUNDANE_FLOATING_FLOWERS = tag("mundane_floating_flowers"); - public static final Tag SPECIAL_FLOATING_FLOWERS = tag("special_floating_flowers"); + public static final ITag.INamedTag FLOATING_FLOWERS = tag("floating_flowers"); + public static final ITag.INamedTag MUNDANE_FLOATING_FLOWERS = tag("mundane_floating_flowers"); + public static final ITag.INamedTag SPECIAL_FLOATING_FLOWERS = tag("special_floating_flowers"); - public static final Tag LENS = tag("lens"); - public static final Tag LIVINGROCK = tag("livingrock"); - public static final Tag LIVINGWOOD = tag("livingwood"); + public static final ITag.INamedTag LENS = tag("lens"); + public static final ITag.INamedTag LIVINGROCK = tag("livingrock"); + public static final ITag.INamedTag LIVINGWOOD = tag("livingwood"); - public static final Tag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); - public static final Tag LOONIUM_BLACKLIST = tag("loonium_blacklist"); + public static final ITag.INamedTag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); + public static final ITag.INamedTag LOONIUM_BLACKLIST = tag("loonium_blacklist"); - public static final Tag SHEARS = forgeTag("shears"); + public static final ITag.INamedTag SHEARS = forgeTag("shears"); - public static final Tag DISPOSABLE = tag("disposable"); - public static final Tag SEMI_DISPOSABLE = tag("semi_disposable"); + public static final ITag.INamedTag DISPOSABLE = tag("disposable"); + public static final ITag.INamedTag SEMI_DISPOSABLE = tag("semi_disposable"); - public static final Tag DYES = tag("dyes"); + public static final ITag.INamedTag DYES = tag("dyes"); - public static final Tag PETALS = tag("petals"); - public static final Tag PETALS_BLACK = tag("petals/black"); - public static final Tag PETALS_BLUE = tag("petals/blue"); - public static final Tag PETALS_BROWN = tag("petals/brown"); - public static final Tag PETALS_CYAN = tag("petals/cyan"); - public static final Tag PETALS_GRAY = tag("petals/gray"); - public static final Tag PETALS_GREEN = tag("petals/green"); - public static final Tag PETALS_LIGHT_BLUE = tag("petals/light_blue"); - public static final Tag PETALS_LIGHT_GRAY = tag("petals/light_gray"); - public static final Tag PETALS_LIME = tag("petals/lime"); - public static final Tag PETALS_MAGENTA = tag("petals/magenta"); - public static final Tag PETALS_ORANGE = tag("petals/orange"); - public static final Tag PETALS_PINK = tag("petals/pink"); - public static final Tag PETALS_PURPLE = tag("petals/purple"); - public static final Tag PETALS_RED = tag("petals/red"); - public static final Tag PETALS_WHITE = tag("petals/white"); - public static final Tag PETALS_YELLOW = tag("petals/yellow"); + public static final ITag.INamedTag PETALS = tag("petals"); + public static final ITag.INamedTag PETALS_BLACK = tag("petals/black"); + public static final ITag.INamedTag PETALS_BLUE = tag("petals/blue"); + public static final ITag.INamedTag PETALS_BROWN = tag("petals/brown"); + public static final ITag.INamedTag PETALS_CYAN = tag("petals/cyan"); + public static final ITag.INamedTag PETALS_GRAY = tag("petals/gray"); + public static final ITag.INamedTag PETALS_GREEN = tag("petals/green"); + public static final ITag.INamedTag PETALS_LIGHT_BLUE = tag("petals/light_blue"); + public static final ITag.INamedTag PETALS_LIGHT_GRAY = tag("petals/light_gray"); + public static final ITag.INamedTag PETALS_LIME = tag("petals/lime"); + public static final ITag.INamedTag PETALS_MAGENTA = tag("petals/magenta"); + public static final ITag.INamedTag PETALS_ORANGE = tag("petals/orange"); + public static final ITag.INamedTag PETALS_PINK = tag("petals/pink"); + public static final ITag.INamedTag PETALS_PURPLE = tag("petals/purple"); + public static final ITag.INamedTag PETALS_RED = tag("petals/red"); + public static final ITag.INamedTag PETALS_WHITE = tag("petals/white"); + public static final ITag.INamedTag PETALS_YELLOW = tag("petals/yellow"); - public static final Tag RUNES = tag("runes"); + public static final ITag.INamedTag RUNES = tag("runes"); - public static final Tag RUNES_AIR = tag("runes/air"); - public static final Tag RUNES_AUTUMN = tag("runes/autumn"); - public static final Tag RUNES_EARTH = tag("runes/earth"); - public static final Tag RUNES_ENVY = tag("runes/envy"); - public static final Tag RUNES_FIRE = tag("runes/fire"); - public static final Tag RUNES_GLUTTONY = tag("runes/gluttony"); - public static final Tag RUNES_GREED = tag("runes/greed"); - public static final Tag RUNES_LUST = tag("runes/lust"); - public static final Tag RUNES_MANA = tag("runes/mana"); - public static final Tag RUNES_PRIDE = tag("runes/pride"); - public static final Tag RUNES_SLOTH = tag("runes/sloth"); - public static final Tag RUNES_SPRING = tag("runes/spring"); - public static final Tag RUNES_SUMMER = tag("runes/summer"); - public static final Tag RUNES_WATER = tag("runes/water"); - public static final Tag RUNES_WINTER = tag("runes/winter"); - public static final Tag RUNES_WRATH = tag("runes/wrath"); + public static final ITag.INamedTag RUNES_AIR = tag("runes/air"); + public static final ITag.INamedTag RUNES_AUTUMN = tag("runes/autumn"); + public static final ITag.INamedTag RUNES_EARTH = tag("runes/earth"); + public static final ITag.INamedTag RUNES_ENVY = tag("runes/envy"); + public static final ITag.INamedTag RUNES_FIRE = tag("runes/fire"); + public static final ITag.INamedTag RUNES_GLUTTONY = tag("runes/gluttony"); + public static final ITag.INamedTag RUNES_GREED = tag("runes/greed"); + public static final ITag.INamedTag RUNES_LUST = tag("runes/lust"); + public static final ITag.INamedTag RUNES_MANA = tag("runes/mana"); + public static final ITag.INamedTag RUNES_PRIDE = tag("runes/pride"); + public static final ITag.INamedTag RUNES_SLOTH = tag("runes/sloth"); + public static final ITag.INamedTag RUNES_SPRING = tag("runes/spring"); + public static final ITag.INamedTag RUNES_SUMMER = tag("runes/summer"); + public static final ITag.INamedTag RUNES_WATER = tag("runes/water"); + public static final ITag.INamedTag RUNES_WINTER = tag("runes/winter"); + public static final ITag.INamedTag RUNES_WRATH = tag("runes/wrath"); - public static Tag getFlowerTag(DyeColor color) { + public static ITag.INamedTag getFlowerTag(DyeColor color) { switch (color) { default: case WHITE: @@ -140,56 +137,56 @@ public class ModTags { } } - private static Tag tag(String name) { - return new ItemTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, name)); + private static ITag.INamedTag tag(String name) { + return ItemTags.makeWrapperTag(new ResourceLocation(LibMisc.MOD_ID, name).toString()); } - private static Tag forgeTag(String name) { - return new ItemTags.Wrapper(new ResourceLocation("forge", name)); + private static ITag.INamedTag forgeTag(String name) { + return ItemTags.makeWrapperTag(new ResourceLocation("forge", name).toString()); } } public static class Blocks { - public static final Tag MYSTICAL_FLOWERS = tag("mystical_flowers"); - public static final Tag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); + public static final ITag.INamedTag MYSTICAL_FLOWERS = tag("mystical_flowers"); + public static final ITag.INamedTag DOUBLE_MYSTICAL_FLOWERS = tag("double_mystical_flowers"); - public static final Tag SPECIAL_FLOWERS = tag("special_flowers"); - public static final Tag MINI_FLOWERS = tag("mini_flowers"); - public static final Tag MISC_SPECIAL_FLOWERS = tag("misc_special_flowers"); - public static final Tag FUNCTIONAL_SPECIAL_FLOWERS = tag("functional_special_flowers"); - public static final Tag GENERATING_SPECIAL_FLOWERS = tag("generating_special_flowers"); + public static final ITag.INamedTag SPECIAL_FLOWERS = tag("special_flowers"); + public static final ITag.INamedTag MINI_FLOWERS = tag("mini_flowers"); + public static final ITag.INamedTag MISC_SPECIAL_FLOWERS = tag("misc_special_flowers"); + public static final ITag.INamedTag FUNCTIONAL_SPECIAL_FLOWERS = tag("functional_special_flowers"); + public static final ITag.INamedTag GENERATING_SPECIAL_FLOWERS = tag("generating_special_flowers"); - public static final Tag FLOATING_FLOWERS = tag("floating_flowers"); - public static final Tag MUNDANE_FLOATING_FLOWERS = tag("mundane_floating_flowers"); - public static final Tag SPECIAL_FLOATING_FLOWERS = tag("special_floating_flowers"); + public static final ITag.INamedTag FLOATING_FLOWERS = tag("floating_flowers"); + public static final ITag.INamedTag MUNDANE_FLOATING_FLOWERS = tag("mundane_floating_flowers"); + public static final ITag.INamedTag SPECIAL_FLOATING_FLOWERS = tag("special_floating_flowers"); - public static final Tag LIVINGROCK = tag("livingrock"); - public static final Tag LIVINGWOOD = tag("livingwood"); + public static final ITag.INamedTag LIVINGROCK = tag("livingrock"); + public static final ITag.INamedTag LIVINGWOOD = tag("livingwood"); - public static final Tag BLOCKS_ELEMENTIUM = forgeTag("storage_blocks/elementium"); - public static final Tag BLOCKS_MANASTEEL = forgeTag("storage_blocks/manasteel"); - public static final Tag BLOCKS_TERRASTEEL = forgeTag("storage_blocks/terrasteel"); - public static final Tag BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); + public static final ITag.INamedTag BLOCKS_ELEMENTIUM = forgeTag("storage_blocks/elementium"); + public static final ITag.INamedTag BLOCKS_MANASTEEL = forgeTag("storage_blocks/manasteel"); + public static final ITag.INamedTag BLOCKS_TERRASTEEL = forgeTag("storage_blocks/terrasteel"); + public static final ITag.INamedTag BLOCKS_QUARTZ = forgeTag("storage_blocks/quartz"); - public static final Tag GAIA_BREAK_BLACKLIST = tag("gaia_break_blacklist"); - public static final Tag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); + public static final ITag.INamedTag GAIA_BREAK_BLACKLIST = tag("gaia_break_blacklist"); + public static final ITag.INamedTag MAGNET_RING_BLACKLIST = tag("magnet_ring_blacklist"); - public static final Tag PEBBLE_SOURCES = tag("pebble_sources"); - public static final Tag TERRAFORMABLE = tag("terraformable"); + public static final ITag.INamedTag PEBBLE_SOURCES = tag("pebble_sources"); + public static final ITag.INamedTag TERRAFORMABLE = tag("terraformable"); - private static Tag tag(String name) { - return new BlockTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, name)); + private static ITag.INamedTag tag(String name) { + return BlockTags.makeWrapperTag(new ResourceLocation(LibMisc.MOD_ID, name).toString()); } - private static Tag forgeTag(String name) { - return new BlockTags.Wrapper(new ResourceLocation("forge", name)); + private static ITag.INamedTag forgeTag(String name) { + return BlockTags.makeWrapperTag(new ResourceLocation("forge", name).toString()); } } public static class Entities { - public static final Tag> SHADED_MESA_BLACKLIST = tag("shaded_mesa_blacklist"); + public static final ITag.INamedTag> SHADED_MESA_BLACKLIST = tag("shaded_mesa_blacklist"); - private static Tag> tag(String name) { + private static ITag.INamedTag> tag(String name) { return new EntityTypeTags.Wrapper(new ResourceLocation(LibMisc.MOD_ID, name)); } } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 47308669d..c5039f22e 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -56,7 +56,7 @@ public final class PacketHandler { } public static void sendToNearby(World world, Entity e, Object toSend) { - sendToNearby(world, new BlockPos(e), toSend); + sendToNearby(world, e.func_233580_cy_(), toSend); } public static void sendTo(ServerPlayerEntity playerMP, Object toSend) { diff --git a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java index 3a8ece617..e6f2b88de 100644 --- a/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java +++ b/src/main/java/vazkii/botania/common/world/MysticalFlowerFeature.java @@ -8,8 +8,7 @@ */ package vazkii.botania.common.world; -import com.mojang.datafixers.Dynamic; - +import com.mojang.serialization.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.DoublePlantBlock; @@ -65,7 +64,7 @@ public class MysticalFlowerFeature extends Feature { int y1 = y + rand.nextInt(4) - rand.nextInt(4); int z1 = z + rand.nextInt(dist * 2) - dist; BlockPos pos2 = new BlockPos(x1, y1, z1); - if (world.isAirBlock(pos2) && (!world.getDimension().isNether() || y1 < 127) && flower.isValidPosition(world, pos2)) { + if (world.isAirBlock(pos2) && (!world.func_230315_m_().func_236037_d_() || y1 < 127) && flower.isValidPosition(world, pos2)) { world.setBlockState(pos2, flower, 2); any = true; if (rand.nextDouble() < config.getTallChance() diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 3d99af300..e2e4507e4 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -23,18 +23,18 @@ import net.minecraft.data.DataGenerator; import net.minecraft.data.DirectoryCache; import net.minecraft.data.IDataProvider; import net.minecraft.enchantment.Enchantments; +import net.minecraft.loot.*; +import net.minecraft.loot.conditions.BlockStateProperty; +import net.minecraft.loot.conditions.MatchTool; +import net.minecraft.loot.conditions.SurvivesExplosion; +import net.minecraft.loot.functions.CopyName; +import net.minecraft.loot.functions.CopyNbt; +import net.minecraft.loot.functions.ExplosionDecay; +import net.minecraft.loot.functions.SetCount; import net.minecraft.state.properties.DoubleBlockHalf; import net.minecraft.state.properties.SlabType; import net.minecraft.util.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraft.world.storage.loot.*; -import net.minecraft.world.storage.loot.conditions.BlockStateProperty; -import net.minecraft.world.storage.loot.conditions.MatchTool; -import net.minecraft.world.storage.loot.conditions.SurvivesExplosion; -import net.minecraft.world.storage.loot.functions.CopyName; -import net.minecraft.world.storage.loot.functions.CopyNbt; -import net.minecraft.world.storage.loot.functions.ExplosionDecay; -import net.minecraft.world.storage.loot.functions.SetCount; import vazkii.botania.api.subtile.TileEntityGeneratingFlower; import vazkii.botania.common.block.BlockAltGrass; diff --git a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java index 8e989cacb..38605a099 100644 --- a/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java @@ -21,7 +21,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.Ingredient; -import net.minecraft.state.IProperty; +import net.minecraft.state.Property; import net.minecraft.tags.ItemTags; import net.minecraft.util.IItemProvider; import net.minecraft.util.ResourceLocation; @@ -254,7 +254,7 @@ public class ManaInfusionProvider extends RecipeProvider { } @SuppressWarnings("unchecked") - private static > String getName(IProperty prop, Comparable val) { + private static > String getName(Property prop, Comparable val) { return prop.getName((T) val); } diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 155c9514c..28f31f7c8 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -26,6 +26,7 @@ import net.minecraft.item.crafting.Ingredient; import net.minecraft.item.crafting.SpecialRecipeSerializer; import net.minecraft.potion.PotionUtils; import net.minecraft.potion.Potions; +import net.minecraft.tags.ITag; import net.minecraft.tags.ItemTags; import net.minecraft.tags.Tag; import net.minecraft.util.IItemProvider; @@ -917,20 +918,20 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .setGroup("botania:petal_double") .addCriterion("has_item", hasItem(ModBlocks.getDoubleFlower(color))) .addCriterion("has_alt_item", hasItem(ModItems.getPetal(color))) - .build(consumer, "botania:petal_" + color.getName() + "_double"); + .build(consumer, "botania:petal_" + color.func_176610_l() + "_double"); ShapelessRecipeBuilder.shapelessRecipe(ModItems.getPetal(color), 2) .addIngredient(ModBlocks.getFlower(color)) .setGroup("botania:petal") .addCriterion("has_item", hasItem(ModBlocks.getFlower(color))) .addCriterion("has_alt_item", hasItem(ModItems.getPetal(color))) - .build(consumer, "botania:petal_" + color.getName()); + .build(consumer, "botania:petal_" + color.func_176610_l()); ShapelessRecipeBuilder.shapelessRecipe(ModItems.getDye(color)) .addIngredient(colorOverrides.getOrDefault(color, Ingredient.fromTag(ModTags.Items.getFlowerTag(color)))) .addIngredient(ModItems.pestleAndMortar) .setGroup("botania:dye") .addCriterion("has_item", hasItem(ModItems.getDye(color))) .addCriterion("has_alt_item", hasItem(ModItems.getPetal(color))) - .build(consumer, "botania:dye_" + color.getName()); + .build(consumer, "botania:dye_" + color.func_176610_l()); } ShapelessRecipeBuilder.shapelessRecipe(ModItems.magentaDye, 2) @@ -2558,7 +2559,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { .addCriterion("has_flower_item", marimorphosis).build(consumer); } - private ShapedRecipeBuilder compression(IItemProvider output, Tag input) { + private ShapedRecipeBuilder compression(IItemProvider output, ITag input) { return ShapedRecipeBuilder.shapedRecipe(output) .key('I', input) .patternLine("III")