From 8ebfd99157605534efa959a43198d721e869d292 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 10 May 2020 21:21:40 +0200 Subject: [PATCH] Update mappings to 20200510 --- build.gradle | 2 +- .../api/item/AccessoryRenderHelper.java | 8 +- .../core/handler/AstrolabePreviewHandler.java | 6 +- .../core/handler/BaubleRenderHandler.java | 8 +- .../handler/BlockHighlightRenderHandler.java | 32 ++--- .../client/core/handler/BossBarHandler.java | 6 +- .../core/handler/BoundTileRenderer.java | 64 ++++----- .../handler/ContributorFancinessHandler.java | 8 +- .../client/core/handler/HUDHandler.java | 26 ++-- .../handler/ItemsRemainingRenderHandler.java | 4 +- .../client/core/handler/LayerTerraHelmet.java | 6 +- .../client/core/handler/LightningHandler.java | 14 +- .../core/handler/MiscellaneousIcons.java | 8 +- .../client/core/handler/RenderLexicon.java | 32 ++--- .../client/core/helper/IconHelper.java | 10 +- .../client/core/helper/RenderHelper.java | 122 +++++++++--------- .../client/core/helper/ShaderHelper.java | 6 +- .../core/helper/ShaderWrappedRenderLayer.java | 10 +- .../client/core/proxy/ClientProxy.java | 4 +- .../vazkii/botania/client/fx/FXLightning.java | 28 ++-- .../vazkii/botania/client/fx/FXSparkle.java | 2 +- .../botania/client/gui/box/GuiBaubleBox.java | 2 +- .../elventrade/ElvenTradeRecipeCategory.java | 8 +- .../client/model/FloatingFlowerModel.java | 8 +- .../vazkii/botania/client/model/GunModel.java | 10 +- .../botania/client/model/LexiconModel.java | 4 +- .../botania/client/model/ModelAvatar.java | 12 +- .../botania/client/model/ModelBellows.java | 10 +- .../botania/client/model/ModelBrewery.java | 20 +-- .../botania/client/model/ModelCloak.java | 6 +- .../botania/client/model/ModelHourglass.java | 18 +-- .../botania/client/model/ModelPixie.java | 12 +- .../botania/client/model/ModelPylonGaia.java | 24 ++-- .../botania/client/model/ModelPylonMana.java | 16 +-- .../client/model/ModelPylonNatura.java | 24 ++-- .../client/model/ModelTeruTeruBozu.java | 8 +- .../client/model/armor/ModelArmor.java | 4 +- .../model/armor/ModelArmorElementium.java | 60 ++++----- .../model/armor/ModelArmorManasteel.java | 46 +++---- .../model/armor/ModelArmorManaweave.java | 36 +++--- .../model/armor/ModelArmorTerrasteel.java | 76 +++++------ .../render/entity/RenderBabylonWeapon.java | 22 ++-- .../render/entity/RenderCorporeaSpark.java | 2 +- .../render/entity/RenderDoppleganger.java | 10 +- .../client/render/entity/RenderPixie.java | 4 +- .../render/entity/RenderPoolMinecart.java | 6 +- .../client/render/entity/RenderSparkBase.java | 14 +- .../render/tile/RenderTileAlfPortal.java | 16 +-- .../client/render/tile/RenderTileAltar.java | 16 +-- .../render/tile/RenderTileAnimatedTorch.java | 4 +- .../client/render/tile/RenderTileAvatar.java | 6 +- .../client/render/tile/RenderTileBellows.java | 4 +- .../client/render/tile/RenderTileCocoon.java | 6 +- .../tile/RenderTileCorporeaCrystalCube.java | 12 +- .../render/tile/RenderTileCorporeaIndex.java | 16 +-- .../render/tile/RenderTileEnchanter.java | 6 +- .../render/tile/RenderTileFloatingFlower.java | 8 +- .../render/tile/RenderTileGaiaHead.java | 4 +- .../render/tile/RenderTileHourglass.java | 4 +- .../render/tile/RenderTileIncensePlate.java | 2 +- .../render/tile/RenderTileLightRelay.java | 16 +-- .../client/render/tile/RenderTilePool.java | 8 +- .../client/render/tile/RenderTilePrism.java | 2 +- .../client/render/tile/RenderTilePump.java | 4 +- .../client/render/tile/RenderTilePylon.java | 4 +- .../render/tile/RenderTileRedString.java | 2 +- .../render/tile/RenderTileRuneAltar.java | 10 +- .../render/tile/RenderTileSparkChanger.java | 4 +- .../render/tile/RenderTileSpreader.java | 38 +++--- .../render/tile/RenderTileStarfield.java | 12 +- .../render/tile/RenderTileTerraPlate.java | 2 +- .../render/tile/RenderTileTeruTeruBozu.java | 8 +- .../render/tile/RenderTileTinyPotato.java | 62 ++++----- .../botania/common/block/BlockAltGrass.java | 4 +- .../botania/common/block/BlockAltar.java | 2 +- .../common/block/BlockAnimatedTorch.java | 2 +- .../botania/common/block/BlockAvatar.java | 2 +- .../botania/common/block/BlockCocoon.java | 2 +- .../common/block/BlockCraftyCrate.java | 4 +- .../botania/common/block/BlockFakeAir.java | 2 +- .../block/BlockFloatingSpecialFlower.java | 6 +- .../botania/common/block/BlockHourglass.java | 4 +- .../common/block/BlockIncensePlate.java | 2 +- .../botania/common/block/BlockLightRelay.java | 4 +- .../botania/common/block/BlockPlatform.java | 6 +- .../botania/common/block/BlockSolidVines.java | 2 +- .../common/block/BlockSparkChanger.java | 2 +- .../common/block/BlockSpecialFlower.java | 2 +- .../common/block/BlockTeruTeruBozu.java | 2 +- .../botania/common/block/ModBlocks.java | 14 +- .../corporea/BlockCorporeaCrystalCube.java | 2 +- .../corporea/BlockCorporeaInterceptor.java | 2 +- .../block/decor/BlockFloatingFlower.java | 2 +- .../common/block/decor/BlockManaFlame.java | 2 +- .../common/block/decor/BlockModMushroom.java | 2 +- .../common/block/decor/BlockTinyPotato.java | 2 +- .../common/block/mana/BlockBellows.java | 2 +- .../common/block/mana/BlockBrewery.java | 2 +- .../common/block/mana/BlockEnchanter.java | 2 +- .../botania/common/block/mana/BlockPrism.java | 2 +- .../common/block/mana/BlockRuneAltar.java | 2 +- .../common/block/mana/BlockSpreader.java | 2 +- .../common/block/mana/BlockTerraPlate.java | 2 +- .../string/BlockRedStringInterceptor.java | 2 +- .../subtile/functional/SubTileHopperhock.java | 4 +- .../subtile/functional/SubTileLoonuim.java | 4 +- .../functional/SubTileRannuncarpus.java | 4 +- .../subtile/functional/SubTileSolegnolia.java | 2 +- .../functional/SubTileSpectranthemum.java | 2 +- .../functional/SubTileTangleberrie.java | 6 +- .../subtile/generating/SubTileEndoflame.java | 4 +- .../generating/SubTileEntropinnyum.java | 4 +- .../generating/SubTileGourmaryllis.java | 2 +- .../subtile/generating/SubTileNarslimmus.java | 2 +- .../subtile/generating/SubTileShulkMeNot.java | 6 +- .../subtile/generating/SubTileSpectrolus.java | 10 +- .../botania/common/block/tile/TileAltar.java | 6 +- .../common/block/tile/TileAnimatedTorch.java | 4 +- .../common/block/tile/TileBrewery.java | 4 +- .../common/block/tile/TileEnchanter.java | 4 +- .../common/block/tile/TileHourglass.java | 4 +- .../common/block/tile/TileLightRelay.java | 12 +- .../common/block/tile/TileOpenCrate.java | 2 +- .../common/block/tile/TileRuneAltar.java | 4 +- .../common/block/tile/TileSpawnerClaw.java | 6 +- .../common/block/tile/TileTerraPlate.java | 2 +- .../tile/corporea/TileCorporeaIndex.java | 2 +- .../common/block/tile/mana/TilePool.java | 4 +- .../common/block/tile/mana/TileSpreader.java | 14 +- .../common/block/tile/mana/TileTurntable.java | 4 +- .../common/core/handler/PixieHandler.java | 2 +- .../botania/common/core/helper/Vector3.java | 4 +- .../common/entity/EntityBabylonWeapon.java | 10 +- .../common/entity/EntityCorporeaSpark.java | 8 +- .../common/entity/EntityDoppleganger.java | 28 ++-- .../common/entity/EntityFallingStar.java | 4 +- .../common/entity/EntityFlameRing.java | 10 +- .../common/entity/EntityMagicLandmine.java | 10 +- .../common/entity/EntityMagicMissile.java | 10 +- .../common/entity/EntityManaBurst.java | 26 ++-- .../common/entity/EntityManaStorm.java | 4 +- .../common/entity/EntityPinkWither.java | 10 +- .../botania/common/entity/EntityPixie.java | 10 +- .../common/entity/EntityPoolMinecart.java | 6 +- .../common/entity/EntitySignalFlare.java | 4 +- .../botania/common/entity/EntitySpark.java | 18 +-- .../common/entity/EntityThornChakram.java | 4 +- .../common/entity/EntityThrowableCopy.java | 8 +- .../common/entity/EntityThrownItem.java | 4 +- .../botania/common/entity/EntityVineBall.java | 2 +- .../integration/curios/CurioIntegration.java | 2 +- .../botania/common/item/ItemAstrolabe.java | 4 +- .../botania/common/item/ItemBaubleBox.java | 2 +- .../common/item/ItemBlackHoleTalisman.java | 4 +- .../botania/common/item/ItemBlackLotus.java | 2 +- .../botania/common/item/ItemBottledMana.java | 18 +-- .../botania/common/item/ItemCacophonium.java | 4 +- .../botania/common/item/ItemCraftingHalo.java | 46 +++---- .../botania/common/item/ItemEnderHand.java | 4 +- .../botania/common/item/ItemFlowerBag.java | 4 +- .../vazkii/botania/common/item/ItemHorn.java | 4 +- .../botania/common/item/ItemLaputaShard.java | 6 +- .../botania/common/item/ItemLexicon.java | 2 +- .../botania/common/item/ItemManaGun.java | 12 +- .../botania/common/item/ItemManaMirror.java | 2 +- .../botania/common/item/ItemPinkinator.java | 10 +- .../botania/common/item/ItemSextant.java | 8 +- .../botania/common/item/ItemSlingshot.java | 6 +- .../common/item/ItemTemperanceStone.java | 4 +- .../botania/common/item/ItemThornChakram.java | 4 +- .../botania/common/item/ItemTwigWand.java | 4 +- .../botania/common/item/ItemVineBall.java | 4 +- .../vazkii/botania/common/item/ItemVirus.java | 2 +- .../botania/common/item/ItemWorldSeed.java | 10 +- .../common/item/brew/ItemBrewBase.java | 4 +- .../equipment/bauble/ItemBalanceCloak.java | 8 +- .../equipment/bauble/ItemBaubleCosmetic.java | 38 +++--- .../equipment/bauble/ItemBloodPendant.java | 8 +- .../equipment/bauble/ItemCloudPendant.java | 6 +- .../item/equipment/bauble/ItemDivaCharm.java | 10 +- .../item/equipment/bauble/ItemDodgeRing.java | 4 +- .../equipment/bauble/ItemFlightTiara.java | 44 +++---- .../equipment/bauble/ItemGoddessCharm.java | 6 +- .../item/equipment/bauble/ItemHolyCloak.java | 16 +-- .../item/equipment/bauble/ItemIcePendant.java | 20 +-- .../item/equipment/bauble/ItemItemFinder.java | 14 +- .../equipment/bauble/ItemKnockbackBelt.java | 4 +- .../equipment/bauble/ItemLavaPendant.java | 6 +- .../item/equipment/bauble/ItemMagnetRing.java | 8 +- .../item/equipment/bauble/ItemMonocle.java | 8 +- .../equipment/bauble/ItemSpeedUpBelt.java | 8 +- .../bauble/ItemSuperLavaPendant.java | 6 +- .../item/equipment/bauble/ItemThirdEye.java | 8 +- .../item/equipment/bauble/ItemTinyPlanet.java | 12 +- .../item/equipment/bauble/ItemTravelBelt.java | 4 +- .../equipment/bauble/ItemUnholyCloak.java | 6 +- .../item/equipment/tool/ItemStarSword.java | 2 +- .../item/equipment/tool/ItemThunderSword.java | 2 +- .../equipment/tool/bow/ItemLivingwoodBow.java | 2 +- .../tool/elementium/ItemElementiumAxe.java | 2 +- .../tool/elementium/ItemElementiumShears.java | 4 +- .../tool/terrasteel/ItemTerraPick.java | 4 +- .../tool/terrasteel/ItemTerraSword.java | 4 +- .../botania/common/item/lens/LensDamage.java | 2 +- .../common/item/lens/LensExplosive.java | 2 +- .../common/item/lens/LensFirework.java | 2 +- .../common/item/lens/LensInfluence.java | 2 +- .../botania/common/item/lens/LensPaint.java | 4 +- .../botania/common/item/lens/LensStorm.java | 2 +- .../common/item/lens/LensTripwire.java | 2 +- .../common/item/material/ItemEnderAir.java | 4 +- .../botania/common/item/relic/ItemDice.java | 10 +- .../common/item/relic/ItemFlugelEye.java | 16 +-- .../common/item/relic/ItemInfiniteFruit.java | 4 +- .../common/item/relic/ItemKingKey.java | 2 +- .../common/item/rod/ItemDiviningRod.java | 6 +- .../common/item/rod/ItemGravityRod.java | 10 +- .../common/item/rod/ItemMissileRod.java | 6 +- .../common/item/rod/ItemRainbowRod.java | 16 +-- .../common/item/rod/ItemSkyDirtRod.java | 2 +- .../botania/common/item/rod/ItemSmeltRod.java | 8 +- .../common/item/rod/ItemTerraformRod.java | 4 +- .../common/item/rod/ItemTornadoRod.java | 10 +- .../common/network/PacketBotaniaEffect.java | 16 +-- .../botania/common/network/PacketDodge.java | 2 +- .../botania/common/world/ModFeatures.java | 4 +- .../common/world/SkyblockChunkGenerator.java | 4 +- .../common/world/SkyblockWorldEvents.java | 6 +- .../common/world/WorldTypeSkyblock.java | 2 +- .../botania/data/BlockLootProvider.java | 8 +- .../data/recipes/ElvenTradeProvider.java | 2 +- .../botania/data/recipes/RecipeProvider.java | 2 +- 232 files changed, 1067 insertions(+), 1067 deletions(-) diff --git a/build.gradle b/build.gradle index 37c6af634..eac79a4d5 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ archivesBaseName = config.mod_name sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' minecraft { - mappings channel: 'snapshot', version: "20200123-mixed-1.15.2" + mappings channel: 'snapshot', version: "20200510-1.15.1" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') runs { client { diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java index 5ce77674d..ffcc97ed4 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java @@ -32,7 +32,7 @@ public final class AccessoryRenderHelper { */ public static void applySneakingRotation(MatrixStack ms) { ms.translate(0F, 0.2F, 0F); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F / (float) Math.PI)); + ms.rotate(Vector3f.XP.rotationDegrees(90F / (float) Math.PI)); } /** @@ -44,9 +44,9 @@ public final class AccessoryRenderHelper { float yawOffset = player.prevRenderYawOffset + (player.renderYawOffset - player.prevRenderYawOffset) * partialTicks; float pitch = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * partialTicks; - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-yawOffset)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(yaw - 270)); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(pitch)); + ms.rotate(Vector3f.YP.rotationDegrees(-yawOffset)); + ms.rotate(Vector3f.YP.rotationDegrees(yaw - 270)); + ms.rotate(Vector3f.ZP.rotationDegrees(pitch)); ms.translate(0, -player.getEyeHeight(), 0); // if (player.shouldRenderSneaking()) TODO Sneaking needs a different adjustment now diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index d1b11aeea..440fd2264 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -40,7 +40,7 @@ public final class AstrolabePreviewHandler { public static void onWorldRenderLast(RenderWorldLastEvent event) { World world = Minecraft.getInstance().world; MatrixStack ms = event.getMatrixStack(); - IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getBufferBuilders().getEntityVertexConsumers(); + IRenderTypeBuffer.Impl buffers = Minecraft.getInstance().getRenderTypeBuffers().getBufferSource(); IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ASTROLABE_PREVIEW); for (PlayerEntity player : world.getPlayers()) { @@ -57,7 +57,7 @@ public final class AstrolabePreviewHandler { } } - buffers.draw(RenderHelper.ASTROLABE_PREVIEW); + buffers.finish(RenderHelper.ASTROLABE_PREVIEW); } private static void renderPlayerLook(MatrixStack ms, IVertexBuilder buffer, PlayerEntity player, ItemStack stack) { @@ -87,7 +87,7 @@ public final class AstrolabePreviewHandler { float g = (float) (color >> 8 & 255) / 255.0F; float b = (float) (color & 255) / 255.0F; // always use entity translucent layer so blending is turned on - brd.getBlockModelRenderer().render(ms.peek(), buffer, state, model, r, g, b, 0xF000F0, OverlayTexture.DEFAULT_UV); + brd.getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, state, model, r, g, b, 0xF000F0, OverlayTexture.NO_OVERLAY); ms.pop(); } 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 79b80b489..482282e5b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -106,18 +106,18 @@ public final class BaubleRenderHandler extends LayerRenderer buffer.vertex(mat, 0, f, 0).color(r, g, b, alpha).endVertex(); + Runnable centerFunc = () -> buffer.pos(mat, 0, f, 0).color(r, g, b, alpha).endVertex(); List vertexFuncs = new ArrayList<>(); for (int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; float xp = (float) (Math.cos(rad) * radius); float zp = (float) (Math.sin(rad) * radius); - vertexFuncs.add(() -> buffer.vertex(mat, xp, f, zp).color(r, g, b, alpha).endVertex()); + vertexFuncs.add(() -> buffer.pos(mat, xp, f, zp).color(r, g, b, alpha).endVertex()); } RenderHelper.triangleFan(centerFunc, vertexFuncs); @@ -196,13 +196,13 @@ public final class BlockHighlightRenderHandler { float f1 = f + f / 4F; int alpha2 = 64; - centerFunc = () -> buffer.vertex(mat, 0, f1, 0).color(r, g, b, alpha2).endVertex(); + centerFunc = () -> buffer.pos(mat, 0, f1, 0).color(r, g, b, alpha2).endVertex(); vertexFuncs.clear(); for (int i = 0; i < totalAngles + 1; i += step) { double rad = (totalAngles - i) * Math.PI / 180.0; float xp = (float) (Math.cos(rad) * radius); float zp = (float) (Math.sin(rad) * radius); - vertexFuncs.add(() -> buffer.vertex(mat, xp, f1, zp).color(r, g, b, alpha2).endVertex()); + vertexFuncs.add(() -> buffer.pos(mat, xp, f1, zp).color(r, g, b, alpha2).endVertex()); } RenderHelper.triangleFan(centerFunc, vertexFuncs); ms.pop(); diff --git a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java index 33eaff661..8af90e6e5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BossBarHandler.java @@ -54,7 +54,7 @@ public final class BossBarHandler { Rectangle bgRect = currentBoss.getBossBarTextureRect(); Rectangle fgRect = currentBoss.getBossBarHPTextureRect(); String name = evt.getBossInfo().getName().getFormattedText(); - int c = Minecraft.getInstance().getWindow().getScaledWidth() / 2; + int c = Minecraft.getInstance().getMainWindow().getScaledWidth() / 2; int x = evt.getX(); int y = evt.getY(); int xf = x + (bgRect.width - fgRect.width) / 2; @@ -101,8 +101,8 @@ public final class BossBarHandler { int startXUniform = GlStateManager.getUniformLocation(shader, "startX"); int startYUniform = GlStateManager.getUniformLocation(shader, "startY"); - GlStateManager.uniform1(startXUniform, x); - GlStateManager.uniform1(startYUniform, y); + GlStateManager.uniform1i(startXUniform, x); + GlStateManager.uniform1i(startYUniform, y); if (callback != null) { callback.call(shader); 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 31a443e99..0b096991b 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -54,12 +54,12 @@ import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, value = Dist.CLIENT) public final class BoundTileRenderer { - private static final IRenderTypeBuffer.Impl LINE_BUFFERS = IRenderTypeBuffer.immediate(Util.make(() -> { + private static final IRenderTypeBuffer.Impl LINE_BUFFERS = IRenderTypeBuffer.getImpl(Util.make(() -> { Map ret = new IdentityHashMap<>(); - ret.put(RenderHelper.LINE_1_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_1_NO_DEPTH.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_4_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_4_NO_DEPTH.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_5_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_5_NO_DEPTH.getExpectedBufferSize())); - ret.put(RenderHelper.LINE_8_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_8_NO_DEPTH.getExpectedBufferSize())); + ret.put(RenderHelper.LINE_1_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_1_NO_DEPTH.getBufferSize())); + ret.put(RenderHelper.LINE_4_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_4_NO_DEPTH.getBufferSize())); + ret.put(RenderHelper.LINE_5_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_5_NO_DEPTH.getBufferSize())); + ret.put(RenderHelper.LINE_8_NO_DEPTH, new BufferBuilder(RenderHelper.LINE_8_NO_DEPTH.getBufferSize())); return ret; }), Tessellator.getInstance().getBuffer()); @@ -116,7 +116,7 @@ public final class BoundTileRenderer { ms.pop(); RenderSystem.disableDepthTest(); - LINE_BUFFERS.draw(); + LINE_BUFFERS.finish(); } private static void renderBlockOutlineAt(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos pos, int color) { @@ -149,7 +149,7 @@ public final class BoundTileRenderer { IVertexBuilder buffer = buffers.getBuffer(thick ? RenderHelper.LINE_5_NO_DEPTH : RenderHelper.LINE_1_NO_DEPTH); for (AxisAlignedBB axis : list) { axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); - renderBlockOutline(ms.peek().getModel(), buffer, axis, color); + renderBlockOutline(ms.getLast().getMatrix(), buffer, axis, color); } buffer = buffers.getBuffer(thick ? RenderHelper.LINE_8_NO_DEPTH : RenderHelper.LINE_4_NO_DEPTH); @@ -157,7 +157,7 @@ public final class BoundTileRenderer { color = (color & ~0xff000000) | (alpha << 24); for (AxisAlignedBB axis : list) { axis = axis.offset(-pos.getX(), -pos.getY(), -(pos.getZ() + 1)); - renderBlockOutline(ms.peek().getModel(), buffer, axis, color); + renderBlockOutline(ms.getLast().getMatrix(), buffer, axis, color); } } @@ -176,40 +176,40 @@ public final class BoundTileRenderer { int g = (color >> 8) & 0xFF; int b = color & 0xFF; - buffer.vertex(mat, ix, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ix, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ix, ay, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, iy, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, iy, az).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, iz).color(r, g, b, a).endVertex(); - buffer.vertex(mat, ax, ay, az).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, iz).color(r, g, b, a).endVertex(); + buffer.pos(mat, ax, ay, az).color(r, g, b, a).endVertex(); } } 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 e82019a49..6ffb5ec2e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -124,20 +124,20 @@ public final class ContributorFancinessHandler extends LayerRenderer= recipe.getManaToConsume() ? 0 : 22; int v = mc.player.getName().getString().equals("haighyorkie") && mc.player.isSneaking() ? 23 : 8; @@ -313,8 +313,8 @@ public final class HUDHandler { String s1 = target.getDisplayName().getString(); String s2 = tile.getItemCount() + "x"; int strlen = Math.max(mc.fontRenderer.getStringWidth(s1), mc.fontRenderer.getStringWidth(s2)); - int w = mc.getWindow().getScaledWidth(); - int h = mc.getWindow().getScaledHeight(); + int w = mc.getMainWindow().getScaledWidth(); + int h = mc.getMainWindow().getScaledHeight(); int boxH = h / 2 + (tile.locked ? 20 : 10); AbstractGui.fill(w / 2 + 8, h / 2 - 12, w / 2 + strlen + 32, boxH, 0x44000000); AbstractGui.fill(w / 2 + 6, h / 2 - 14, w / 2 + strlen + 34, boxH + 2, 0x44000000); @@ -338,8 +338,8 @@ public final class HUDHandler { String txt2 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex2"); int l = Math.max(mc.fontRenderer.getStringWidth(txt0), Math.max(mc.fontRenderer.getStringWidth(txt1), mc.fontRenderer.getStringWidth(txt2))) + 20; - int x = mc.getWindow().getScaledWidth() - l - 20; - int y = mc.getWindow().getScaledHeight() - 60; + int x = mc.getMainWindow().getScaledWidth() - l - 20; + int y = mc.getMainWindow().getScaledHeight() - 60; AbstractGui.fill(x - 6, y - 6, x + l + 6, y + 37, 0x44000000); AbstractGui.fill(x - 4, y - 4, x + l + 4, y + 35, 0x44000000); @@ -355,12 +355,12 @@ public final class HUDHandler { RenderSystem.enableBlend(); RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); Minecraft mc = Minecraft.getInstance(); - int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2; - int y = mc.getWindow().getScaledHeight() / 2 + 10; + int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(name) / 2; + int y = mc.getMainWindow().getScaledHeight() / 2 + 10; mc.fontRenderer.drawStringWithShadow(name, x, y, color); - x = mc.getWindow().getScaledWidth() / 2 - 51; + x = mc.getMainWindow().getScaledWidth() / 2 - 51; y += 10; renderManaBar(x, y, color, 1F, mana, maxMana); @@ -373,8 +373,8 @@ public final class HUDHandler { Minecraft mc = Minecraft.getInstance(); - int x = mc.getWindow().getScaledWidth() / 2 + 55; - int y = mc.getWindow().getScaledHeight() / 2 + 12; + int x = mc.getMainWindow().getScaledWidth() / 2 + 55; + int y = mc.getMainWindow().getScaledHeight() / 2 + 12; RenderSystem.enableRescaleNormal(); mc.getItemRenderer().renderItemAndEffectIntoGUI(bindDisplay, x, y); diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 3485afb03..6deef5445 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -42,8 +42,8 @@ public final class ItemsRemainingRenderHandler { if (ticks > 0 && !stack.isEmpty()) { int pos = maxTicks - ticks; Minecraft mc = Minecraft.getInstance(); - int x = mc.getWindow().getScaledWidth() / 2 + 10 + Math.max(0, pos - leaveTicks); - int y = mc.getWindow().getScaledHeight() / 2; + int x = mc.getMainWindow().getScaledWidth() / 2 + 10 + Math.max(0, pos - leaveTicks); + int y = mc.getMainWindow().getScaledHeight() / 2; int start = maxTicks - leaveTicks; float alpha = ticks + partTicks > start ? 1F : (ticks + partTicks) / start; diff --git a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java index ddd8f45c9..3f7a1d74c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java +++ b/src/main/java/vazkii/botania/client/core/handler/LayerTerraHelmet.java @@ -39,13 +39,13 @@ public class LayerTerraHelmet extends LayerRenderer { int alpha = GlStateManager.getUniformLocation(shader, "alpha"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.4F); - GlStateManager.uniform1(alpha, ShaderHelper.FLOAT_BUF); + GlStateManager.uniform1f(alpha, ShaderHelper.FLOAT_BUF); }; - RenderType astrolabePreview = RenderType.of(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, 7, 256, true, true, glState); + RenderType astrolabePreview = RenderType.makeType(LibResources.PREFIX_MOD + "astrolabe_preview", DefaultVertexFormats.ENTITY, 7, 256, true, true, glState); ASTROLABE_PREVIEW = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.ALPHA, cb, astrolabePreview) : astrolabePreview; - glState = RenderType.State.builder().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); - RenderType gold = RenderType.of(LibResources.PREFIX_MOD + "entity_translucent_gold", DefaultVertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, GL11.GL_QUADS, 128, true, true, glState); + glState = RenderType.State.getBuilder().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); + RenderType gold = RenderType.makeType(LibResources.PREFIX_MOD + "entity_translucent_gold", DefaultVertexFormats.ENTITY, GL11.GL_QUADS, 128, true, true, glState); ENTITY_TRANSLUCENT_GOLD = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.GOLD, null, gold) : gold; } public static RenderType getHaloLayer(ResourceLocation texture) { - RenderType.State glState = RenderType.State.builder() + RenderType.State glState = RenderType.State.getBuilder() .texture(new RenderState.TextureState(texture, true, false)) .cull(new RenderState.CullState(false)) .transparency(TRANSLUCENT_TRANSPARENCY).build(false); - return RenderType.of(LibResources.PREFIX_MOD + "crafting_halo", DefaultVertexFormats.POSITION_COLOR_TEXTURE, GL11.GL_QUADS, 64, false, true, glState); + return RenderType.makeType(LibResources.PREFIX_MOD + "crafting_halo", DefaultVertexFormats.POSITION_COLOR_TEX, GL11.GL_QUADS, 64, false, true, glState); } public static void drawTexturedModalRect(int x, int y, int u, int v, int width, int height) { @@ -213,24 +213,24 @@ public final class RenderHelper { ms.scale(xScale, yScale, zScale); for (int i = 0; i < (f1 + f1 * f1) / 2F * 90F + 30F; i++) { - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(random.nextFloat() * 360F)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(random.nextFloat() * 360F)); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(random.nextFloat() * 360F)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(random.nextFloat() * 360F)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(random.nextFloat() * 360F)); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(random.nextFloat() * 360F + f1 * 90F)); + ms.rotate(Vector3f.XP.rotationDegrees(random.nextFloat() * 360F)); + ms.rotate(Vector3f.YP.rotationDegrees(random.nextFloat() * 360F)); + ms.rotate(Vector3f.ZP.rotationDegrees(random.nextFloat() * 360F)); + ms.rotate(Vector3f.XP.rotationDegrees(random.nextFloat() * 360F)); + ms.rotate(Vector3f.YP.rotationDegrees(random.nextFloat() * 360F)); + ms.rotate(Vector3f.ZP.rotationDegrees(random.nextFloat() * 360F + f1 * 90F)); float f3 = random.nextFloat() * 20F + 5F + f2 * 10F; float f4 = random.nextFloat() * 2F + 1F + f2 * 2F; float r = ((color & 0xFF0000) >> 16) / 255F; float g = ((color & 0xFF00) >> 8) / 255F; float b = (color & 0xFF) / 255F; - Matrix4f mat = ms.peek().getModel(); - Runnable center = () -> buffer.vertex(mat, 0, 0, 0).color(r, g, b, 1F - f2).endVertex(); + Matrix4f mat = ms.getLast().getMatrix(); + Runnable center = () -> buffer.pos(mat, 0, 0, 0).color(r, g, b, 1F - f2).endVertex(); Runnable[] vertices = { - () -> buffer.vertex(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), - () -> buffer.vertex(mat, 0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), - () -> buffer.vertex(mat, 0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(), - () -> buffer.vertex(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex() + () -> buffer.pos(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.pos(mat, 0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.pos(mat, 0, f3, 1F * f4).color(0, 0, 0, 0).endVertex(), + () -> buffer.pos(mat, -0.866F * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex() }; triangleFan(center, vertices); } @@ -286,14 +286,14 @@ public final class RenderHelper { BufferBuilder buf = Tessellator.getInstance().getBuffer(); buf.begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); - buf.vertex(centerX, centerY, 0).color(0, 0.5F, 0.5F, a).endVertex(); + buf.pos(centerX, centerY, 0).color(0, 0.5F, 0.5F, a).endVertex(); for (int i = degs; i > 0; i--) { double rad = (i - 90) / 180F * Math.PI; - buf.vertex(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r, 0).color(0F, 1F, 0.5F, a).endVertex(); + buf.pos(centerX + Math.cos(rad) * r, centerY + Math.sin(rad) * r, 0).color(0F, 1F, 0.5F, a).endVertex(); } - buf.vertex(centerX, centerY, 0).color(0F, 1F, 0.5F, a).endVertex(); + buf.pos(centerX, centerY, 0).color(0F, 1F, 0.5F, a).endVertex(); Tessellator.getInstance().draw(); RenderSystem.disableBlend(); @@ -327,9 +327,9 @@ public final class RenderHelper { model = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ms, model, ItemCameraTransforms.TransformType.NONE, false); ms.translate(-0.5D, -0.5D, -0.5D); if (!model.isBuiltInRenderer()) { - RenderType rendertype = RenderTypeLookup.getItemLayer(stack); + RenderType rendertype = RenderTypeLookup.getRenderType(stack); - IVertexBuilder ivertexbuilder = ItemRenderer.getArmorVertexConsumer(buffers, rendertype, true, stack.hasEffect()); + IVertexBuilder ivertexbuilder = ItemRenderer.getBuffer(buffers, rendertype, true, stack.hasEffect()); renderBakedItemModel(model, stack, color, light, overlay, ms, ivertexbuilder); } else { stack.getItem().getItemStackTileEntityRenderer().render(stack, ms, buffers, light, overlay); @@ -358,7 +358,7 @@ public final class RenderHelper { // [VanillaCopy] ItemRenderer, with custom color + alpha support private static void renderBakedItemQuads(MatrixStack ms, IVertexBuilder buffer, int color, List quads, ItemStack stack, int light, int overlay) { - MatrixStack.Entry matrixstack$entry = ms.peek(); + MatrixStack.Entry matrixstack$entry = ms.getLast(); for (BakedQuad bakedquad : quads) { int i = color; @@ -390,7 +390,7 @@ public final class RenderHelper { ibakedmodel = net.minecraftforge.client.ForgeHooksClient.handleCameraTransforms(ms, ibakedmodel, transform, false); ms.translate(-0.5D, -0.5D, -0.5D); if (!ibakedmodel.isBuiltInRenderer() && (stack.getItem() != Items.TRIDENT || flag1)) { - IVertexBuilder ivertexbuilder = ItemRenderer.getArmorVertexConsumer(buffers, ENTITY_TRANSLUCENT_GOLD, true, stack.hasEffect()); + IVertexBuilder ivertexbuilder = ItemRenderer.getBuffer(buffers, ENTITY_TRANSLUCENT_GOLD, true, stack.hasEffect()); try { RENDER_BAKED_ITEM_MODEL.invokeExact(ir, ibakedmodel, stack, light, overlay, ms, ivertexbuilder); } catch (Throwable ex) { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java index 962f850ba..df3e072df 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderHelper.java @@ -103,10 +103,10 @@ public final class ShaderHelper { } int program = prog.getProgram(); - ShaderLinkHelper.useProgram(program); + ShaderLinkHelper.func_227804_a_(program); int time = GlStateManager.getUniformLocation(program, "time"); - GlStateManager.uniform1(time, ClientTickHandler.ticksInGame); + GlStateManager.uniform1i(time, ClientTickHandler.ticksInGame); if (callback != null) { callback.call(program); @@ -118,7 +118,7 @@ public final class ShaderHelper { } public static void releaseShader() { - ShaderLinkHelper.useProgram(0); + ShaderLinkHelper.func_227804_a_(0); } public static boolean useShaders() { diff --git a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java index 915183d19..f01c52966 100644 --- a/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java +++ b/src/main/java/vazkii/botania/client/core/helper/ShaderWrappedRenderLayer.java @@ -24,14 +24,14 @@ public class ShaderWrappedRenderLayer extends RenderType { @Nullable private final ShaderCallback cb; public ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader shader, @Nullable ShaderCallback cb, RenderType delegate) { - super(LibResources.PREFIX_MOD + delegate.toString() + "_with_" + shader.name(), delegate.getVertexFormat(), delegate.getDrawMode(), delegate.getExpectedBufferSize(), delegate.func_228665_s_(), true, + super(LibResources.PREFIX_MOD + delegate.toString() + "_with_" + shader.name(), delegate.getVertexFormat(), delegate.getDrawMode(), delegate.getBufferSize(), delegate.isUseDelegate(), true, () -> { - delegate.startDrawing(); + delegate.setupRenderState(); ShaderHelper.useShader(shader, cb); }, () -> { ShaderHelper.releaseShader(); - delegate.endDrawing(); + delegate.clearRenderState(); }); this.delegate = delegate; this.shader = shader; @@ -39,8 +39,8 @@ public class ShaderWrappedRenderLayer extends RenderType { } @Override - public Optional getAffectedOutline() { - return delegate.getAffectedOutline(); + public Optional getOutline() { + return delegate.getOutline(); } @Override diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index 0c4fbc226..8ba916a56 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -161,8 +161,8 @@ public class ClientProxy implements IProxy { ColorHandler.init(); // Needed to prevent mana pools on carts from X-raying through the cart - SortedMap layers = ObfuscationReflectionHelper.getPrivateValue(RenderTypeBuffers.class, Minecraft.getInstance().getBufferBuilders(), "field_228480_b_"); - layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.getExpectedBufferSize())); + SortedMap layers = ObfuscationReflectionHelper.getPrivateValue(RenderTypeBuffers.class, Minecraft.getInstance().getRenderTypeBuffers(), "field_228480_b_"); + layers.put(RenderHelper.MANA_POOL_WATER, new BufferBuilder(RenderHelper.MANA_POOL_WATER.getBufferSize())); }); } diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index 608e2a59d..83f93ce12 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -77,7 +77,7 @@ public class FXLightning extends Particle { } @Override - public void buildGeometry(IVertexBuilder buffer, ActiveRenderInfo info, float partialTicks) { + public void renderParticle(IVertexBuilder buffer, ActiveRenderInfo info, float partialTicks) { LightningHandler.queuedLightningBolts.offer(this); } @@ -124,27 +124,27 @@ public class FXLightning extends Particle { int b = color & 0xFF; int a = (int) (mainAlpha * rendersegment.light * 0xFF); - wr.vertex(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5F, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5F, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5F, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5F, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); if (rendersegment.next == null) { Vector3 roundend = rendersegment.endPoint.point.add(rendersegment.diff.normalize().multiply(width)); - wr.vertex(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).texture(0, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).texture(0, 1).light(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5F, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5F, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); } if (rendersegment.prev == null) { Vector3 roundend = rendersegment.startPoint.point.subtract(rendersegment.diff.normalize().multiply(width)); - wr.vertex(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).texture(0.5F, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).texture(0, 0).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).texture(0, 1).light(0xF000F0).color(r, g, b, a).endVertex(); - wr.vertex(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).texture(0.5F, 1).light(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5F, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); + wr.pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5F, 1).lightmap(0xF000F0).color(r, g, b, a).endVertex(); } } } @@ -278,7 +278,7 @@ public class FXLightning extends Particle { private static Vector3 getRelativeViewVector(Vector3 pos) { Entity renderEntity = Minecraft.getInstance().getRenderViewEntity(); - return new Vector3((float) renderEntity.getX() - pos.x, (float) renderEntity.getY() + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.getZ() - pos.z); + return new Vector3((float) renderEntity.getPosX() - pos.x, (float) renderEntity.getPosY() + renderEntity.getEyeHeight() - pos.y, (float) renderEntity.getPosZ() - pos.z); } } diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index c63a02e8b..f3ea83904 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -121,7 +121,7 @@ public class FXSparkle extends SpriteTexturedParticle { for (Direction direction1 : new Direction[] { Direction.NORTH, Direction.SOUTH, Direction.WEST, Direction.EAST, Direction.UP }) { blockpos$mutable.setPos(blockpos).move(direction1); - if (!this.world.getBlockState(blockpos$mutable).isFullCube(this.world, blockpos$mutable)) { + if (!this.world.getBlockState(blockpos$mutable).isCollisionShapeOpaque(this.world, blockpos$mutable)) { double d1 = vec3d.getCoordinate(direction1.getAxis()); double d2 = direction1.getAxisDirection() == Direction.AxisDirection.POSITIVE ? 1.0D - d1 : d1; if (d2 < d0) { diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 2ac2bb4dc..e21dd2d5f 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -43,7 +43,7 @@ public class GuiBaubleBox extends ContainerScreen { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); Minecraft.getInstance().getTextureManager().bindTexture(texture); blit(guiLeft, guiTop, 0, 0, xSize, ySize); - InventoryScreen.drawEntity(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player); + InventoryScreen.drawEntityOnScreen(guiLeft + 31, guiTop + 75, 30, guiLeft + 31 - this.mouseX, guiTop + 75 - 50 - this.mouseY, this.minecraft.player); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 7db301ace..8f4745ef9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -115,10 +115,10 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory Set ret = new HashSet<>(); for (Map.Entry e : BotaniaAPIClient.instance().getRegisteredIslandTypeModels().entrySet()) { IUnbakedModel unbakedIsland = modelGetter.apply(e.getValue()); - ret.addAll(unbakedIsland.getTextureDependencies(modelGetter, missingTextureErrors)); + ret.addAll(unbakedIsland.getTextures(modelGetter, missingTextureErrors)); unbakedIslands.put(e.getKey(), unbakedIsland); } - ret.addAll(unbakedFlower.getTextureDependencies(modelGetter, missingTextureErrors)); + ret.addAll(unbakedFlower.getTextures(modelGetter, missingTextureErrors)); return ret; } @@ -84,11 +84,11 @@ public class FloatingFlowerModel implements IModelGeometry 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.bake(bakery, spriteGetter, comp, name); + IBakedModel bakedFlower = unbakedFlower.bakeModel(bakery, spriteGetter, comp, name); Map bakedIslands = new HashMap<>(); for (Map.Entry e : unbakedIslands.entrySet()) { - IBakedModel bakedIsland = e.getValue().bake(bakery, spriteGetter, transform, name); + IBakedModel bakedIsland = e.getValue().bakeModel(bakery, spriteGetter, transform, name); bakedIslands.put(e.getKey(), bakedIsland); } return new Baked(bakedFlower, bakedIslands); diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index ae8d03dc4..2c04e4e43 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -127,8 +127,8 @@ public class GunModel implements IBakedModel { } @Override - public boolean isSideLit() { - return originalModel.isSideLit(); + public boolean func_230044_c_() { + return originalModel.func_230044_c_(); } private final HashMap, CompositeBakedModel> cache = new HashMap<>(); @@ -147,7 +147,7 @@ public class GunModel implements IBakedModel { super(gun); IUnbakedModel lensUnbaked = bakery.getUnbakedModel(new ModelResourceLocation(lens.getItem().getRegistryName(), "inventory")); - IModelTransform transform = new SimpleModelTransform(new TransformationMatrix(new Vector3f(-0.4F, 0.2F, 0.0F), Vector3f.POSITIVE_Y.getRadialQuaternion((float) Math.PI / 2), new Vector3f(0.625F, 0.625F, 0.625F), null)); + IModelTransform transform = new SimpleModelTransform(new TransformationMatrix(new Vector3f(-0.4F, 0.2F, 0.0F), Vector3f.YP.rotation((float) Math.PI / 2), new Vector3f(0.625F, 0.625F, 0.625F), null)); ResourceLocation name = prefix("gun_with_" + lens.getItem().getRegistryName().toString().replace(':', '_')); IBakedModel lensBaked; @@ -155,9 +155,9 @@ public class GunModel implements IBakedModel { BlockModel bm = (BlockModel) lensUnbaked; lensBaked = new ItemModelGenerator() .makeItemModel(ModelLoader.defaultTextureGetter(), bm) - .bake(bakery, bm, ModelLoader.defaultTextureGetter(), transform, name, false); + .bakeModel(bakery, bm, ModelLoader.defaultTextureGetter(), transform, name, false); } else { - lensBaked = lensUnbaked.bake(bakery, ModelLoader.defaultTextureGetter(), transform, name); + lensBaked = lensUnbaked.bakeModel(bakery, ModelLoader.defaultTextureGetter(), transform, name); } for (Direction e : Direction.values()) { diff --git a/src/main/java/vazkii/botania/client/model/LexiconModel.java b/src/main/java/vazkii/botania/client/model/LexiconModel.java index c8f86adf5..0d608e8fc 100644 --- a/src/main/java/vazkii/botania/client/model/LexiconModel.java +++ b/src/main/java/vazkii/botania/client/model/LexiconModel.java @@ -66,8 +66,8 @@ public class LexiconModel implements IBakedModel { } @Override - public boolean isSideLit() { - return original.isSideLit(); + public boolean func_230044_c_() { + return original.func_230044_c_(); } @Nonnull diff --git a/src/main/java/vazkii/botania/client/model/ModelAvatar.java b/src/main/java/vazkii/botania/client/model/ModelAvatar.java index b87b51866..cf59a9675 100644 --- a/src/main/java/vazkii/botania/client/model/ModelAvatar.java +++ b/src/main/java/vazkii/botania/client/model/ModelAvatar.java @@ -31,25 +31,25 @@ public class ModelAvatar extends Model { leftleg = new ModelRenderer(this, 0, 20); leftleg.mirror = true; leftleg.setRotationPoint(1.5F, 18.0F, -0.5F); - leftleg.addCuboid(-1.5F, 0.0F, -1.5F, 3, 6, 3, 0.0F); + leftleg.addBox(-1.5F, 0.0F, -1.5F, 3, 6, 3, 0.0F); rightarm = new ModelRenderer(this, 0, 20); rightarm.setRotationPoint(-3.0F, 15.0F, -1.0F); - rightarm.addCuboid(-2.0F, -1.0F, -1.0F, 2, 6, 3, 0.0F); + rightarm.addBox(-2.0F, -1.0F, -1.0F, 2, 6, 3, 0.0F); setRotateAngle(rightarm, 0.0F, -0.0F, 0.08726646259971647F); leftarm = new ModelRenderer(this, 0, 20); leftarm.mirror = true; leftarm.setRotationPoint(3.0F, 15.0F, -1.0F); - leftarm.addCuboid(0.0F, -1.0F, -1.0F, 2, 6, 3, 0.0F); + leftarm.addBox(0.0F, -1.0F, -1.0F, 2, 6, 3, 0.0F); setRotateAngle(leftarm, 0.0F, -0.0F, -0.08726646259971647F); head = new ModelRenderer(this, 0, 0); head.setRotationPoint(0.0F, 14.0F, 0.0F); - head.addCuboid(-3.0F, -6.0F, -3.0F, 6, 6, 6, 0.0F); + head.addBox(-3.0F, -6.0F, -3.0F, 6, 6, 6, 0.0F); rightleg = new ModelRenderer(this, 0, 20); rightleg.setRotationPoint(-1.5F, 18.0F, -0.5F); - rightleg.addCuboid(-1.5F, 0.0F, -1.5F, 3, 6, 3, 0.0F); + rightleg.addBox(-1.5F, 0.0F, -1.5F, 3, 6, 3, 0.0F); body = new ModelRenderer(this, 0, 12); body.setRotationPoint(0.0F, 14.0F, 0.0F); - body.addCuboid(-3.0F, 0.0F, -2.0F, 6, 4, 4, 0.0F); + body.addBox(-3.0F, 0.0F, -2.0F, 6, 4, 4, 0.0F); } @Override diff --git a/src/main/java/vazkii/botania/client/model/ModelBellows.java b/src/main/java/vazkii/botania/client/model/ModelBellows.java index 6dde538c1..1ee3242ae 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBellows.java +++ b/src/main/java/vazkii/botania/client/model/ModelBellows.java @@ -30,17 +30,17 @@ public class ModelBellows extends Model { top = new ModelRenderer(this, 0, 0); top.setRotationPoint(0.0F, 16.0F, 0.0F); - top.addCuboid(-4.0F, -2.0F, -4.0F, 8, 1, 8, 0.0F); + top.addBox(-4.0F, -2.0F, -4.0F, 8, 1, 8, 0.0F); base = new ModelRenderer(this, 0, 9); base.setRotationPoint(0.0F, 16.0F, 0.0F); - base.addCuboid(-5.0F, 6.0F, -5.0F, 10, 2, 10, 0.0F); + base.addBox(-5.0F, 6.0F, -5.0F, 10, 2, 10, 0.0F); pipe = new ModelRenderer(this, 0, 21); pipe.setRotationPoint(0.0F, 16.0F, 0.0F); - pipe.addCuboid(-1.0F, 6.0F, -8.0F, 2, 2, 3, 0.0F); + pipe.addBox(-1.0F, 6.0F, -8.0F, 2, 2, 3, 0.0F); funnel = new ModelRenderer(this, 40, 0); funnel.setRotationPoint(0.0F, 0.0F, 0.0F); - funnel.addCuboid(0.0F, 0.0F, 0.0F, 6, 7, 6, 0.0F); + funnel.addBox(0.0F, 0.0F, 0.0F, 6, 7, 6, 0.0F); } @Override @@ -58,7 +58,7 @@ public class ModelBellows extends Model { top.render(ms, buffer, light, overlay, r, g, b, alpha); ms.translate(0F, -mov, 0F); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.XP.rotationDegrees(180F)); ms.translate(-0.19F, -1.375F, -0.19F); ms.scale(1F, fract, 1F); funnel.render(ms, buffer, light, overlay, r, g, b, alpha); diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 3548d6b1b..f8662446a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -43,17 +43,17 @@ public class ModelBrewery extends Model { top = new ModelRenderer(this, 8, 0); top.setRotationPoint(0.0F, 16.0F, 0.0F); - top.addCuboid(-2.0F, -7.0F, -2.0F, 4, 1, 4, 0.0F); + top.addBox(-2.0F, -7.0F, -2.0F, 4, 1, 4, 0.0F); pole = new ModelRenderer(this, 0, 0); pole.setRotationPoint(0.0F, 16.0F, 0.0F); - pole.addCuboid(-1.0F, -6.0F, -1.0F, 2, 10, 2, 0.0F); + pole.addBox(-1.0F, -6.0F, -1.0F, 2, 10, 2, 0.0F); bottom = new ModelRenderer(this, 8, 5); bottom.setRotationPoint(0.0F, 16.0F, 0.0F); - bottom.addCuboid(-2.0F, 4.0F, -2.0F, 4, 1, 4, 0.0F); + bottom.addBox(-2.0F, 4.0F, -2.0F, 4, 1, 4, 0.0F); plate = new ModelRenderer(this, 8, 5); plate.setRotationPoint(0.0F, 17.0F, 0.0F); - plate.addCuboid(5.0F, 0.0F, -2.0F, 4, 1, 4, 0.0F); + plate.addBox(5.0F, 0.0F, -2.0F, 4, 1, 4, 0.0F); } public void render(@Nullable TileBrewery brewery, double time, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { @@ -64,20 +64,20 @@ public class ModelBrewery extends Model { float polerot = -deg * 25F; ms.translate(0F, offset, 0F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(polerot)); + ms.rotate(Vector3f.YP.rotationDegrees(polerot)); if (hasTile && !brewery.getItemHandler().getStackInSlot(0).isEmpty()) { ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + ms.rotate(Vector3f.XP.rotationDegrees(180)); ms.translate(0, -0.45F, 0); renderItemStack(brewery.getItemHandler().getStackInSlot(0), ms, buffers, light, overlay); ms.pop(); } - RenderType layer = getLayer(TEXTURE); + RenderType layer = getRenderType(TEXTURE); pole.render(ms, buffers.getBuffer(layer), light, overlay); top.render(ms, buffers.getBuffer(layer), light, overlay); bottom.render(ms, buffers.getBuffer(layer), light, overlay); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-polerot)); + ms.rotate(Vector3f.YP.rotationDegrees(-polerot)); float degper = (float) (2F * Math.PI) / plates; for (int i = 0; i < plates; i++) { @@ -94,9 +94,9 @@ public class ModelBrewery extends Model { float transY = 1.06F; float transZ = 0.1245F; ms.push(); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rot)); + ms.rotate(Vector3f.YP.rotationDegrees(rot)); ms.translate(transX, transY, transZ); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.XP.rotationDegrees(-90F)); ms.translate(0.125F, 0.125F, 0); renderItemStack(brewery.getItemHandler().getStackInSlot(i + 1), ms, buffers, light, overlay); ms.pop(); diff --git a/src/main/java/vazkii/botania/client/model/ModelCloak.java b/src/main/java/vazkii/botania/client/model/ModelCloak.java index 298ef815f..be5d8f06a 100644 --- a/src/main/java/vazkii/botania/client/model/ModelCloak.java +++ b/src/main/java/vazkii/botania/client/model/ModelCloak.java @@ -34,16 +34,16 @@ public class ModelCloak extends Model { collar = new ModelRenderer(this, 0, 0); collar.setRotationPoint(0.0F, -3.0F, -4.5F); - collar.addCuboid(-5.5F, 0.0F, -1.5F, 11, 5, 11, s); + collar.addBox(-5.5F, 0.0F, -1.5F, 11, 5, 11, s); setRotateAngle(collar, 0.08726646259971647F, 0.0F, 0.0F); sideL = new ModelRenderer(this, 0, 16); sideL.mirror = true; sideL.setRotationPoint(0.0F, 0.0F, 0.0F); - sideL.addCuboid(-0.5F, -0.5F, -5.5F, 11, 21, 10, s); + sideL.addBox(-0.5F, -0.5F, -5.5F, 11, 21, 10, s); setRotateAngle(sideL, 0.08726646259971647F, -0.08726646259971647F, -0.17453292519943295F); sideR = new ModelRenderer(this, 0, 16); sideR.setRotationPoint(0.0F, 0.0F, 0.0F); - sideR.addCuboid(-10.5F, -0.5F, -5.5F, 11, 21, 10, s); + sideR.addBox(-10.5F, -0.5F, -5.5F, 11, 21, 10, s); setRotateAngle(sideR, 0.08726646259971647F, 0.08726646259971647F, 0.17453292519943295F); } diff --git a/src/main/java/vazkii/botania/client/model/ModelHourglass.java b/src/main/java/vazkii/botania/client/model/ModelHourglass.java index bd8e29458..d46e5ad26 100644 --- a/src/main/java/vazkii/botania/client/model/ModelHourglass.java +++ b/src/main/java/vazkii/botania/client/model/ModelHourglass.java @@ -35,26 +35,26 @@ public class ModelHourglass extends Model { top = new ModelRenderer(this, 20, 0); top.setRotationPoint(0.0F, 0.0F, 0.0F); - top.addCuboid(-3.0F, -6.5F, -3.0F, 6, 1, 6, 0.0F); + top.addBox(-3.0F, -6.5F, -3.0F, 6, 1, 6, 0.0F); glassT = new ModelRenderer(this, 0, 0); glassT.setRotationPoint(0.0F, 0.0F, 0.0F); - glassT.addCuboid(-2.5F, -5.5F, -2.5F, 5, 5, 5, 0.0F); + glassT.addBox(-2.5F, -5.5F, -2.5F, 5, 5, 5, 0.0F); ring = new ModelRenderer(this, 0, 20); ring.setRotationPoint(0.0F, 0.0F, 0.0F); - ring.addCuboid(-1.5F, -0.5F, -1.5F, 3, 1, 3, 0.0F); + ring.addBox(-1.5F, -0.5F, -1.5F, 3, 1, 3, 0.0F); glassB = new ModelRenderer(this, 0, 10); glassB.setRotationPoint(0.0F, 0.0F, 0.0F); - glassB.addCuboid(-2.5F, 0.5F, -2.5F, 5, 5, 5, 0.0F); + glassB.addBox(-2.5F, 0.5F, -2.5F, 5, 5, 5, 0.0F); bottom = new ModelRenderer(this, 20, 7); bottom.setRotationPoint(0.0F, 0.0F, 0.0F); - bottom.addCuboid(-3.0F, 5.5F, -3.0F, 6, 1, 6, 0.0F); + bottom.addBox(-3.0F, 5.5F, -3.0F, 6, 1, 6, 0.0F); sandT = new ModelRenderer(this, 20, 14); sandT.setRotationPoint(0.0F, 0.0F, 0.0F); - sandT.addCuboid(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, -5.0F, -2.0F + sandT.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, -5.0F, -2.0F sandB = new ModelRenderer(this, 20, 14); sandB.setRotationPoint(0.0F, 0.0F, 0.0F); - sandB.addCuboid(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F + sandB.addBox(0.0F, 0.0F, 0.0F, 4, 4, 4, 0.0F); // -2.0F, 1.0F, -2.05F } @Override @@ -79,7 +79,7 @@ public class ModelHourglass extends Model { if (flip) { ms.translate(-2.0F * f, 1.0F * f, -2.0F * f); } else { - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); ms.translate(-2.0F * f, -5.0F * f, -2.0F * f); } ms.scale(1F, fract1, 1F); @@ -92,7 +92,7 @@ public class ModelHourglass extends Model { if (flip) { ms.translate(-2.0F * f, -5.0F * f, -2.0F * f); } else { - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); ms.translate(-2.0F * f, 1.0F * f, -2.0F * f); } ms.scale(1F, fract2, 1F); diff --git a/src/main/java/vazkii/botania/client/model/ModelPixie.java b/src/main/java/vazkii/botania/client/model/ModelPixie.java index 363b9b49e..cf28a5c0f 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPixie.java +++ b/src/main/java/vazkii/botania/client/model/ModelPixie.java @@ -45,23 +45,23 @@ public class ModelPixie extends EntityModel { body = new ModelRenderer(this, 0, 0); body.setRotationPoint(0.0F, 16.0F, 0.0F); - body.addCuboid(-2.5F, 0.0F, -2.5F, 5, 5, 5, 0.0F); + body.addBox(-2.5F, 0.0F, -2.5F, 5, 5, 5, 0.0F); leftWingT = new ModelRenderer(this, 0, 4); leftWingT.setRotationPoint(2.5F, 18.0F, 0.5F); - leftWingT.addCuboid(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); + leftWingT.addBox(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); setRotateAngle(leftWingT, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); leftWingB = new ModelRenderer(this, 0, 11); leftWingB.setRotationPoint(2.5F, 18.0F, 0.5F); - leftWingB.addCuboid(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); + leftWingB.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); setRotateAngle(leftWingB, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); rightWingT = new ModelRenderer(this, 0, 4); rightWingT.setRotationPoint(-2.5F, 18.0F, 0.5F); - rightWingT.addCuboid(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); + rightWingT.addBox(0.0F, -5.0F, 0.0F, 0, 5, 6, 0.0F); setRotateAngle(rightWingT, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); rightWingB = new ModelRenderer(this, 0, 11); rightWingB.setRotationPoint(-2.5F, 18.0F, 0.5F); - rightWingB.addCuboid(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); + rightWingB.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, 0.0F); setRotateAngle(rightWingB, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); } @@ -82,7 +82,7 @@ public class ModelPixie extends EntityModel { } @Override - public void setAngles(EntityPixie entity, float f, float f1, float f2, float f3, float f4) { + public void setRotationAngles(EntityPixie entity, float f, float f1, float f2, float f3, float f4) { evil = entity.getPixieType() == 1; rightWingT.rotateAngleY = -(MathHelper.cos(f2 * 1.7F) * (float) Math.PI * 0.5F); leftWingT.rotateAngleY = MathHelper.cos(f2 * 1.7F) * (float) Math.PI * 0.5F; diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java index c8b2ea6fe..371e9ec69 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonGaia.java @@ -41,46 +41,46 @@ public class ModelPylonGaia extends Model implements IPylonModel { //plates platel = new ModelRenderer(this, 36, 0); platel.setRotationPoint(0.0F, 16.0F, 0.0F); - platel.addCuboid(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + platel.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); plater = new ModelRenderer(this, 36, 0); plater.setRotationPoint(0.0F, 16.0F, 0.0F); - plater.addCuboid(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + plater.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); platef = new ModelRenderer(this, 36, 0); platef.setRotationPoint(0.0F, 16.0F, 0.0F); - platef.addCuboid(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + platef.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); plateb = new ModelRenderer(this, 36, 0); plateb.setRotationPoint(0.0F, 16.0F, 0.0F); - plateb.addCuboid(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); + plateb.addBox(-3.0F, -3.0F, -8.0F, 6, 6, 2, 0.0F); setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); //shards shardrft = new ModelRenderer(this, 16, 32); shardrft.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrft.addCuboid(2.0F, -6.0F, -5.0F, 3, 2, 3, 0.0F); + shardrft.addBox(2.0F, -6.0F, -5.0F, 3, 2, 3, 0.0F); shardlbt = new ModelRenderer(this, 0, 0); shardlbt.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlbt.addCuboid(-5.0F, -6.0F, 0.0F, 6, 5, 5, 0.0F); + shardlbt.addBox(-5.0F, -6.0F, 0.0F, 6, 5, 5, 0.0F); shardrbt = new ModelRenderer(this, 22, 9); shardrbt.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrbt.addCuboid(3.0F, -5.0F, 0.0F, 2, 4, 5, 0.0F); + shardrbt.addBox(3.0F, -5.0F, 0.0F, 2, 4, 5, 0.0F); shardlft = new ModelRenderer(this, 0, 32); shardlft.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlft.addCuboid(-5.0F, -7.0F, -5.0F, 5, 6, 3, 0.0F); + shardlft.addBox(-5.0F, -7.0F, -5.0F, 5, 6, 3, 0.0F); shardrfb = new ModelRenderer(this, 16, 37); shardrfb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrfb.addCuboid(2.0F, -2.0F, -5.0F, 3, 6, 3, 0.0F); + shardrfb.addBox(2.0F, -2.0F, -5.0F, 3, 6, 3, 0.0F); shardlbb = new ModelRenderer(this, 0, 10); shardlbb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlbb.addCuboid(-5.0F, 1.0F, 0.0F, 6, 3, 5, 0.0F); + shardlbb.addBox(-5.0F, 1.0F, 0.0F, 6, 3, 5, 0.0F); shardrbb = new ModelRenderer(this, 22, 0); shardrbb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrbb.addCuboid(3.0F, 1.0F, 0.0F, 2, 4, 5, 0.0F); + shardrbb.addBox(3.0F, 1.0F, 0.0F, 2, 4, 5, 0.0F); shardlfb = new ModelRenderer(this, 0, 41); shardlfb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlfb.addCuboid(-5.0F, 1.0F, -5.0F, 5, 2, 3, 0.0F); + shardlfb.addBox(-5.0F, 1.0F, -5.0F, 5, 2, 3, 0.0F); } @Override diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java index ecd497a33..a6e81ffe3 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonMana.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonMana.java @@ -36,33 +36,33 @@ public class ModelPylonMana extends Model implements IPylonModel { //plates platef = new ModelRenderer(this, 36, 0); platef.setRotationPoint(0.0F, 16.0F, 0.0F); - platef.addCuboid(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + platef.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); plateb = new ModelRenderer(this, 36, 0); plateb.setRotationPoint(0.0F, 16.0F, 0.0F); - plateb.addCuboid(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + plateb.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); platel = new ModelRenderer(this, 36, 0); platel.setRotationPoint(0.0F, 16.0F, 0.0F); - platel.addCuboid(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + platel.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); plater = new ModelRenderer(this, 36, 0); plater.setRotationPoint(0.0F, 16.0F, 0.0F); - plater.addCuboid(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); + plater.addBox(-3.0F, -4.0F, -8.0F, 6, 8, 2, 0.0F); setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); //shards shardlf = new ModelRenderer(this, 0, 21); shardlf.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlf.addCuboid(-5.0F, -9.0F, -5.0F, 5, 16, 3, 0.0F); + shardlf.addBox(-5.0F, -9.0F, -5.0F, 5, 16, 3, 0.0F); shardrf = new ModelRenderer(this, 16, 21); shardrf.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrf.addCuboid(2.0F, -12.0F, -5.0F, 3, 16, 3, 0.0F); + shardrf.addBox(2.0F, -12.0F, -5.0F, 3, 16, 3, 0.0F); shardlb = new ModelRenderer(this, 0, 0); shardlb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlb.addCuboid(-5.0F, -10.0F, 0.0F, 6, 16, 5, 0.0F); + shardlb.addBox(-5.0F, -10.0F, 0.0F, 6, 16, 5, 0.0F); shardrb = new ModelRenderer(this, 22, 0); shardrb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrb.addCuboid(3.0F, -11.0F, 0.0F, 2, 16, 5, 0.0F); + shardrb.addBox(3.0F, -11.0F, 0.0F, 2, 16, 5, 0.0F); } @Override diff --git a/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java index 11a2ee113..0a2c28b2d 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylonNatura.java @@ -41,46 +41,46 @@ public class ModelPylonNatura extends Model implements IPylonModel { //plates platef = new ModelRenderer(this, 36, 0); platef.setRotationPoint(0.0F, 16.0F, 0.0F); - platef.addCuboid(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + platef.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); plateb = new ModelRenderer(this, 36, 0); plateb.setRotationPoint(0.0F, 16.0F, 0.0F); - plateb.addCuboid(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + plateb.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); setRotation(plateb, 0.0F, 3.141592653589793F, 0.0F); platel = new ModelRenderer(this, 36, 0); platel.setRotationPoint(0.0F, 16.0F, 0.0F); - platel.addCuboid(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + platel.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); setRotation(platel, 0.0F, 1.5707963267948966F, 0.0F); plater = new ModelRenderer(this, 36, 0); plater.setRotationPoint(0.0F, 16.0F, 0.0F); - plater.addCuboid(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); + plater.addBox(-4.0F, -4.0F, -8.0F, 8, 8, 2, 0.0F); setRotation(plater, 0.0F, -1.5707963267948966F, 0.0F); //shards shardrft = new ModelRenderer(this, 16, 32); shardrft.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrft.addCuboid(2.0F, -13.0F, -5.0F, 3, 7, 3, 0.0F); + shardrft.addBox(2.0F, -13.0F, -5.0F, 3, 7, 3, 0.0F); shardlbt = new ModelRenderer(this, 0, 0); shardlbt.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlbt.addCuboid(-5.0F, -11.0F, 0.0F, 6, 9, 5, 0.0F); + shardlbt.addBox(-5.0F, -11.0F, 0.0F, 6, 9, 5, 0.0F); shardrbt = new ModelRenderer(this, 22, 0); shardrbt.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrbt.addCuboid(3.0F, -12.0F, 0.0F, 2, 8, 5, 0.0F); + shardrbt.addBox(3.0F, -12.0F, 0.0F, 2, 8, 5, 0.0F); shardlft = new ModelRenderer(this, 0, 32); shardlft.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlft.addCuboid(-5.0F, -10.0F, -5.0F, 5, 10, 3, 0.0F); + shardlft.addBox(-5.0F, -10.0F, -5.0F, 5, 10, 3, 0.0F); shardrfb = new ModelRenderer(this, 16, 42); shardrfb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrfb.addCuboid(2.0F, -4.0F, -5.0F, 3, 9, 3, 0.0F); + shardrfb.addBox(2.0F, -4.0F, -5.0F, 3, 9, 3, 0.0F); shardlbb = new ModelRenderer(this, 0, 14); shardlbb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlbb.addCuboid(-5.0F, 0.0F, 0.0F, 6, 7, 5, 0.0F); + shardlbb.addBox(-5.0F, 0.0F, 0.0F, 6, 7, 5, 0.0F); shardrbb = new ModelRenderer(this, 22, 13); shardrbb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardrbb.addCuboid(3.0F, -2.0F, 0.0F, 2, 8, 5, 0.0F); + shardrbb.addBox(3.0F, -2.0F, 0.0F, 2, 8, 5, 0.0F); shardlfb = new ModelRenderer(this, 0, 45); shardlfb.setRotationPoint(0.0F, 16.0F, 0.0F); - shardlfb.addCuboid(-5.0F, 2.0F, -5.0F, 5, 6, 3, 0.0F); + shardlfb.addBox(-5.0F, 2.0F, -5.0F, 5, 6, 3, 0.0F); } @Override diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index ad10a97d5..2659d3c40 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -29,18 +29,18 @@ public class ModelTeruTeruBozu extends Model { textureHeight = 32; sadFace = new ModelRenderer(this, 32, 0); sadFace.setRotationPoint(0.0F, 14.5F, 0.0F); - sadFace.addCuboid(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + sadFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); setRotateAngle(sadFace, 0.17453292519943295F, 0.0F, 0.0F); happyFace = new ModelRenderer(this, 0, 0); happyFace.setRotationPoint(0.0F, 14.5F, 0.0F); - happyFace.addCuboid(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); + happyFace.addBox(-4.0F, -6.0F, -4.0F, 8, 8, 8, 0.0F); setRotateAngle(happyFace, -0.17453292519943295F, 0.0F, 0.0F); thread = new ModelRenderer(this, 32, 16); thread.setRotationPoint(0.0F, 14.0F, 0.0F); - thread.addCuboid(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); + thread.addBox(-3.0F, 2.0F, -3.0F, 6, 1, 6, 0.0F); cloth = new ModelRenderer(this, 0, 16); cloth.setRotationPoint(0.0F, 21.5F, -1.0F); - cloth.addCuboid(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); + cloth.addBox(-4.0F, -4.0F, -4.0F, 8, 8, 8, 0.0F); setRotateAngle(cloth, 0.7853981633974483F, 2.2689280275926285F, 1.5707963267948966F); } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java index f6feb9360..cf36320a0 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmor.java @@ -25,9 +25,9 @@ public class ModelArmor extends BipedModel { // [VanillaCopy] ArmorStandArmorModel.setRotationAngles because armor stands are dumb // This fixes the armor "breathing" and helmets always facing south on armor stands @Override - public void setAngles(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { + public void setRotationAngles(LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) { if (!(entity instanceof ArmorStandEntity)) { - super.setAngles(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch); + super.setRotationAngles(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch); return; } diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java index f565a2012..d37ec26ed 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorElementium.java @@ -62,128 +62,128 @@ public class ModelArmorElementium extends ModelArmor { //helm this.helmAnchor = new ModelRenderer(this, 0, 0); this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmAnchor.addCuboid(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); this.helm = new ModelRenderer(this, 0, 0); this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addCuboid(-4.5F, -9.0F, -4.5F, 9, 9, 9, s); + this.helm.addBox(-4.5F, -9.0F, -4.5F, 9, 9, 9, s); this.helmFairy = new ModelRenderer(this, 36, 11); this.helmFairy.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmFairy.addCuboid(-2.5F, -10.0F, -5.5F, 5, 5, 5, s); + this.helmFairy.addBox(-2.5F, -10.0F, -5.5F, 5, 5, 5, s); this.helmWing1l = new ModelRenderer(this, 36, 0); this.helmWing1l.mirror = true; this.helmWing1l.setRotationPoint(4.5F, -6.0F, -0.5F); - this.helmWing1l.addCuboid(-1.0F, -5.0F, 0.0F, 1, 5, 6, s); + this.helmWing1l.addBox(-1.0F, -5.0F, 0.0F, 1, 5, 6, s); this.setRotateAngle(helmWing1l, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); this.helmWing2l = new ModelRenderer(this, 50, 0); this.helmWing2l.setRotationPoint(4.5F, -6.0F, -0.5F); - this.helmWing2l.addCuboid(-1.0F, 0.0F, 0.0F, 1, 3, 4, s); + this.helmWing2l.addBox(-1.0F, 0.0F, 0.0F, 1, 3, 4, s); this.setRotateAngle(helmWing2l, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); this.helmWing1r = new ModelRenderer(this, 36, 0); this.helmWing1r.setRotationPoint(-4.5F, -6.0F, -0.5F); - this.helmWing1r.addCuboid(0.0F, -5.0F, 0.0F, 1, 5, 6, s); + this.helmWing1r.addBox(0.0F, -5.0F, 0.0F, 1, 5, 6, s); this.setRotateAngle(helmWing1r, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); this.helmWing2r = new ModelRenderer(this, 50, 0); this.helmWing2r.mirror = true; this.helmWing2r.setRotationPoint(-4.5F, -6.0F, -0.5F); - this.helmWing2r.addCuboid(0.0F, 0.0F, 0.0F, 1, 3, 4, s); + this.helmWing2r.addBox(0.0F, 0.0F, 0.0F, 1, 3, 4, s); this.setRotateAngle(helmWing2r, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); //body this.bodyAnchor = new ModelRenderer(this, 0, 0); this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.bodyTop = new ModelRenderer(this, 0, 19); this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyTop.addCuboid(-4.5F, 0.0F, -3.0F, 9, 6, 6, s); + this.bodyTop.addBox(-4.5F, 0.0F, -3.0F, 9, 6, 6, s); this.bodyBottom = new ModelRenderer(this, 0, 31); this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyBottom.addCuboid(-3.5F, 5.0F, -2.5F, 7, 3, 5, s); + this.bodyBottom.addBox(-3.5F, 5.0F, -2.5F, 7, 3, 5, s); //armL this.armLAnchor = new ModelRenderer(this, 0, 0); this.armLAnchor.mirror = true; this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); - this.armLAnchor.addCuboid(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armL = new ModelRenderer(this, 24, 40); this.armL.mirror = true; this.armL.setRotationPoint(0.0F, 0.0F, -0.0F); - this.armL.addCuboid(0.5F, 4.5F, -2.49F, 3, 6, 5, s); + this.armL.addBox(0.5F, 4.5F, -2.49F, 3, 6, 5, s); this.armLpauldron = new ModelRenderer(this, 0, 40); this.armLpauldron.mirror = true; this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armLpauldron.addCuboid(-0.5F, -3.0F, -3.0F, 6, 7, 6, s); + this.armLpauldron.addBox(-0.5F, -3.0F, -3.0F, 6, 7, 6, s); this.armLwing1 = new ModelRenderer(this, 40, 35); this.armLwing1.setRotationPoint(6.0F, -1.0F, 0.0F); - this.armLwing1.addCuboid(0.0F, -4.0F, 0.0F, 0, 4, 5, s); + this.armLwing1.addBox(0.0F, -4.0F, 0.0F, 0, 4, 5, s); this.setRotateAngle(armLwing1, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); this.armLwing2 = new ModelRenderer(this, 40, 40); this.armLwing2.setRotationPoint(6.0F, -1.0F, 0.0F); - this.armLwing2.addCuboid(0.0F, 0.0F, 0.0F, 0, 3, 4, s); + this.armLwing2.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, s); this.setRotateAngle(armLwing2, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); //armR this.armRAnchor = new ModelRenderer(this, 0, 0); this.armRAnchor.mirror = true; this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); - this.armRAnchor.addCuboid(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armR = new ModelRenderer(this, 24, 40); this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armR.addCuboid(-3.5F, 4.5F, -2.51F, 3, 6, 5, s); + this.armR.addBox(-3.5F, 4.5F, -2.51F, 3, 6, 5, s); this.armRpauldron = new ModelRenderer(this, 0, 40); this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addCuboid(-5.5F, -3.0F, -3.0F, 6, 7, 6, s); + this.armRpauldron.addBox(-5.5F, -3.0F, -3.0F, 6, 7, 6, s); this.setRotateAngle(armRpauldron, 0.0F, 0.0F, 0.0017453292519943296F); this.armRwing1 = new ModelRenderer(this, 40, 35); this.armRwing1.mirror = true; this.armRwing1.setRotationPoint(-6.5F, -1.0F, 0.0F); - this.armRwing1.addCuboid(0.0F, -4.0F, 0.0F, 0, 4, 5, s); + this.armRwing1.addBox(0.0F, -4.0F, 0.0F, 0, 4, 5, s); this.setRotateAngle(armRwing1, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); this.armRwing2 = new ModelRenderer(this, 40, 40); this.armRwing2.mirror = true; this.armRwing2.setRotationPoint(-6.5F, -1.0F, 0.0F); - this.armRwing2.addCuboid(0.0F, 0.0F, 0.0F, 0, 3, 4, s); + this.armRwing2.addBox(0.0F, 0.0F, 0.0F, 0, 3, 4, s); this.setRotateAngle(armRwing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); //pants this.pantsAnchor = new ModelRenderer(this, 0, 0); this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.pantsAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.belt = new ModelRenderer(this, 0, 53); this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addCuboid(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); + this.belt.addBox(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); this.legL = new ModelRenderer(this, 0, 64); this.legL.mirror = true; this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addCuboid(-2.39F, 0.0F, -2.49F, 5, 6, 5, s); + this.legL.addBox(-2.39F, 0.0F, -2.49F, 5, 6, 5, s); this.legR = new ModelRenderer(this, 0, 64); this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addCuboid(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); //boots this.bootL = new ModelRenderer(this, 0, 75); this.bootL.mirror = true; this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addCuboid(-2.39F, 8.5F, -2.49F, 5, 5, 5, s); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 5, 5, s); this.bootLwing1 = new ModelRenderer(this, 40, 40); this.bootLwing1.setRotationPoint(2.5F, 8.5F, 0.0F); - this.bootLwing1.addCuboid(0.0F, -3.0F, 0.0F, 0, 3, 4, s); + this.bootLwing1.addBox(0.0F, -3.0F, 0.0F, 0, 3, 4, s); this.setRotateAngle(bootLwing1, 0.2617993877991494F, 0.5235987755982988F, 0.2617993877991494F); this.bootLwing2 = new ModelRenderer(this, 40, 44); this.bootLwing2.setRotationPoint(2.5F, 8.5F, 0.0F); - this.bootLwing2.addCuboid(0.0F, 0.0F, 0.0F, 0, 2, 3, s); + this.bootLwing2.addBox(0.0F, 0.0F, 0.0F, 0, 2, 3, s); this.setRotateAngle(bootLwing2, -0.2617993877991494F, 0.2617993877991494F, -0.2617993877991494F); this.bootR = new ModelRenderer(this, 0, 75); this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.bootR.addCuboid(-2.61F, 8.5F, -2.51F, 5, 5, 5, s); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 5, 5, s); this.bootRwing1 = new ModelRenderer(this, 40, 40); this.bootRwing1.mirror = true; this.bootRwing1.setRotationPoint(-2.6F, 8.5F, 0.0F); - this.bootRwing1.addCuboid(0.0F, -3.0F, 0.0F, 0, 3, 4, s); + this.bootRwing1.addBox(0.0F, -3.0F, 0.0F, 0, 3, 4, s); this.setRotateAngle(bootRwing1, 0.2617993877991494F, -0.5235987755982988F, -0.2617993877991494F); this.bootRwing2 = new ModelRenderer(this, 40, 44); this.bootRwing2.mirror = true; this.bootRwing2.setRotationPoint(-2.5F, 8.5F, 0.0F); - this.bootRwing2.addCuboid(0.0F, 0.0F, 0.0F, 0, 2, 3, s); + this.bootRwing2.addBox(0.0F, 0.0F, 0.0F, 0, 2, 3, s); this.setRotateAngle(bootRwing2, -0.2617993877991494F, -0.2617993877991494F, 0.2617993877991494F); //hierarchy diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java index fd165aff2..479808ac6 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManasteel.java @@ -54,97 +54,97 @@ public class ModelArmorManasteel extends ModelArmor { //helm this.helmAnchor = new ModelRenderer(this, 0, 0); this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmAnchor.addCuboid(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); this.helm = new ModelRenderer(this, 0, 0); this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addCuboid(-4.5F, -8.5F, -4.5F, 9, 9, 9, s); + this.helm.addBox(-4.5F, -8.5F, -4.5F, 9, 9, 9, s); this.helmTop = new ModelRenderer(this, 36, 6); this.helmTop.setRotationPoint(0.0F, -8.5F, 3.5F); - this.helmTop.addCuboid(-1.5F, 0.0F, -7.0F, 3, 3, 7, s); + this.helmTop.addBox(-1.5F, 0.0F, -7.0F, 3, 3, 7, s); this.setRotateAngle(helmTop, -0.2617993877991494F, 0.0F, 0.0F); this.helmCrystal = new ModelRenderer(this, 36, 0); this.helmCrystal.setRotationPoint(0.0F, -7.5F, -4.5F); - this.helmCrystal.addCuboid(-1.5F, -4.0F, -1.0F, 3, 5, 1, s); + this.helmCrystal.addBox(-1.5F, -4.0F, -1.0F, 3, 5, 1, s); this.setRotateAngle(helmCrystal, 0.08726646259971647F, 0.0F, 0.0F); //body this.bodyAnchor = new ModelRenderer(this, 0, 0); this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.bodyTop = new ModelRenderer(this, 0, 18); this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyTop.addCuboid(-4.5F, -0.5F, -3.0F, 9, 6, 6, s); + this.bodyTop.addBox(-4.5F, -0.5F, -3.0F, 9, 6, 6, s); this.setRotateAngle(bodyTop, 0.0F, 0.0F, 0.0F); this.bodyBottom = new ModelRenderer(this, 0, 30); this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyBottom.addCuboid(-2.5F, 5.5F, -2.5F, 5, 3, 5, 0.0F); + this.bodyBottom.addBox(-2.5F, 5.5F, -2.5F, 5, 3, 5, 0.0F); //armL this.armLAnchor = new ModelRenderer(this, 0, 0); this.armLAnchor.mirror = true; this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); - this.armLAnchor.addCuboid(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armL = new ModelRenderer(this, 22, 40); this.armL.mirror = true; this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armL.addCuboid(1.5F, 2.0F, -2.49F, 2, 6, 5, s); + this.armL.addBox(1.5F, 2.0F, -2.49F, 2, 6, 5, s); this.armLpauldron = new ModelRenderer(this, 0, 40); this.armLpauldron.mirror = true; this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armLpauldron.addCuboid(-0.5F, -3.0F, -3.0F, 5, 4, 6, s); + this.armLpauldron.addBox(-0.5F, -3.0F, -3.0F, 5, 4, 6, s); this.armLcrystal = new ModelRenderer(this, 36, 40); this.armLcrystal.mirror = true; this.armLcrystal.setRotationPoint(2.0F, -2.5F, 0.0F); - this.armLcrystal.addCuboid(-0.5F, -2.5F, -1.5F, 2, 3, 3, s); + this.armLcrystal.addBox(-0.5F, -2.5F, -1.5F, 2, 3, 3, s); this.setRotateAngle(armLcrystal, 0.0F, 0.0F, -0.08726646259971647F); //armR this.armRAnchor = new ModelRenderer(this, 0, 0); this.armRAnchor.mirror = true; this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); - this.armRAnchor.addCuboid(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armR = new ModelRenderer(this, 22, 40); this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armR.addCuboid(-3.5F, 2.0F, -2.51F, 2, 6, 5, s); + this.armR.addBox(-3.5F, 2.0F, -2.51F, 2, 6, 5, s); this.armRpauldron = new ModelRenderer(this, 0, 40); this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addCuboid(-4.5F, -3.0F, -3.0F, 5, 4, 6, s); + this.armRpauldron.addBox(-4.5F, -3.0F, -3.0F, 5, 4, 6, s); this.armRcrystal = new ModelRenderer(this, 36, 40); this.armRcrystal.setRotationPoint(-2.0F, -2.5F, 0.0F); - this.armRcrystal.addCuboid(-1.5F, -2.5F, -1.5F, 2, 3, 3, s); + this.armRcrystal.addBox(-1.5F, -2.5F, -1.5F, 2, 3, 3, s); this.setRotateAngle(armRcrystal, 0.0F, 0.0F, 0.08726646259971647F); //pants this.pantsAnchor = new ModelRenderer(this, 0, 0); this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.pantsAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.belt = new ModelRenderer(this, 0, 51); this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addCuboid(-4.5F, 9.0F, -3.0F, 9, 3, 6, s); + this.belt.addBox(-4.5F, 9.0F, -3.0F, 9, 3, 6, s); this.legL = new ModelRenderer(this, 0, 60); this.legL.mirror = true; this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addCuboid(-0.39F, 0.0F, -2.49F, 3, 6, 5, s); + this.legL.addBox(-0.39F, 0.0F, -2.49F, 3, 6, 5, s); this.legR = new ModelRenderer(this, 0, 60); this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addCuboid(-2.61F, 0.0F, -2.51F, 3, 6, 5, s); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 3, 6, 5, s); //boots this.bootL = new ModelRenderer(this, 0, 71); this.bootL.mirror = true; this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addCuboid(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); this.bootLcrystal = new ModelRenderer(this, 36, 46); this.bootLcrystal.mirror = true; this.bootLcrystal.setRotationPoint(2.5F, 9.0F, 2.0F); - this.bootLcrystal.addCuboid(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); + this.bootLcrystal.addBox(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); this.setRotateAngle(bootLcrystal, 0.0F, 0.0F, 0.08726646259971647F); this.bootR = new ModelRenderer(this, 0, 71); this.bootR.setRotationPoint(-2.0F, 12.0F, 0.0F); - this.bootR.addCuboid(-2.5F, 8.5F, -2.51F, 5, 4, 5, s); + this.bootR.addBox(-2.5F, 8.5F, -2.51F, 5, 4, 5, s); this.bootRcrystal = new ModelRenderer(this, 36, 46); this.bootRcrystal.setRotationPoint(-2.5F, 9.0F, 2.0F); - this.bootRcrystal.addCuboid(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); + this.bootRcrystal.addBox(-1.0F, -2.0F, -1.5F, 2, 3, 3, s); this.setRotateAngle(bootRcrystal, 0.0F, 0.0F, -0.08726646259971647F); //hierarchy diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java index de4892d10..d58be0412 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorManaweave.java @@ -49,82 +49,82 @@ public class ModelArmorManaweave extends ModelArmor { //helm this.helmAnchor = new ModelRenderer(this, 0, 0); this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmAnchor.addCuboid(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); this.helm = new ModelRenderer(this, 0, 0); this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addCuboid(-4.5F, -9.5F, -4.0F, 9, 11, 10, s); + this.helm.addBox(-4.5F, -9.5F, -4.0F, 9, 11, 10, s); this.setRotateAngle(helm, 0.17453292519943295F, 0.0F, 0.0F); //body this.bodyAnchor = new ModelRenderer(this, 0, 0); this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.bodyTop = new ModelRenderer(this, 0, 21); this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyTop.addCuboid(-4.5F, -0.5F, -3.0F, 9, 7, 6, s); + this.bodyTop.addBox(-4.5F, -0.5F, -3.0F, 9, 7, 6, s); this.setRotateAngle(bodyTop, 0.0F, 0.0F, 0.0F); this.bodyBottom = new ModelRenderer(this, 0, 34); this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyBottom.addCuboid(-4.5F, 6.5F, -2.5F, 9, 5, 5, s); + this.bodyBottom.addBox(-4.5F, 6.5F, -2.5F, 9, 5, 5, s); this.setRotateAngle(bodyBottom, -0F, 0.0F, 0.0F); //armL this.armLAnchor = new ModelRenderer(this, 0, 0); this.armLAnchor.mirror = true; this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); - this.armLAnchor.addCuboid(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armL = new ModelRenderer(this, 0, 44); this.armL.mirror = true; this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armL.addCuboid(-1.5F, -2.5F, -2.49F, 5, 10, 5, s); + this.armL.addBox(-1.5F, -2.5F, -2.49F, 5, 10, 5, s); this.armLpauldron = new ModelRenderer(this, 20, 44); this.armLpauldron.mirror = true; this.armLpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armLpauldron.addCuboid(-1.0F, -3.0F, -3.0F, 6, 5, 6, s); + this.armLpauldron.addBox(-1.0F, -3.0F, -3.0F, 6, 5, 6, s); this.setRotateAngle(armLpauldron, 0.0F, 0.0F, -0.08726646259971647F); //armR this.armRAnchor = new ModelRenderer(this, 0, 0); this.armRAnchor.mirror = true; this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); - this.armRAnchor.addCuboid(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armR = new ModelRenderer(this, 0, 44); this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armR.addCuboid(-3.5F, -2.5F, -2.51F, 5, 10, 5, s); + this.armR.addBox(-3.5F, -2.5F, -2.51F, 5, 10, 5, s); this.armRpauldron = new ModelRenderer(this, 20, 44); this.armRpauldron.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armRpauldron.addCuboid(-5.0F, -3.0F, -3.0F, 6, 5, 6, s); + this.armRpauldron.addBox(-5.0F, -3.0F, -3.0F, 6, 5, 6, s); this.setRotateAngle(armRpauldron, 0.0F, 0.0F, 0.08726646259971647F); //pants this.pantsAnchor = new ModelRenderer(this, 0, 0); this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.pantsAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.legL = new ModelRenderer(this, 0, 78); this.legL.mirror = true; this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addCuboid(-2.39F, -0.5F, -2.49F, 5, 6, 5, s); + this.legL.addBox(-2.39F, -0.5F, -2.49F, 5, 6, 5, s); this.skirtL = new ModelRenderer(this, 0, 59); this.skirtL.mirror = true; this.skirtL.setRotationPoint(-0.5F, -2.0F, -2.5F); - this.skirtL.addCuboid(-1.0F, 0.0F, -0.5F, 5, 13, 6, s); + this.skirtL.addBox(-1.0F, 0.0F, -0.5F, 5, 13, 6, s); this.setRotateAngle(skirtL, 0.0F, -0.17453292519943295F, -0.2617993877991494F); this.legR = new ModelRenderer(this, 0, 78); this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addCuboid(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); + this.legR.addBox(-2.61F, 0.0F, -2.51F, 5, 6, 5, s); this.skirtR = new ModelRenderer(this, 0, 59); this.skirtR.setRotationPoint(0.5F, -2.0F, -2.5F); - this.skirtR.addCuboid(-4.0F, 0.0F, -0.5F, 5, 13, 6, s); + this.skirtR.addBox(-4.0F, 0.0F, -0.5F, 5, 13, 6, s); this.setRotateAngle(skirtR, 0.0F, 0.17453292519943295F, 0.2617993877991494F); //boot this.bootL = new ModelRenderer(this, 0, 89); this.bootL.mirror = true; this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addCuboid(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); this.bootR = new ModelRenderer(this, 0, 89); this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.bootR.addCuboid(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); //hierarchy this.helmAnchor.addChild(this.helm); diff --git a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java index bcec650ec..e71d36457 100644 --- a/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java +++ b/src/main/java/vazkii/botania/client/model/armor/ModelArmorTerrasteel.java @@ -71,161 +71,161 @@ public class ModelArmorTerrasteel extends ModelArmor { //helm this.helmAnchor = new ModelRenderer(this, 0, 0); this.helmAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmAnchor.addCuboid(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); + this.helmAnchor.addBox(-1.0F, -2.0F, 0.0F, 2, 2, 2, s); this.helm = new ModelRenderer(this, 0, 0); this.helm.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helm.addCuboid(-4.5F, -9.0F, -4.5F, 9, 11, 9, s); + this.helm.addBox(-4.5F, -9.0F, -4.5F, 9, 11, 9, s); this.helmFront = new ModelRenderer(this, 36, 0); this.helmFront.setRotationPoint(0.0F, 0.0F, 0.0F); - this.helmFront.addCuboid(-1.5F, -10.0F, -5.5F, 3, 8, 7, s); + this.helmFront.addBox(-1.5F, -10.0F, -5.5F, 3, 8, 7, s); this.helmLeaf1l = new ModelRenderer(this, 56, 14); this.helmLeaf1l.mirror = true; this.helmLeaf1l.setRotationPoint(4.5F, -6.0F, -2.5F); - this.helmLeaf1l.addCuboid(0.0F, -3.0F, -1.0F, 2, 3, 1, s); + this.helmLeaf1l.addBox(0.0F, -3.0F, -1.0F, 2, 3, 1, s); this.setRotateAngle(helmLeaf1l, -0.2617993877991494F, -0.2617993877991494F, 0.5235987755982988F); this.helmLeaf2l = new ModelRenderer(this, 56, 8); this.helmLeaf2l.mirror = true; this.helmLeaf2l.setRotationPoint(4.5F, -6.0F, -0.5F); - this.helmLeaf2l.addCuboid(0.0F, -5.0F, -1.0F, 2, 5, 1, s); + this.helmLeaf2l.addBox(0.0F, -5.0F, -1.0F, 2, 5, 1, s); this.setRotateAngle(helmLeaf2l, -0.5235987755982988F, -0.5235987755982988F, 0.7853981633974483F); this.helmLeaf3l = new ModelRenderer(this, 56, 0); this.helmLeaf3l.mirror = true; this.helmLeaf3l.setRotationPoint(4.5F, -6.0F, 2.5F); - this.helmLeaf3l.addCuboid(0.0F, -7.0F, -1.0F, 2, 7, 1, s); + this.helmLeaf3l.addBox(0.0F, -7.0F, -1.0F, 2, 7, 1, s); this.setRotateAngle(helmLeaf3l, -0.7853981633974483F, -0.7853981633974483F, 0.7853981633974483F); this.helmLeaf1r = new ModelRenderer(this, 56, 14); this.helmLeaf1r.setRotationPoint(-4.5F, -6.0F, -2.5F); - this.helmLeaf1r.addCuboid(-2.0F, -3.0F, -1.0F, 2, 3, 1, s); + this.helmLeaf1r.addBox(-2.0F, -3.0F, -1.0F, 2, 3, 1, s); this.setRotateAngle(helmLeaf1r, -0.2617993877991494F, 0.2617993877991494F, -0.5235987755982988F); this.helmLeaf2r = new ModelRenderer(this, 56, 8); this.helmLeaf2r.setRotationPoint(-4.5F, -6.0F, -0.5F); - this.helmLeaf2r.addCuboid(-2.0F, -5.0F, -1.0F, 2, 5, 1, s); + this.helmLeaf2r.addBox(-2.0F, -5.0F, -1.0F, 2, 5, 1, s); this.setRotateAngle(helmLeaf2r, -0.5235987755982988F, 0.5235987755982988F, -0.7853981633974483F); this.helmLeaf3r = new ModelRenderer(this, 56, 0); this.helmLeaf3r.setRotationPoint(-4.5F, -6.0F, 2.5F); - this.helmLeaf3r.addCuboid(-2.0F, -7.0F, -1.0F, 2, 7, 1, s); + this.helmLeaf3r.addBox(-2.0F, -7.0F, -1.0F, 2, 7, 1, s); this.setRotateAngle(helmLeaf3r, -0.7853981633974483F, 0.7853981633974483F, -0.7853981633974483F); this.helmbranch1l = new ModelRenderer(this, 36, 15); this.helmbranch1l.mirror = true; this.helmbranch1l.setRotationPoint(2.5F, -9.0F, -3.5F); - this.helmbranch1l.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.helmbranch1l.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(helmbranch1l, 0.5235987755982988F, 0.2617993877991494F, 0.0F); this.helmbranch2l = new ModelRenderer(this, 36, 15); this.helmbranch2l.mirror = true; this.helmbranch2l.setRotationPoint(4.5F, -3.0F, -2.5F); - this.helmbranch2l.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.helmbranch2l.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(helmbranch2l, 0.08726646259971647F, 0.2617993877991494F, 0.0F); this.helmbranch1r = new ModelRenderer(this, 36, 15); this.helmbranch1r.setRotationPoint(-2.5F, -9.0F, -3.5F); - this.helmbranch1r.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.helmbranch1r.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(helmbranch1r, 0.5235987755982988F, -0.2617993877991494F, 0.0F); this.helmbranch2r = new ModelRenderer(this, 36, 15); this.helmbranch2r.setRotationPoint(-4.5F, -3.0F, -2.5F); - this.helmbranch2r.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.helmbranch2r.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(helmbranch2r, 0.08726646259971647F, -0.2617993877991494F, 0.0F); //body this.bodyAnchor = new ModelRenderer(this, 0, 0); this.bodyAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.bodyAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.bodyTop = new ModelRenderer(this, 0, 20); this.bodyTop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyTop.addCuboid(-5.5F, 0.0F, -3.0F, 11, 6, 6, s); + this.bodyTop.addBox(-5.5F, 0.0F, -3.0F, 11, 6, 6, s); this.bodyBottom = new ModelRenderer(this, 0, 32); this.bodyBottom.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bodyBottom.addCuboid(-4.5F, 5.0F, -2.5F, 9, 3, 5, s); + this.bodyBottom.addBox(-4.5F, 5.0F, -2.5F, 9, 3, 5, s); //armL this.armLAnchor = new ModelRenderer(this, 0, 0); this.armLAnchor.mirror = true; this.armLAnchor.setRotationPoint(4.0F, 2.0F, 0.0F); - this.armLAnchor.addCuboid(0.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armLAnchor.addBox(0.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armL = new ModelRenderer(this, 0, 52); this.armL.mirror = true; this.armL.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armL.addCuboid(-1.5F, 3.0F, -2.49F, 5, 8, 5, s); + this.armL.addBox(-1.5F, 3.0F, -2.49F, 5, 8, 5, s); this.armLpauldron = new ModelRenderer(this, 0, 40); this.armLpauldron.mirror = true; this.armLpauldron.setRotationPoint(1.5F, 0.0F, 0.0F); - this.armLpauldron.addCuboid(-1.0F, -3.0F, -3.0F, 6, 6, 6, s); + this.armLpauldron.addBox(-1.0F, -3.0F, -3.0F, 6, 6, 6, s); this.armLbranch1 = new ModelRenderer(this, 36, 15); this.armLbranch1.mirror = true; this.armLbranch1.setRotationPoint(4.0F, -3.0F, -1.0F); - this.armLbranch1.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.armLbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(armLbranch1, 0.5235987755982988F, 0.5235987755982988F, 0.0F); this.armLbranch2 = new ModelRenderer(this, 36, 24); this.armLbranch2.mirror = true; this.armLbranch2.setRotationPoint(5.0F, -2.0F, 0.0F); - this.armLbranch2.addCuboid(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); + this.armLbranch2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); this.setRotateAngle(armLbranch2, 0.08726646259971647F, 0.7853981633974483F, 0.0F); //armR this.armRAnchor = new ModelRenderer(this, 0, 0); this.armRAnchor.mirror = true; this.armRAnchor.setRotationPoint(-4.0F, 2.0F, 0.0F); - this.armRAnchor.addCuboid(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); + this.armRAnchor.addBox(-2.0F, -1.0F, -1.0F, 2, 2, 2, s); this.armR = new ModelRenderer(this, 0, 52); this.armR.setRotationPoint(0.0F, 0.0F, 0.0F); - this.armR.addCuboid(-3.5F, 3.0F, -2.51F, 5, 8, 5, s); + this.armR.addBox(-3.5F, 3.0F, -2.51F, 5, 8, 5, s); this.armRpauldron = new ModelRenderer(this, 0, 40); this.armRpauldron.setRotationPoint(-1.5F, 0.0F, 0.0F); - this.armRpauldron.addCuboid(-5.0F, -3.0F, -3.0F, 6, 6, 6, s); + this.armRpauldron.addBox(-5.0F, -3.0F, -3.0F, 6, 6, 6, s); this.armRbranch1 = new ModelRenderer(this, 36, 15); this.armRbranch1.setRotationPoint(-4.0F, -3.0F, -1.0F); - this.armRbranch1.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.armRbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(armRbranch1, 0.5235987755982988F, -0.5235987755982988F, 0.0F); this.armRbranch2 = new ModelRenderer(this, 36, 24); this.armRbranch2.setRotationPoint(-5.0F, -2.0F, 0.0F); - this.armRbranch2.addCuboid(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); + this.armRbranch2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 5, s); this.setRotateAngle(armRbranch2, 0.08726646259971647F, -0.7853981633974483F, 0.0F); //pants this.pantsAnchor = new ModelRenderer(this, 0, 0); this.pantsAnchor.setRotationPoint(0.0F, 0.0F, 0.0F); - this.pantsAnchor.addCuboid(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); + this.pantsAnchor.addBox(-1.0F, 0.0F, -1.0F, 2, 2, 2, s); this.belt = new ModelRenderer(this, 0, 65); this.belt.setRotationPoint(0.0F, 0.0F, 0.0F); - this.belt.addCuboid(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); + this.belt.addBox(-4.5F, 8.0F, -3.0F, 9, 5, 6, s); this.legL = new ModelRenderer(this, 0, 76); this.legL.mirror = true; this.legL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.legL.addCuboid(-2.39F, -0.01F, -2.49F, 5, 6, 5, s); + this.legL.addBox(-2.39F, -0.01F, -2.49F, 5, 6, 5, s); this.legR = new ModelRenderer(this, 0, 76); this.legR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.legR.addCuboid(-2.61F, -0.01F, -2.51F, 5, 6, 5, s); + this.legR.addBox(-2.61F, -0.01F, -2.51F, 5, 6, 5, s); //boots this.bootL = new ModelRenderer(this, 0, 94); this.bootL.mirror = true; this.bootL.setRotationPoint(1.9F, 12.0F, 0.0F); - this.bootL.addCuboid(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); + this.bootL.addBox(-2.39F, 8.5F, -2.49F, 5, 4, 5, s); this.bootLtop = new ModelRenderer(this, 0, 87); this.bootLtop.mirror = true; this.bootLtop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootLtop.addCuboid(-2.39F, 6.0F, -2.49F, 6, 2, 5, s); + this.bootLtop.addBox(-2.39F, 6.0F, -2.49F, 6, 2, 5, s); this.bootLbranch1 = new ModelRenderer(this, 36, 15); this.bootLbranch1.mirror = true; this.bootLbranch1.setRotationPoint(3.5F, 6.0F, 0.0F); - this.bootLbranch1.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.bootLbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(bootLbranch1, 0.2617993877991494F, 0.2617993877991494F, -0.08726646259971647F); this.bootLbranch2 = new ModelRenderer(this, 36, 24); this.bootLbranch2.mirror = true; this.bootLbranch2.setRotationPoint(2.5F, 9.0F, 0.0F); - this.bootLbranch2.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); + this.bootLbranch2.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); this.setRotateAngle(bootLbranch2, 0.08726646259971647F, 0.7853981633974483F, 0.0F); this.bootR = new ModelRenderer(this, 0, 94); this.bootR.setRotationPoint(-1.9F, 12.0F, 0.0F); - this.bootR.addCuboid(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); + this.bootR.addBox(-2.61F, 8.5F, -2.51F, 5, 4, 5, s); this.bootRtop = new ModelRenderer(this, 0, 87); this.bootRtop.setRotationPoint(0.0F, 0.0F, 0.0F); - this.bootRtop.addCuboid(-3.61F, 6.0F, -2.51F, 6, 2, 5, s); + this.bootRtop.addBox(-3.61F, 6.0F, -2.51F, 6, 2, 5, s); this.bootRbranch1 = new ModelRenderer(this, 36, 15); this.bootRbranch1.setRotationPoint(-3.5F, 6.0F, 0.0F); - this.bootRbranch1.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); + this.bootRbranch1.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 7, s); this.setRotateAngle(bootRbranch1, 0.2617993877991494F, -0.2617993877991494F, 0.08726646259971647F); this.bootRbranch2 = new ModelRenderer(this, 36, 24); this.bootRbranch2.setRotationPoint(-2.5F, 9.0F, 0.5F); - this.bootRbranch2.addCuboid(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); + this.bootRbranch2.addBox(-1.0F, -1.0F, 0.0F, 2, 2, 5, s); this.setRotateAngle(bootRbranch2, 0.08726646259971647F, -0.7853981633974483F, 0.0F); //hierarchy 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 68c7e19bc..8505c6f06 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderBabylonWeapon.java @@ -40,7 +40,7 @@ public class RenderBabylonWeapon extends EntityRenderer { @Override public void render(@Nonnull EntityBabylonWeapon weapon, float yaw, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light) { ms.push(); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(weapon.getRotation())); + ms.rotate(Vector3f.YP.rotationDegrees(weapon.getRotation())); int live = weapon.getLiveTicks(); int delay = weapon.getDelay(); @@ -50,18 +50,18 @@ public class RenderBabylonWeapon extends EntityRenderer { ms.push(); float s = 1.5F; ms.scale(s, s, s); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(45F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); + ms.rotate(Vector3f.ZP.rotationDegrees(45F)); // todo 1.15 get the alpha in to the BMR // GlStateManager.color4f(1F, 1F, 1F, chargeMul); IBakedModel model = MiscellaneousIcons.INSTANCE.kingKeyWeaponModels[weapon.getVariety()]; - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.DEFAULT_UV); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, 0xF000F0, OverlayTexture.NO_OVERLAY); ms.pop(); Random rand = new Random(weapon.getUniqueID().getMostSignificantBits()); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.XP.rotationDegrees(-90F)); ms.translate(0F, -0.3F + rand.nextFloat() * 0.1F, 1F); s = chargeMul; @@ -71,14 +71,14 @@ public class RenderBabylonWeapon extends EntityRenderer { s *= 2F; ms.scale(s, s, s); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(charge * 9F + (weapon.ticksExisted + partialTicks) * 0.5F + rand.nextFloat() * 360F)); + ms.rotate(Vector3f.YP.rotationDegrees(charge * 9F + (weapon.ticksExisted + partialTicks) * 0.5F + rand.nextFloat() * 360F)); IVertexBuilder buffer = buffers.getBuffer(RenderHelper.BABYLON_ICON); - Matrix4f mat = ms.peek().getModel(); - buffer.vertex(mat, -1, 0, -1).color(1, 1, 1, chargeMul).texture(0, 0).endVertex(); - buffer.vertex(mat, -1, 0, 1).color(1, 1, 1, chargeMul).texture(0, 1).endVertex(); - buffer.vertex(mat, 1, 0, 1).color(1, 1, 1, chargeMul).texture(1, 1).endVertex(); - buffer.vertex(mat, 1, 0, -1).color(1, 1, 1, chargeMul).texture(1, 0).endVertex(); + Matrix4f mat = ms.getLast().getMatrix(); + buffer.pos(mat, -1, 0, -1).color(1, 1, 1, chargeMul).tex(0, 0).endVertex(); + buffer.pos(mat, -1, 0, 1).color(1, 1, 1, chargeMul).tex(0, 1).endVertex(); + buffer.pos(mat, 1, 0, 1).color(1, 1, 1, chargeMul).tex(1, 1).endVertex(); + buffer.pos(mat, 1, 0, -1).color(1, 1, 1, chargeMul).tex(1, 0).endVertex(); ms.pop(); } 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 e8bd97fbe..2a5b26d5d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -46,7 +46,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { } ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.rotate(Vector3f.XP.rotationDegrees(90)); float scalef = 1F / 6F; ms.scale(scalef, scalef, scalef); //todo 1.15 GlStateManager.color4f(1F, 1F, 1F, absTime / 10); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index dc27354cd..c8cd38834 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -41,13 +41,13 @@ public class RenderDoppleganger extends BipedRenderer { @@ -55,13 +55,13 @@ public class RenderDoppleganger extends BipedRenderer { int disfigurationUniform = GlStateManager.getUniformLocation(shader, "disfiguration"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.025F); - GlStateManager.uniform1(disfigurationUniform, ShaderHelper.FLOAT_BUF); + GlStateManager.uniform1f(disfigurationUniform, ShaderHelper.FLOAT_BUF); // Vert Uniforms int grainIntensityUniform = GlStateManager.getUniformLocation(shader, "grainIntensity"); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, 0.05F); - GlStateManager.uniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF); + GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF); }; public RenderPixie(EntityRendererManager renderManager) { diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java index dacf0cab2..3d378ea72 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java @@ -32,10 +32,10 @@ public class RenderPoolMinecart extends MinecartRenderer { } @Override - protected void renderBlock(EntityPoolMinecart poolCart, float partialTicks, @Nonnull BlockState state, MatrixStack ms, IRenderTypeBuffer buffers, int light) { - super.renderBlock(poolCart, partialTicks, state, ms, buffers, light); + protected void renderBlockState(EntityPoolMinecart poolCart, float partialTicks, @Nonnull BlockState state, MatrixStack ms, IRenderTypeBuffer buffers, int light) { + super.renderBlockState(poolCart, partialTicks, state, ms, buffers, light); RenderTilePool.cartMana = poolCart.getMana(); - TileEntityRendererDispatcher.instance.getRenderer(DUMMY).render(null, ClientTickHandler.partialTicks, ms, buffers, light, OverlayTexture.DEFAULT_UV); + TileEntityRendererDispatcher.instance.getRenderer(DUMMY).render(null, ClientTickHandler.partialTicks, ms, buffers, light, OverlayTexture.NO_OVERLAY); } } 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 4d3c34add..631b221db 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -53,8 +53,8 @@ public abstract class RenderSparkBase extends EntityR IVertexBuilder buffer = buffers.getBuffer(RenderHelper.SPARK); ms.push(); - ms.multiply(renderManager.getRotation()); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); + ms.rotate(renderManager.getCameraOrientation()); + ms.rotate(Vector3f.YP.rotationDegrees(180)); renderIcon(ms, buffer, iicon, iconColor); ms.push(); @@ -107,11 +107,11 @@ public abstract class RenderSparkBase extends EntityR int r = (color >> 16) & 0xFF; int g = (color >> 8) & 0xFF; int b = color & 0xFF; - Matrix4f mat = ms.peek().getModel(); - buffer.vertex(mat, 0.0F - f5, 0.0F - f6, 0.0F).color(r, g, b, a).texture(f, f3).light(fullbright).endVertex(); - buffer.vertex(mat, f4 - f5, 0.0F - f6, 0.0F).color(r, g, b, a).texture(f1, f3).light(fullbright).endVertex(); - buffer.vertex(mat, f4 - f5, f4 - f6, 0.0F).color(r, g, b, a).texture(f1, f2).light(fullbright).endVertex(); - buffer.vertex(mat, 0.0F - f5, f4 - f6, 0.0F).color(r, g, b, a).texture(f, f2).light(fullbright).endVertex(); + Matrix4f mat = ms.getLast().getMatrix(); + buffer.pos(mat, 0.0F - f5, 0.0F - f6, 0.0F).color(r, g, b, a).tex(f, f3).lightmap(fullbright).endVertex(); + buffer.pos(mat, f4 - f5, 0.0F - f6, 0.0F).color(r, g, b, a).tex(f1, f3).lightmap(fullbright).endVertex(); + buffer.pos(mat, f4 - f5, f4 - f6, 0.0F).color(r, g, b, a).tex(f1, f2).lightmap(fullbright).endVertex(); + buffer.pos(mat, 0.0F - f5, f4 - f6, 0.0F).color(r, g, b, a).tex(f, f2).lightmap(fullbright).endVertex(); } } 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 4b4a311e2..08fcf7827 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -48,7 +48,7 @@ public class RenderTileAlfPortal extends TileEntityRenderer { if (state == AlfPortalState.ON_X) { ms.translate(1.25F, 0F, 1.75F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.YP.rotationDegrees(90F)); } renderIcon(ms, buffers, MiscellaneousIcons.INSTANCE.alfPortalTex, 0, 0, 3, 3, alpha, overlay); @@ -59,13 +59,13 @@ 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.getEntityTranslucent()); - Matrix4f model = ms.peek().getModel(); - Matrix3f normal = ms.peek().getNormal(); - buffer.vertex(model, x, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); - buffer.vertex(model, x + width, y + height, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMaxV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); - buffer.vertex(model, x + width, y, 0).color(1, 1, 1, alpha).texture(icon.getMaxU(), icon.getMinV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); - buffer.vertex(model, x, y, 0).color(1, 1, 1, alpha).texture(icon.getMinU(), icon.getMinV()).overlay(overlay).light(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType()); + 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(); + buffer.pos(model, x + width, y + height, 0).color(1, 1, 1, alpha).tex(icon.getMaxU(), icon.getMaxV()).overlay(overlay).lightmap(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + buffer.pos(model, x + width, y, 0).color(1, 1, 1, alpha).tex(icon.getMaxU(), icon.getMinV()).overlay(overlay).lightmap(0xF000F0).normal(normal, 1, 0, 0).endVertex(); + buffer.pos(model, x, y, 0).color(1, 1, 1, alpha).tex(icon.getMinU(), icon.getMinV()).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 845fc659e..37927a26e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java @@ -92,7 +92,7 @@ public class RenderTileAltar extends TileEntityRenderer { v /= 2F; ms.translate(v, v, v); - ms.multiply(new Vector3f(xRotate, yRotate, zRotate).getDegreesQuaternion(deg)); + ms.rotate(new Vector3f(xRotate, yRotate, zRotate).rotationDegrees(deg)); ms.translate(-v, -v, -v); v *= 2F; @@ -108,14 +108,14 @@ public class RenderTileAltar extends TileEntityRenderer { float alpha = lava ? 1F : 0.7F; ms.translate(w, -0.3F, w); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.rotate(Vector3f.XP.rotationDegrees(90)); ms.scale(s, s, s); TextureAtlasSprite sprite = lava ? Minecraft.getInstance().getModelManager().getBlockModelShapes().getModel(Blocks.LAVA.getDefaultState()).getParticleTexture() : 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.getEntityTranslucent()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getTranslucentBlockType()); renderIcon(ms, buffer, sprite, color, alpha, overlay, lava ? 0xF000F0 : light); ms.pop(); } @@ -126,12 +126,12 @@ public class RenderTileAltar extends TileEntityRenderer { int red = ((color >> 16) & 0xFF); int green = ((color >> 8) & 0xFF); int blue = (color & 0xFF); - Matrix4f mat = ms.peek().getModel(); + Matrix4f mat = ms.getLast().getMatrix(); // todo 1.15 check the normals - builder.vertex(mat, 0, 16, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMinU(), sprite.getMaxV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex(); - builder.vertex(mat, 16, 16, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMaxU(), sprite.getMaxV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex(); - builder.vertex(mat, 16, 0, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMaxU(), sprite.getMinV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex(); - builder.vertex(mat, 0, 0, 0).color(red, green, blue, (int) (alpha * 255F)).texture(sprite.getMinU(), sprite.getMinV()).overlay(overlay).light(light).normal(0, 0, 1).endVertex(); + builder.pos(mat, 0, 16, 0).color(red, green, blue, (int) (alpha * 255F)).tex(sprite.getMinU(), sprite.getMaxV()).overlay(overlay).lightmap(light).normal(0, 0, 1).endVertex(); + builder.pos(mat, 16, 16, 0).color(red, green, blue, (int) (alpha * 255F)).tex(sprite.getMaxU(), sprite.getMaxV()).overlay(overlay).lightmap(light).normal(0, 0, 1).endVertex(); + builder.pos(mat, 16, 0, 0).color(red, green, blue, (int) (alpha * 255F)).tex(sprite.getMaxU(), sprite.getMinV()).overlay(overlay).lightmap(light).normal(0, 0, 1).endVertex(); + builder.pos(mat, 0, 0, 0).color(red, green, blue, (int) (alpha * 255F)).tex(sprite.getMinU(), sprite.getMinV()).overlay(overlay).lightmap(light).normal(0, 0, 1).endVertex(); } } 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 d7383ccdc..fd764287a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAnimatedTorch.java @@ -48,13 +48,13 @@ public class RenderTileAnimatedTorch extends TileEntityRenderer { ms.translate(0.5F, 1.6F, 0.5F); ms.scale(1F, -1F, -1F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)])); - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + ms.rotate(Vector3f.YP.rotationDegrees(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)])); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); model.render(ms, buffer, light, overlay, 1, 1, 1, 1); if (avatar != null) { @@ -70,7 +70,7 @@ public class RenderTileAvatar extends TileEntityRenderer { float s = 0.6F; ms.scale(s, s, s); ms.translate(-0.5F, 2F, -0.25F); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(-70)); + ms.rotate(Vector3f.XP.rotationDegrees(-70)); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.THIRD_PERSON_RIGHT_HAND, light, overlay, ms, buffers); ms.pop(); 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 9fbbd3780..efbcb8bc2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -53,9 +53,9 @@ public class RenderTileBellows extends TileEntityRenderer { break; } } - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle)); + ms.rotate(Vector3f.YP.rotationDegrees(angle)); float fract = Math.max(0.1F, 1F - (bellows == null ? 0 : bellows.movePos + bellows.moving * f + 0.1F)); - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); model.render(ms, buffer, light, overlay, 1, 1, 1, 1, fract); ms.pop(); } 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 6f910819d..3d329fb53 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java @@ -42,12 +42,12 @@ public class RenderTileCocoon extends TileEntityRenderer { ms.push(); ms.translate(0.5, 0, 0); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rot)); + ms.rotate(Vector3f.XP.rotationDegrees(rot)); ms.translate(-0.5, 0, 0); BlockState state = cocoon.getBlockState(); IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(state); - IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getBlockLayer(state)); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, state, model, 1, 1, 1, light, overlay); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getChunkRenderType(state)); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, state, model, 1, 1, 1, light, overlay); ms.pop(); } } 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 e7206ec2b..c8f59f554 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -75,7 +75,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntityRenderer { item.setItem(enchanter.itemToEnchant); ms.translate(0.5F, 1.25F, 0.5F); - Minecraft.getInstance().getRenderManager().render(item, 0, 0, 0, 0, f, ms, buffers, light); + Minecraft.getInstance().getRenderManager().renderEntityStatic(item, 0, 0, 0, 0, f, ms, buffers, light); ms.translate(-0.5F, -1.25F, -0.5F); } - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.XP.rotationDegrees(90F)); ms.translate(-2F, -2F, -0.001F); float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.4D) * alphaMod; @@ -74,7 +74,7 @@ public class RenderTileEnchanter extends TileEntityRenderer { ms.translate(2.5F, 2.5F, -yTranslation); ms.scale(scale, scale, 1F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(angle)); + ms.rotate(Vector3f.ZP.rotationDegrees(angle)); ms.translate(-2.5F, -2.5F, 0F); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java index 5393ada95..b44d07314 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java @@ -55,17 +55,17 @@ public class RenderTileFloatingFlower extends TileEntityRenderer { } ms.translate(0.5F, 0, 0.5F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-((float) worldTime * 0.5F))); + ms.rotate(Vector3f.YP.rotationDegrees(-((float) worldTime * 0.5F))); ms.translate(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(4F * (float) Math.sin(worldTime * 0.04F))); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F)); + ms.rotate(Vector3f.XP.rotationDegrees(4F * (float) Math.sin(worldTime * 0.04F))); + ms.rotate(Vector3f.YP.rotationDegrees(90.0F)); BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher(); BlockState state = tile.getBlockState(); IBakedModel ibakedmodel = brd.getModelForState(state); - brd.getBlockModelRenderer().renderModel(ms.peek(), buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(state)), state, ibakedmodel, 1, 1, 1, light, overlay, data); + brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.getRenderType(state)), state, ibakedmodel, 1, 1, 1, light, overlay, data); ms.pop(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java index f6be5dba5..33e341e9e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileGaiaHead.java @@ -124,8 +124,8 @@ public class RenderTileGaiaHead extends SkullTileEntityRenderer { ms.scale(-1.0F, -1.0F, 1.0F); IVertexBuilder ivertexbuilder = buffers.getBuffer(layerFor(type, profile)); - genericheadmodel.render(partialTicks, rotation, 0.0F); - genericheadmodel.render(ms, ivertexbuilder, light, OverlayTexture.DEFAULT_UV, 1.0F, 1.0F, 1.0F, 1.0F); + genericheadmodel.func_225603_a_(partialTicks, rotation, 0.0F); + genericheadmodel.render(ms, ivertexbuilder, light, OverlayTexture.NO_OVERLAY, 1.0F, 1.0F, 1.0F, 1.0F); 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 003837b49..f0b263923 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java @@ -60,14 +60,14 @@ public class RenderTileHourglass extends TileEntityRenderer { if (hasWorld && hourglass.flipTicks > 0) { rot += (hourglass.flipTicks - ticks) * (180F / 4F); } - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rot)); + ms.rotate(Vector3f.ZP.rotationDegrees(rot)); ms.scale(1F, -1F, -1F); int color = hasWorld ? hourglass.getColor() : 0; float r = (color >> 16) / 255.0F; float g = (color >> 8) / 255.0F; float b = (color & 0xFF) / 255.0F; - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); model.render(ms, buffer, light, overlay, r, g, b, 1, fract1, fract2, hasWorld && hourglass.flip); ms.pop(); } 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 bcd819f03..ff3fef6cb 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java @@ -47,7 +47,7 @@ public class RenderTileIncensePlate extends TileEntityRenderer ms.push(); ms.translate(0.5F, 1.5F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ROTATIONS.get(facing))); + ms.rotate(Vector3f.YP.rotationDegrees(ROTATIONS.get(facing))); float s = 0.6F; ms.translate(-0.11F, -1.35F, 0F); ms.scale(s, s, s); 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 36b67a17c..cb25ccb70 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java @@ -65,12 +65,12 @@ public class RenderTileLightRelay extends TileEntityRenderer { float scale = 0.75F; ms.scale(scale, scale, scale); - ms.multiply(mc.getRenderManager().getRotation()); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180.0F)); + ms.rotate(mc.getRenderManager().getCameraOrientation()); + ms.rotate(Vector3f.YP.rotationDegrees(180.0F)); float off = 0.25F; ms.translate(0F, off, 0F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion((float) time)); + ms.rotate(Vector3f.ZP.rotationDegrees((float) time)); ms.translate(0F, -off, 0F); IVertexBuilder buffer = buffers.getBuffer(RenderHelper.LIGHT_RELAY); @@ -91,12 +91,12 @@ public class RenderTileLightRelay extends TileEntityRenderer { float f5 = 0.5F; float f6 = 0.25F; - Matrix4f mat = ms.peek().getModel(); + Matrix4f mat = ms.getLast().getMatrix(); int fullbright = 0xF000F0; - buffer.vertex(mat, 0.0F - f5, 0.0F - f6, 0.0F).color(1F, 1F, 1F, 1F).texture(f, f3).light(fullbright).endVertex(); - buffer.vertex(mat, f4 - f5, 0.0F - f6, 0.0F).color(1F, 1F, 1F, 1F).texture(f1, f3).light(fullbright).endVertex(); - buffer.vertex(mat, f4 - f5, f4 - f6, 0.0F).color(1F, 1F, 1F, 1F).texture(f1, f2).light(fullbright).endVertex(); - buffer.vertex(mat, 0.0F - f5, f4 - f6, 0.0F).color(1F, 1F, 1F, 1F).texture(f, f2).light(fullbright).endVertex(); + buffer.pos(mat, 0.0F - f5, 0.0F - f6, 0.0F).color(1F, 1F, 1F, 1F).tex(f, f3).lightmap(fullbright).endVertex(); + buffer.pos(mat, f4 - f5, 0.0F - f6, 0.0F).color(1F, 1F, 1F, 1F).tex(f1, f3).lightmap(fullbright).endVertex(); + buffer.pos(mat, f4 - f5, f4 - f6, 0.0F).color(1F, 1F, 1F, 1F).tex(f1, f2).lightmap(fullbright).endVertex(); + buffer.pos(mat, 0.0F - f5, f4 - f6, 0.0F).color(1F, 1F, 1F, 1F).tex(f, f2).lightmap(fullbright).endVertex(); } 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 f861438ee..0c82f4f04 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -66,9 +66,9 @@ public class RenderTilePool extends TileEntityRenderer { int blue = color & 0xFF; BlockState state = pool.getBlockState(); IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes().getModel(state); - IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(state)); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getRenderType(state)); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, state, model, red / 255F, green / 255F, blue / 255F, light, overlay); + .renderModelBrightnessColor(ms.getLast(), buffer, state, model, red / 255F, green / 255F, blue / 255F, light, overlay); } ms.translate(0.5F, 1.5F, 0.5F); @@ -93,7 +93,7 @@ public class RenderTilePool extends TileEntityRenderer { ms.push(); float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 20.0) + 1) * 0.3 + 0.2); ms.translate(-0.5F, -1F - 0.43F, -0.5F); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.XP.rotationDegrees(90F)); ms.scale(s, s, s); IVertexBuilder buffer = buffers.getBuffer(RenderHelper.ICON_OVERLAY); @@ -108,7 +108,7 @@ public class RenderTilePool extends TileEntityRenderer { s = 1F / 256F * 14F; ms.push(); ms.translate(w, -1F - (0.43F - waterLevel), w); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.XP.rotationDegrees(90F)); ms.scale(s, s, s); IVertexBuilder buffer = buffers.getBuffer(RenderHelper.MANA_POOL_WATER); 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 6478f49bc..93987ab96 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -41,7 +41,7 @@ public class RenderTilePrism extends TileEntityRenderer { Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE); if (stack.getItem() instanceof ILens) { ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.rotate(Vector3f.XP.rotationDegrees(90)); ms.translate(0.5F, 0.5F, pos); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, overlay, ms, buffers); ms.pop(); 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 887a756fa..70eabc992 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java @@ -48,12 +48,12 @@ public class RenderTilePump extends TileEntityRenderer { angle = 90; break; } - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angle)); + ms.rotate(Vector3f.YP.rotationDegrees(angle)); ms.translate(-0.5, 0, -0.5); double diff = Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * partialTicks)); ms.translate(0, 0, diff / 14); IVertexBuilder buffer = buffers.getBuffer(RenderType.getSolid()); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, null, headModel, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, null, headModel, 1, 1, 1, light, overlay); ms.pop(); } } 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 1a7107bb7..eedffedf4 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java @@ -102,7 +102,7 @@ public class RenderTilePylon extends TileEntityRenderer { ms.push(); ms.translate(0.5F, 0F, -0.5F); if (pylon != null) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(worldTime * 1.5F)); + ms.rotate(Vector3f.YP.rotationDegrees(worldTime * 1.5F)); } RenderType layer = RenderType.getEntityTranslucent(texture); @@ -121,7 +121,7 @@ public class RenderTilePylon extends TileEntityRenderer { ms.translate(0.5F, 0F, -0.5F); if (pylon != null) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-worldTime)); + ms.rotate(Vector3f.YP.rotationDegrees(-worldTime)); } buffer = buffers.getBuffer(shaderLayer); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java index 00f15b3f4..256a329b7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java @@ -94,7 +94,7 @@ public class RenderTileRedString extends TileEntityRenderer { int r = (color >> 16) & 0xFF; int g = (color >> 8) & 0xFF; int b = color & 0xFF; - buffer.vertex(ms.peek().getModel(), (float) x, (float) y, (float) z).color(r, g, b, a).endVertex(); + buffer.pos(ms.getLast().getMatrix(), (float) x, (float) y, (float) z).color(r, g, b, a).endVertex(); } } 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 c36eabc8e..ef2e86ac2 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -31,7 +31,7 @@ public class RenderTileRuneAltar extends TileEntityRenderer { public RenderTileRuneAltar(TileEntityRendererDispatcher manager) { super(manager); - spinningCube.addCuboid(0F, 0F, 0F, 1, 1, 1); + spinningCube.addBox(0F, 0F, 0F, 1, 1, 1); spinningCube.setRotationPoint(0F, 0F, 0F); spinningCube.setTextureSize(64, 64); } @@ -61,9 +61,9 @@ public class RenderTileRuneAltar extends TileEntityRenderer { for (int i = 0; i < altar.getSizeInventory(); i++) { ms.push(); ms.translate(0.5F, 1.25F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angles[i] + (float) time)); + ms.rotate(Vector3f.YP.rotationDegrees(angles[i] + (float) time)); ms.translate(1.125F, 0F, 0.25F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.YP.rotationDegrees(90F)); ms.translate(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F); ItemStack stack = altar.getItemHandler().getStackInSlot(i); Minecraft mc = Minecraft.getInstance(); @@ -75,7 +75,7 @@ public class RenderTileRuneAltar extends TileEntityRenderer { ms.push(); ms.translate(0.5F, 1.8F, 0.5F); - ms.multiply(new Vector3f(1, 0, 1).getDegreesQuaternion(180F)); + ms.rotate(new Vector3f(1, 0, 1).rotationDegrees(180F)); renderSpinningCubes(ms, buffers, overlay, 2, 15); ms.pop(); @@ -119,7 +119,7 @@ public class RenderTileRuneAltar extends TileEntityRenderer { float yRotate = (float) Math.max(0.6F, Math.sin(ticks * 0.1F) / 2F + 0.5F); float zRotate = (float) Math.cos(ticks * rotationModifier) / 2F; - ms.multiply(new Vector3f(xRotate, yRotate, zRotate).getDegreesQuaternion(deg)); + ms.rotate(new Vector3f(xRotate, yRotate, zRotate).rotationDegrees(deg)); float alpha = 1; if (curIter < iters) { alpha = (float) curIter / (float) iters * 0.4F; 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 7477123dc..7b72dc29d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java @@ -31,11 +31,11 @@ public class RenderTileSparkChanger extends TileEntityRenderer @Override public void render(@Nonnull TileSparkChanger tileentity, float pticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.rotate(Vector3f.XP.rotationDegrees(90)); ms.translate(1.0F, -0.125F, -0.25F); ItemStack stack = tileentity.getItemHandler().getStackInSlot(0); if (!stack.isEmpty()) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); + ms.rotate(Vector3f.YP.rotationDegrees(180)); ms.translate(0.5F, 0.5F, 0); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers); } 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 440afeb62..5a2086d09 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -46,9 +46,9 @@ public class RenderTileSpreader extends TileEntityRenderer { ms.translate(0.5F, 0.5, 0.5F); - Quaternion transform = Vector3f.POSITIVE_Y.getDegreesQuaternion(spreader.rotationX + 90F); - transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(spreader.rotationY)); - ms.multiply(transform); + Quaternion transform = Vector3f.YP.rotationDegrees(spreader.rotationX + 90F); + transform.multiply(Vector3f.XP.rotationDegrees(spreader.rotationY)); + ms.rotate(transform); ms.translate(-0.5F, -0.5F, -0.5F); @@ -62,20 +62,20 @@ public class RenderTileSpreader extends TileEntityRenderer { b = (color & 0xFF) / 255F; } - IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(spreader.getBlockState())); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getRenderType(spreader.getBlockState())); IBakedModel bakedModel = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(spreader.getBlockState()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, spreader.getBlockState(), + .renderModelBrightnessColor(ms.getLast(), buffer, spreader.getBlockState(), bakedModel, r, g, b, light, overlay); ms.push(); ms.translate(0.5, 0.5, 0.5); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((float) time % 360)); + ms.rotate(Vector3f.YP.rotationDegrees((float) time % 360)); ms.translate(-0.5, -0.5, -0.5); ms.translate(0F, (float) Math.sin(time / 20.0) * 0.05F, 0F); IBakedModel cube = getInsideModel(spreader); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, spreader.getBlockState(), + .renderModelBrightnessColor(ms.getLast(), buffer, spreader.getBlockState(), cube, 1, 1, 1, light, overlay); ms.pop(); @@ -85,8 +85,8 @@ public class RenderTileSpreader extends TileEntityRenderer { if (!stack.isEmpty()) { ms.push(); ms.translate(0.0F, -1F, -0.4675F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + ms.rotate(Vector3f.ZP.rotationDegrees(180)); + ms.rotate(Vector3f.XP.rotationDegrees(180)); ms.scale(1.0F, 1.0F, 1.0F); Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, overlay, ms, buffers); ms.pop(); @@ -95,42 +95,42 @@ public class RenderTileSpreader extends TileEntityRenderer { if (spreader.paddingColor != null) { BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).get().getDefaultState(); IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(carpet); - buffer = buffers.getBuffer(RenderTypeLookup.getEntityBlockLayer(carpet)); + buffer = buffers.getBuffer(RenderTypeLookup.getRenderType(carpet)); float f = 1 / 16F; // back ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90)); + ms.rotate(Vector3f.XP.rotationDegrees(90)); ms.translate(-0.5F, 0.5F - f, 0.5F); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, carpet, model, 1, 1, 1, light, overlay); ms.pop(); // left ms.push(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-90)); + ms.rotate(Vector3f.ZP.rotationDegrees(-90)); ms.translate(0.5F, 0.5F, -0.5F - f); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, carpet, model, 1, 1, 1, light, overlay); ms.pop(); // right ms.push(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(90)); + ms.rotate(Vector3f.ZP.rotationDegrees(90)); ms.translate(-1.5F, 0.5F, -0.5F - f); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, carpet, model, 1, 1, 1, light, overlay); ms.pop(); // top ms.push(); ms.translate(-0.5F, -0.5F, -0.5F - f); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, carpet, model, 1, 1, 1, light, overlay); ms.pop(); // bottom ms.push(); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); + ms.rotate(Vector3f.YP.rotationDegrees(180)); ms.translate(-0.5F, -1.5F - f, -0.5F + f); - Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffer, carpet, model, 1, 1, 1, light, overlay); ms.pop(); } 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 505c56e4f..aaf67ea11 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -40,10 +40,10 @@ public class RenderTileStarfield extends TileEntityRenderer { public void render(TileStarfield p_225616_1_, float p_225616_2_, MatrixStack p_225616_3_, IRenderTypeBuffer p_225616_4_, int p_225616_5_, int p_225616_6_) { RANDOM.setSeed(31100L); - double d0 = p_225616_1_.getPos().distanceSq(this.dispatcher.renderInfo.getProjectedView(), true); + double d0 = p_225616_1_.getPos().distanceSq(this.renderDispatcher.renderInfo.getProjectedView(), true); int i = this.getPasses(d0); float f = this.getOffset(); - Matrix4f matrix4f = p_225616_3_.peek().getModel(); + Matrix4f matrix4f = p_225616_3_.getLast().getMatrix(); this.func_228883_a_(p_225616_1_, f, 0.15F, matrix4f, p_225616_4_.getBuffer(field_228881_e_.get(0))); for (int j = 1; j < i; ++j) { @@ -73,10 +73,10 @@ public class RenderTileStarfield extends TileEntityRenderer { private void func_228884_a_(TileStarfield p_228884_1_, Matrix4f p_228884_2_, IVertexBuilder p_228884_3_, float p_228884_4_, float p_228884_5_, float p_228884_6_, float p_228884_7_, float p_228884_8_, float p_228884_9_, float p_228884_10_, float p_228884_11_, float p_228884_12_, float p_228884_13_, float p_228884_14_, Direction p_228884_15_) { if (p_228884_15_ == Direction.UP) { // Botania: up face only - p_228884_3_.vertex(p_228884_2_, p_228884_4_, p_228884_6_, p_228884_8_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); - p_228884_3_.vertex(p_228884_2_, p_228884_5_, p_228884_6_, p_228884_9_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); - p_228884_3_.vertex(p_228884_2_, p_228884_5_, p_228884_7_, p_228884_10_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); - p_228884_3_.vertex(p_228884_2_, p_228884_4_, p_228884_7_, p_228884_11_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); + p_228884_3_.pos(p_228884_2_, p_228884_4_, p_228884_6_, p_228884_8_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); + p_228884_3_.pos(p_228884_2_, p_228884_5_, p_228884_6_, p_228884_9_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); + p_228884_3_.pos(p_228884_2_, p_228884_5_, p_228884_7_, p_228884_10_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); + p_228884_3_.pos(p_228884_2_, p_228884_4_, p_228884_7_, p_228884_11_).color(p_228884_12_, p_228884_13_, p_228884_14_, 1.0F).endVertex(); } } 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 8a9bcddf6..060808237 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -36,7 +36,7 @@ public class RenderTileTerraPlate extends TileEntityRenderer { float alphaMod = Math.min(max, plate.getCurrentMana()) / max; ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.XP.rotationDegrees(90F)); ms.translate(0F, 0F, -3F / 16F - 0.001F); float alpha = (float) ((Math.sin((ClientTickHandler.ticksInGame + f) / 8D) + 1D) / 5D + 0.6D) * alphaMod; 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 7cfda9b67..35fc1df2d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java @@ -40,7 +40,7 @@ public class RenderTileTeruTeruBozu extends TileEntityRenderer @Override public void render(@Nullable TileTeruTeruBozu tileentity, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + ms.rotate(Vector3f.XP.rotationDegrees(180)); double time = Botania.proxy.getWorldElapsedTicks() + partialTicks; boolean hasWorld = tileentity != null && tileentity.getWorld() != null; if (hasWorld) { @@ -49,13 +49,13 @@ public class RenderTileTeruTeruBozu extends TileEntityRenderer ms.translate(0.5F, -1.25F + (hasWorld ? (float) Math.sin(time * 0.01F) * 0.05F : 0F), -0.5F); if (hasWorld) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((float) (time * 0.3))); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(4F * (float) Math.sin(time * 0.05F))); + ms.rotate(Vector3f.YP.rotationDegrees((float) (time * 0.3))); + ms.rotate(Vector3f.ZP.rotationDegrees(4F * (float) Math.sin(time * 0.05F))); float s = 0.75F; ms.scale(s, s, s); } - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(ClientProxy.dootDoot ? textureHalloween : texture)); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(ClientProxy.dootDoot ? textureHalloween : texture)); model.render(ms, buffer, light, overlay, 1, 1, 1, 1); ms.pop(); } 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 18d64773e..93db805d9 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -60,7 +60,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { public RenderTileTinyPotato(TileEntityRendererDispatcher manager) { super(manager); - potatoModel.addCuboid(0F, 0F, 0F, 4, 6, 4); + potatoModel.addBox(0F, 0F, 0F, 4, 6, 4); potatoModel.setRotationPoint(-2F, 18F, -2F); potatoModel.setTextureSize(64, 32); } @@ -135,7 +135,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { rotY = 90F; break; } - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotY)); + ms.rotate(Vector3f.YP.rotationDegrees(rotY)); float jump = potato.jumpTicks; if (jump > 0) { @@ -146,7 +146,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { float rotZ = (float) Math.sin(jump / 10 * Math.PI) * 2; ms.translate(0F, up, 0F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rotZ)); + ms.rotate(Vector3f.ZP.rotationDegrees(rotZ)); ms.push(); float r = 1; @@ -159,7 +159,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { break; case "dinnerbone": case "grumm": - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); ms.translate(0F, -2.625F, 0F); break; case "aureylian": @@ -184,8 +184,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer { MinecraftForge.EVENT_BUS.post(new TinyPotatoRenderEvent(potato, potato.name, partialTicks, ms, buffers, light, overlay)); ms.pop(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-rotZ)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-rotY)); + ms.rotate(Vector3f.ZP.rotationDegrees(-rotZ)); + ms.rotate(Vector3f.YP.rotationDegrees(-rotY)); ms.scale(1F, -1F, -1F); renderName(potato, name, ms, buffers, light); @@ -199,23 +199,23 @@ public class RenderTileTinyPotato extends TileEntityRenderer { && potato.getPos().equals(((BlockRayTraceResult) pos).getPos())) { ms.push(); ms.translate(0F, -0.6F, 0F); - ms.multiply(mc.getRenderManager().getRotation()); + ms.rotate(mc.getRenderManager().getCameraOrientation()); float f1 = 0.016666668F * 1.6F; ms.scale(-f1, -f1, f1); ms.translate(0.0F, 0F / f1, 0.0F); int halfWidth = mc.fontRenderer.getStringWidth(potato.name.getString()) / 2; - float opacity = Minecraft.getInstance().gameSettings.func_216840_a(0.25F); + float opacity = Minecraft.getInstance().gameSettings.getTextBackgroundOpacity(0.25F); int opacityRGB = (int) (opacity * 255.0F) << 24; - mc.fontRenderer.draw(potato.name.getFormattedText(), -halfWidth, 0, 0x20FFFFFF, false, ms.peek().getModel(), buffers, true, opacityRGB, light); - mc.fontRenderer.draw(potato.name.getFormattedText(), -halfWidth, 0, 0xFFFFFFFF, false, ms.peek().getModel(), buffers, false, 0, light); + mc.fontRenderer.renderString(potato.name.getFormattedText(), -halfWidth, 0, 0x20FFFFFF, false, ms.getLast().getMatrix(), buffers, true, opacityRGB, light); + mc.fontRenderer.renderString(potato.name.getFormattedText(), -halfWidth, 0, 0xFFFFFFFF, false, ms.getLast().getMatrix(), buffers, false, 0, light); if (name.equals("pahimar") || name.equals("soaryn")) { ms.translate(0F, 14F, 0F); String str = name.equals("pahimar") ? "[WIP]" : "(soon)"; halfWidth = mc.fontRenderer.getStringWidth(str) / 2; - mc.fontRenderer.draw(str, -halfWidth, 0, 0x20FFFFFF, false, ms.peek().getModel(), buffers, true, opacityRGB, light); - mc.fontRenderer.draw(str, -halfWidth, 0, 0xFFFFFFFF, false, ms.peek().getModel(), buffers, true, 0, light); + mc.fontRenderer.renderString(str, -halfWidth, 0, 0x20FFFFFF, false, ms.getLast().getMatrix(), buffers, true, opacityRGB, light); + mc.fontRenderer.renderString(str, -halfWidth, 0, 0xFFFFFFFF, false, ms.getLast().getMatrix(), buffers, true, 0, light); } ms.pop(); @@ -224,7 +224,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { private void renderItems(TileTinyPotato potato, Direction facing, String name, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) { ms.push(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); ms.translate(0F, -1F, 0F); float s = 1F / 3.5F; ms.scale(s, s, s); @@ -284,7 +284,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } else if (block) { ms.translate(-0.4F, 0.8F, 0F); } else { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); } ms.translate(-0.3F, -1.9F, 0.04F); break; @@ -294,7 +294,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } else if (block) { ms.translate(1F, 0.8F, 1F); } else { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); } ms.translate(-0.3F, -1.9F, -0.92F); break; @@ -306,7 +306,7 @@ public class RenderTileTinyPotato extends TileEntityRenderer { ms.scale(0.5F, 0.5F, 0.5F); } if (block && side == Direction.NORTH) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); } renderItem(ms, buffers, light, overlay, stack); ms.pop(); @@ -323,39 +323,39 @@ public class RenderTileTinyPotato extends TileEntityRenderer { if (name.equals("phi") || name.equals("vazkii")) { ms.push(); ms.translate(-0.15, 0.1, 0.4); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); - ms.multiply(new Vector3f(1, 0, 1).getDegreesQuaternion(20)); + ms.rotate(Vector3f.YP.rotationDegrees(90F)); + ms.rotate(new Vector3f(1, 0, 1).rotationDegrees(20)); renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.phiFlowerModel); ms.pop(); if (name.equals("vazkii")) { ms.scale(1.25F, 1.25F, 1.25F); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.XP.rotationDegrees(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.translate(0.2, -1.25, 0); renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.nerfBatModel); } } else if (name.equals("haighyorkie")) { ms.scale(1.25F, 1.25F, 1.25F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.translate(-0.5F, -1.2F, -0.075F); renderModel(ms, buffers, light, overlay, MiscellaneousIcons.INSTANCE.goldfishModel); } else if (name.equals("martysgames") || name.equals("marty")) { ms.scale(0.7F, 0.7F, 0.7F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(180F)); ms.translate(-0.3F, -2.7F, -1.2F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(15F)); + ms.rotate(Vector3f.ZP.rotationDegrees(15F)); renderItem(ms, buffers, light, overlay, new ItemStack(ModItems.infiniteFruit, 1).setDisplayName(new StringTextComponent("das boot"))); } else if (name.equals("jibril")) { ms.scale(1.5F, 1.5F, 1.5F); ms.translate(0F, -0.8F, 0F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90)); + ms.rotate(Vector3f.YP.rotationDegrees(90)); ItemFlightTiara.renderHalo(null, ms, buffers, partialTicks); } else if (name.equals("kingdaddydmac")) { ms.scale(0.5F, 0.5F, 0.5F); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90)); + ms.rotate(Vector3f.ZP.rotationDegrees(180)); + ms.rotate(Vector3f.YP.rotationDegrees(90)); ms.push(); ms.translate(0F, -2.5F, 0.65F); ItemStack ring = new ItemStack(ModItems.manaRing); @@ -369,8 +369,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } else { ItemStack icon = ContributorFancinessHandler.getFlower(name); if (!icon.isEmpty()) { - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); + ms.rotate(Vector3f.XP.rotationDegrees(180)); + ms.rotate(Vector3f.YP.rotationDegrees(180)); ms.translate(0, -0.75, -0.5); RenderHelper.renderItemModelGold(null, icon, ItemCameraTransforms.TransformType.HEAD, ms, buffers, null, light, overlay); } @@ -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().render(ms.peek(), buffers.getBuffer(Atlases.getEntityTranslucent()), null, model, 1, 1, 1, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().renderModelBrightnessColor(ms.getLast(), buffers.getBuffer(Atlases.getTranslucentBlockType()), null, model, 1, 1, 1, light, overlay); } private void renderItem(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, ItemStack stack) { @@ -388,6 +388,6 @@ public class RenderTileTinyPotato extends TileEntityRenderer { } private void renderBlock(MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay, Block block) { - Minecraft.getInstance().getBlockRendererDispatcher().renderBlockAsEntity(block.getDefaultState(), ms, buffers, light, overlay); + Minecraft.getInstance().getBlockRendererDispatcher().renderBlock(block.getDefaultState(), ms, buffers, light, overlay); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 42f1dbacf..c3737695c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -59,7 +59,7 @@ public class BlockAltGrass extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack held = player.getHeldItem(hand); if (held.getItem() instanceof HoeItem && world.isAirBlock(pos.up())) { held.damageItem(1, player, e -> e.sendBreakAnimation(hand)); @@ -71,7 +71,7 @@ public class BlockAltGrass extends BlockMod { } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { if (!world.isRemote && state.getBlock() == this && world.getLight(pos.up()) >= 9) { for (int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 7b5fbbbd0..0e50d42a1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -99,7 +99,7 @@ public class BlockAltar extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileAltar tile = (TileAltar) world.getTileEntity(pos); ItemStack stack = player.getHeldItem(hand); if (player.isSneaking()) { diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 83f744efe..d5eb1388c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -47,7 +47,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - public ActionResultType onUse(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World worldIn, BlockPos pos, PlayerEntity playerIn, Hand hand, BlockRayTraceResult hit) { if (hand == Hand.MAIN_HAND && playerIn.isSneaking() && playerIn.getHeldItem(hand).isEmpty()) { ((TileAnimatedTorch) worldIn.getTileEntity(pos)).handRotate(); return ActionResultType.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 3296113f9..71791d2a5 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -64,7 +64,7 @@ public class BlockAvatar extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); ItemStack stackOnPlayer = player.getHeldItem(hand); diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 8ef88af67..16706054a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -68,7 +68,7 @@ public class BlockCocoon extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); return addStack(world, pos, stack, player.abilities.isCreativeMode); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java index 0b97fdb3a..2e4a86dcb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockCraftyCrate.java @@ -55,8 +55,8 @@ public class BlockCraftyCrate extends BlockOpenCrate implements IWandHUD { int width = 52; int height = 52; - int xc = mc.getWindow().getScaledWidth() / 2 + 20; - int yc = mc.getWindow().getScaledHeight() / 2 - height / 2; + int xc = mc.getMainWindow().getScaledWidth() / 2 + 20; + int yc = mc.getMainWindow().getScaledHeight() / 2 - height / 2; AbstractGui.fill(xc - 6, yc - 6, xc + width + 6, yc + height + 6, 0x22000000); AbstractGui.fill(xc - 4, yc - 4, xc + width + 4, yc + height + 4, 0x22000000); diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 7ac6116d5..2f085f05c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -43,7 +43,7 @@ public class BlockFakeAir extends AirBlock { } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { if (shouldRemove(world, pos)) { world.setBlockState(pos, rand.nextInt(10) == 0 ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 2af6a548d..45ff8a3cb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -106,12 +106,12 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ActionResultType tileResult = ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, hit); - if (tileResult.isAccepted()) { + if (tileResult.isSuccessOrConsume()) { return tileResult; } else { - return super.onUse(state, world, pos, player, hand, hit); + return super.onBlockActivated(state, world, pos, player, hand, hit); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 96b737c20..811042ab0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -68,7 +68,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); ItemStack stack = player.getHeldItem(hand); @@ -114,7 +114,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { if (state.get(BlockStateProperties.POWERED)) { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 716263ec6..d54ea328f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -49,7 +49,7 @@ public class BlockIncensePlate extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); ItemStack stack = player.getHeldItem(hand); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 1ed80742b..0c6316fcc 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -59,7 +59,7 @@ public class BlockLightRelay extends BlockMod implements IWandable { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ((TileLightRelay) world.getTileEntity(pos)).mountEntity(player); return ActionResultType.SUCCESS; } @@ -81,7 +81,7 @@ public class BlockLightRelay extends BlockMod implements IWandable { } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index f91096836..07482b7d4 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -58,8 +58,8 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision if (variant == Variant.INFRANGIBLE || variant == Variant.ABSTRUSE && e != null - && e.getY() > pos.getY() + 0.9 - && !context.isDescending()) { + && e.getPosY() > pos.getY() + 0.9 + && !context.func_225581_b_()) { return super.getCollisionShape(state, world, pos, context); } else { return VoxelShapes.empty(); @@ -99,7 +99,7 @@ public class BlockPlatform extends BlockMod implements IWandable, IManaCollision @Nonnull @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEntity tile = world.getTileEntity(pos); ItemStack currentStack = player.getHeldItem(hand); if (!currentStack.isEmpty() diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index a2aca5ba0..5c957e738 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -32,7 +32,7 @@ public class BlockSolidVines extends VineBlock { } @Override - public void scheduledTick(@Nonnull BlockState state, ServerWorld world, @Nonnull BlockPos pos, @Nonnull Random rand) {} + public void tick(@Nonnull BlockState state, ServerWorld world, @Nonnull BlockPos pos, @Nonnull Random rand) {} @Override public boolean isShearable(ItemStack item, IWorldReader world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index 314968bb2..4b50a9dd1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -66,7 +66,7 @@ public class BlockSparkChanger extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack pstack = player.getHeldItem(hand); ItemStack cstack = changer.getItemHandler().getStackInSlot(0); diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 06d68e127..93f88b526 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -142,7 +142,7 @@ public class BlockSpecialFlower extends FlowerBlock implements IWandable, IWandH } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { return ((TileEntitySpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, hit); } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 8ae3ac041..d36a2967a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -55,7 +55,7 @@ public class BlockTeruTeruBozu extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); if (!stack.isEmpty() && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { if (!player.abilities.isCreativeMode) { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 961015010..15fbdd420 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -468,8 +468,8 @@ public final class ModBlocks { register(r, new BlockMod(builder.lightValue(12)), LibBlockNames.DREAM_WOOD_GLIMMERING); register(r, new BlockConjurationCatalyst(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.CONJURATION_CATALYST); - register(r, new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).nonOpaque()), LibBlockNames.BIFROST); - register(r, new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).nonOpaque()), LibBlockNames.SOLID_VINE); + register(r, new BlockBifrost(Block.Properties.create(Material.GLASS).hardnessAndResistance(-1, 0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()), LibBlockNames.BIFROST); + register(r, new BlockSolidVines(Block.Properties.create(Material.TALL_PLANTS).hardnessAndResistance(0.2F).sound(SoundType.PLANT).notSolid()), LibBlockNames.SOLID_VINE); builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(4); for (DyeColor color : DyeColor.values()) { @@ -492,9 +492,9 @@ public final class ModBlocks { register(r, new BlockEnderEye(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.ENDER_EYE_BLOCK); register(r, new BlockStarfield(Block.Properties.create(Material.IRON).hardnessAndResistance(5, 2000).sound(SoundType.METAL)), LibBlockNames.STARFIELD); register(r, new BlockRFGenerator(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.FLUXFIELD); - register(r, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).nonOpaque()), LibBlockNames.ELF_GLASS); + register(r, new BlockElfGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).notSolid()), LibBlockNames.ELF_GLASS); register(r, new BlockBrewery(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)), LibBlockNames.BREWERY); - register(r, new BlockModGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).nonOpaque()), LibBlockNames.MANA_GLASS); + register(r, new BlockModGlass(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).notSolid()), LibBlockNames.MANA_GLASS); register(r, new BlockTerraPlate(Block.Properties.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL)), LibBlockNames.TERRA_PLATE); builder = Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); @@ -513,7 +513,7 @@ public final class ModBlocks { register(r, new BlockPetalBlock(color, builder), color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX); } - register(r, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).nonOpaque()), LibBlockNames.CORPOREA_INDEX); + register(r, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).notSolid()), LibBlockNames.CORPOREA_INDEX); register(r, new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_FUNNEL); builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3); @@ -550,7 +550,7 @@ public final class ModBlocks { register(r, new BlockManaBomb(Block.Properties.create(Material.WOOD).hardnessAndResistance(12).sound(SoundType.WOOD)), LibBlockNames.MANA_BOMB); register(r, new BlockCacophonium(Block.Properties.create(Material.WOOD).hardnessAndResistance(0.8F)), LibBlockNames.CACOPHONIUM); register(r, new BlockBellows(Block.Properties.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)), LibBlockNames.BELLOWS); - register(r, new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).nonOpaque()), LibBlockNames.BIFROST_PERM); + register(r, new BlockBifrostPerm(Block.Properties.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS).notSolid()), LibBlockNames.BIFROST_PERM); register(r, new BlockCell(Block.Properties.create(Material.GOURD).sound(SoundType.CLOTH)), LibBlockNames.CELL_BLOCK); register(r, new BlockGaiaHeadWall(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)), LibBlockNames.GAIA_WALL_HEAD); register(r, new BlockGaiaHead(Block.Properties.create(Material.MISCELLANEOUS).hardnessAndResistance(1)), LibBlockNames.GAIA_HEAD); @@ -565,7 +565,7 @@ public final class ModBlocks { register(r, new BlockAltGrass(v, builder), v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX); } - register(r, new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).nonOpaque()), LibBlockNames.ANIMATED_TORCH); + register(r, new BlockAnimatedTorch(Block.Properties.create(Material.MISCELLANEOUS).lightValue(7).notSolid()), LibBlockNames.ANIMATED_TORCH); } @SubscribeEvent diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index a6da83b39..9aaf0ccfa 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -54,7 +54,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements IWand } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); if (!stack.isEmpty()) { if (stack.getItem() == ModItems.twigWand && player.isSneaking()) { 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 f38511700..1116667d4 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java @@ -38,7 +38,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase { } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random rand) { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index 196bbcb87..c606ee987 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -78,7 +78,7 @@ public class BlockFloatingFlower extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); TileEntity te = world.getTileEntity(pos); if (!stack.isEmpty() && te != null && te.getCapability(TileEntitySpecialFlower.FLOATING_FLOWER_CAP).isPresent()) { 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 e90543e6c..10d49ab4d 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -52,7 +52,7 @@ public class BlockManaFlame extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + 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))) { diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index b326011fa..173485ad6 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -51,7 +51,7 @@ public class BlockModMushroom extends MushroomBlock implements IHornHarvestable, } @Override - public void scheduledTick(@Nonnull BlockState state, @Nonnull ServerWorld world, @Nonnull BlockPos pos, Random rand) {} // Prevent spreading + public void tick(@Nonnull BlockState state, @Nonnull ServerWorld world, @Nonnull BlockPos pos, Random rand) {} // Prevent spreading // [VanillaCopy] super, without light level requirement @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index a9fd2a127..37494b786 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -70,7 +70,7 @@ public class BlockTinyPotato extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEntity tile = world.getTileEntity(pos); if (tile instanceof TileTinyPotato) { ((TileTinyPotato) tile).interact(player, hand, player.getHeldItem(hand), hit.getFace()); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 75892df66..81e4b550a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -58,7 +58,7 @@ public class BlockBellows extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (EntityDoppleganger.isTruePlayer(player)) { ((TileBellows) world.getTileEntity(pos)).interact(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index bf47e0d61..d6ccf5b33 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -57,7 +57,7 @@ public class BlockBrewery extends BlockMod implements IWandHUD { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileBrewery brew = (TileBrewery) world.getTileEntity(pos); if (player.isSneaking()) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 9491fd8bb..0c8a3a6be 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -61,7 +61,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, IWandHUD { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); ItemStack stack = player.getHeldItem(hand); if (!stack.isEmpty() && stack.getItem() == ModItems.twigWand) { diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index f5316cbf1..81db1dfb0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -59,7 +59,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, IManaCollision } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TilePrism)) { return ActionResultType.PASS; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index 700853534..844574a82 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -51,7 +51,7 @@ public class BlockRuneAltar extends BlockMod implements IWandable { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { if (world.isRemote) { return ActionResultType.SUCCESS; } 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 5559dc1f7..6b9c72326 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -127,7 +127,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, IWir } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { TileEntity tile = world.getTileEntity(pos); if (!(tile instanceof TileSpreader)) { return ActionResultType.PASS; 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 06bd2c21e..225d19e3c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -45,7 +45,7 @@ public class BlockTerraPlate extends BlockMod { } @Override - public ActionResultType onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { + public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) { ItemStack stack = player.getHeldItem(hand); if (!stack.isEmpty() && (stack.getItem() == ModItems.manaSteel || stack.getItem() == ModItems.manaPearl || stack.getItem() == ModItems.manaDiamond)) { 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 eaa93fc24..bc530ae96 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringInterceptor.java @@ -59,7 +59,7 @@ public class BlockRedStringInterceptor extends BlockRedString { } @Override - public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random update) { + public void tick(BlockState state, ServerWorld world, BlockPos pos, Random update) { world.setBlockState(pos, state.with(BlockStateProperties.POWERED, false)); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 3578c194e..2c212f5e4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -244,8 +244,8 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { int color = getColor(); String filter = I18n.format("botaniamisc.filter" + filterType); - int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2; - int y = mc.getWindow().getScaledHeight() / 2 + 30; + int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2; + int y = mc.getMainWindow().getScaledHeight() / 2 + 30; mc.fontRenderer.drawStringWithShadow(filter, x, y, color); RenderSystem.disableLighting(); 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 0558906ca..1fcc631d1 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 @@ -94,7 +94,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { if (pos.getY() >= 254) { return; } - } while (world.getBlockState(pos).canSuffocate(world, pos)); + } while (world.getBlockState(pos).isSuffocating(world, pos)); pos = pos.up(); double x = pos.getX() + Math.random(); @@ -205,7 +205,7 @@ public class SubTileLoonuim extends TileEntityFunctionalFlower { CompoundNBT cmp = e.getPersistentData().getCompound(TAG_ITEMSTACK_TO_DROP); ItemStack stack = ItemStack.read(cmp); event.getDrops().clear(); - event.getDrops().add(new ItemEntity(e.world, e.getX(), e.getY(), e.getZ(), stack)); + event.getDrops().add(new ItemEntity(e.world, e.getPosX(), e.getPosY(), e.getPosZ(), stack)); } } } 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 d98e35bfe..8c2ee80b9 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 @@ -154,8 +154,8 @@ public class SubTileRannuncarpus extends TileEntityFunctionalFlower { if (!recieverStack.isEmpty()) { ITextComponent stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2; - int x = mc.getWindow().getScaledWidth() / 2 - width; - int y = mc.getWindow().getScaledHeight() / 2 + 30; + 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.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index a22c6f1b6..982ce2fa4 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -55,7 +55,7 @@ public class SubTileSolegnolia extends TileEntityFunctionalFlower { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) .filter(f -> f.getWorld() == e.world) - .anyMatch(f -> f.getEffectivePos().distanceSq(e.getX(), e.getY(), e.getZ(), false) <= f.getRange() * f.getRange()); + .anyMatch(f -> f.getEffectivePos().distanceSq(e.getPosX(), e.getPosY(), e.getPosZ(), false) <= f.getRange() * f.getRange()); } @Override 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 9073d7318..d4ddb9ce4 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 @@ -96,7 +96,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.getX(), item.getY(), item.getZ(), item.getEntityId(), p)); + PacketHandler.sendToNearby(item.world, new BlockPos(item), 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/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 054f85374..cddc3815a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -55,9 +55,9 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { continue; } - double x2 = entity.getX(); - double y2 = entity.getY(); - double z2 = entity.getZ(); + double x2 = entity.getPosX(); + double y2 = entity.getPosY(); + double z2 = entity.getPosZ(); float distance = MathHelper.pointDistanceSpace(x1, y1, z1, x2, y2, z2); 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 1864dc8ab..a8c62c774 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 @@ -92,8 +92,8 @@ public class SubTileEndoflame extends TileEntityGeneratingFlower { if (event == START_BURN_EVENT) { Entity e = getWorld().getEntityByID(param); if (e != null) { - e.world.addParticle(ParticleTypes.LARGE_SMOKE, e.getX(), e.getY() + 0.1, e.getZ(), 0.0D, 0.0D, 0.0D); - e.world.addParticle(ParticleTypes.FLAME, e.getX(), e.getY(), e.getZ(), 0.0D, 0.0D, 0.0D); + e.world.addParticle(ParticleTypes.LARGE_SMOKE, e.getPosX(), e.getPosY() + 0.1, e.getPosZ(), 0.0D, 0.0D, 0.0D); + e.world.addParticle(ParticleTypes.FLAME, e.getPosX(), e.getPosY(), e.getPosZ(), 0.0D, 0.0D, 0.0D); } return true; } else { 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 5a857d96a..e1179a74e 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 @@ -64,10 +64,10 @@ public class SubTileEntropinnyum extends TileEntityGeneratingFlower { for (int i = 0; i < 50; i++) { SparkleParticleData data = SparkleParticleData.sparkle((float) (Math.random() * 0.65F + 1.25F), 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 12); - world.addParticle(data, e.getX() + Math.random() * 4 - 2, e.getY() + Math.random() * 4 - 2, e.getZ() + Math.random() * 4 - 2, 0, 0, 0); + world.addParticle(data, e.getPosX() + Math.random() * 4 - 2, e.getPosY() + Math.random() * 4 - 2, e.getPosZ() + Math.random() * 4 - 2, 0, 0, 0); } - getWorld().addParticle(ParticleTypes.EXPLOSION_EMITTER, e.getX(), e.getY(), e.getZ(), 1D, 0D, 0D); + getWorld().addParticle(ParticleTypes.EXPLOSION_EMITTER, e.getPosX(), e.getPosY(), e.getPosZ(), 1D, 0D, 0D); } return true; } else { 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 1eca8a8ec..2d1c28077 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 @@ -99,7 +99,7 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower { cooldown = val * 10; item.playSound(SoundEvents.ENTITY_GENERIC_EAT, 0.2F, 0.6F); sync(); - ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, stack), item.getX(), item.getY(), item.getZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, stack), item.getPosX(), item.getPosY(), item.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); } item.remove(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 25fe6c23f..1825567f5 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -67,7 +67,7 @@ public class SubTileNarslimmus extends TileEntityGeneratingFlower { float f2 = MathHelper.sin(f) * size * 0.5F * f1; float f3 = MathHelper.cos(f) * size * 0.5F * f1; float f4 = slime.world.rand.nextFloat() * size * 0.5F * f1; - slime.world.addParticle(ParticleTypes.ITEM_SLIME, slime.getX() + f2, slime.getBoundingBox().minY + f4, slime.getZ() + f3, 0.0D, 0.0D, 0.0D); + slime.world.addParticle(ParticleTypes.ITEM_SLIME, slime.getPosX() + f2, slime.getBoundingBox().minY + f4, slime.getPosZ() + f3, 0.0D, 0.0D, 0.0D); } break; } 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 5b0c68b3f..f72520679 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 @@ -81,9 +81,9 @@ public class SubTileShulkMeNot extends TileEntityGeneratingFlower { if (world instanceof ServerWorld) { ServerWorld ws = (ServerWorld) world; ws.spawnParticle(ParticleTypes.EXPLOSION, - entity.getX() + entity.getWidth() / 2, - entity.getY() + entity.getHeight() / 2, - entity.getZ() + entity.getWidth() / 2, + entity.getPosX() + entity.getWidth() / 2, + entity.getPosY() + entity.getHeight() / 2, + entity.getPosZ() + entity.getWidth() / 2, 100, entity.getWidth(), entity.getHeight(), entity.getWidth(), 0.05); ws.spawnParticle(ParticleTypes.PORTAL, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 40, 0, 0, 0, 0.6); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 4406b8079..8be275629 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -81,10 +81,10 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { sheep.playSound(SoundEvents.ENTITY_GENERIC_EAT, 1, 1); ItemStack morbid = new ItemStack(sheep.isBurning() ? Items.COOKED_MUTTON : Items.MUTTON); - ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, morbid), target.getX(), target.getY() + target.getEyeHeight(), target.getZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, morbid), target.getPosX(), target.getPosY() + target.getEyeHeight(), target.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); ItemStack wool = new ItemStack(ColorHelper.WOOL_MAP.get(sheep.getFleeceColor()).get()); - ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, wool), target.getX(), target.getY() + target.getEyeHeight(), target.getZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, wool), target.getPosX(), target.getPosY() + target.getEyeHeight(), target.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); } sheep.setHealth(0); } else if (target instanceof ItemEntity) { @@ -95,7 +95,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { if (expected.asItem() == stack.getItem()) { addManaAndCycle(WOOL_GEN); - ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, stack), target.getX(), target.getY(), target.getZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); + ((ServerWorld) getWorld()).spawnParticle(new ItemParticleData(ParticleTypes.ITEM, stack), target.getPosX(), target.getPosY(), target.getPosZ(), 20, 0.1D, 0.1D, 0.1D, 0.05D); } target.remove(); @@ -136,8 +136,8 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower { if (!stack.isEmpty()) { ITextComponent stackName = stack.getDisplayName(); int width = 16 + mc.fontRenderer.getStringWidth(stackName.getString()) / 2; - int x = mc.getWindow().getScaledWidth() / 2 - width; - int y = mc.getWindow().getScaledHeight() / 2 + 30; + 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.getItemRenderer().renderItemAndEffectIntoGUI(stack, x, y); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 5d6b7ef5b..ea489337e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -238,7 +238,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, } if (didAny) { - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); ServerPlayerEntity mp = (ServerPlayerEntity) player; mp.container.detectAndSendChanges(); } @@ -372,8 +372,8 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary, @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc) { - int xc = mc.getWindow().getScaledWidth() / 2; - int yc = mc.getWindow().getScaledHeight() / 2; + int xc = mc.getMainWindow().getScaledWidth() / 2; + int yc = mc.getMainWindow().getScaledHeight() / 2; float angle = -90; int radius = 24; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 4b5d5dfad..8cccd1e77 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -137,8 +137,8 @@ public class TileAnimatedTorch extends TileMod implements ITickableTileEntity { @OnlyIn(Dist.CLIENT) public void renderHUD(Minecraft mc) { - int x = mc.getWindow().getScaledWidth() / 2 + 10; - int y = mc.getWindow().getScaledHeight() / 2 - 8; + int x = mc.getMainWindow().getScaledWidth() / 2 + 10; + int y = mc.getMainWindow().getScaledHeight() / 2 - 8; mc.getItemRenderer().renderItemAndEffectIntoGUI(new ItemStack(Blocks.REDSTONE_TORCH), x, y); mc.fontRenderer.drawStringWithShadow(I18n.format("botania.animatedTorch." + torchMode.name().toLowerCase()), x + 18, y + 6, 0xFF4444); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index f866709d9..2612a9972 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -263,8 +263,8 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver, I public void renderHUD(Minecraft mc) { int manaToGet = getManaCost(); if (manaToGet > 0) { - int x = mc.getWindow().getScaledWidth() / 2 + 20; - int y = mc.getWindow().getScaledHeight() / 2 - 8; + int x = mc.getMainWindow().getScaledWidth() / 2 + 20; + int y = mc.getMainWindow().getScaledHeight() / 2 - 8; if (recipe == null) { return; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index e83e48b00..43a2f4914 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -506,8 +506,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable, ITickabl @OnlyIn(Dist.CLIENT) public void renderHUD() { if (manaRequired > 0 && !itemToEnchant.isEmpty()) { - int x = Minecraft.getInstance().getWindow().getScaledWidth() / 2 + 20; - int y = Minecraft.getInstance().getWindow().getScaledHeight() / 2 - 8; + int x = Minecraft.getInstance().getMainWindow().getScaledWidth() / 2 + 20; + int y = Minecraft.getInstance().getMainWindow().getScaledHeight() / 2 - 8; RenderHelper.renderProgressPie(x, y, (float) mana / (float) manaRequired, itemToEnchant); } 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 0d2b7c004..b788b20a3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -217,8 +217,8 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE @OnlyIn(Dist.CLIENT) public void renderHUD() { Minecraft mc = Minecraft.getInstance(); - int x = mc.getWindow().getScaledWidth() / 2 + 10; - int y = mc.getWindow().getScaledHeight() / 2 - 10; + int x = mc.getMainWindow().getScaledWidth() / 2 + 10; + int y = mc.getMainWindow().getScaledHeight() / 2 - 10; ItemStack stack = itemHandler.getStackInSlot(0); if (!stack.isEmpty()) { 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 6013418ec..97a1fe77d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -123,9 +123,9 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan List enderPearls = world.getEntitiesWithinAABB(EnderPearlEntity.class, aabb.grow(range)); for (EnderPearlEntity pearl : enderPearls) { pearl.setPositionAndUpdate( - endpoint.getX() + pearl.getX() - pos.getX(), - endpoint.getY() + pearl.getY() - pos.getY(), - endpoint.getZ() + pearl.getZ() - pos.getZ() + endpoint.getX() + pearl.getPosX() - pos.getX(), + endpoint.getY() + pearl.getPosY() - pos.getY(), + endpoint.getZ() + pearl.getPosZ() - pos.getZ() ); } } @@ -311,7 +311,7 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan for (Entity e : getPassengers()) { e.stopRiding(); - e.setPositionAndUpdate(getX(), getY(), getZ()); + e.setPositionAndUpdate(getPosX(), getPosY(), getPosZ()); } remove(); } else { @@ -332,10 +332,10 @@ public class TileLightRelay extends TileMod implements ITickableTileEntity, IWan int g = (color >> 8) & 0xFF; int b = color & 0xFF; SparkleParticleData data = SparkleParticleData.sparkle(1.2F, r / 255F, g / 255F, b / 255F, 10); - world.addParticle(data, getX() + cos * s, getY() - 0.5, getZ() + sin * s, 0, 0, 0); + world.addParticle(data, getPosX() + cos * s, getPosY() - 0.5, getPosZ() + sin * s, 0, 0, 0); } - setPosition(getX() + motVec.x, getY() + motVec.y, getZ() + motVec.z); + setPosition(getPosX() + motVec.x, getPosY() + motVec.y, getPosZ() + motVec.z); } } 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 6162cf369..7870b1d95 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -70,7 +70,7 @@ public class TileOpenCrate extends TileSimpleInventory implements ITickableTileE float width = EntityType.ITEM.getWidth(); float height = EntityType.ITEM.getHeight(); AxisAlignedBB itemBB = new AxisAlignedBB(ejectX - width / 2, ejectY, ejectZ - width / 2, ejectX + width / 2, ejectY + height, ejectZ + width / 2); - return world.doesNotCollide(itemBB); + return world.hasNoCollisions(itemBB); } public void eject(ItemStack stack, boolean redstone) { 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 f7eec9e60..e61dba8b5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -365,8 +365,8 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver, } public void renderHUD(Minecraft mc) { - int xc = mc.getWindow().getScaledWidth() / 2; - int yc = mc.getWindow().getScaledHeight() / 2; + int xc = mc.getMainWindow().getScaledWidth() / 2; + int yc = mc.getMainWindow().getScaledHeight() / 2; float angle = -90; int radius = 24; 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 9d1624bd6..4a50f4912 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -95,7 +95,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable double d0 = j >= 1 ? listnbt.getDouble(0) : (double) blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double) logic.spawnRange + 0.5D; double d1 = j >= 2 ? listnbt.getDouble(1) : (double) (blockpos.getY() + world.rand.nextInt(3) - 1); double d2 = j >= 3 ? listnbt.getDouble(2) : (double) blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double) logic.spawnRange + 0.5D; - if (world.doesNotCollide(optional.get().func_220328_a(d0, d1, d2))) { + if (world.hasNoCollisions(optional.get().func_220328_a(d0, d1, d2))) { Entity entity = EntityType.func_220335_a(compoundnbt, world, (p_221408_6_) -> { p_221408_6_.setLocationAndAngles(d0, d1, d2, p_221408_6_.rotationYaw, p_221408_6_.rotationPitch); return p_221408_6_; @@ -111,10 +111,10 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable return; } - entity.setLocationAndAngles(entity.getX(), entity.getY(), entity.getZ(), world.rand.nextFloat() * 360.0F, 0.0F); + entity.setLocationAndAngles(entity.getPosX(), entity.getPosY(), entity.getPosZ(), world.rand.nextFloat() * 360.0F, 0.0F); if (entity instanceof MobEntity) { MobEntity mobentity = (MobEntity) entity; - if (!net.minecraftforge.event.ForgeEventFactory.canEntitySpawnSpawner(mobentity, world, (float) entity.getX(), (float) entity.getY(), (float) entity.getZ(), logic)) { + if (!net.minecraftforge.event.ForgeEventFactory.canEntitySpawnSpawner(mobentity, world, (float) entity.getPosX(), (float) entity.getPosY(), (float) entity.getPosZ(), logic)) { continue; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 7d5e1b6b5..664f7ed21 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -103,7 +103,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable, ITickab item.setItem(new ItemStack(ModItems.terrasteel)); } } - world.playSound(null, item.getX(), item.getY(), item.getZ(), ModSounds.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); + world.playSound(null, item.getPosX(), item.getPosY(), item.getPosZ(), ModSounds.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); mana = 0; world.updateComparatorOutputLevel(pos, getBlockState().getBlock()); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); 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 df1479a8c..f9e6e70ae 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 @@ -336,7 +336,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.getX(), player.getZ()) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.getY() + (player.world.isRemote ? 0 : 1.6)) < 5; + 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; } public static void addPattern(String pattern, IRegexStacker stacker) { 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 046601c8b..3919b6b14 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 @@ -407,8 +407,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, getCurrentMana(), manaCap, name); - int x = Minecraft.getInstance().getWindow().getScaledWidth() / 2 - 11; - int y = Minecraft.getInstance().getWindow().getScaledHeight() / 2 + 30; + int x = Minecraft.getInstance().getMainWindow().getScaledWidth() / 2 - 11; + int y = Minecraft.getInstance().getMainWindow().getScaledHeight() / 2 + 30; int u = outputting ? 22 : 0; int v = 38; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index 6bd90145a..321bd5ecc 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -563,8 +563,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (!lens.isEmpty()) { String lensName = lens.getDisplayName().getString(); int width = 16 + mc.fontRenderer.getStringWidth(lensName) / 2; - int x = mc.getWindow().getScaledWidth() / 2 - width; - int y = mc.getWindow().getScaledHeight() / 2 + 50; + int x = mc.getMainWindow().getScaledWidth() / 2 - width; + int y = mc.getMainWindow().getScaledHeight() / 2 + 50; mc.fontRenderer.drawStringWithShadow(lensName, x + 20, y + 5, color); mc.getItemRenderer().renderItemAndEffectIntoGUI(lens, x, y); @@ -577,8 +577,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (!recieverStack.isEmpty()) { String stackName = recieverStack.getDisplayName().getString(); int width = 16 + mc.fontRenderer.getStringWidth(stackName) / 2; - int x = mc.getWindow().getScaledWidth() / 2 - width; - int y = mc.getWindow().getScaledHeight() / 2 + 30; + int x = mc.getMainWindow().getScaledWidth() / 2 - width; + int y = mc.getMainWindow().getScaledHeight() / 2 + 30; mc.fontRenderer.drawStringWithShadow(stackName, x + 20, y + 5, color); mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y); @@ -795,9 +795,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if (getIdentifier().equals(expectedIdentity)) { pingbackTicks = TICKS_ALLOWED_WITHOUT_PINGBACK; Entity e = (Entity) burst; - lastPingbackX = e.getX(); - lastPingbackY = e.getY(); - lastPingbackZ = e.getZ(); + lastPingbackX = e.getPosX(); + lastPingbackY = e.getPosY(); + lastPingbackZ = e.getPosZ(); setCanShoot(false); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index a68470101..27cb55c9c 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -95,8 +95,8 @@ public class TileTurntable extends TileMod implements ITickableTileEntity { speed = speed + motion; } - int x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2; - int y = mc.getWindow().getScaledHeight() / 2 - 15; + int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2; + int y = mc.getMainWindow().getScaledHeight() / 2 - 15; mc.fontRenderer.drawStringWithShadow(speed, x, y, color); } 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 bf6d9652b..b676cd190 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -85,7 +85,7 @@ public final class PixieHandler { if (Math.random() < chance) { EntityPixie pixie = new EntityPixie(player.world); - pixie.setPosition(player.getX(), player.getY() + 2, player.getZ()); + pixie.setPosition(player.getPosX(), player.getPosY() + 2, player.getPosZ()); if (((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { pixie.setApplyPotionEffect(new EffectInstance(potions[event.getEntityLiving().world.rand.nextInt(potions.length)], 40, 0)); 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 8f5695a0b..e2a9b7031 100644 --- a/src/main/java/vazkii/botania/common/core/helper/Vector3.java +++ b/src/main/java/vazkii/botania/common/core/helper/Vector3.java @@ -49,11 +49,11 @@ public class Vector3 { } public static Vector3 fromEntity(Entity e) { - return new Vector3(e.getX(), e.getY(), e.getZ()); + return new Vector3(e.getPosX(), e.getPosY(), e.getPosZ()); } public static Vector3 fromEntityCenter(Entity e) { - return new Vector3(e.getX(), e.getY() - e.getYOffset() + e.getHeight() / 2, e.getZ()); + return new Vector3(e.getPosX(), e.getPosY() - e.getYOffset() + e.getHeight() / 2, e.getPosZ()); } public static Vector3 fromTileEntity(TileEntity e) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 78210220f..f3203dc39 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -123,7 +123,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { setChargeTicks(chargeTime + 1); if (world.rand.nextInt(20) == 0) { - world.playSound(null, getX(), getY(), getZ(), ModSounds.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + world.rand.nextFloat() * 3F); + world.playSound(null, getPosX(), getPosY(), getPosZ(), ModSounds.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + world.rand.nextFloat() * 3F); } } else { if (liveTime < delay) { @@ -141,12 +141,12 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { Vector3 motionVec = playerLook.subtract(thisVec).normalize().multiply(2); mot = motionVec.toVec3D(); - world.playSound(null, getX(), getY(), getZ(), ModSounds.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + world.rand.nextFloat() * 3F); + world.playSound(null, getPosX(), getPosY(), getPosZ(), ModSounds.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + world.rand.nextFloat() * 3F); } setLiveTicks(liveTime + 1); if (!world.isRemote) { - AxisAlignedBB axis = new AxisAlignedBB(getX(), getY(), getZ(), lastTickPosX, lastTickPosY, lastTickPosZ).grow(2); + AxisAlignedBB axis = new AxisAlignedBB(getPosX(), getPosY(), getPosZ(), lastTickPosX, lastTickPosY, lastTickPosZ).grow(2); List entities = world.getEntitiesWithinAABB(LivingEntity.class, axis); for (LivingEntity living : entities) { if (living == thrower) { @@ -172,7 +172,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { if (liveTime > delay) { WispParticleData data = WispParticleData.wisp(0.3F, 1F, 1F, 0F, 1); - world.addParticle(data, getX(), getY(), getZ(), 0, -0F, 0); + world.addParticle(data, getPosX(), getPosY(), getPosZ(), 0, -0F, 0); } if (liveTime > 200 + delay) { @@ -184,7 +184,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { protected void onImpact(RayTraceResult pos) { LivingEntity thrower = getThrower(); if (pos.getType() != RayTraceResult.Type.ENTITY || ((EntityRayTraceResult) pos).getEntity() != thrower) { - world.createExplosion(this, getX(), getY(), getZ(), 3F, Explosion.Mode.NONE); + 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 f9639e330..98600aaad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -151,7 +151,7 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa @SuppressWarnings("unchecked") private List getNearbySparks() { - return (List) world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getX() - SCAN_RANGE, getY() - SCAN_RANGE, getZ() - SCAN_RANGE, getX() + SCAN_RANGE, getY() + SCAN_RANGE, getZ() + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); + return (List) world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(getPosX() - SCAN_RANGE, getPosY() - SCAN_RANGE, getPosZ() - SCAN_RANGE, getPosX() + SCAN_RANGE, getPosY() + SCAN_RANGE, getPosZ() + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); } private void restartNetwork() { @@ -201,9 +201,9 @@ public class EntityCorporeaSpark extends EntitySparkBase implements ICorporeaSpa @Override public InvWithLocation getSparkInventory() { - int x = MathHelper.floor(getX()); - int y = MathHelper.floor(getY() - 1); - int z = MathHelper.floor(getZ()); + int x = MathHelper.floor(getPosX()); + int y = MathHelper.floor(getPosY() - 1); + int z = MathHelper.floor(getPosZ()); return InventoryHelper.getInventoryWithLocation(world, new BlockPos(x, y, z), Direction.UP); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 296663772..6c4e6a144 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -439,7 +439,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp } playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - world.addParticle(ParticleTypes.EXPLOSION_EMITTER, getX(), getY(), getZ(), 1D, 0D, 0D); + world.addParticle(ParticleTypes.EXPLOSION_EMITTER, getPosX(), getPosY(), getPosZ(), 1D, 0D, 0D); } @Override @@ -486,7 +486,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp attackingPlayer = player; // Fake attacking player as the killer // Spoof pos so drops spawn at the player - setPosition(player.getX(), player.getY(), player.getZ()); + setPosition(player.getPosX(), player.getPosY(), player.getPosZ()); super.dropLoot(DamageSource.causePlayerDamage(player), wasRecentlyHit); setPosition(savePos.getX(), savePos.getY(), savePos.getZ()); attackingPlayer = saveLastAttacker; @@ -611,7 +611,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp } private void keepInsideArena(PlayerEntity player) { - if (vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.getX(), player.getY(), player.getZ(), source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= ARENA_RANGE) { + if (vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(player.getPosX(), player.getPosY(), player.getPosZ(), source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5) >= ARENA_RANGE) { Vector3 sourceVector = new Vector3(source.getX() + 0.5, source.getY() + 0.5, source.getZ() + 0.5); Vector3 playerVector = Vector3.fromEntityCenter(player); Vector3 motion = sourceVector.subtract(playerVector).normalize(); @@ -645,7 +645,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp for (int j = 0; j < 1 + world.rand.nextInt(hardMode ? 8 : 5); j++) { EntityPixie pixie = new EntityPixie(world); pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); - pixie.setPosition(getX() + getWidth() / 2, getY() + 2, getZ() + getWidth() / 2); + pixie.setPosition(getPosX() + getWidth() / 2, getPosY() + 2, getPosZ() + getWidth() / 2); pixie.onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(pixie)), SpawnReason.MOB_SUMMONED, null, null); world.addEntity(pixie); @@ -660,8 +660,8 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp entity.addPotionEffect(new EffectInstance(Effects.FIRE_RESISTANCE, 600, 0)); } float range = 6F; - entity.setPosition(getX() + 0.5 + Math.random() * range - range / 2, getY() - 1, - getZ() + 0.5 + Math.random() * range - range / 2); + entity.setPosition(getPosX() + 0.5 + Math.random() * range - range / 2, getPosY() - 1, + getPosZ() + 0.5 + Math.random() * range - range / 2); entity.onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(entity)), SpawnReason.MOB_SUMMONED, null, null); if (entity instanceof WitherSkeletonEntity && hardMode) { @@ -698,7 +698,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp remove(); } - smashBlocksAround(MathHelper.floor(getX()), MathHelper.floor(getY()), MathHelper.floor(getZ()), 1); + smashBlocksAround(MathHelper.floor(getPosX()), MathHelper.floor(getPosY()), MathHelper.floor(getPosZ()), 1); List players = getPlayersAround(); @@ -715,7 +715,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp //also see SleepingHandler if (player.isSleeping()) { - player.wakeUp(true, true); + player.func_225652_a_(true, true); } clearPotions(player); @@ -781,7 +781,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp int count = dying && hardMode ? 7 : 6; for (int i = 0; i < count; i++) { int x = source.getX() - 10 + rand.nextInt(20); - int y = (int) players.get(rand.nextInt(players.size())).getY(); + int y = (int) players.get(rand.nextInt(players.size())).getPosY(); int z = source.getZ() - 10 + rand.nextInt(20); EntityMagicLandmine landmine = new EntityMagicLandmine(world); @@ -796,7 +796,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp for (int i = 0; i < (spawnPixies ? world.rand.nextInt(hardMode ? 6 : 3) : 1); i++) { EntityPixie pixie = new EntityPixie(world); pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); - pixie.setPosition(getX() + getWidth() / 2, getY() + 2, getZ() + getWidth() / 2); + pixie.setPosition(getPosX() + getWidth() / 2, getPosY() + 2, getPosZ() + getWidth() / 2); pixie.onInitialSpawn(world, world.getDifficultyForLocation(new BlockPos(pixie)), SpawnReason.MOB_SUMMONED, null, null); world.addEntity(pixie); @@ -849,7 +849,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp private void spawnMissile() { EntityMagicMissile missile = new EntityMagicMissile(this, true); - missile.setPosition(getX() + (Math.random() - 0.5 * 0.1), getY() + 2.4 + (Math.random() - 0.5 * 0.1), getZ() + (Math.random() - 0.5 * 0.1)); + missile.setPosition(getPosX() + (Math.random() - 0.5 * 0.1), getPosY() + 2.4 + (Math.random() - 0.5 * 0.1), getPosZ() + (Math.random() - 0.5 * 0.1)); if (missile.findTarget()) { playSound(ModSounds.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); world.addEntity(missile); @@ -858,7 +858,7 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp private void teleportRandomly() { //choose a location to teleport to - double oldX = getX(), oldY = getY(), oldZ = getZ(); + double oldX = getPosX(), oldY = getPosY(), oldZ = getPosZ(); double newX, newY = source.getY(), newZ; int tries = 0; @@ -996,11 +996,11 @@ public class EntityDoppleganger extends MobEntity implements IEntityAdditionalSp ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, grainIntensity); - GlStateManager.uniform1(grainIntensityUniform, ShaderHelper.FLOAT_BUF); + GlStateManager.uniform1f(grainIntensityUniform, ShaderHelper.FLOAT_BUF); ShaderHelper.FLOAT_BUF.position(0); ShaderHelper.FLOAT_BUF.put(0, getHealth() / getMaxHealth()); - GlStateManager.uniform1(hpFractUniform, ShaderHelper.FLOAT_BUF); + GlStateManager.uniform1f(hpFractUniform, ShaderHelper.FLOAT_BUF); }; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index fd85d661b..029eacdfb 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -60,12 +60,12 @@ public class EntityFallingStar extends EntityThrowableCopy { float xs = (float) (Math.random() - 0.5) * dist; float ys = (float) (Math.random() - 0.5) * dist; float zs = (float) (Math.random() - 0.5) * dist; - world.addParticle(data, getX() + xs, getY() + ys, getZ() + zs, 0, 0, 0); + world.addParticle(data, getPosX() + xs, getPosY() + ys, getPosZ() + zs, 0, 0, 0); } LivingEntity thrower = getThrower(); if (!world.isRemote && thrower != null) { - AxisAlignedBB axis = new AxisAlignedBB(getX(), getY(), getZ(), lastTickPosX, lastTickPosY, lastTickPosZ).grow(2); + AxisAlignedBB axis = new AxisAlignedBB(getPosX(), getPosY(), getPosZ(), lastTickPosX, lastTickPosY, lastTickPosZ).grow(2); List entities = world.getEntitiesWithinAABB(LivingEntity.class, axis); for (LivingEntity living : entities) { if (living == thrower) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 44d79111a..71f0ddaae 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -62,19 +62,19 @@ public class EntityFlameRing extends Entity { double z = Math.sin(rad) * renderRadius; WispParticleData data1 = WispParticleData.wisp(0.65F + (float) Math.random() * 0.45F, 1F, (float) Math.random() * 0.25F, (float) Math.random() * 0.25F); - world.addParticle(data1, getX() + x, getY() - 0.2, getZ() + z, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); + world.addParticle(data1, getPosX() + x, getPosY() - 0.2, getPosZ() + z, (float) (Math.random() - 0.5F) * 0.15F, 0.055F + (float) Math.random() * 0.025F, (float) (Math.random() - 0.5F) * 0.15F); float gs = (float) Math.random() * 0.15F; float smokeRadius = (float) (renderRadius - Math.random() * renderRadius * 0.9); x = Math.cos(rad) * smokeRadius; z = Math.sin(rad) * smokeRadius; WispParticleData data = WispParticleData.wisp(0.65F + (float) Math.random() * 0.45F, gs, gs, gs, 1); - world.addParticle(data, getX() + x, getY() - 0.2, getZ() + z, 0, -(-0.155F - (float) Math.random() * 0.025F), 0); + world.addParticle(data, getPosX() + x, getPosY() - 0.2, getPosZ() + z, 0, -(-0.155F - (float) Math.random() * 0.025F), 0); } } if (world.rand.nextInt(20) == 0) { - world.playSound(getX(), getY(), getZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); + world.playSound(getPosX(), getPosY(), getPosZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); } if (world.isRemote) { @@ -87,7 +87,7 @@ public class EntityFlameRing extends Entity { } if (ticksExisted > 45) { - AxisAlignedBB boundingBox = new AxisAlignedBB(getX(), getY(), getZ(), getX(), getY(), getZ()).grow(radius, radius, radius); + AxisAlignedBB boundingBox = new AxisAlignedBB(getPosX(), getPosY(), getPosZ(), getPosX(), getPosY(), getPosZ()).grow(radius, radius, radius); List entities = world.getEntitiesWithinAABB(LivingEntity.class, boundingBox); if (entities.isEmpty()) { @@ -95,7 +95,7 @@ public class EntityFlameRing extends Entity { } for (LivingEntity entity : entities) { - if (entity == null || MathHelper.pointDistancePlane(getX(), getY(), entity.getX(), entity.getY()) > radius) { + if (entity == null || MathHelper.pointDistancePlane(getPosX(), getPosY(), entity.getPosX(), entity.getPosY()) > radius) { continue; } diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index e34e8232e..640ac0467 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -55,24 +55,24 @@ public class EntityMagicLandmine extends Entity { float g = 0F; float b = 0.2F; - //Botania.proxy.wispFX(world, getX(), getY(), getZ(), r, g, b, 0.6F, -0.2F, 1); + //Botania.proxy.wispFX(world, getPosX(), getPosY(), getPosZ(), r, g, b, 0.6F, -0.2F, 1); for (int i = 0; i < 6; i++) { WispParticleData data = WispParticleData.wisp(0.4F, r, g, b, (float) 1); - world.addParticle(data, getX() - range + Math.random() * range * 2, getY(), getZ() - range + Math.random() * range * 2, 0, - -0.015F, 0); + world.addParticle(data, getPosX() - range + Math.random() * range * 2, getPosY(), getPosZ() - range + Math.random() * range * 2, 0, - -0.015F, 0); } if (ticksExisted >= 55) { - world.playSound(null, getX(), getY(), getZ(), ModSounds.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); + world.playSound(null, getPosX(), getPosY(), getPosZ(), ModSounds.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); float m = 0.35F; g = 0.4F; for (int i = 0; i < 25; i++) { WispParticleData data = WispParticleData.wisp(0.5F, r, g, b); - world.addParticle(data, getX(), getY() + 1, getZ(), (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); + world.addParticle(data, getPosX(), getPosY() + 1, getPosZ(), (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); } if (!world.isRemote) { - List players = world.getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getX() - range, getY() - range, getZ() - range, getX() + range, getY() + range, getZ() + range)); + List players = world.getEntitiesWithinAABB(PlayerEntity.class, new AxisAlignedBB(getPosX() - range, getPosY() - range, getPosZ() - range, getPosX() + range, getPosY() + range, getPosZ() + range)); for (PlayerEntity player : players) { player.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, summoner), 10); player.addPotionEffect(new EffectInstance(Effects.BLINDNESS, 25, 0)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 20eeaee23..b6633a580 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -134,9 +134,9 @@ public class EntityMagicMissile extends ThrowableEntity { LivingEntity target = getTargetEntity(); if (target != null) { if (lockY == -1) { - lockX = target.getX(); - lockY = target.getY(); - lockZ = target.getZ(); + lockX = target.getPosX(); + lockY = target.getPosY(); + lockZ = target.getPosZ(); } Vector3 targetVec = evil ? new Vector3(lockX, lockY, lockZ) : Vector3.fromEntityCenter(target); @@ -147,7 +147,7 @@ public class EntityMagicMissile extends ThrowableEntity { setMotion(getMotion().getX(), Math.abs(getMotion().getY()), getMotion().getZ()); } - List targetList = world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(getX() - 0.5, getY() - 0.5, getZ() - 0.5, getX() + 0.5, getY() + 0.5, getZ() + 0.5)); + 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) { @@ -190,7 +190,7 @@ public class EntityMagicMissile extends ThrowableEntity { } double range = 12; - AxisAlignedBB bounds = new AxisAlignedBB(getX() - range, getY() - range, getZ() - range, getX() + range, getY() + range, getZ() + range); + AxisAlignedBB bounds = new AxisAlignedBB(getPosX() - range, getPosY() - range, getPosZ() - range, getPosX() + range, getPosY() + range, getPosZ() + range); List entities; if (isEvil()) { entities = world.getEntitiesWithinAABB(PlayerEntity.class, bounds); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index bea60a8e9..bd0ef97b9 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -219,9 +219,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { } Vec3d vec3d = this.getMotion(); - double d0 = this.getX() + vec3d.x; - double d1 = this.getY() + vec3d.y; - double d2 = this.getZ() + vec3d.z; + double d0 = this.getPosX() + vec3d.x; + double d1 = this.getPosY() + vec3d.y; + double d2 = this.getPosZ() + vec3d.z; float f = MathHelper.sqrt(horizontalMag(vec3d)); this.rotationYaw = (float) (MathHelper.atan2(vec3d.x, vec3d.z) * (double) (180F / (float) Math.PI)); @@ -463,14 +463,14 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { if (!noParticles && shouldDoFakeParticles()) { SparkleParticleData data = SparkleParticleData.fake(0.4F * size, r, g, b, 1); - Botania.proxy.addParticleForce(world, data, getX(), getY(), getZ(), 0, 0, 0); + Botania.proxy.addParticleForce(world, data, getPosX(), getPosY(), getPosZ(), 0, 0, 0); } } else { boolean depth = !Botania.proxy.isClientPlayerWearingMonocle(); if (ConfigHandler.CLIENT.subtlePowerSystem.get()) { WispParticleData data = WispParticleData.wisp(0.1F * size, r, g, b, depth); - world.addParticle(data, getX(), getY(), getZ(), (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); + world.addParticle(data, getPosX(), getPosY(), getPosZ(), (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.02F, (float) (Math.random() - 0.5F) * 0.01F); } else { float or = r; float og = g; @@ -478,9 +478,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { double luminance = 0.2126 * r + 0.7152 * g + 0.0722 * b; // Standard relative luminance calculation - double iterX = getX(); - double iterY = getY(); - double iterZ = getZ(); + double iterX = getPosX(); + double iterY = getPosY(); + double iterZ = getPosZ(); Vector3 currentPos = Vector3.fromEntity(this); Vector3 oldPos = new Vector3(prevPosX, prevPosY, prevPosZ); @@ -592,11 +592,11 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { if (!ConfigHandler.CLIENT.subtlePowerSystem.get()) { for (int i = 0; i < 4; i++) { WispParticleData data = WispParticleData.wisp(0.15F * size, r, g, b); - world.addParticle(data, getX(), getY(), getZ(), (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); + world.addParticle(data, getPosX(), getPosY(), getPosZ(), (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F, (float) (Math.random() - 0.5F) * 0.04F); } } SparkleParticleData data = SparkleParticleData.sparkle((float) 4, r, g, b, 2); - world.addParticle(data, getX(), getY(), getZ(), 0, 0, 0); + world.addParticle(data, getPosX(), getPosY(), getPosZ(), 0, 0, 0); } remove(); @@ -843,9 +843,9 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst { public boolean invalid = false; public PositionProperties(Entity entity) { - int x = MathHelper.floor(entity.getX()); - int y = MathHelper.floor(entity.getY()); - int z = MathHelper.floor(entity.getZ()); + int x = MathHelper.floor(entity.getPosX()); + int y = MathHelper.floor(entity.getPosY()); + int z = MathHelper.floor(entity.getPosZ()); coords = new BlockPos(x, y, z); state = entity.world.getBlockState(coords); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index 97cece735..d6a3738bd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -66,14 +66,14 @@ public class EntityManaStorm extends Entity { deathTime++; if (deathTime >= DEATH_TIME) { remove(); - world.createExplosion(this, getX(), getY(), getZ(), 8F, true, Explosion.Mode.DESTROY); + world.createExplosion(this, getPosX(), getPosY(), getPosZ(), 8F, true, Explosion.Mode.DESTROY); } } } private void spawnBurst() { EntityManaBurst burst = new EntityManaBurst(world); - burst.setPosition(getX(), getY(), getZ()); + burst.setPosition(getPosX(), getPosY(), getPosZ()); float motionModifier = 0.5F; burst.setColor(0x20FF20); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 141383db5..e7ec3e6ec 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -82,25 +82,25 @@ public class EntityPinkWither extends WitherEntity { private double getHeadX(int p_82214_1_) { if (p_82214_1_ <= 0) { - return this.getX(); + return this.getPosX(); } else { float f = (this.renderYawOffset + (float) (180 * (p_82214_1_ - 1))) * ((float) Math.PI / 180F); float f1 = MathHelper.cos(f); - return this.getX() + (double) f1 * 1.3D; + return this.getPosX() + (double) f1 * 1.3D; } } private double getHeadY(int p_82208_1_) { - return p_82208_1_ <= 0 ? this.getY() + 3.0D : this.getY() + 2.2D; + return p_82208_1_ <= 0 ? this.getPosY() + 3.0D : this.getPosY() + 2.2D; } private double getHeadZ(int p_82213_1_) { if (p_82213_1_ <= 0) { - return this.getZ(); + return this.getPosZ(); } else { float f = (this.renderYawOffset + (float) (180 * (p_82213_1_ - 1))) * ((float) Math.PI / 180F); float f1 = MathHelper.sin(f); - return this.getZ() + (double) f1 * 1.3D; + return this.getPosZ() + (double) f1 * 1.3D; } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index e2593d6c0..e7247dc92 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -85,9 +85,9 @@ public class EntityPixie extends FlyingEntity { protected void updateAITasks() { LivingEntity target = getAttackTarget(); if (target != null) { - double d0 = target.getX() + target.getWidth() / 2 - getX(); - double d1 = target.getY() + target.getHeight() / 2 - getY(); - double d2 = target.getZ() + target.getWidth() / 2 - getZ(); + double d0 = target.getPosX() + target.getWidth() / 2 - getPosX(); + double d1 = target.getPosY() + target.getHeight() / 2 - getPosY(); + double d2 = target.getPosZ() + target.getWidth() / 2 - getPosZ(); double d3 = d0 * d0 + d1 * d1 + d2 * d2; float mod = 0.45F; @@ -142,7 +142,7 @@ public class EntityPixie extends FlyingEntity { float g = dark ? 0.025F : 0.25F; float b = dark ? 0.09F : 0.9F; SparkleParticleData data = SparkleParticleData.sparkle(0.1F + (float) Math.random() * 0.25F, r, g, b, 12); - world.addParticle(data, getX() + (Math.random() - 0.5) * 0.25, getY() + 0.5 + (Math.random() - 0.5) * 0.25, getZ() + (Math.random() - 0.5) * 0.25, 0, 0, 0); + world.addParticle(data, getPosX() + (Math.random() - 0.5) * 0.25, getPosY() + 0.5 + (Math.random() - 0.5) * 0.25, getPosZ() + (Math.random() - 0.5) * 0.25, 0, 0, 0); } } } @@ -152,7 +152,7 @@ public class EntityPixie extends FlyingEntity { if (world != null && world.isRemote && getPixieType() == 0) { for (int i = 0; i < 12; i++) { SparkleParticleData data = SparkleParticleData.sparkle(1F + (float) Math.random() * 0.25F, 1F, 0.25F, 0.9F, 5); - world.addParticle(data, getX() + (Math.random() - 0.5) * 0.25, getY() + 0.5 + (Math.random() - 0.5) * 0.25, getZ() + (Math.random() - 0.5) * 0.25, 0, 0, 0); + world.addParticle(data, getPosX() + (Math.random() - 0.5) * 0.25, getPosY() + 0.5 + (Math.random() - 0.5) * 0.25, getPosZ() + (Math.random() - 0.5) * 0.25, 0, 0, 0); } } super.remove(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index f9baa6220..e54572fe2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -122,9 +122,9 @@ public class EntityPoolMinecart extends AbstractMinecartEntity { float red = (color >> 16 & 0xFF) / 255F; float green = (color >> 8 & 0xFF) / 255F; float blue = (color & 0xFF) / 255F; - double x = MathHelper.floor(getX()); - double y = MathHelper.floor(getY()); - double z = MathHelper.floor(getZ()); + double x = MathHelper.floor(getPosX()); + double y = MathHelper.floor(getPosY()); + double z = MathHelper.floor(getPosZ()); if (Math.random() > particleChance) { WispParticleData data = WispParticleData.wisp((float) Math.random() / 3F, red, green, blue, 2F); world.addParticle(data, x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), 0, (float) Math.random() / 25F, 0); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java index 443cd5ff3..acd6aa6ad 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySignalFlare.java @@ -69,12 +69,12 @@ public class EntitySignalFlare extends Entity { for (int i = 0; i < 3; i++) { WispParticleData data = WispParticleData.wisp((float) Math.random() * 5 + 1F, r / 255F, g / 255F, b / 255F); - Botania.proxy.addParticleForce(world, data, getX(), getY(), getZ() + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) getY())), (float) (Math.random() - 0.5F)); + Botania.proxy.addParticleForce(world, data, getPosX(), getPosY(), getPosZ() + 0.5, (float) (Math.random() - 0.5F), 10F * (float) Math.sqrt(256F / (256F - (float) getPosY())), (float) (Math.random() - 0.5F)); } for (int i = 0; i < 4; i++) { WispParticleData data = WispParticleData.wisp((float) Math.random() * 15 + 8F, r / 255F, g / 255F, b / 255F); - Botania.proxy.addParticleForce(world, data, getX() + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), getZ() + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); + Botania.proxy.addParticleForce(world, data, getPosX() + 0.5, Math.min(256, getFiredAt() + Botania.proxy.getClientRenderDistance() * 16), getPosZ() + 0.5, (float) (Math.random() - 0.5F) * 8F, 0F, (float) (Math.random() - 0.5F) * 8F); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index a12f5ddfc..a1b7addd0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -105,7 +105,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { switch (upgrade) { case DISPERSIVE: { - List players = SparkHelper.getEntitiesAround(PlayerEntity.class, world, getX(), getY() + (getHeight() / 2.0), getZ()); + List players = SparkHelper.getEntitiesAround(PlayerEntity.class, world, getPosX(), getPosY() + (getHeight() / 2.0), getPosZ()); Map> receivingPlayers = new HashMap<>(); @@ -164,7 +164,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { break; } case DOMINANT: { - List validSparks = SparkHelper.getSparksAround(world, getX(), getY() + (getHeight() / 2), getZ(), getNetwork()) + List validSparks = SparkHelper.getSparksAround(world, getPosX(), getPosY() + (getHeight() / 2), getPosZ(), getNetwork()) .filter(s -> { SparkUpgradeType otherUpgrade = s.getUpgrade(); return s != this && otherUpgrade == SparkUpgradeType.NONE && s.getAttachedTile() instanceof IManaPool; @@ -177,7 +177,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { break; } case RECESSIVE: { - SparkHelper.getSparksAround(world, getX(), getY() + (getHeight() / 2), getZ(), getNetwork()) + SparkHelper.getSparksAround(world, getPosX(), getPosY() + (getHeight() / 2), getPosZ(), getNetwork()) .filter(s -> { SparkUpgradeType otherUpgrade = s.getUpgrade(); return s != this @@ -224,14 +224,14 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { private void particlesTowards(Entity e) { PacketHandler.sendToNearby(world, this, - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_MANA_FLOW, getX(), getY(), getZ(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_MANA_FLOW, getPosX(), getPosY(), getPosZ(), getEntityId(), e.getEntityId())); } public static void particleBeam(PlayerEntity player, Entity e1, Entity e2) { if (e1 != null && e2 != null && !e1.world.isRemote) { PacketHandler.sendTo((ServerPlayerEntity) player, - new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.getX(), e1.getY(), e1.getZ(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.getPosX(), e1.getPosY(), e1.getPosZ(), e1.getEntityId(), e2.getEntityId())); } } @@ -272,7 +272,7 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { } return true; } else { - SparkHelper.getSparksAround(world, getX(), getY() + (getHeight() / 2), getZ(), getNetwork()) + SparkHelper.getSparksAround(world, getPosX(), getPosY() + (getHeight() / 2), getPosZ(), getNetwork()) .forEach(s -> particleBeam(player, this, (Entity) s)); return true; } @@ -316,9 +316,9 @@ public class EntitySpark extends EntitySparkBase implements ISparkEntity { @Override public ISparkAttachable getAttachedTile() { - int x = MathHelper.floor(getX()); - int y = MathHelper.floor(getY()) - 1; - int z = MathHelper.floor(getZ()); + int x = MathHelper.floor(getPosX()); + int y = MathHelper.floor(getPosY()) - 1; + int z = MathHelper.floor(getPosZ()); TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); if (tile instanceof ISparkAttachable) { return (ISparkAttachable) tile; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index 6f6af32c8..ae9f94559 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -114,7 +114,7 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte double r = 0.1; double m = 0.1; for (int i = 0; i < 3; i++) { - world.addParticle(ParticleTypes.FLAME, getX() + r * (Math.random() - 0.5), getY() + r * (Math.random() - 0.5), getZ() + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); + world.addParticle(ParticleTypes.FLAME, getPosX() + r * (Math.random() - 0.5), getPosY() + r * (Math.random() - 0.5), getPosZ() + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); } } @@ -134,7 +134,7 @@ public class EntityThornChakram extends ThrowableEntity implements IRendersAsIte private void dropAndKill() { ItemStack stack = getItemStack(); - ItemEntity item = new ItemEntity(world, getX(), getY(), getZ(), stack); + ItemEntity item = new ItemEntity(world, getPosX(), getPosY(), getPosZ(), stack); world.addEntity(item); remove(); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index 93799629b..45e8a4265 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -55,7 +55,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } protected EntityThrowableCopy(EntityType p_i48542_1_, LivingEntity p_i48542_2_, World p_i48542_3_) { - this(p_i48542_1_, p_i48542_2_.getX(), p_i48542_2_.getEyeY() - (double) 0.1F, p_i48542_2_.getZ(), 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(); } @@ -162,9 +162,9 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } Vec3d vec3d = this.getMotion(); - double d0 = this.getX() + vec3d.x; - double d1 = this.getY() + vec3d.y; - double d2 = this.getZ() + vec3d.z; + double d0 = this.getPosX() + vec3d.x; + double d1 = this.getPosY() + vec3d.y; + double d2 = this.getPosZ() + vec3d.z; float f = MathHelper.sqrt(horizontalMag(vec3d)); this.rotationYaw = (float) (MathHelper.atan2(vec3d.x, vec3d.z) * (double) (180F / (float) Math.PI)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 67b2e1061..5f7922dbe 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -111,7 +111,7 @@ public class EntityThrownItem extends ItemEntity { if (!world.isRemote) { Entity item = getItem().getItem().createEntity(world, this, getItem()); if (item == null) { - item = new ItemEntity(world, getX(), getY(), getZ(), getItem()); + item = new ItemEntity(world, getPosX(), getPosY(), getPosZ(), getItem()); world.addEntity(item); } item.setMotion(getMotion().scale(0.25)); @@ -127,7 +127,7 @@ public class EntityThrownItem extends ItemEntity { if (!world.isRemote) { Entity item = getItem().getItem().createEntity(world, this, getItem()); if (item == null) { - item = new ItemEntity(world, getX(), getY(), getZ(), getItem()); + item = new ItemEntity(world, getPosX(), getPosY(), getPosZ(), getItem()); world.addEntity(item); } item.setMotion(getMotion()); diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index 08788eb18..3fb0224c2 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -83,7 +83,7 @@ public class EntityVineBall extends ThrowableEntity implements IRendersAsItem { public void handleStatusUpdate(byte id) { if (id == 3) { for (int j = 0; j < 16; j++) { - world.addParticle(new ItemParticleData(ParticleTypes.ITEM, new ItemStack(ModItems.vineBall)), getX(), getY(), getZ(), Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1); + world.addParticle(new ItemParticleData(ParticleTypes.ITEM, new ItemStack(ModItems.vineBall)), getPosX(), getPosY(), getPosZ(), Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1); } } } diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index 33567cdbc..38d4029b9 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -140,7 +140,7 @@ public class CurioIntegration extends EquipmentHandler { @Override public void playEquipSound(LivingEntity entity) { - entity.world.playSound(null, entity.getX(), entity.getY(), entity.getZ(), ModSounds.equipBauble, entity.getSoundCategory(), 0.1F, 1.3F); + entity.world.playSound(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), ModSounds.equipBauble, entity.getSoundCategory(), 0.1F, 1.3F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 1d7cfe51e..78d435864 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -91,10 +91,10 @@ public class ItemAstrolabe extends Item { ItemsRemainingRenderHandler.send(playerIn, stack, 0, new StringTextComponent(newSize + "x" + newSize)); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } public boolean placeAllBlocks(ItemStack stack, PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 7b515f77a..16334b85c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -90,6 +90,6 @@ public class ItemBaubleBox extends Item { b.writeBoolean(hand == Hand.MAIN_HAND); }); } - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 253c81016..86073fde3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -65,10 +65,10 @@ public class ItemBlackHoleTalisman extends Item implements IBlockProvider { if (getBlock(stack) != null && player.isSneaking()) { ItemNBTHelper.setBoolean(stack, TAG_ACTIVE, !ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)); player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index d5622110a..7034be0d4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -56,7 +56,7 @@ public class ItemBlackLotus extends Item implements IManaDissolvable { pool.receiveMana(t2 ? MANA_PER_T2 : MANA_PER); stack.shrink(1); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.world, tile.getPos()); - PacketHandler.sendToNearby(item.world, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.getX(), tile.getPos().getY() + 0.5, item.getZ())); + PacketHandler.sendToNearby(item.world, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.getPosX(), tile.getPos().getY() + 0.5, item.getPosZ())); } item.playSound(ModSounds.blackLotus, 0.5F, t2 ? 0.1F : 1F); diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 045735916..3b57c00cd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -77,8 +77,8 @@ public class ItemBottledMana extends Item { } case 3: { // Mini Explosion if (!living.world.isRemote) { - living.world.createExplosion(null, living.getX(), living.getY(), - living.getZ(), 0.25F, Explosion.Mode.NONE); + living.world.createExplosion(null, living.getPosX(), living.getPosY(), + living.getPosZ(), 0.25F, Explosion.Mode.NONE); } break; } @@ -127,14 +127,14 @@ public class ItemBottledMana extends Item { break; } case 9: { // Highest Possible - int x = MathHelper.floor(living.getX()); - int z = MathHelper.floor(living.getZ()); + int x = MathHelper.floor(living.getPosX()); + int z = MathHelper.floor(living.getPosZ()); for (int i = 256; i > 0; i--) { Block block = living.world.getBlockState(new BlockPos(x, i, z)).getBlock(); if (!block.isAir(living.world.getBlockState(new BlockPos(x, i, z)), living.world, new BlockPos(x, i, z))) { if (living instanceof ServerPlayerEntity) { ServerPlayerEntity mp = (ServerPlayerEntity) living; - mp.connection.setPlayerLocation(living.getX(), i, living.getZ(), living.rotationYaw, living.rotationPitch); + mp.connection.setPlayerLocation(living.getPosX(), i, living.getPosZ(), living.rotationYaw, living.rotationPitch); } break; } @@ -157,14 +157,14 @@ public class ItemBottledMana extends Item { case 12: { // Flare if (!living.world.isRemote) { EntitySignalFlare flare = new EntitySignalFlare(living.world); - flare.setPosition(living.getX(), living.getY(), living.getZ()); + flare.setPosition(living.getPosX(), living.getPosY(), living.getPosZ()); flare.setColor(living.world.rand.nextInt(16)); flare.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 40F, (1.0F + (living.world.rand.nextFloat() - living.world.rand.nextFloat()) * 0.2F) * 0.7F); living.world.addEntity(flare); int range = 5; - List entities = living.world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(living.getX() - range, living.getY() - range, living.getZ() - range, living.getX() + range, living.getY() + range, living.getZ() + range)); + List entities = living.world.getEntitiesWithinAABB(LivingEntity.class, new AxisAlignedBB(living.getPosX() - range, living.getPosY() - range, living.getPosZ() - range, living.getPosX() + range, living.getPosY() + range, living.getPosZ() + range)); for (LivingEntity entity : entities) { if (entity != living && (!(entity instanceof PlayerEntity) || ServerLifecycleHooks.getCurrentServer() == null || ServerLifecycleHooks.getCurrentServer().isPVPEnabled())) { entity.addPotionEffect(new EffectInstance(Effects.SLOWNESS, 50, 5)); @@ -177,7 +177,7 @@ public class ItemBottledMana extends Item { case 13: { // Pixie Friend if (!living.world.isRemote) { EntityPixie pixie = new EntityPixie(living.world); - pixie.setPosition(living.getX(), living.getY() + 1.5, living.getZ()); + pixie.setPosition(living.getPosX(), living.getPosY() + 1.5, living.getPosZ()); living.world.addEntity(pixie); } break; @@ -230,7 +230,7 @@ public class ItemBottledMana extends Item { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index fee13fc68..3d181c04c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -135,13 +135,13 @@ public class ItemCacophonium extends Item { if (getSound(stack) != null) { player.setActiveHand(hand); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } @Override public void onUsingTick(ItemStack stack, LivingEntity player, int count) { if (count % (isDOIT(stack) ? 20 : 6) == 0) { - playSound(player.world, stack, player.getX(), player.getY(), player.getZ(), SoundCategory.PLAYERS, 0.9F); + playSound(player.world, stack, player.getPosX(), player.getPosY(), player.getPosZ(), SoundCategory.PLAYERS, 0.9F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 6b119da28..ba7ef4378 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -112,7 +112,7 @@ public class ItemCraftingHalo extends Item { } } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } public static IItemHandler getFakeInv(PlayerEntity player) { @@ -436,7 +436,7 @@ public class ItemCraftingHalo extends Item { @OnlyIn(Dist.CLIENT) public void render(ItemStack stack, PlayerEntity player, MatrixStack ms, float partialTicks) { Minecraft mc = Minecraft.getInstance(); - IRenderTypeBuffer.Impl buffers = mc.getBufferBuilders().getEntityVertexConsumers(); + IRenderTypeBuffer.Impl buffers = mc.getRenderTypeBuffers().getBufferSource(); double renderPosX = mc.getRenderManager().info.getProjectedView().getX(); double renderPosY = mc.getRenderManager().info.getProjectedView().getY(); @@ -445,9 +445,9 @@ public class ItemCraftingHalo extends Item { ms.push(); float alpha = ((float) Math.sin((ClientTickHandler.ticksInGame + partialTicks) * 0.2F) * 0.5F + 0.5F) * 0.4F + 0.3F; - double posX = player.prevPosX + (player.getX() - player.prevPosX) * partialTicks; - double posY = player.prevPosY + (player.getY() - player.prevPosY) * partialTicks + player.getEyeHeight(); - double posZ = player.prevPosZ + (player.getZ() - player.prevPosZ) * partialTicks; + double posX = player.prevPosX + (player.getPosX() - player.prevPosX) * partialTicks; + double posY = player.prevPosY + (player.getPosY() - player.prevPosY) * partialTicks + player.getEyeHeight(); + double posZ = player.prevPosZ + (player.getPosZ() - player.prevPosZ) * partialTicks; ms.translate(posX - renderPosX, posY - renderPosY, posZ - renderPosZ); @@ -472,7 +472,7 @@ public class ItemCraftingHalo extends Item { boolean inside = false; float rotationAngle = (seg + 0.5F) * segAngles + shift; ms.push(); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(rotationAngle)); + ms.rotate(Vector3f.YP.rotationDegrees(rotationAngle)); ms.translate(s * m, -0.75F, 0F); if (segmentLookedAt == seg) { @@ -483,16 +483,16 @@ public class ItemCraftingHalo extends Item { if (!slotStack.isEmpty()) { float scale = seg == 0 ? 0.9F : 0.8F; ms.scale(scale, scale, scale); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.translate(seg == 0 ? 0.5F : 0F, seg == 0 ? -0.1F : 0.6F, 0F); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F)); - Minecraft.getInstance().getItemRenderer().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI, 0xF000F0, OverlayTexture.DEFAULT_UV, ms, buffers); + ms.rotate(Vector3f.YP.rotationDegrees(90.0F)); + Minecraft.getInstance().getItemRenderer().renderItem(slotStack, ItemCameraTransforms.TransformType.GUI, 0xF000F0, OverlayTexture.NO_OVERLAY, ms, buffers); } ms.pop(); ms.push(); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); + ms.rotate(Vector3f.XP.rotationDegrees(180)); float r = 1, g = 1, b = 1, a = alpha; if (inside) { a += 0.3F; @@ -505,25 +505,25 @@ public class ItemCraftingHalo extends Item { IVertexBuilder buffer = buffers.getBuffer(layer); for (int i = 0; i < segAngles; i++) { - Matrix4f mat = ms.peek().getModel(); + Matrix4f mat = ms.getLast().getMatrix(); float ang = i + seg * segAngles + shift; float xp = (float) Math.cos(ang * Math.PI / 180F) * s; float zp = (float) Math.sin(ang * Math.PI / 180F) * s; - buffer.vertex(mat, xp * m, y, zp * m).color(r, g, b, a).texture(u, v).endVertex(); - buffer.vertex(mat, xp, y0, zp).color(r, g, b, a).texture(u, 0).endVertex(); + buffer.pos(mat, xp * m, y, zp * m).color(r, g, b, a).tex(u, v).endVertex(); + buffer.pos(mat, xp, y0, zp).color(r, g, b, a).tex(u, 0).endVertex(); xp = (float) Math.cos((ang + 1) * Math.PI / 180F) * s; zp = (float) Math.sin((ang + 1) * Math.PI / 180F) * s; - buffer.vertex(mat, xp, y0, zp).color(r, g, b, a).texture(0, 0).endVertex(); - buffer.vertex(mat, xp * m, y, zp * m).color(r, g, b, a).texture(0, v).endVertex(); + buffer.pos(mat, xp, y0, zp).color(r, g, b, a).tex(0, 0).endVertex(); + buffer.pos(mat, xp * m, y, zp * m).color(r, g, b, a).tex(0, v).endVertex(); } y0 = 0; ms.pop(); } ms.pop(); - buffers.draw(); + buffers.finish(); } @OnlyIn(Dist.CLIENT) @@ -539,12 +539,12 @@ public class ItemCraftingHalo extends Item { if (slot == 0) { String name = craftingTable.getDisplayName().getString(); int l = mc.fontRenderer.getStringWidth(name); - int x = mc.getWindow().getScaledWidth() / 2 - l / 2; - int y = mc.getWindow().getScaledHeight() / 2 - 65; + int x = mc.getMainWindow().getScaledWidth() / 2 - l / 2; + int y = mc.getMainWindow().getScaledHeight() / 2 - 65; AbstractGui.fill(x - 6, y - 6, x + l + 6, y + 37, 0x22000000); AbstractGui.fill(x - 4, y - 4, x + l + 4, y + 35, 0x22000000); - mc.getItemRenderer().renderItemAndEffectIntoGUI(craftingTable, mc.getWindow().getScaledWidth() / 2 - 8, mc.getWindow().getScaledHeight() / 2 - 52); + mc.getItemRenderer().renderItemAndEffectIntoGUI(craftingTable, mc.getMainWindow().getScaledWidth() / 2 - 8, mc.getMainWindow().getScaledHeight() / 2 - 52); mc.fontRenderer.drawStringWithShadow(name, x, y, 0xFFFFFF); } else { @@ -568,8 +568,8 @@ public class ItemCraftingHalo extends Item { Minecraft mc = Minecraft.getInstance(); if (!recipe[9].isEmpty()) { - int x = mc.getWindow().getScaledWidth() / 2 - 45; - int y = mc.getWindow().getScaledHeight() / 2 - 90; + int x = mc.getMainWindow().getScaledWidth() / 2 - 45; + int y = mc.getMainWindow().getScaledHeight() / 2 - 90; AbstractGui.fill(x - 6, y - 6, x + 90 + 6, y + 60, 0x22000000); AbstractGui.fill(x - 4, y - 4, x + 90 + 4, y + 58, 0x22000000); @@ -596,10 +596,10 @@ public class ItemCraftingHalo extends Item { int yoff = 110; if (setRecipe && !canCraft(recipe, getFakeInv(player))) { String warning = TextFormatting.RED + I18n.format("botaniamisc.cantCraft"); - mc.fontRenderer.drawStringWithShadow(warning, mc.getWindow().getScaledWidth() / 2.0F - mc.fontRenderer.getStringWidth(warning) / 2.0F, mc.getWindow().getScaledHeight() / 2.0F - yoff, 0xFFFFFF); + mc.fontRenderer.drawStringWithShadow(warning, mc.getMainWindow().getScaledWidth() / 2.0F - mc.fontRenderer.getStringWidth(warning) / 2.0F, mc.getMainWindow().getScaledHeight() / 2.0F - yoff, 0xFFFFFF); yoff += 12; } - mc.fontRenderer.drawStringWithShadow(label.getFormattedText(), mc.getWindow().getScaledWidth() / 2.0F - mc.fontRenderer.getStringWidth(label.getString()) / 2.0F, mc.getWindow().getScaledHeight() / 2.0F - yoff, 0xFFFFFF); + mc.fontRenderer.drawStringWithShadow(label.getFormattedText(), mc.getMainWindow().getScaledWidth() / 2.0F - mc.fontRenderer.getStringWidth(label.getString()) / 2.0F, mc.getMainWindow().getScaledHeight() / 2.0F - yoff, 0xFFFFFF); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 8165aa882..ffdc29cbd 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -52,9 +52,9 @@ public class ItemEnderHand extends Item implements IManaUsingItem, IBlockProvide ManaItemHandler.instance().requestManaExact(stack, player, COST_SELF, true); } player.playSound(SoundEvents.BLOCK_ENDER_CHEST_OPEN, 1F, 1F); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 7e57f5a95..50d186cc9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -113,7 +113,7 @@ public class ItemFlowerBag extends Item { if (numPickedUp > 0) { event.setCanceled(true); if (!event.getItem().isSilent()) { - event.getItem().world.playSound(null, event.getPlayer().getX(), event.getPlayer().getY(), event.getPlayer().getZ(), + event.getItem().world.playSound(null, event.getPlayer().getPosX(), event.getPlayer().getPosY(), event.getPlayer().getPosZ(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((event.getItem().world.rand.nextFloat() - event.getItem().world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } @@ -137,7 +137,7 @@ public class ItemFlowerBag extends Item { buf.writeBoolean(hand == Hand.MAIN_HAND); }); } - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 76f798a3b..42806b9c6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -60,7 +60,7 @@ public class ItemHorn extends Item { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Override @@ -69,7 +69,7 @@ public class ItemHorn extends Item { if (time != getUseDuration(stack) && time % 5 == 0) { breakGrass(player.world, stack, new BlockPos(player)); } - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_NOTE_BLOCK_BASS, SoundCategory.BLOCKS, 1F, 0.001F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_NOTE_BLOCK_BASS, SoundCategory.BLOCKS, 1F, 0.001F); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 2a288da6c..2d7c120f2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -251,9 +251,9 @@ public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExc spawnBurst(entity.world, new BlockPos(x, y, z), lens); } } else if (burst.getTicksExisted() == placeTicks) { - int x = net.minecraft.util.math.MathHelper.floor(entity.getX()); + int x = net.minecraft.util.math.MathHelper.floor(entity.getPosX()); int y = ItemNBTHelper.getInt(lens, TAG_Y_START, -1) + targetDistance; - int z = net.minecraft.util.math.MathHelper.floor(entity.getZ()); + int z = net.minecraft.util.math.MathHelper.floor(entity.getPosZ()); BlockPos pos = new BlockPos(x, y, z); if (entity.world.isAirBlock(pos)) { @@ -290,7 +290,7 @@ public class ItemLaputaShard extends Item implements ILensEffect, ITinyPlanetExc ThrowableEntity entity = (ThrowableEntity) burst; ItemStack lens = burst.getSourceLens(); BlockState state = NBTUtil.readBlockState(lens.getOrCreateTag().getCompound(TAG_STATE)); - entity.world.addParticle(new BlockParticleData(ParticleTypes.BLOCK, state), entity.getX(), entity.getY(), entity.getZ(), + entity.world.addParticle(new BlockParticleData(ParticleTypes.BLOCK, state), entity.getPosX(), entity.getPosY(), entity.getPosZ(), entity.getMotion().getX(), entity.getMotion().getY(), entity.getMotion().getZ()); return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 2f09b39ef..5eecdfb85 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -80,7 +80,7 @@ public class ItemLexicon extends Item implements IElvenItem { if (playerIn instanceof ServerPlayerEntity) { ServerPlayerEntity player = (ServerPlayerEntity) playerIn; - UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.getX(), player.getY(), player.getZ()); + UseItemSuccessTrigger.INSTANCE.trigger(player, stack, player.getServerWorld(), player.getPosX(), player.getPosY(), player.getPosZ()); PatchouliAPI.instance.openBookGUI((ServerPlayerEntity) playerIn, getRegistryName()); playerIn.playSound(ModSounds.lexiconOpen, 1F, (float) (0.7 + Math.random() * 0.4)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 84a106c3e..e6db1ec90 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -77,7 +77,7 @@ public class ItemManaGun extends Item implements IManaUsingItem { if (player.isSneaking() && hasClip(stack)) { rotatePos(stack); - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); if (world.isRemote) { player.swingArm(hand); } else { @@ -85,12 +85,12 @@ public class ItemManaGun extends Item implements IManaUsingItem { ItemsRemainingRenderHandler.send(player, lens, -2); stack.setDamage(effCd); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } else if (stack.getDamage() == 0) { EntityManaBurst burst = getBurst(player, stack, true, hand); if (burst != null && ManaItemHandler.instance().requestManaExact(stack, player, burst.getMana(), true)) { if (!world.isRemote) { - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); world.addEntity(burst); ManaGunTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack); } else { @@ -99,12 +99,12 @@ public class ItemManaGun extends Item implements IManaUsingItem { } stack.setDamage(effCd); } else if (!world.isRemote) { - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index c6d388a53..f28732d6b 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -88,7 +88,7 @@ public class ItemManaMirror extends Item implements IManaItem, ICoordBoundItem, TileEntity tile = world.getTileEntity(ctx.getPos()); if (tile instanceof IManaPool) { bindPool(ctx.getItem(), tile); - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); return ActionResultType.SUCCESS; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index 531398a97..a35d06cff 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -46,12 +46,12 @@ public class ItemPinkinator extends Item { public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); int range = 16; - List withers = world.getEntitiesWithinAABB(WitherEntity.class, new AxisAlignedBB(player.getX() - range, player.getY() - range, player.getZ() - range, player.getX() + range, player.getY() + range, player.getZ() + range)); + List withers = world.getEntitiesWithinAABB(WitherEntity.class, new AxisAlignedBB(player.getPosX() - range, player.getPosY() - range, player.getPosZ() - range, player.getPosX() + range, player.getPosY() + range, player.getPosZ() + range)); for (WitherEntity wither : withers) { if (!world.isRemote && wither.isAlive() && !(wither instanceof EntityPinkWither)) { wither.remove(); EntityPinkWither pink = new EntityPinkWither(world); - pink.setLocationAndAngles(wither.getX(), wither.getY(), wither.getZ(), wither.rotationYaw, wither.rotationPitch); + pink.setLocationAndAngles(wither.getPosX(), wither.getPosY(), wither.getPosZ(), wither.rotationYaw, wither.rotationPitch); pink.setNoAI(wither.isAIDisabled()); if (wither.hasCustomName()) { pink.setCustomName(wither.getCustomName()); @@ -61,13 +61,13 @@ public class ItemPinkinator extends Item { world.addEntity(pink); pink.spawnExplosionParticle(); pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - UseItemSuccessTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack, (ServerWorld) world, player.getX(), player.getY(), player.getZ()); + UseItemSuccessTrigger.INSTANCE.trigger((ServerPlayerEntity) player, stack, (ServerWorld) world, player.getPosX(), player.getPosY(), player.getPosZ()); stack.shrink(1); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index d2b1bd41d..72bd49177 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -158,7 +158,7 @@ public class ItemSextant extends Item { reset(world, stack); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } private static double calculateRadius(ItemStack stack, PlayerEntity player) { @@ -190,8 +190,8 @@ public class ItemSextant extends Item { if (onUse == stack && stack.getItem().getUseDuration(stack) - time >= 10) { double radius = calculateRadius(stack, player); FontRenderer font = Minecraft.getInstance().fontRenderer; - int x = Minecraft.getInstance().getWindow().getScaledWidth() / 2 + 30; - int y = Minecraft.getInstance().getWindow().getScaledHeight() / 2; + int x = Minecraft.getInstance().getMainWindow().getScaledWidth() / 2 + 30; + int y = Minecraft.getInstance().getMainWindow().getScaledHeight() / 2; String s = Integer.toString((int) radius); boolean inRange = 0 < radius && radius <= MAX_RADIUS; @@ -211,7 +211,7 @@ public class ItemSextant extends Item { float radian = (float) (i * Math.PI / 180); double xp = x + Math.cos(radian) * radius; double yp = y + Math.sin(radian) * radius; - Tessellator.getInstance().getBuffer().vertex(xp, yp, 0).endVertex(); + Tessellator.getInstance().getBuffer().pos(xp, yp, 0).endVertex(); } Tessellator.getInstance().draw(); RenderSystem.enableTexture(); diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 949c135d9..0d5aec846 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -54,7 +54,7 @@ public class ItemSlingshot extends Item { ball.shoot(living, living.rotationPitch, living.rotationYaw, 0F, 1.5F, 1F); ball.setMotion(ball.getMotion().scale(1.6)); world.addEntity(ball); - world.playSound(null, living.getX(), living.getY(), living.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); + 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)); } } @@ -75,10 +75,10 @@ public class ItemSlingshot extends Item { ItemStack stack = player.getHeldItem(hand); if (player.abilities.isCreativeMode || PlayerHelper.hasAmmo(player, AMMO_FUNC)) { player.setActiveHand(hand); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index 1b2f60432..ffe7d0216 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -45,8 +45,8 @@ public class ItemTemperanceStone extends Item { public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { ItemStack stack = player.getHeldItem(hand); ItemNBTHelper.setBoolean(stack, TAG_ACTIVE, !ItemNBTHelper.getBoolean(stack, TAG_ACTIVE, false)); - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); - return ActionResult.success(stack); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); + return ActionResult.resultSuccess(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index 9ead5c0c8..935619870 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -41,11 +41,11 @@ public class ItemThornChakram extends Item { c.setFire(true); } world.addEntity(c); - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); stack.shrink(1); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 2a84d66cf..3086f1ab8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -155,7 +155,7 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { bindPos.getPos().getX() + 0.5, bindPos.getPos().getY() + 0.5, bindPos.getPos().getZ() + 0.5, pos.getX(), pos.getY(), pos.getZ())); - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.ding, SoundCategory.PLAYERS, 1F, 1F); return true; } return false; @@ -344,7 +344,7 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { } } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 252cf4d2e..97ee9af41 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -34,7 +34,7 @@ public class ItemVineBall extends Item { player.getHeldItem(hand).shrink(1); } - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); if (!world.isRemote) { EntityVineBall ball = new EntityVineBall(player, true); @@ -42,7 +42,7 @@ public class ItemVineBall extends Item { world.addEntity(ball); } - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 87fdcc686..ff7d1b134 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -76,7 +76,7 @@ public class ItemVirus extends Item { ? EntityType.ZOMBIE_HORSE.create(player.world) : EntityType.SKELETON_HORSE.create(player.world); newHorse.setTamedBy(player); - newHorse.setPositionAndRotation(horse.getX(), horse.getY(), horse.getZ(), horse.rotationYaw, horse.rotationPitch); + newHorse.setPositionAndRotation(horse.getPosX(), horse.getPosY(), horse.getPosZ(), horse.rotationYaw, horse.rotationPitch); // Put the saddle back if (!saddle.isEmpty()) { diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index bc4cae060..5abf87167 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -40,18 +40,18 @@ public class ItemWorldSeed extends Item { } BlockPos coords = world.getSpawnPoint(); - if (world.getDimension().canRespawnHere() && MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.getX(), player.getY(), player.getZ()) > 24) { + 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; player.setPositionAndUpdate(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - while (!world.doesNotCollide(player, player.getBoundingBox())) { - player.setPositionAndUpdate(player.getX(), player.getY() + 1, player.getZ()); + while (!world.hasNoCollisions(player, player.getBoundingBox())) { + player.setPositionAndUpdate(player.getPosX(), player.getPosY() + 1, player.getPosZ()); } - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); SparkleParticleData data = SparkleParticleData.sparkle(1F, 0.25F, 1F, 0.25F, 10); - ((ServerWorld) world).spawnParticle(data, player.getX(), player.getY() + player.getHeight() / 2, player.getZ(), 50, player.getWidth() / 8, player.getHeight() / 4, player.getWidth() / 8, 0); + ((ServerWorld) world).spawnParticle(data, player.getPosX(), player.getPosY() + player.getHeight() / 2, player.getPosZ(), 50, player.getWidth() / 8, player.getHeight() / 4, player.getWidth() / 8, 0); stack.shrink(1); return new ActionResult<>(ActionResultType.SUCCESS, stack); 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 dfaec7a81..9f0b42fc5 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -82,7 +82,7 @@ public class ItemBrewBase extends Item implements IBrewItem { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Nonnull @@ -99,7 +99,7 @@ public class ItemBrewBase extends Item implements IBrewItem { } if (world.rand.nextBoolean()) { - world.playSound(null, living.getX(), living.getY(), living.getZ(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, living.getPosX(), living.getPosY(), living.getPosZ(), SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 1F, 1F); } int swigs = getSwigsLeft(stack); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java index 4c5bd3840..fc8f2209a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java @@ -42,11 +42,11 @@ public class ItemBalanceCloak extends ItemHolyCloak { event.setAmount(player.getHealth() - 1); } - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for (int i = 0; i < 30; i++) { - double x = player.getX() + Math.random() * player.getWidth() * 2 - player.getWidth(); - double y = player.getY() + Math.random() * player.getHeight(); - double z = player.getZ() + Math.random() * player.getWidth() * 2 - player.getWidth(); + double x = player.getPosX() + Math.random() * player.getWidth() * 2 - player.getWidth(); + double y = player.getPosY() + Math.random() * player.getHeight(); + double z = player.getPosZ() + Math.random() * player.getWidth() * 2 - player.getWidth(); boolean green = Math.random() > 0.5; float g = green ? 1F : 0.3F; float b = green ? 0.3F : 1F; 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 24869da3f..e7a6d0cca 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 @@ -81,7 +81,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant; if (variant.isHead) { - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); switch (variant) { case RED_GLASSES: case ENGINEER_GOGGLES: @@ -92,7 +92,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case EYEPATCH: ms.translate(0.125, -0.225, -0.3); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; @@ -103,39 +103,39 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case RED_RIBBONS: ms.translate(0, -0.65, 0.2); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case PINK_FLOWER_BUD: ms.translate(0.275, -0.6, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case POLKA_DOTTED_BOWS: ms.push(); ms.translate(0.275, -0.4, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); ms.pop(); ms.translate(-0.275, -0.4, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F)); + ms.rotate(Vector3f.YP.rotationDegrees(90F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; case BLUE_BUTTERFLY: ms.push(); ms.translate(0.275, -0.4, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(45F)); + ms.rotate(Vector3f.YP.rotationDegrees(45F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); ms.pop(); ms.translate(0.275, -0.4, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-45F)); + ms.rotate(Vector3f.YP.rotationDegrees(-45F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; @@ -156,7 +156,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case UNICORN_HORN: ms.translate(0, -0.7, -0.3); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; @@ -191,7 +191,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { ms.translate(0, -0.3, -0.3); ms.scale(0.7F, -0.7F, -0.7F); int color = 0xFFFFFF | (178 << 24); - RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.DEFAULT_UV); + RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.NO_OVERLAY); break; case GROUCHO_GLASSES: ms.translate(0, -0.1, -0.3); @@ -206,7 +206,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { ms.pop(); ms.translate(0.1, -0.3, -0.3); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.scale(0.3F, -0.3F, -0.3F); renderItem(stack, ms, buffers, light); break; @@ -222,7 +222,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case THINKING_HAND: ms.translate(-0.1, 0, -0.3); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-15F)); + ms.rotate(Vector3f.ZP.rotationDegrees(-15F)); ms.scale(0.5F, -0.5F, -0.5F); renderItem(stack, ms, buffers, light); break; @@ -230,7 +230,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; } } else { // body cosmetics - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); switch (variant) { case BLACK_BOWTIE: ms.translate(0, 0.1, -0.13); @@ -250,7 +250,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case DEVIL_TAIL: ms.translate(0, 0.55, 0.2); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; @@ -262,9 +262,9 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { ms.pop(); ms.translate(-0.4, 0.1, -0.2); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.scale(0.5F, -0.5F, -0.5F); - RenderHelper.renderItemCustomColor(player, stack, 0xFF00004C, ms, buffers, light, OverlayTexture.DEFAULT_UV); + RenderHelper.renderItemCustomColor(player, stack, 0xFF00004C, ms, buffers, light, OverlayTexture.NO_OVERLAY); break; case FOUR_LEAF_CLOVER: ms.translate(0.1, 0.1, -0.13); @@ -278,8 +278,8 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { break; case LUSITANIC_SHIELD: ms.translate(0F, 0.35, 0.13); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(8F)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F)); + ms.rotate(Vector3f.ZP.rotationDegrees(8F)); + ms.rotate(Vector3f.YP.rotationDegrees(180F)); ms.scale(0.6F, -0.6F, -0.6F); renderItem(stack, ms, buffers, light); break; @@ -290,7 +290,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { } public static void renderItem(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light) { - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers); } } 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 e960f05e3..2ccc9f32c 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 @@ -118,14 +118,14 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); ms.translate(-0.25, 0.4, armor ? 0.05 : 0.12); ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.bloodPendantChain; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); model = MiscellaneousIcons.INSTANCE.bloodPendantGem; int color = Minecraft.getInstance().getItemColors().getColor(stack, 1); @@ -133,7 +133,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre float g = (color >> 8 & 0xFF) / 255F; float b = (color & 0xFF) / 255F; Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, r, g, b, 0xF000F0, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, r, g, b, 0xF000F0, OverlayTexture.NO_OVERLAY); } @Override 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 f4a06996e..07ecb9e26 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 @@ -69,16 +69,16 @@ public class ItemCloudPendant extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); ms.translate(-0.3, 0.4, armor ? 0.05 : 0.12); ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = stack.getItem() == ModItems.superCloudPendant ? MiscellaneousIcons.INSTANCE.nimbusGem : MiscellaneousIcons.INSTANCE.cirrusGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); } public int getMaxAllowedJumps() { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index 8cb06a46d..99b404bda 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -69,7 +69,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { if (ManaItemHandler.instance().requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.getX() - range, target.getY() - range, target.getZ() - range, target.getX() + range, target.getY() + range, target.getZ() + range), Predicates.instanceOf(IMob.class)); + List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(target.getPosX() - range, target.getPosY() - range, target.getPosZ() - range, target.getPosX() + range, target.getPosY() + range, target.getPosZ() + range), Predicates.instanceOf(IMob.class)); if (mobs.size() > 1) { if (SubTileHeiseiDream.brainwashEntity(target, (List) mobs)) { target.heal(target.getMaxHealth()); @@ -79,8 +79,8 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { } ManaItemHandler.instance().requestManaExact(amulet, player, cost, true); - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); - PacketHandler.sendToNearby(target.world, target, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.DIVA_EFFECT, target.getX(), target.getY(), target.getZ(), target.getEntityId())); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.divaCharm, SoundCategory.PLAYERS, 1F, 1F); + PacketHandler.sendToNearby(target.world, target, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.DIVA_EFFECT, target.getPosX(), target.getPosY(), target.getPosZ(), target.getEntityId())); } } } @@ -102,9 +102,9 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); ms.translate(0.15, -0.42, -0.35); ms.scale(0.4F, -0.4F, -0.4F); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers); } } 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 0c0d6b0ab..ad716005a 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 @@ -125,8 +125,8 @@ public class ItemDodgeRing extends ItemBauble { @OnlyIn(Dist.CLIENT) public static void renderHUD(PlayerEntity player, ItemStack stack, float pticks) { - int xo = Minecraft.getInstance().getWindow().getScaledWidth() / 2 - 20; - int y = Minecraft.getInstance().getWindow().getScaledHeight() / 2 + 20; + int xo = Minecraft.getInstance().getMainWindow().getScaledWidth() / 2 - 20; + int y = Minecraft.getInstance().getMainWindow().getScaledHeight() / 2 + 20; if (!player.abilities.isFlying) { int cd = ItemNBTHelper.getInt(stack, TAG_DODGE_COOLDOWN, 0); 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 cee3edab9..740769ab4 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 @@ -124,9 +124,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { if (!player.world.isRemote) { ManaItemHandler.instance().requestManaExact(tiara, player, getCost(tiara, left), true); } else if (Math.abs(player.getMotion().getX()) > 0.1 || Math.abs(player.getMotion().getZ()) > 0.1) { - double x = event.getEntityLiving().getX() - 0.5; - double y = event.getEntityLiving().getY() - 0.5; - double z = event.getEntityLiving().getZ() - 0.5; + double x = event.getEntityLiving().getPosX() - 0.5; + double y = event.getEntityLiving().getPosY() - 0.5; + double z = event.getEntityLiving().getPosZ() - 0.5; player.getGameProfile().getName(); float r = 1F; @@ -268,7 +268,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { int cooldown = ItemNBTHelper.getInt(stack, TAG_DASH_COOLDOWN, 0); if (!wasSprting && isSprinting && cooldown == 0) { p.setMotion(p.getMotion().add(look.x, 0, look.z)); - p.world.playSound(null, p.getX(), p.getY(), p.getZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); ItemNBTHelper.setBoolean(stack, TAG_BOOST_PENDING, true); } else if (cooldown > 0) { @@ -395,22 +395,22 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { ms.translate(0F, h, i); ms.push(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rz)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rx)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ry)); + ms.rotate(Vector3f.ZP.rotationDegrees(rz)); + ms.rotate(Vector3f.XP.rotationDegrees(rx)); + ms.rotate(Vector3f.YP.rotationDegrees(ry)); ms.scale(s, s, s); - RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.DEFAULT_UV, model); + RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.NO_OVERLAY, model); ms.pop(); if (meta != 2) { // Sephiroth ms.scale(-1F, 1F, 1F); ms.push(); - ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(rz)); - ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rx)); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(ry)); + ms.rotate(Vector3f.ZP.rotationDegrees(rz)); + ms.rotate(Vector3f.XP.rotationDegrees(rx)); + ms.rotate(Vector3f.YP.rotationDegrees(ry)); ms.scale(s, s, s); - RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.DEFAULT_UV, model); + RenderHelper.renderItemCustomColor(player, stack, color, ms, buffers, light, OverlayTexture.NO_OVERLAY, model); ms.pop(); } @@ -428,20 +428,20 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { AccessoryRenderHelper.translateToHeadLevel(ms, player, partialTicks); } ms.translate(0, 1.5F, 0); - ms.multiply(new Vector3f(1, 0, -1).getDegreesQuaternion(30)); + ms.rotate(new Vector3f(1, 0, -1).rotationDegrees(30)); ms.translate(-0.1F, -0.5F, -0.1F); if (player != null) { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(player.ticksExisted + partialTicks)); + ms.rotate(Vector3f.YP.rotationDegrees(player.ticksExisted + partialTicks)); } else { - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(Botania.proxy.getWorldElapsedTicks())); + ms.rotate(Vector3f.YP.rotationDegrees(Botania.proxy.getWorldElapsedTicks())); } IVertexBuilder buffer = buffers.getBuffer(RenderHelper.HALO); - Matrix4f mat = ms.peek().getModel(); - buffer.vertex(mat, -0.75F, 0, -0.75F).texture(0, 0).endVertex(); - buffer.vertex(mat, -0.75F, 0, 0.75F).texture(0, 1).endVertex(); - buffer.vertex(mat, 0.75F, 0, 0.75F).texture(1, 1).endVertex(); - buffer.vertex(mat, 0.75F, 0, -0.75F).texture(1, 0).endVertex(); + Matrix4f mat = ms.getLast().getMatrix(); + buffer.pos(mat, -0.75F, 0, -0.75F).tex(0, 0).endVertex(); + buffer.pos(mat, -0.75F, 0, 0.75F).tex(0, 1).endVertex(); + buffer.pos(mat, 0.75F, 0, 0.75F).tex(1, 1).endVertex(); + buffer.pos(mat, 0.75F, 0, -0.75F).tex(1, 0).endVertex(); } @OnlyIn(Dist.CLIENT) @@ -451,9 +451,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { Minecraft mc = Minecraft.getInstance(); mc.textureManager.bindTexture(textureHud); - int xo = mc.getWindow().getScaledWidth() / 2 + 10; + int xo = mc.getMainWindow().getScaledWidth() / 2 + 10; int x = xo; - int y = mc.getWindow().getScaledHeight() - ForgeIngameGui.right_height; + int y = mc.getMainWindow().getScaledHeight() - ForgeIngameGui.right_height; ForgeIngameGui.right_height += 10; int left = ItemNBTHelper.getInt(stack, TAG_TIME_LEFT, MAX_FLY_TIME); 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 b51981d45..b4ccfd2e0 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 @@ -64,11 +64,11 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); ms.translate(0.275, -0.4, 0); - ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F)); + ms.rotate(Vector3f.YP.rotationDegrees(-90F)); ms.scale(0.55F, -0.55F, -0.55F); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 577a2dd63..c7d6e74ce 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -89,21 +89,21 @@ public class ItemHolyCloak extends ItemBauble { } Minecraft.getInstance().textureManager.bindTexture(item.getCloakTexture()); - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(item.getCloakTexture())); - model.render(ms, buffer, light, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(item.getCloakTexture())); + model.render(ms, buffer, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); - buffer = buffers.getBuffer(model.getLayer(item.getCloakGlowTexture())); - model.render(ms, buffer, 0xF000F0, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); + buffer = buffers.getBuffer(model.getRenderType(item.getCloakGlowTexture())); + model.render(ms, buffer, 0xF000F0, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } public boolean effectOnDamage(LivingHurtEvent event, PlayerEntity player, ItemStack stack) { if (!event.getSource().isMagicDamage()) { event.setCanceled(true); - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for (int i = 0; i < 30; i++) { - double x = player.getX() + Math.random() * player.getWidth() * 2 - player.getWidth(); - double y = player.getY() + Math.random() * player.getHeight(); - double z = player.getZ() + Math.random() * player.getWidth() * 2 - player.getWidth(); + double x = player.getPosX() + Math.random() * player.getWidth() * 2 - player.getWidth(); + double y = player.getPosY() + Math.random() * player.getHeight(); + double z = player.getPosZ() + Math.random() * player.getWidth() * 2 - player.getWidth(); boolean yellow = Math.random() > 0.5; float r = yellow ? 1F : 0.3F; float g = yellow ? 1F : 0.3F; 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 12130d165..d6f975e30 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 @@ -47,22 +47,22 @@ public class ItemIcePendant extends ItemBauble { FrostWalkerEnchantment.freezeNearby(entity, entity.world, new BlockPos(entity), 8); entity.onGround = lastOnGround; - int x = MathHelper.floor(entity.getX()); - int y = MathHelper.floor(entity.getY()); - int z = MathHelper.floor(entity.getZ()); + int x = MathHelper.floor(entity.getPosX()); + int y = MathHelper.floor(entity.getPosY()); + int z = MathHelper.floor(entity.getPosZ()); BlockState blockstate = Blocks.SNOW.getDefaultState(); for (int l = 0; l < 4; ++l) { - x = MathHelper.floor(entity.getX() + (double) ((float) (l % 2 * 2 - 1) * 0.25F)); - z = MathHelper.floor(entity.getZ() + (double) ((float) (l / 2 % 2 * 2 - 1) * 0.25F)); + x = MathHelper.floor(entity.getPosX() + (double) ((float) (l % 2 * 2 - 1) * 0.25F)); + z = MathHelper.floor(entity.getPosZ() + (double) ((float) (l / 2 % 2 * 2 - 1) * 0.25F)); BlockPos blockpos = new BlockPos(x, y, z); - if (entity.world.isAirBlock(blockpos) && entity.world.getBiome(blockpos).getTemperatureCached(blockpos) < 0.9F && blockstate.isValidPosition(entity.world, blockpos)) { + if (entity.world.isAirBlock(blockpos) && entity.world.getBiome(blockpos).getTemperature(blockpos) < 0.9F && blockstate.isValidPosition(entity.world, blockpos)) { entity.world.setBlockState(blockpos, blockstate); } } } else if (entity.world.isRemote && !entity.isSneaking()) { if (entity.world.rand.nextFloat() >= 0.25F) { - entity.world.addParticle(new BlockParticleData(ParticleTypes.FALLING_DUST, Blocks.SNOW_BLOCK.getDefaultState()), entity.getX() + entity.world.rand.nextFloat() * 0.6 - 0.3, entity.getY() + 1.1, entity.getZ() + entity.world.rand.nextFloat() * 0.6 - 0.3, 0, -0.15, 0); + entity.world.addParticle(new BlockParticleData(ParticleTypes.FALLING_DUST, Blocks.SNOW_BLOCK.getDefaultState()), entity.getPosX() + entity.world.rand.nextFloat() * 0.6 - 0.3, entity.getPosY() + 1.1, entity.getPosZ() + entity.world.rand.nextFloat() * 0.6 - 0.3, 0, -0.15, 0); } } } @@ -71,14 +71,14 @@ public class ItemIcePendant extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.snowflakePendantGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); } } 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 9f4b44c64..5521aa0c3 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 @@ -80,14 +80,14 @@ public class ItemItemFinder extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty(); - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); ms.translate(-0.35, -0.2, armor ? 0.05 : 0.1); ms.scale(0.75F, -0.75F, -0.75F); IBakedModel model = MiscellaneousIcons.INSTANCE.itemFinderGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); } protected void tickClient(ItemStack stack, PlayerEntity player) { @@ -109,7 +109,7 @@ public class ItemItemFinder extends ItemBauble { Entity e = player.world.getEntityByID(i); if (e != null && Math.random() < 0.6) { WispParticleData data = WispParticleData.wisp(0.15F + 0.05F * (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), Math.random() < 0.6); - player.world.addParticle(data, e.getX() + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.getY() + e.getHeight(), e.getZ() + (float) (Math.random() * 0.5 - 0.25) * 0.45F, 0, 0.05F + 0.03F * (float) Math.random(), 0); + player.world.addParticle(data, e.getPosX() + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.getPosY() + e.getHeight(), e.getPosZ() + (float) (Math.random() * 0.5 - 0.25) * 0.45F, 0, 0.05F + 0.03F * (float) Math.random(), 0); } } } @@ -131,7 +131,7 @@ public class ItemItemFinder extends ItemBauble { if (!pstack.isEmpty() || player.isSneaking()) { int range = 24; - List entities = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getX() - range, player.getY() - range, player.getZ() - range, player.getX() + range, player.getY() + range, player.getZ() + range)); + List entities = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getPosX() - range, player.getPosY() - range, player.getPosZ() - range, player.getPosX() + range, player.getPosY() + range, player.getPosZ() + range)); for (Entity e : entities) { if (e == player) { continue; @@ -180,7 +180,7 @@ public class ItemItemFinder extends ItemBauble { boolean foundCap = false; for (Direction e : Direction.values()) { if (scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { - blockPosBuilder.add(LongNBT.of(pos_.toLong())); + blockPosBuilder.add(LongNBT.valueOf(pos_.toLong())); foundCap = true; break; } @@ -188,7 +188,7 @@ public class ItemItemFinder extends ItemBauble { if (!foundCap && tile instanceof IInventory) { IInventory inv = (IInventory) tile; if (scanInventory(LazyOptional.of(() -> new InvWrapper(inv)), pstack)) { - blockPosBuilder.add(LongNBT.of(pos_.toLong())); + blockPosBuilder.add(LongNBT.valueOf(pos_.toLong())); } } } 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 8e8132ea9..4dbfcefe1 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 @@ -56,7 +56,7 @@ public class ItemKnockbackBelt extends ItemBauble { model = new BipedModel(1.0F); } - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); - model.bipedBody.render(ms, buffer, light, OverlayTexture.DEFAULT_UV); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); + model.bipedBody.render(ms, buffer, light, OverlayTexture.NO_OVERLAY); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index d42137abc..b24e36b44 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -44,12 +44,12 @@ public class ItemLavaPendant extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.pyroclastGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); } } 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 268f88d44..9a56ede9d 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 @@ -73,9 +73,9 @@ public class ItemMagnetRing extends ItemBauble { if (cooldown <= 0) { if (living.isSneaking() == ConfigHandler.COMMON.invertMagnetRing.get()) { - double x = living.getX(); - double y = living.getY() + 0.75; - double z = living.getZ(); + double x = living.getPosX(); + double y = living.getPosY() + 0.75; + double z = living.getPosZ(); int range = ((ItemMagnetRing) stack.getItem()).range; List items = living.world.getEntitiesWithinAABB(ItemEntity.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); @@ -92,7 +92,7 @@ public class ItemMagnetRing extends ItemBauble { float r = red ? 1F : 0F; float b = red ? 0F : 1F; SparkleParticleData data = SparkleParticleData.sparkle(1F, r, 0F, b, 3); - living.world.addParticle(data, item.getX(), item.getY(), item.getZ(), 0, 0, 0); + living.world.addParticle(data, item.getPosX(), item.getPosY(), item.getPosZ(), 0, 0, 0); } pulled++; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index ac76ff529..cc7001b53 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -51,10 +51,10 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); ms.translate(0.15, -0.2, -0.25); ms.scale(0.3F, -0.3F, -0.3F); - Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers); + Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.NO_OVERLAY, ms, buffers); } @OnlyIn(Dist.CLIENT) @@ -87,8 +87,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm return; } - int x = mc.getWindow().getScaledWidth() / 2 + 15; - int y = mc.getWindow().getScaledHeight() / 2 - 8; + int x = mc.getMainWindow().getScaledWidth() / 2 + 15; + int y = mc.getMainWindow().getScaledHeight() / 2 - 8; mc.getItemRenderer().renderItemAndEffectIntoGUI(dispStack, x, y); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java index 3aba50f53..60c50361c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSpeedUpBelt.java @@ -58,11 +58,11 @@ public class ItemSpeedUpBelt extends ItemTravelBelt { double oldY = ItemNBTHelper.getDouble(stack, TAG_OLD_Y, 0); double oldZ = ItemNBTHelper.getDouble(stack, TAG_OLD_Z, 0); - ItemNBTHelper.setDouble(stack, TAG_OLD_X, player.getX()); - ItemNBTHelper.setDouble(stack, TAG_OLD_Y, player.getY()); - ItemNBTHelper.setDouble(stack, TAG_OLD_Z, player.getZ()); + ItemNBTHelper.setDouble(stack, TAG_OLD_X, player.getPosX()); + ItemNBTHelper.setDouble(stack, TAG_OLD_Y, player.getPosY()); + ItemNBTHelper.setDouble(stack, TAG_OLD_Z, player.getPosZ()); - return Math.abs(oldX - player.getX()) > 0.001 || Math.abs(oldY - player.getY()) > 0.001 || Math.abs(oldZ - player.getZ()) > 0.001; + return Math.abs(oldX - player.getPosX()) > 0.001 || Math.abs(oldY - player.getPosY()) > 0.001 || Math.abs(oldZ - player.getPosZ()) > 0.001; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index 70add9b02..acb66a6b5 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -55,12 +55,12 @@ public class ItemSuperLavaPendant extends ItemBauble { @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); ms.translate(-0.25, 0.5, armor ? 0.05 : 0.12); ms.scale(0.5F, -0.5F, -0.5F); IBakedModel model = MiscellaneousIcons.INSTANCE.crimsonGem; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index 2abc224eb..e1ba33a96 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -53,7 +53,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { PlayerEntity eplayer = (PlayerEntity) living; double range = 24; - AxisAlignedBB aabb = new AxisAlignedBB(living.getX(), living.getY(), living.getZ(), living.getX(), living.getY(), living.getZ()).grow(range); + AxisAlignedBB aabb = new AxisAlignedBB(living.getPosX(), living.getPosY(), living.getPosZ(), living.getPosX(), living.getPosY(), living.getPosZ()).grow(range); List mobs = living.world.getEntitiesWithinAABB(LivingEntity.class, aabb, (Entity e) -> e instanceof IMob); for (LivingEntity e : mobs) { @@ -71,7 +71,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { for (int i = 0; i < 3; i++) { ms.push(); - layer.getEntityModel().bipedBody.rotate(ms); + layer.getEntityModel().bipedBody.translateRotate(ms); switch (i) { case 0: @@ -92,9 +92,9 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem { ms.translate(-0.3, 0.6, armor ? 0.10 : 0.15); ms.scale(0.6F, -0.6F, -0.6F); IBakedModel model = MiscellaneousIcons.INSTANCE.thirdEyeLayers[i]; - IVertexBuilder buffer = buffers.getBuffer(Atlases.getEntityCutout()); + IVertexBuilder buffer = buffers.getBuffer(Atlases.getCutoutBlockType()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() - .render(ms.peek(), buffer, null, model, 1, 1, 1, light, OverlayTexture.DEFAULT_UV); + .renderModelBrightnessColor(ms.getLast(), buffer, null, model, 1, 1, 1, light, OverlayTexture.NO_OVERLAY); ms.pop(); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 3a5e99879..dbe28c713 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -42,9 +42,9 @@ public class ItemTinyPlanet extends ItemBauble { @Override public void onWornTick(ItemStack stack, LivingEntity player) { - double x = player.getX(); - double y = player.getY() + player.getEyeHeight(); - double z = player.getZ(); + double x = player.getPosX(); + double y = player.getPosY() + player.getEyeHeight(); + double z = player.getPosZ(); applyEffect(player.world, x, y, z); } @@ -52,10 +52,10 @@ public class ItemTinyPlanet extends ItemBauble { @Override @OnlyIn(Dist.CLIENT) public void doRender(BaubleRenderHandler layer, ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) { - layer.getEntityModel().bipedHead.rotate(ms); + layer.getEntityModel().bipedHead.translateRotate(ms); ms.translate(-0.25, -0.4, 0); ms.scale(0.5F, -0.5F, -0.5F); - Minecraft.getInstance().getBlockRendererDispatcher().renderBlockAsEntity(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.DEFAULT_UV); + Minecraft.getInstance().getBlockRendererDispatcher().renderBlock(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.NO_OVERLAY); } public static void applyEffect(World world, double x, double y, double z) { @@ -81,7 +81,7 @@ public class ItemTinyPlanet extends ItemBauble { float zTarget = (float) (z + Math.sin(angle * 10 * Math.PI / 180F) * radius); Vector3 targetVec = new Vector3(xTarget, yTarget, zTarget); - Vector3 currentVec = new Vector3(entity.getX(), entity.getY(), entity.getZ()); + Vector3 currentVec = new Vector3(entity.getPosX(), entity.getPosY(), entity.getPosZ()); Vector3 moveVector = targetVec.subtract(currentVec); burst.setBurstMotion(moveVector.x, moveVector.y, moveVector.z); 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 eac91ce65..371541e9f 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 @@ -158,8 +158,8 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem { } ResourceLocation texture = ((ItemTravelBelt) stack.getItem()).getRenderTexture(); - IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture)); - model.bipedBody.render(ms, buffer, light, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1); + IVertexBuilder buffer = buffers.getBuffer(model.getRenderType(texture)); + model.bipedBody.render(ms, buffer, light, OverlayTexture.NO_OVERLAY, 1, 1, 1, 1); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index 82505ca12..7f955fb3d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -42,7 +42,7 @@ public class ItemUnholyCloak extends ItemHolyCloak { public boolean effectOnDamage(LivingHurtEvent event, PlayerEntity player, ItemStack stack) { if (!event.getSource().isUnblockable()) { int range = 6; - List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getX() - range, player.getY() - range, player.getZ() - range, player.getX() + range, player.getY() + range, player.getZ() + range), Predicates.instanceOf(IMob.class)); + List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.getPosX() - range, player.getPosY() - range, player.getPosZ() - range, player.getPosX() + range, player.getPosY() + range, player.getPosZ() + range), Predicates.instanceOf(IMob.class)); for (IMob mob : (List) mobs) { if (mob instanceof LivingEntity) { LivingEntity entity = (LivingEntity) mob; @@ -50,13 +50,13 @@ public class ItemUnholyCloak extends ItemHolyCloak { } } - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); for (int i = 0; i < 90; i++) { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; float zMotion = (float) Math.sin(rad) * 0.2F; WispParticleData data = WispParticleData.wisp(0.6F + (float) Math.random() * 0.2F, 0.4F + (float) Math.random() + 0.25F, 0F, 0F); - player.world.addParticle(data, player.getX(), player.getY() + 0.5, player.getZ(), xMotion, 0F, zMotion); + player.world.addParticle(data, player.getPosX(), player.getPosY() + 0.5, player.getPosZ(), xMotion, 0F, zMotion); } return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index 3adcf4544..29b65b394 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -64,7 +64,7 @@ public class ItemStarSword extends ItemManasteelSword { } ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE); - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.starcaller, SoundCategory.PLAYERS, 0.4F, 1.4F); } } } 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 0d89ccf94..de7592d49 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 @@ -56,7 +56,7 @@ public class ItemThunderSword extends ItemManasteelSword { LivingEntity lightningSource = entity; int hops = entity.world.isThundering() ? 10 : 4; for (int i = 0; i < hops; i++) { - List entities = entity.world.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.getX() - range, lightningSource.getY() - range, lightningSource.getZ() - range, lightningSource.getX() + range, lightningSource.getY() + range, lightningSource.getZ() + range), selector::test); + List entities = entity.world.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.getPosX() - range, lightningSource.getPosY() - range, lightningSource.getPosZ() - range, lightningSource.getPosX() + range, lightningSource.getPosY() + range, lightningSource.getPosZ() + range), selector::test); if (entities.isEmpty()) { break; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 711dc504b..fc18e201e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -125,7 +125,7 @@ public class ItemLivingwoodBow extends BowItem implements IManaUsingItem { worldIn.addEntity(abstractarrowentity); } - worldIn.playSound((PlayerEntity) null, playerentity.getX(), playerentity.getY(), playerentity.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (random.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + worldIn.playSound((PlayerEntity) null, playerentity.getPosX(), playerentity.getPosY(), playerentity.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 1.0F, 1.0F / (random.nextFloat() * 0.4F + 1.2F) + f * 0.5F); if (!flag1 && !playerentity.abilities.isCreativeMode) { itemstack.shrink(1); if (itemstack.isEmpty()) { 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 e6306155b..893d0635c 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 @@ -65,7 +65,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { } private void addDrop(LivingDropsEvent event, ItemStack drop) { - ItemEntity entityitem = new ItemEntity(event.getEntityLiving().world, event.getEntityLiving().getX(), event.getEntityLiving().getY(), event.getEntityLiving().getZ(), drop); + ItemEntity entityitem = new ItemEntity(event.getEntityLiving().world, event.getEntityLiving().getPosX(), event.getEntityLiving().getPosY(), event.getEntityLiving().getPosZ(), drop); entityitem.setPickupDelay(10); event.getDrops().add(entityitem); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 3a2887bec..a3e795f33 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -57,7 +57,7 @@ public class ItemElementiumShears extends ItemManasteelShears { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Override @@ -68,7 +68,7 @@ public class ItemElementiumShears extends ItemManasteelShears { if (count != getUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = living.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.getX() - range, living.getY() - range, living.getZ() - range, living.getX() + range, living.getY() + range, living.getZ() + range), Predicates.instanceOf(IShearable.class)); + List sheep = living.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.getPosX() - range, living.getPosY() - range, living.getPosZ() - range, living.getPosX() + range, living.getPosY() + range, living.getPosZ() + range), Predicates.instanceOf(IShearable.class)); if (sheep.size() > 0) { for (IShearable target : (List) sheep) { Entity entity = (Entity) target; 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 f4a24d285..d23d14ab4 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 @@ -118,11 +118,11 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if (level != 0) { setEnabled(stack, !isEnabled(stack)); if (!world.isRemote) { - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); } } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } @Nonnull 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 77671c263..c4ece906d 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 @@ -63,7 +63,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { EntityManaBurst burst = getBurst(player, player.getHeldItemMainhand()); player.world.addEntity(burst); ToolCommons.damageItem(player.getHeldItemMainhand(), 1, player, MANA_PER_DAMAGE); - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } @@ -101,7 +101,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { @Override public void updateBurst(IManaBurst burst, ItemStack stack) { ThrowableEntity entity = (ThrowableEntity) burst; - AxisAlignedBB axis = new AxisAlignedBB(entity.getX(), entity.getY(), entity.getZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(1); + 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(); 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 42fa3d911..11da9e790 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -26,7 +26,7 @@ public class LensDamage extends Lens { if (entity.world.isRemote) { return; } - AxisAlignedBB axis = new AxisAlignedBB(entity.getX(), entity.getY(), entity.getZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(1); + 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); for (LivingEntity living : entities) { if (living instanceof PlayerEntity) { 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 2ac00e7ba..b4e8d8853 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -26,7 +26,7 @@ public class LensExplosive extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if (!isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos())) { Entity cause = entity.getThrower() != null ? entity.getThrower() : entity; - entity.world.createExplosion(cause, entity.getX(), entity.getY(), entity.getZ(), + entity.world.createExplosion(cause, entity.getPosX(), entity.getPosY(), entity.getPosZ(), burst.getMana() / 50F, Explosion.Mode.BREAK); } } else { 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 2082d6378..3d8fc4306 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -32,7 +32,7 @@ public class LensFirework extends Lens { && !((BlockRayTraceResult) pos).getPos().equals(coords)) { ItemStack fireworkStack = generateFirework(burst.getColor()); - FireworkRocketEntity rocket = new FireworkRocketEntity(entity.world, entity.getX(), entity.getY(), entity.getZ(), fireworkStack); + FireworkRocketEntity rocket = new FireworkRocketEntity(entity.world, entity.getPosX(), entity.getPosY(), entity.getPosZ(), fireworkStack); entity.world.addEntity(rocket); } } else { diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 7f363e883..d402083b9 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -30,7 +30,7 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, ThrowableEntity entity, ItemStack stack) { if (!burst.isFake()) { double range = 3.5; - AxisAlignedBB bounds = new AxisAlignedBB(entity.getX() - range, entity.getY() - range, entity.getZ() - range, entity.getX() + range, entity.getY() + range, entity.getZ() + range); + AxisAlignedBB bounds = new AxisAlignedBB(entity.getPosX() - range, entity.getPosY() - range, entity.getPosZ() - range, entity.getPosX() + range, entity.getPosY() + range, entity.getPosZ() + range); List movables = entity.world.getEntitiesWithinAABB(ItemEntity.class, bounds); movables.addAll(entity.world.getEntitiesWithinAABB(ExperienceOrbEntity.class, bounds)); movables.addAll(entity.world.getEntitiesWithinAABB(AbstractArrowEntity.class, bounds)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index fbe705fd4..247a037cb 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -42,8 +42,8 @@ public class LensPaint extends Lens { SheepEntity sheep = (SheepEntity) ((EntityRayTraceResult) pos).getEntity(); DyeColor sheepColor = sheep.getFleeceColor(); List sheepList = entity.world.getEntitiesWithinAABB(SheepEntity.class, - new AxisAlignedBB(sheep.getX() - r, sheep.getY() - r, sheep.getZ() - r, - sheep.getX() + r, sheep.getY() + r, sheep.getZ() + r)); + new AxisAlignedBB(sheep.getPosX() - r, sheep.getPosY() - r, sheep.getPosZ() - r, + sheep.getPosX() + r, sheep.getPosY() + r, sheep.getPosZ() + r)); for (SheepEntity other : sheepList) { if (other.getFleeceColor() == sheepColor) { other.setFleeceColor(DyeColor.byId(storedColor == 16 ? other.world.rand.nextInt(16) : storedColor)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index ea3b9b904..5379895cc 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -26,7 +26,7 @@ public class LensStorm extends Lens { if (pos.getType() == RayTraceResult.Type.BLOCK && !isManaBlock && !coords.equals(((BlockRayTraceResult) pos).getPos())) { - entity.world.createExplosion(entity, entity.getX(), entity.getY(), entity.getZ(), 5F, Explosion.Mode.DESTROY); + entity.world.createExplosion(entity, entity.getPosX(), entity.getPosY(), entity.getPosZ(), 5F, Explosion.Mode.DESTROY); } } else { dead = false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java index 2e57836d9..98aa70122 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java @@ -37,7 +37,7 @@ public class LensTripwire extends Lens { return; } - AxisAlignedBB axis = new AxisAlignedBB(entity.getX(), entity.getY(), entity.getZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(0.25); + AxisAlignedBB axis = new AxisAlignedBB(entity.getPosX(), entity.getPosY(), entity.getPosZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(0.25); List entities = entity.world.getEntitiesWithinAABB(LivingEntity.class, axis); if (!entities.isEmpty()) { Entity e = (Entity) burst; 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 1e7dd8f2c..aa893563b 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemEnderAir.java @@ -74,7 +74,7 @@ public class ItemEnderAir extends Item { stack.shrink(1); } - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (random.nextFloat() * 0.4F + 0.8F)); if (!world.isRemote) { EntityEnderAirBottle b = new EntityEnderAirBottle(player, world); @@ -83,6 +83,6 @@ public class ItemEnderAir extends Item { } else { player.swingArm(hand); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } } 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 7fe8df8dd..076f86436 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -54,10 +54,10 @@ public class ItemDice extends ItemRelic { if (isRightPlayer(player, stack)) { if (world.isRemote) { - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); List possible = new ArrayList<>(); for (int i = 0; i < 6; i++) { @@ -69,15 +69,15 @@ public class ItemDice extends ItemRelic { if (possible.isEmpty()) { player.sendMessage(new TranslationTextComponent("botaniamisc.dudDiceRoll", world.rand.nextInt(6) + 1).applyTextStyle(TextFormatting.DARK_GREEN)); stack.shrink(1); - return ActionResult.success(stack); + 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)); - return ActionResult.success(new ItemStack(getRelics()[relic])); + return ActionResult.resultSuccess(new ItemStack(getRelics()[relic])); } } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @Override 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 6dbec7f71..331a6057c 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -68,7 +68,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs ItemStack stack = ctx.getItem(); GlobalPos loc = GlobalPos.of(world.getDimension().getType(), pos); ItemNBTHelper.set(stack, TAG_LOCATION, loc.serialize(NBTDynamicOps.INSTANCE)); - world.playSound(null, player.getX(), player.getY(), player.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 5F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 5F); } return ActionResultType.SUCCESS; @@ -79,9 +79,9 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Override public void onUsingTick(ItemStack stack, LivingEntity living, int count) { - float x = (float) (living.getX() - Math.random() * living.getWidth()); - float y = (float) (living.getY() + Math.random()); - float z = (float) (living.getZ() - Math.random() * living.getWidth()); + float x = (float) (living.getPosX() - Math.random() * living.getWidth()); + float y = (float) (living.getPosY() + Math.random()); + float z = (float) (living.getPosZ() - Math.random() * living.getWidth()); WispParticleData data = WispParticleData.wisp((float) Math.random() * 0.7F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 1); living.world.addParticle(data, x, y, z, 0, 0.05F + (float) Math.random() * 0.05F, 0); } @@ -90,7 +90,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Nonnull @@ -105,7 +105,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs int y = loc.getPos().getY(); int z = loc.getPos().getZ(); - int cost = (int) (MathHelper.pointDistanceSpace(x + 0.5, y + 0.5, z + 0.5, living.getX(), living.getY(), living.getZ()) * 10); + 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() && (!(living instanceof PlayerEntity) || ManaItemHandler.instance().requestManaExact(stack, (PlayerEntity) living, cost, true))) { @@ -118,8 +118,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs } private static void moveParticlesAndSound(Entity entity) { - PacketHandler.sendToNearby(entity.world, entity, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.FLUGEL_EFFECT, entity.getX(), entity.getY(), entity.getZ(), entity.getEntityId())); - entity.world.playSound(null, entity.getX(), entity.getY(), entity.getZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); + PacketHandler.sendToNearby(entity.world, entity, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.FLUGEL_EFFECT, entity.getPosX(), entity.getPosY(), entity.getPosZ(), entity.getEntityId())); + entity.world.playSound(null, entity.getPosX(), entity.getPosY(), entity.getPosZ(), SoundEvents.ENTITY_ENDERMAN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index 1d8a0fcd2..f07fc9462 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -49,9 +49,9 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { ItemStack stack = player.getHeldItem(hand); if (player.canEat(false) && isRightPlayer(player, stack)) { player.setActiveHand(hand); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index a152a916e..2037eb702 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -47,7 +47,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { player.setActiveHand(hand); ItemStack stack = player.getHeldItem(hand); setCharging(stack, true); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } @Override 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 6d763fe1b..bf3bab6df 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -56,12 +56,12 @@ public class ItemDiviningRod extends Item implements IManaUsingItem, IAvatarWiel doHighlight(world, new BlockPos(p), range, seedxor); p.swingArm(hand); } else { - world.playSound(null, p.getX(), p.getY(), p.getZ(), ModSounds.divinationRod, SoundCategory.PLAYERS, 1F, 1F); + world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), ModSounds.divinationRod, SoundCategory.PLAYERS, 1F, 1F); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } private void doHighlight(World world, BlockPos pos, int range, long seedxor) { 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 5cea71337..f5428b09e 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -151,7 +151,7 @@ public class ItemGravityRod extends Item implements IManaUsingItem { if (target != null) { if (BLACKLIST.contains(target.getType())) { - return ActionResult.fail(stack); + return ActionResult.resultFail(stack); } if (ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true)) { @@ -182,7 +182,7 @@ public class ItemGravityRod extends Item implements IManaUsingItem { float ym = ((float) Math.random() - 0.5F) * m; float zm = ((float) Math.random() - 0.5F) * m; WispParticleData data = WispParticleData.wisp(s, r, 0F, b); - world.addParticle(data, target.getX() + target.getWidth() / 2, target.getY() + target.getHeight() / 2, target.getZ() + target.getWidth() / 2, xm, ym, zm); + world.addParticle(data, target.getPosX() + target.getWidth() / 2, target.getPosY() + target.getHeight() / 2, target.getPosZ() + target.getWidth() / 2, xm, ym, zm); } MathHelper.setEntityMotionFromVector(target, target3, 0.3333333F); @@ -192,10 +192,10 @@ public class ItemGravityRod extends Item implements IManaUsingItem { } ItemNBTHelper.setInt(stack, TAG_TICKS_TILL_EXPIRE, 5); - return ActionResult.consume(stack); + return ActionResult.resultConsume(stack); } } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } @Override @@ -236,7 +236,7 @@ public class ItemGravityRod extends Item implements IManaUsingItem { float mot = IManaProficiencyArmor.hasProficiency(player, stack) ? 2.25F : 1.5F; item.setMotion(moveVector.x * mot, moveVector.y, moveVector.z * mot); if (!player.world.isRemote) { - EntityThrownItem thrown = new EntityThrownItem(item.world, item.getX(), item.getY(), item.getZ(), (ItemEntity) item); + EntityThrownItem thrown = new EntityThrownItem(item.world, item.getPosX(), item.getPosY(), item.getPosZ(), (ItemEntity) item); item.world.addEntity(thrown); } item.remove(); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 4e87e8284..6e12cdd52 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -61,12 +61,12 @@ public class ItemMissileRod extends Item implements IManaUsingItem, IAvatarWield PlayerEntity player = (PlayerEntity) living; if (count != getUseDuration(stack) && count % (IManaProficiencyArmor.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.world.isRemote && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST_PER, false)) { - if (spawnMissile(player.world, player, player.getX() + (Math.random() - 0.5 * 0.1), player.getY() + 2.4 + (Math.random() - 0.5 * 0.1), player.getZ() + (Math.random() - 0.5 * 0.1))) { + if (spawnMissile(player.world, player, player.getPosX() + (Math.random() - 0.5 * 0.1), player.getPosY() + 2.4 + (Math.random() - 0.5 * 0.1), player.getPosZ() + (Math.random() - 0.5 * 0.1))) { ManaItemHandler.instance().requestManaExactForTool(stack, player, COST_PER, true); } SparkleParticleData data = SparkleParticleData.sparkle(6F, 1F, 0.4F, 1F, 6); - player.world.addParticle(data, player.getX(), player.getY() + 2.4, player.getZ(), 0, 0, 0); + player.world.addParticle(data, player.getPosX(), player.getPosY() + 2.4, player.getPosZ(), 0, 0, 0); } } @@ -94,7 +94,7 @@ public class ItemMissileRod extends Item implements IManaUsingItem, IAvatarWield @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Override 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 08058c799..d92a49018 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -59,9 +59,9 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(player.getLookVec()).normalize(); - double x = player.getX(); - double y = player.getY(); - double z = player.getZ(); + double x = player.getPosX(); + double y = player.getPosY(); + double z = player.getPosZ(); BlockPos.Mutable pos = new BlockPos.Mutable((int) x, (int) y, (int) z); double lastX = 0; @@ -112,13 +112,13 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield } if (count > 0) { - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); + world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); ManaItemHandler.instance().requestManaExactForTool(stack, player, MANA_COST, false); player.getCooldownTracker().setCooldown(this, TIME); } } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } @Nonnull @@ -170,9 +170,9 @@ public class ItemRainbowRod extends Item implements IManaUsingItem, IAvatarWield List players = world.getEntitiesWithinAABB(PlayerEntity.class, axis); for (PlayerEntity p : players) { - int px = MathHelper.floor(p.getX()); - int py = MathHelper.floor(p.getY()) - 1; - int pz = MathHelper.floor(p.getZ()); + int px = MathHelper.floor(p.getPosX()); + int py = MathHelper.floor(p.getPosY()) - 1; + int pz = MathHelper.floor(p.getPosZ()); int dist = 5; int diff = dist / 2; 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 8ec3bf889..e00b4c78b 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -69,7 +69,7 @@ public class ItemSkyDirtRod extends ItemDirtRod { player.swingArm(hand); } - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index de7280571..f9630a941 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -66,7 +66,7 @@ public class ItemSmeltRod extends Item implements IManaUsingItem { @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } @Override @@ -106,8 +106,8 @@ public class ItemSmeltRod extends Item implements IManaUsingItem { if (data.progress <= 0) { if (!p.world.isRemote) { p.world.setBlockState(pos.getPos(), Block.getBlockFromItem(result.getItem()).getDefaultState()); - p.world.playSound(null, p.getX(), p.getY(), p.getZ(), SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); - p.world.playSound(null, p.getX(), p.getY(), p.getZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); + p.world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); ManaItemHandler.instance().requestManaExactForTool(stack, p, COST_PER_TICK, true); playerData.remove(p); @@ -136,7 +136,7 @@ public class ItemSmeltRod extends Item implements IManaUsingItem { p.world.addParticle(data, x, y, z, 0, (float) Math.random() / 10F, 0); } if (time % 10 == 0) { - p.world.playSound(null, p.getX(), p.getY(), p.getZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); + p.world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); } } } 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 b2c26294c..5730eba39 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -83,7 +83,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv @Override public ActionResult onItemRightClick(World world, PlayerEntity player, @Nonnull Hand hand) { player.setActiveHand(hand); - return ActionResult.success(player.getHeldItem(hand)); + return ActionResult.resultSuccess(player.getHeldItem(hand)); } private void terraform(ItemStack stack, World world, PlayerEntity player) { @@ -143,7 +143,7 @@ public class ItemTerraformRod extends Item implements IManaUsingItem, IBlockProv if (!blocks.isEmpty()) { for (int i = 0; i < 10; i++) { - world.playSound(player, player.getX(), player.getY(), player.getZ(), SoundEvents.BLOCK_SAND_STEP, SoundCategory.BLOCKS, 1F, 0.4F); + world.playSound(player, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_SAND_STEP, SoundCategory.BLOCKS, 1F, 0.4F); } SparkleParticleData data = SparkleParticleData.sparkle(2F, 0.35F, 0.2F, 0.05F, 5); for (int i = 0; i < 120; i++) { 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 44e0c03c8..834c6e5b9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -77,7 +77,7 @@ public class ItemTornadoRod extends Item implements IManaUsingItem, IAvatarWield player.playSound(ModSounds.airRod, 0.1F, 0.25F); for (int i = 0; i < 5; i++) { WispParticleData data = WispParticleData.wisp(0.35F + (float) Math.random() * 0.1F, 0.25F, 0.25F, 0.25F); - world.addParticle(data, player.getX(), player.getY(), player.getZ(), 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + world.addParticle(data, player.getPosX(), player.getPosY(), player.getPosZ(), 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } } @@ -111,10 +111,10 @@ public class ItemTornadoRod extends Item implements IManaUsingItem, IAvatarWield if (fly == 0 && ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, false)) { ManaItemHandler.instance().requestManaExactForTool(stack, player, COST, true); setFlying(stack, true); - return ActionResult.success(stack); + return ActionResult.resultSuccess(stack); } - return ActionResult.pass(stack); + return ActionResult.resultPass(stack); } private boolean isFlying(ItemStack stack) { @@ -153,12 +153,12 @@ public class ItemTornadoRod extends Item implements IManaUsingItem, IAvatarWield for (int i = 0; i < 20; i++) { for (int j = 0; j < 5; j++) { WispParticleData data = WispParticleData.wisp(0.35F + (float) Math.random() * 0.1F, 0.25F, 0.25F, 0.25F); - world.addParticle(data, p.getX(), p.getY() + i, p.getZ(), 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); + world.addParticle(data, p.getPosX(), p.getPosY() + i, p.getPosZ(), 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } } if (!world.isRemote) { - p.world.playSound(null, p.getX(), p.getY(), p.getZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.getPosX(), p.getPosY(), p.getPosZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); p.addPotionEffect(new EffectInstance(ModPotions.featherfeet, 100, 0)); tile.receiveMana(-COST); } diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index ee3dac472..78a5441b2 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -136,8 +136,8 @@ public class PacketBotaniaEffect { return; } - Vector3 orig = new Vector3(e1.getX(), e1.getY() + 0.25, e1.getZ()); - Vector3 end = new Vector3(e2.getX(), e2.getY() + 0.25, e2.getZ()); + Vector3 orig = new Vector3(e1.getPosX(), e1.getPosY() + 0.25, e1.getPosZ()); + Vector3 end = new Vector3(e2.getPosX(), e2.getPosY() + 0.25, e2.getPosZ()); Vector3 diff = end.subtract(orig); Vector3 movement = diff.normalize().multiply(0.1); int iters = (int) (diff.mag() / movement.mag()); @@ -251,9 +251,9 @@ public class PacketBotaniaEffect { Entity entity = world.getEntityByID(message.args[0]); if (entity != null) { for (int i = 0; i < 15; i++) { - float x = (float) (entity.getX() + Math.random()); - float y = (float) (entity.getY() + Math.random()); - float z = (float) (entity.getZ() + Math.random()); + float x = (float) (entity.getPosX() + Math.random()); + float y = (float) (entity.getPosY() + Math.random()); + float z = (float) (entity.getPosZ() + Math.random()); WispParticleData data = WispParticleData.wisp((float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 1); world.addParticle(data, x, y, z, 0, -(-0.3F + (float) Math.random() * 0.2F), 0); } @@ -272,9 +272,9 @@ public class PacketBotaniaEffect { break; } - double x = target.getX(); - double y = target.getY(); - double z = target.getZ(); + double x = target.getPosX(); + double y = target.getPosY(); + double z = target.getPosZ(); SparkleParticleData data = SparkleParticleData.sparkle(1F, 1F, 1F, 0.25F, 3); for (int i = 0; i < 50; i++) { diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index 70c185b28..2604e9bda 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -34,7 +34,7 @@ public class PacketDodge { if (ctx.get().getDirection().getReceptionSide().isServer()) { ctx.get().enqueueWork(() -> { ServerPlayerEntity player = ctx.get().getSender(); - player.world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); ItemStack ringStack = EquipmentHandler.findOrEmpty(ModItems.dodgeRing, player); if (ringStack.isEmpty()) { diff --git a/src/main/java/vazkii/botania/common/world/ModFeatures.java b/src/main/java/vazkii/botania/common/world/ModFeatures.java index fdb83aa3e..afdaaa95f 100644 --- a/src/main/java/vazkii/botania/common/world/ModFeatures.java +++ b/src/main/java/vazkii/botania/common/world/ModFeatures.java @@ -59,9 +59,9 @@ public class ModFeatures { public static void addWorldgen() { for (Biome biome : ForgeRegistries.BIOMES) { if (BiomeDictionary.getTypes(biome).stream().noneMatch(TYPE_BLACKLIST::contains)) { - biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_FLOWERS.configure(new MysticalFlowerConfig()).createDecoratedFeature(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); + biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_FLOWERS.withConfiguration(new MysticalFlowerConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); } - biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_MUSHROOMS.configure(new MysticalFlowerConfig()).createDecoratedFeature(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); + biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_MUSHROOMS.withConfiguration(new MysticalFlowerConfig()).withPlacement(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG))); } } } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java index 74d849080..40dd1955e 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockChunkGenerator.java @@ -29,11 +29,11 @@ public class SkyblockChunkGenerator extends OverworldChunkGenerator { public void makeBase(IWorld worldIn, IChunk chunkIn) {} @Override - public void buildSurface(WorldGenRegion region, IChunk chunkIn) {} + public void generateSurface(WorldGenRegion region, IChunk chunkIn) {} @Override public void decorate(WorldGenRegion region) {} @Override - public void carve(BiomeManager biomeManager, IChunk chunkIn, GenerationStage.Carving carvingSettings) {} + public void func_225550_a_(BiomeManager biomeManager, IChunk chunkIn, GenerationStage.Carving carvingSettings) {} } diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index aff3a18a2..aadfdcf9a 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -158,9 +158,9 @@ public final class SkyblockWorldEvents { if (fabricated) { persist.putBoolean(TAG_HAS_OWN_ISLAND, true); - persist.putDouble(TAG_ISLAND_X, player.getX()); - persist.putDouble(TAG_ISLAND_Y, player.getY()); - persist.putDouble(TAG_ISLAND_Z, player.getZ()); + persist.putDouble(TAG_ISLAND_X, player.getPosX()); + persist.putDouble(TAG_ISLAND_Y, player.getPosY()); + persist.putDouble(TAG_ISLAND_Z, player.getPosZ()); } } else { double posX = persist.getDouble(TAG_ISLAND_X); diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 453eb3987..b6b2797c0 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -47,7 +47,7 @@ public class WorldTypeSkyblock extends WorldType { public ChunkGenerator createChunkGenerator(@Nonnull World world) { if (world.dimension.getType() == DimensionType.OVERWORLD) { OverworldGenSettings genSettings = SkyblockChunkGenerator.TYPE.createSettings(); - OverworldBiomeProviderSettings biomeSettings = BiomeProviderType.VANILLA_LAYERED.getConfig(world.getWorldInfo()).setGeneratorSettings(genSettings); + OverworldBiomeProviderSettings biomeSettings = BiomeProviderType.VANILLA_LAYERED.createSettings(world.getWorldInfo()).setGeneratorSettings(genSettings); return SkyblockChunkGenerator.TYPE.create(world, BiomeProviderType.VANILLA_LAYERED.create(biomeSettings), genSettings); } return super.createChunkGenerator(world); diff --git a/src/main/java/vazkii/botania/data/BlockLootProvider.java b/src/main/java/vazkii/botania/data/BlockLootProvider.java index 0b236d6bb..b4a66b6df 100644 --- a/src/main/java/vazkii/botania/data/BlockLootProvider.java +++ b/src/main/java/vazkii/botania/data/BlockLootProvider.java @@ -155,9 +155,9 @@ public class BlockLootProvider implements IDataProvider { private static LootTable.Builder genCopyNbt(Block b, String... tags) { LootEntry.Builder entry = ItemLootEntry.builder(b); - CopyNbt.Builder func = CopyNbt.func_215881_a(CopyNbt.Source.BLOCK_ENTITY); + CopyNbt.Builder func = CopyNbt.builder(CopyNbt.Source.BLOCK_ENTITY); for (String tag : tags) { - func = func.func_216056_a(tag, "BlockEntityTag." + tag); + func = func.replaceOperation(tag, "BlockEntityTag." + tag); } LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) .acceptCondition(SurvivesExplosion.builder()) @@ -205,14 +205,14 @@ public class BlockLootProvider implements IDataProvider { private static LootTable.Builder genSlab(Block b) { LootEntry.Builder entry = ItemLootEntry.builder(b) .acceptFunction(SetCount.builder(ConstantRange.of(2)) - .acceptCondition(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(SlabBlock.TYPE, SlabType.DOUBLE)))) + .acceptCondition(BlockStateProperty.builder(b).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withProp(SlabBlock.TYPE, SlabType.DOUBLE)))) .acceptFunction(ExplosionDecay.builder()); return LootTable.builder().addLootPool(LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry)); } private static LootTable.Builder genDoubleFlower(Block b) { LootEntry.Builder entry = ItemLootEntry.builder(b) - .acceptCondition(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER))) + .acceptCondition(BlockStateProperty.builder(b).fromProperties(StatePropertiesPredicate.Builder.newBuilder().withProp(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER))) .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().tag(ModTags.Items.SHEARS))); LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry) .acceptCondition(SurvivesExplosion.builder()); diff --git a/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java index 030610ecc..d2a0ec1cd 100644 --- a/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/ElvenTradeProvider.java @@ -67,7 +67,7 @@ public class ElvenTradeProvider extends RecipeProvider { consumer.accept(new FinishedRecipe(id("diamond_return"), new ItemStack(Items.DIAMOND), Ingredient.fromItems(Items.DIAMOND))); consumer.accept(new FinishedRecipe(id("diamond_block_return"), new ItemStack(Blocks.DIAMOND_BLOCK), Ingredient.fromItems(Blocks.DIAMOND_BLOCK))); - CustomRecipeBuilder.func_218656_a(ModRecipeTypes.LEXICON_ELVEN_TRADE_SERIALIZER).build(consumer, id("lexicon_elven").toString()); + CustomRecipeBuilder.customRecipe(ModRecipeTypes.LEXICON_ELVEN_TRADE_SERIALIZER).build(consumer, id("lexicon_elven").toString()); } private static ResourceLocation id(String path) { diff --git a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java index 6afa10c12..57073a5e7 100644 --- a/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java +++ b/src/main/java/vazkii/botania/data/recipes/RecipeProvider.java @@ -2657,7 +2657,7 @@ public class RecipeProvider extends net.minecraft.data.RecipeProvider { } private void specialRecipe(Consumer consumer, SpecialRecipeSerializer serializer) { - CustomRecipeBuilder.func_218656_a(serializer).build(consumer, prefix("dynamic/" + serializer.getRegistryName().getPath()).toString()); + CustomRecipeBuilder.customRecipe(serializer).build(consumer, prefix("dynamic/" + serializer.getRegistryName().getPath()).toString()); } @Override