diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index 46fd4b1e9..0984a0dfe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -81,7 +81,7 @@ public final class BlockHighlightRenderHandler { double offY = -1.0 / 16 + 0.005; for (Entity e : mc.world.getAllEntities()) { if (e instanceof EntityMagicLandmine) { - BlockPos bpos = e.getPosition(); + BlockPos bpos = e.func_233580_cy_(); AxisAlignedBB aabb = new AxisAlignedBB(bpos).offset(0, offY, 0).grow(2.5, 0, 2.5); float gs = (float) (Math.sin(ClientTickHandler.total / 20) + 1) * 0.2F + 0.6F; diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 5c9274549..5326a2c08 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -225,7 +225,7 @@ public final class HUDHandler { } profiler.endStartSection("itemsRemaining"); - ItemsRemainingRenderHandler.render(event.getPartialTicks()); + ItemsRemainingRenderHandler.render(ms, event.getPartialTicks()); profiler.endSection(); profiler.endSection(); 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 c203471de..3833a4efc 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.core.handler; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; @@ -15,6 +16,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -39,7 +41,7 @@ public final class ItemsRemainingRenderHandler { private static int ticks, count; @OnlyIn(Dist.CLIENT) - public static void render(float partTicks) { + public static void render(MatrixStack ms, float partTicks) { if (ticks > 0 && !stack.isEmpty()) { int pos = maxTicks - ticks; Minecraft mc = Minecraft.getInstance(); @@ -56,39 +58,48 @@ public final class ItemsRemainingRenderHandler { RenderSystem.color4f(1F, 1F, 1F, alpha); int xp = x + (int) (16F * (1F - alpha)); - RenderSystem.translatef(xp, y, 0F); - RenderSystem.scalef(alpha, 1F, 1F); + ms.translate(xp, y, 0F); + ms.scale(alpha, 1F, 1F); mc.getItemRenderer().renderItemAndEffectIntoGUI(stack, 0, 0); - RenderSystem.scalef(1F / alpha, 1F, 1F); - RenderSystem.translatef(-xp, -y, 0F); + ms.scale(1F / alpha, 1F, 1F); + ms.translate(-xp, -y, 0F); RenderSystem.color4f(1F, 1F, 1F, 1F); RenderSystem.enableBlend(); - String text = ""; + ITextComponent text = StringTextComponent.field_240750_d_; if (customString == null) { if (!stack.isEmpty()) { - text = TextFormatting.GREEN + stack.getDisplayName().getString(); + text = stack.getDisplayName().func_230532_e_().func_240699_a_(TextFormatting.GREEN); if (count >= 0) { int max = stack.getMaxStackSize(); int stacks = count / max; int rem = count % max; if (stacks == 0) { - text = "" + count; + text = new StringTextComponent(Integer.toString(count)); } else { - text = count + " (" + TextFormatting.AQUA + stacks + TextFormatting.RESET + "*" + TextFormatting.GRAY + max + TextFormatting.RESET + "+" + TextFormatting.YELLOW + rem + TextFormatting.RESET + ")"; + ITextComponent stacksText = new StringTextComponent(Integer.toString(stacks)).func_240699_a_(TextFormatting.AQUA); + ITextComponent maxText = new StringTextComponent(Integer.toString(max)).func_240699_a_(TextFormatting.GRAY); + ITextComponent remText = new StringTextComponent(Integer.toString(rem)).func_240699_a_(TextFormatting.YELLOW); + text = new StringTextComponent(count + " (") + .func_230529_a_(stacksText) + .func_240702_b_("*") + .func_230529_a_(maxText) + .func_240702_b_("+") + .func_230529_a_(remText) + .func_240702_b_(")"); } } else if (count == -1) { - text = "\u221E"; + text = new StringTextComponent("\u221E"); } } } else { - text = customString.getFormattedText(); + text = customString; } int color = 0x00FFFFFF | (int) (alpha * 0xFF) << 24; - mc.fontRenderer.func_238405_a_(text, x + 20, y + 6, color); + mc.fontRenderer.func_238407_a_(ms, text, x + 20, y + 6, color); RenderSystem.disableBlend(); RenderSystem.enableAlphaTest(); diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 0891ddbca..4b37b73b1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -8,6 +8,7 @@ */ package vazkii.botania.client.core.handler; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.gui.AbstractGui; @@ -28,6 +29,7 @@ public final class TooltipAdditionDisplayHandler { if (evt.getStack().isEmpty()) { return; } + MatrixStack ms = new MatrixStack(); // todo 1.16 get from event? ItemStack stack = evt.getStack(); int width = evt.getWidth(); @@ -37,13 +39,13 @@ public final class TooltipAdditionDisplayHandler { FontRenderer font = evt.getFontRenderer(); if (stack.getItem() instanceof ItemTerraPick) { - drawTerraPick(stack, tooltipX, tooltipY, width, height, font); + drawTerraPick(ms, stack, tooltipX, tooltipY, width, height, font); } else if (stack.getItem() instanceof IManaTooltipDisplay) { - drawManaBar(stack, (IManaTooltipDisplay) stack.getItem(), tooltipX, tooltipY, width, height); + drawManaBar(ms, stack, (IManaTooltipDisplay) stack.getItem(), tooltipX, tooltipY, width, height); } } - private static void drawTerraPick(ItemStack stack, int mouseX, int mouseY, int width, int height, FontRenderer font) { + private static void drawTerraPick(MatrixStack ms, ItemStack stack, int mouseX, int mouseY, int width, int height, FontRenderer font) { int level = ItemTerraPick.getLevel(stack); int max = ItemTerraPick.LEVELS[Math.min(ItemTerraPick.LEVELS.length - 1, level + 1)]; boolean ss = level >= ItemTerraPick.LEVELS.length - 1; @@ -54,37 +56,37 @@ public final class TooltipAdditionDisplayHandler { float hueOff = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.01F; RenderSystem.disableDepthTest(); - AbstractGui.fill(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); + AbstractGui.func_238467_a_(ms, mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); for (int i = 0; i < rainbowWidth; i++) { - AbstractGui.fill(mouseX + i, mouseY - height, mouseX + i + 1, mouseY, 0xFF000000 | MathHelper.hsvToRGB((hueOff + huePer * i) % 1F, 1F, 1F)); + AbstractGui.func_238467_a_(ms, mouseX + i, mouseY - height, mouseX + i + 1, mouseY, 0xFF000000 | MathHelper.hsvToRGB((hueOff + huePer * i) % 1F, 1F, 1F)); } - AbstractGui.fill(mouseX + rainbowWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); + AbstractGui.func_238467_a_(ms, mouseX + rainbowWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7"); GL11.glPushAttrib(GL11.GL_LIGHTING_BIT); RenderSystem.disableLighting(); - RenderSystem.pushMatrix(); - RenderSystem.translatef(0, 0, 300); - font.func_238405_a_(rank, mouseX, mouseY - 12, 0xFFFFFF); + ms.push(); + ms.translate(0, 0, 300); + font.func_238405_a_(ms, rank, mouseX, mouseY - 12, 0xFFFFFF); if (!ss) { rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7"); - font.func_238405_a_(rank, mouseX + width - font.getStringWidth(rank), mouseY - 12, 0xFFFFFF); + font.func_238405_a_(ms, rank, mouseX + width - font.getStringWidth(rank), mouseY - 12, 0xFFFFFF); } - RenderSystem.popMatrix(); + ms.pop(); RenderSystem.enableLighting(); RenderSystem.enableDepthTest(); GL11.glPopAttrib(); } - private static void drawManaBar(ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int width, int height) { + private static void drawManaBar(MatrixStack ms, ItemStack stack, IManaTooltipDisplay display, int mouseX, int mouseY, int width, int height) { float fraction = display.getManaFractionForDisplay(stack); int manaBarWidth = (int) Math.ceil(width * fraction); RenderSystem.disableDepthTest(); - AbstractGui.fill(mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); - AbstractGui.fill(mouseX, mouseY - height, mouseX + manaBarWidth, mouseY, 0xFF000000 | MathHelper.hsvToRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); - AbstractGui.fill(mouseX + manaBarWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); + AbstractGui.func_238467_a_(ms, mouseX - 1, mouseY - height - 1, mouseX + width + 1, mouseY, 0xFF000000); + AbstractGui.func_238467_a_(ms, mouseX, mouseY - height, mouseX + manaBarWidth, mouseY, 0xFF000000 | MathHelper.hsvToRGB(0.528F, ((float) Math.sin((ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.2) + 1F) * 0.3F + 0.4F, 1F)); + AbstractGui.func_238467_a_(ms, mouseX + manaBarWidth, mouseY - height, mouseX + width, mouseY, 0xFF555555); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 24fa2b155..d129b2c57 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -221,7 +221,7 @@ public class JEIBotaniaPlugin implements IModPlugin { public static void addDefaultRecipeIdTooltip(IGuiIngredientGroup group, int slot, ResourceLocation recipeId) { group.addTooltipCallback((slotIndex, input, ingredient, tooltip) -> { if (slotIndex == slot) { - if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.hasShiftDown()) { + if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.func_231173_s_()) { tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); } } 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 8f4745ef9..e8207aebc 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 @@ -142,7 +142,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { if (slotIndex >= endIndex) { - if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.hasShiftDown()) { + if (Minecraft.getInstance().gameSettings.advancedItemTooltips || Screen.func_231173_s_()) { tooltip.add(TextFormatting.DARK_GRAY + I18n.format("jei.tooltip.recipe.id", recipeId)); } } diff --git a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java index 35b9462fc..e14de6a67 100644 --- a/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java +++ b/src/main/java/vazkii/botania/client/patchouli/component/RotatingItemListComponentBase.java @@ -44,7 +44,7 @@ abstract class RotatingItemListComponentBase implements ICustomComponent { int ticksElapsed = context.getTicksInBook(); float currentDegree = ConfigHandler.CLIENT.lexiconRotatingItems.get() - ? Screen.hasShiftDown() + ? Screen.func_231173_s_() ? ticksElapsed : ticksElapsed + pticks : 0; 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 d7c6ad8b8..5de1bf59a 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -66,7 +66,7 @@ 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.getRenderType(state)); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.func_239220_a_(state, false)); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .renderModelBrightnessColor(ms.getLast(), buffer, state, model, red / 255F, green / 255F, blue / 255F, light, overlay); } 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 7b9914f41..9e2b40311 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java @@ -62,7 +62,7 @@ public class RenderTileSpreader extends TileEntityRenderer { b = (color & 0xFF) / 255F; } - IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.getRenderType(spreader.getBlockState())); + IVertexBuilder buffer = buffers.getBuffer(RenderTypeLookup.func_239220_a_(spreader.getBlockState(), false)); IBakedModel bakedModel = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(spreader.getBlockState()); Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer() .renderModelBrightnessColor(ms.getLast(), buffer, spreader.getBlockState(), @@ -95,7 +95,7 @@ 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.getRenderType(carpet)); + buffer = buffers.getBuffer(RenderTypeLookup.func_239220_a_(carpet, false)); float f = 1 / 16F; 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 188123bc2..3fbe90d61 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -207,8 +207,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer { float opacity = Minecraft.getInstance().gameSettings.getTextBackgroundOpacity(0.25F); int opacityRGB = (int) (opacity * 255.0F) << 24; - 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); + mc.fontRenderer.func_238416_a_(potato.name, -halfWidth, 0, 0x20FFFFFF, false, ms.getLast().getMatrix(), buffers, true, opacityRGB, light); + mc.fontRenderer.func_238416_a_(potato.name, -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)"; diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java index cdcb2a8d5..b21e08ae9 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalBreadTrigger.java @@ -8,14 +8,14 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.criterion.AbstractCriterionTrigger; +import net.minecraft.advancements.criterion.CriterionInstance; +import net.minecraft.advancements.criterion.EntityPredicate; import net.minecraft.advancements.criterion.LocationPredicate; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.server.ServerWorld; @@ -26,10 +26,9 @@ import javax.annotation.Nonnull; import java.util.*; -public class AlfPortalBreadTrigger implements ICriterionTrigger { +public class AlfPortalBreadTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "alf_portal_bread"); public static final AlfPortalBreadTrigger INSTANCE = new AlfPortalBreadTrigger(); - private final Map playerTrackers = new HashMap<>(); private AlfPortalBreadTrigger() {} @@ -39,69 +38,21 @@ public class AlfPortalBreadTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, AlfPortalBreadTrigger.PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - AlfPortalBreadTrigger.PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public AlfPortalBreadTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new AlfPortalBreadTrigger.Instance(LocationPredicate.deserialize(json.get("portal_location"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerWorld world, BlockPos portal) { - List> list = new ArrayList<>(); - - for (ICriterionTrigger.Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(world, portal)) { - list.add(listener); - } - } - - for (ICriterionTrigger.Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public AlfPortalBreadTrigger.Instance func_230241_b_(@Nonnull JsonObject json, EntityPredicate.AndPredicate playerPredicate, ConditionArrayParser conditions) { + return new AlfPortalBreadTrigger.Instance(playerPredicate, LocationPredicate.deserialize(json.get("portal_location"))); } public void trigger(ServerPlayerEntity player, BlockPos portal) { - AlfPortalBreadTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(player.getServerWorld(), portal); - } + this.func_235959_a_(player, instance -> instance.test(player.getServerWorld(), portal)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final LocationPredicate portal; - Instance(LocationPredicate portal) { + Instance(EntityPredicate.AndPredicate playerPredicate, LocationPredicate portal) { + super(ID, playerPredicate); this.portal = portal; } diff --git a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java index e0d033b48..21ea46600 100644 --- a/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/AlfPortalTrigger.java @@ -8,16 +8,12 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.criterion.ItemPredicate; -import net.minecraft.advancements.criterion.LocationPredicate; +import net.minecraft.advancements.criterion.*; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.server.ServerWorld; @@ -26,12 +22,9 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - -public class AlfPortalTrigger implements ICriterionTrigger { +public class AlfPortalTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "open_elf_portal"); public static final AlfPortalTrigger INSTANCE = new AlfPortalTrigger(); - private final Map playerTrackers = new HashMap<>(); private AlfPortalTrigger() {} @@ -41,70 +34,22 @@ public class AlfPortalTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new Instance(ItemPredicate.deserialize(json.get("wand")), LocationPredicate.deserialize(json.get("location"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerWorld world, BlockPos pos, ItemStack wand) { - List> list = new ArrayList<>(); - - for (ICriterionTrigger.Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(world, pos, wand)) { - list.add(listener); - } - } - - for (ICriterionTrigger.Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public Instance func_230241_b_(@Nonnull JsonObject json, EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { + return new Instance(playerPred, ItemPredicate.deserialize(json.get("wand")), LocationPredicate.deserialize(json.get("location"))); } public void trigger(ServerPlayerEntity player, ServerWorld world, BlockPos pos, ItemStack wand) { - PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(world, pos, wand); - } + func_235959_a_(player, instance -> instance.test(world, pos, wand)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final ItemPredicate wand; private final LocationPredicate pos; - Instance(ItemPredicate predicate, LocationPredicate pos) { + Instance(EntityPredicate.AndPredicate playerPred, ItemPredicate predicate, LocationPredicate pos) { + super(ID, playerPred); this.wand = predicate; this.pos = pos; } diff --git a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java index f00f19034..aef8412b8 100644 --- a/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/CorporeaRequestTrigger.java @@ -8,15 +8,11 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.criterion.LocationPredicate; -import net.minecraft.advancements.criterion.MinMaxBounds; +import net.minecraft.advancements.criterion.*; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.server.ServerWorld; @@ -25,12 +21,9 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - -public class CorporeaRequestTrigger implements ICriterionTrigger { +public class CorporeaRequestTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "corporea_index_request"); public static final CorporeaRequestTrigger INSTANCE = new CorporeaRequestTrigger(); - private final Map playerTrackers = new HashMap<>(); private CorporeaRequestTrigger() {} @@ -40,70 +33,22 @@ public class CorporeaRequestTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new Instance(MinMaxBounds.IntBound.fromJson(json.get("extracted")), LocationPredicate.deserialize(json.get("location"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerWorld world, BlockPos pos, int count) { - List> list = new ArrayList<>(); - - for (Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(world, pos, count)) { - list.add(listener); - } - } - - for (Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + protected Instance func_230241_b_(JsonObject json, EntityPredicate.AndPredicate playerPredicate, ConditionArrayParser conditions) { + return new Instance(playerPredicate, MinMaxBounds.IntBound.fromJson(json.get("extracted")), LocationPredicate.deserialize(json.get("location"))); } public void trigger(ServerPlayerEntity player, ServerWorld world, BlockPos pos, int count) { - PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(world, pos, count); - } + this.func_235959_a_(player, instance -> instance.test(world, pos, count)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final MinMaxBounds.IntBound count; private final LocationPredicate indexPos; - Instance(MinMaxBounds.IntBound count, LocationPredicate indexPos) { + Instance(EntityPredicate.AndPredicate playerPredicate, MinMaxBounds.IntBound count, LocationPredicate indexPos) { + super(ID, playerPredicate); this.count = count; this.indexPos = indexPos; } diff --git a/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java index b8e92aaa5..6c3f30605 100644 --- a/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/DopplegangerNoArmorTrigger.java @@ -8,15 +8,14 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.criterion.AbstractCriterionTrigger; +import net.minecraft.advancements.criterion.CriterionInstance; import net.minecraft.advancements.criterion.DamageSourcePredicate; import net.minecraft.advancements.criterion.EntityPredicate; import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; @@ -25,12 +24,9 @@ import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - -public class DopplegangerNoArmorTrigger implements ICriterionTrigger { +public class DopplegangerNoArmorTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "gaia_guardian_no_armor"); public static final DopplegangerNoArmorTrigger INSTANCE = new DopplegangerNoArmorTrigger(); - private final Map playerTrackers = new HashMap<>(); private DopplegangerNoArmorTrigger() {} @@ -40,70 +36,22 @@ public class DopplegangerNoArmorTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, DopplegangerNoArmorTrigger.PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - DopplegangerNoArmorTrigger.PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public DopplegangerNoArmorTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new DopplegangerNoArmorTrigger.Instance(EntityPredicate.deserialize(json.get("guardian")), DamageSourcePredicate.deserialize(json.get("killing_blow"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerPlayerEntity player, EntityDoppleganger guardian, DamageSource src) { - List> list = new ArrayList<>(); - - for (Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(player, guardian, src)) { - list.add(listener); - } - } - - for (Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public DopplegangerNoArmorTrigger.Instance func_230241_b_(@Nonnull JsonObject json, EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { + return new DopplegangerNoArmorTrigger.Instance(playerPred, EntityPredicate.deserialize(json.get("guardian")), DamageSourcePredicate.deserialize(json.get("killing_blow"))); } public void trigger(ServerPlayerEntity player, EntityDoppleganger guardian, DamageSource src) { - DopplegangerNoArmorTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(player, guardian, src); - } + func_235959_a_(player, instance -> instance.test(player, guardian, src)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final EntityPredicate guardian; private final DamageSourcePredicate killingBlow; - Instance(EntityPredicate count, DamageSourcePredicate indexPos) { + Instance(EntityPredicate.AndPredicate playerPred, EntityPredicate count, DamageSourcePredicate indexPos) { + super(ID, playerPred); this.guardian = count; this.killingBlow = indexPos; } diff --git a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java index 0dc95ef59..957d3c1e0 100644 --- a/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/LokiPlaceTrigger.java @@ -8,29 +8,21 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.criterion.EntityPredicate; -import net.minecraft.advancements.criterion.ItemPredicate; -import net.minecraft.advancements.criterion.MinMaxBounds; +import net.minecraft.advancements.criterion.*; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - -public class LokiPlaceTrigger implements ICriterionTrigger { +public class LokiPlaceTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "loki_placed_blocks"); public static final LokiPlaceTrigger INSTANCE = new LokiPlaceTrigger(); - private final Map playerTrackers = new HashMap<>(); private LokiPlaceTrigger() {} @@ -40,71 +32,23 @@ public class LokiPlaceTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, LokiPlaceTrigger.PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - LokiPlaceTrigger.PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public LokiPlaceTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new LokiPlaceTrigger.Instance(EntityPredicate.deserialize(json.get("player")), ItemPredicate.deserialize(json.get("ring")), MinMaxBounds.IntBound.fromJson(json.get("blocks_placed"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerPlayerEntity player, ItemStack ring, int blocksPlaced) { - List> list = new ArrayList<>(); - - for (ICriterionTrigger.Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(player, ring, blocksPlaced)) { - list.add(listener); - } - } - - for (ICriterionTrigger.Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public LokiPlaceTrigger.Instance func_230241_b_(@Nonnull JsonObject json, EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { + return new LokiPlaceTrigger.Instance(playerPred, EntityPredicate.deserialize(json.get("player")), ItemPredicate.deserialize(json.get("ring")), MinMaxBounds.IntBound.fromJson(json.get("blocks_placed"))); } public void trigger(ServerPlayerEntity player, ItemStack ring, int blocksPlaced) { - LokiPlaceTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(player, ring, blocksPlaced); - } + func_235959_a_(player, instance -> instance.test(player, ring, blocksPlaced)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final EntityPredicate player; private final ItemPredicate ring; private final MinMaxBounds.IntBound blocksPlaced; - Instance(EntityPredicate player, ItemPredicate ring, MinMaxBounds.IntBound blocksPlaced) { + Instance(EntityPredicate.AndPredicate playerPred, EntityPredicate player, ItemPredicate ring, MinMaxBounds.IntBound blocksPlaced) { + super(ID, playerPred); this.player = player; this.ring = ring; this.blocksPlaced = blocksPlaced; diff --git a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java index d3ea41274..dd1ea2b80 100644 --- a/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/ManaGunTrigger.java @@ -8,16 +8,15 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.criterion.AbstractCriterionTrigger; +import net.minecraft.advancements.criterion.CriterionInstance; import net.minecraft.advancements.criterion.EntityPredicate; import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.item.ItemManaGun; @@ -25,15 +24,11 @@ import vazkii.botania.common.item.ItemManaGun; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.util.*; - import static vazkii.botania.common.lib.ResourceLocationHelper.prefix; -public class ManaGunTrigger implements ICriterionTrigger { +public class ManaGunTrigger extends AbstractCriterionTrigger { private static final ResourceLocation ID = prefix("fire_mana_blaster"); - public static final ManaGunTrigger INSTANCE = new ManaGunTrigger(); - private final Map playerTrackers = new HashMap<>(); private ManaGunTrigger() {} @@ -43,73 +38,25 @@ public class ManaGunTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, ManaGunTrigger.PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - ManaGunTrigger.PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public ManaGunTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { + public ManaGunTrigger.Instance func_230241_b_(@Nonnull JsonObject json, EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { Boolean desu = json.get("desu") == null ? null : json.get("desu").getAsBoolean(); - return new ManaGunTrigger.Instance(ItemPredicate.deserialize(json.get("item")), EntityPredicate.deserialize(json.get("user")), desu); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerPlayerEntity player, ItemStack stack) { - List> list = new ArrayList<>(); - - for (Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(stack, player)) { - list.add(listener); - } - } - - for (Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + return new ManaGunTrigger.Instance(playerPred, ItemPredicate.deserialize(json.get("item")), EntityPredicate.deserialize(json.get("user")), desu); } public void trigger(ServerPlayerEntity player, ItemStack stack) { - ManaGunTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(player, stack); - } + func_235959_a_(player, instance -> instance.test(stack, player)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final ItemPredicate item; private final EntityPredicate user; @Nullable private final Boolean desu; - Instance(ItemPredicate count, EntityPredicate user, Boolean desu) { + Instance(EntityPredicate.AndPredicate entityPred, ItemPredicate count, EntityPredicate user, Boolean desu) { + super(ID, entityPred); this.item = count; this.user = user; this.desu = desu; diff --git a/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java index 921942941..e3590b95c 100644 --- a/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/RelicBindTrigger.java @@ -8,27 +8,24 @@ */ package vazkii.botania.common.advancements; -import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import net.minecraft.advancements.ICriterionInstance; -import net.minecraft.advancements.ICriterionTrigger; -import net.minecraft.advancements.PlayerAdvancements; +import net.minecraft.advancements.criterion.AbstractCriterionTrigger; +import net.minecraft.advancements.criterion.CriterionInstance; +import net.minecraft.advancements.criterion.EntityPredicate; import net.minecraft.advancements.criterion.ItemPredicate; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import vazkii.botania.common.lib.LibMisc; import javax.annotation.Nonnull; -import java.util.*; - -public class RelicBindTrigger implements ICriterionTrigger { +public class RelicBindTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "relic_bind"); public static final RelicBindTrigger INSTANCE = new RelicBindTrigger(); - private final Map playerTrackers = new HashMap<>(); private RelicBindTrigger() {} @@ -38,69 +35,21 @@ public class RelicBindTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements playerAdvancementsIn) { - playerTrackers.remove(playerAdvancementsIn); - } - @Nonnull @Override - public Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new Instance(ItemPredicate.deserialize(json.get("relic"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ItemStack stack) { - List> list = new ArrayList<>(); - - for (Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(stack)) { - list.add(listener); - } - } - - for (Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public Instance func_230241_b_(@Nonnull JsonObject json, @Nonnull EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { + return new Instance(playerPred, ItemPredicate.deserialize(json.get("relic"))); } public void trigger(ServerPlayerEntity player, ItemStack relic) { - PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(relic); - } + func_235959_a_(player, instance -> instance.test(relic)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final ItemPredicate predicate; - Instance(ItemPredicate predicate) { + Instance(EntityPredicate.AndPredicate playerPred, ItemPredicate predicate) { + super(ID, playerPred); this.predicate = predicate; } diff --git a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java index ea7c8c372..07c8f487d 100644 --- a/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java +++ b/src/main/java/vazkii/botania/common/advancements/UseItemSuccessTrigger.java @@ -14,10 +14,10 @@ import com.google.gson.JsonObject; import net.minecraft.advancements.ICriterionInstance; import net.minecraft.advancements.ICriterionTrigger; import net.minecraft.advancements.PlayerAdvancements; -import net.minecraft.advancements.criterion.ItemPredicate; -import net.minecraft.advancements.criterion.LocationPredicate; +import net.minecraft.advancements.criterion.*; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; +import net.minecraft.loot.ConditionArrayParser; import net.minecraft.util.ResourceLocation; import net.minecraft.world.server.ServerWorld; @@ -29,10 +29,9 @@ import java.util.*; // Catch-all "used an item and it succeeded" trigger for Botania items, because making a separate // trigger for each one is dumb. -public class UseItemSuccessTrigger implements ICriterionTrigger { +public class UseItemSuccessTrigger extends AbstractCriterionTrigger { public static final ResourceLocation ID = new ResourceLocation(LibMisc.MOD_ID, "use_item_success"); public static final UseItemSuccessTrigger INSTANCE = new UseItemSuccessTrigger(); - private final Map playerTrackers = new HashMap<>(); private UseItemSuccessTrigger() {} @@ -42,70 +41,22 @@ public class UseItemSuccessTrigger implements ICriterionTrigger listener) { - this.playerTrackers.computeIfAbsent(player, UseItemSuccessTrigger.PlayerTracker::new).listeners.add(listener); - } - - @Override - public void removeListener(@Nonnull PlayerAdvancements player, @Nonnull ICriterionTrigger.Listener listener) { - UseItemSuccessTrigger.PlayerTracker tracker = this.playerTrackers.get(player); - - if (tracker != null) { - tracker.listeners.remove(listener); - - if (tracker.listeners.isEmpty()) { - this.playerTrackers.remove(player); - } - } - } - - @Override - public void removeAllListeners(@Nonnull PlayerAdvancements player) { - playerTrackers.remove(player); - } - @Nonnull @Override - public UseItemSuccessTrigger.Instance deserializeInstance(@Nonnull JsonObject json, @Nonnull JsonDeserializationContext context) { - return new UseItemSuccessTrigger.Instance(ItemPredicate.deserialize(json.get("item")), LocationPredicate.deserialize(json.get("location"))); - } - - static class PlayerTracker { - private final PlayerAdvancements playerAdvancements; - final Set> listeners = new HashSet<>(); - - PlayerTracker(PlayerAdvancements playerAdvancementsIn) { - this.playerAdvancements = playerAdvancementsIn; - } - - public void trigger(ServerPlayerEntity player, ItemStack stack, ServerWorld world, double x, double y, double z) { - List> list = new ArrayList<>(); - - for (Listener listener : this.listeners) { - if (listener.getCriterionInstance().test(stack, world, x, y, z)) { - list.add(listener); - } - } - - for (Listener listener : list) { - listener.grantCriterion(this.playerAdvancements); - } - } + public UseItemSuccessTrigger.Instance func_230241_b_(@Nonnull JsonObject json, @Nonnull EntityPredicate.AndPredicate playerPred, ConditionArrayParser conditions) { + return new UseItemSuccessTrigger.Instance(playerPred, ItemPredicate.deserialize(json.get("item")), LocationPredicate.deserialize(json.get("location"))); } public void trigger(ServerPlayerEntity player, ItemStack stack, ServerWorld world, double x, double y, double z) { - UseItemSuccessTrigger.PlayerTracker tracker = playerTrackers.get(player.getAdvancements()); - if (tracker != null) { - tracker.trigger(player, stack, world, x, y, z); - } + func_235959_a_(player, instance -> instance.test(stack, world, x, y, z)); } - static class Instance implements ICriterionInstance { + static class Instance extends CriterionInstance { private final ItemPredicate item; private final LocationPredicate location; - Instance(ItemPredicate count, LocationPredicate indexPos) { + Instance(EntityPredicate.AndPredicate playerPred, ItemPredicate count, LocationPredicate indexPos) { + super(ID, playerPred); this.item = count; this.location = indexPos; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 4539d4e29..ee6a1470f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -159,7 +159,7 @@ public class BlockHourglass extends BlockModWaterloggable implements IManaTrigge @Override public void renderHUD(MatrixStack ms, Minecraft mc, World world, BlockPos pos) { TileHourglass tile = (TileHourglass) world.getTileEntity(pos); - tile.renderHUD(); + tile.renderHUD(ms); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index f7f0d2aa2..74998e290 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -64,11 +64,6 @@ public class BlockPistonRelay extends BlockMod implements IWandable { MinecraftForge.EVENT_BUS.addListener(this::tickEnd); } - @Override - public boolean canEntitySpawn(BlockState state, @Nonnull IBlockReader world, @Nonnull BlockPos pos, EntityType type) { - return false; - } - @Override public void onReplaced(@Nonnull BlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState newState, boolean isMoving) { if (!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 53bdf8dac..ffcb1cbc9 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -106,7 +106,7 @@ public final class ModBlocks { public static Block naturaPylon = new BlockPylon(BlockPylon.Variant.NATURA, Block.Properties.from(manaPylon)); public static Block gaiaPylon = new BlockPylon(BlockPylon.Variant.GAIA, Block.Properties.from(manaPylon)); - public static Block pistonRelay = new BlockPistonRelay(Block.Properties.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL)); + public static Block pistonRelay = new BlockPistonRelay(Block.Properties.create(Material.GOURD).hardnessAndResistance(2, 10).sound(SoundType.METAL).func_235827_a_(NO_SPAWN)); public static Block distributor = new BlockDistributor(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)); public static Block manaVoid = new BlockManaVoid(Block.Properties.create(Material.ROCK).hardnessAndResistance(2, 2000).sound(SoundType.STONE)); public static Block manaDetector = new BlockManaDetector(Block.Properties.from(livingrock)); 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 ab8df8daf..2665b9439 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -205,7 +205,7 @@ public class BlockSpreader extends BlockModWaterloggable implements ITileEntityP @OnlyIn(Dist.CLIENT) @Override public void renderHUD(MatrixStack ms, Minecraft mc, World world, BlockPos pos) { - ((TileSpreader) world.getTileEntity(pos)).renderHUD(mc); + ((TileSpreader) world.getTileEntity(pos)).renderHUD(ms, mc); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java index 1da147174..478760da3 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTurntable.java @@ -43,7 +43,7 @@ public class BlockTurntable extends BlockMod implements ITileEntityProvider, IWa @OnlyIn(Dist.CLIENT) @Override public void renderHUD(MatrixStack ms, Minecraft mc, World world, BlockPos pos) { - ((TileTurntable) world.getTileEntity(pos)).renderHUD(mc); + ((TileTurntable) world.getTileEntity(pos)).renderHUD(ms, mc); } @Override 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 6dde5528b..a1a3cae48 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 @@ -172,7 +172,7 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower { if (recursiveForDoubleChests) { BlockState chest = getWorld().getBlockState(pos); - if (chest.has(ChestBlock.TYPE)) { + if (chest.func_235901_b_(ChestBlock.TYPE)) { ChestType type = chest.get(ChestBlock.TYPE); if (type != ChestType.SINGLE) { BlockPos other = pos.offset(ChestBlock.getDirectionToAttached(chest)); 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 e856dacbe..b47964e38 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.tile; +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.Minecraft; @@ -214,7 +215,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE } @OnlyIn(Dist.CLIENT) - public void renderHUD() { + public void renderHUD(MatrixStack ms) { Minecraft mc = Minecraft.getInstance(); int x = mc.getMainWindow().getScaledWidth() / 2 + 10; int y = mc.getMainWindow().getScaledHeight() / 2 - 10; @@ -226,7 +227,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE int time = getTotalTime(); String timeStr = StringUtils.ticksToElapsedTime(time); - mc.fontRenderer.func_238405_a_(timeStr, x + 20, y, getColor()); + mc.fontRenderer.func_238405_a_(ms, timeStr, x + 20, y, getColor()); String status = ""; if (lock) { @@ -236,7 +237,7 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE status = status.isEmpty() ? "stopped" : "lockedStopped"; } if (!status.isEmpty()) { - mc.fontRenderer.func_238405_a_(I18n.format("botaniamisc." + status), x + 20, y + 12, getColor()); + mc.fontRenderer.func_238405_a_(ms, I18n.format("botaniamisc." + status), x + 20, y + 12, getColor()); } } 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 4dd59d722..f08f42990 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 @@ -9,6 +9,7 @@ package vazkii.botania.common.block.tile.mana; import com.google.common.base.Predicates; +import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.Block; @@ -537,7 +538,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } @OnlyIn(Dist.CLIENT) - public void renderHUD(Minecraft mc) { + public void renderHUD(MatrixStack ms, Minecraft mc) { String name = new ItemStack(getBlockState().getBlock()).getDisplayName().getString(); int color = getVariant().hudColor; HUDHandler.drawSimpleManaHUD(ms, color, getCurrentMana(), getMaxMana(), name); @@ -549,7 +550,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int x = mc.getMainWindow().getScaledWidth() / 2 - width; int y = mc.getMainWindow().getScaledHeight() / 2 + 50; - mc.fontRenderer.func_238405_a_(lensName, x + 20, y + 5, color); + mc.fontRenderer.func_238405_a_(ms, lensName, x + 20, y + 5, color); mc.getItemRenderer().renderItemAndEffectIntoGUI(lens, x, y); RenderSystem.disableLighting(); } @@ -563,7 +564,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, int x = mc.getMainWindow().getScaledWidth() / 2 - width; int y = mc.getMainWindow().getScaledHeight() / 2 + 30; - mc.fontRenderer.func_238405_a_(stackName, x + 20, y + 5, color); + mc.fontRenderer.func_238405_a_(ms, stackName, x + 20, y + 5, color); mc.getItemRenderer().renderItemAndEffectIntoGUI(recieverStack, x, y); } 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 7a46d64c5..6bf82d53f 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 @@ -8,6 +8,7 @@ */ package vazkii.botania.common.block.tile.mana; +import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -86,7 +87,7 @@ public class TileTurntable extends TileMod implements ITickableTileEntity { } @OnlyIn(Dist.CLIENT) - public void renderHUD(Minecraft mc) { + public void renderHUD(MatrixStack ms, Minecraft mc) { int color = 0xAA006600; char motion = backwards ? '<' : '>'; @@ -97,7 +98,7 @@ public class TileTurntable extends TileMod implements ITickableTileEntity { int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(speed) / 2; int y = mc.getMainWindow().getScaledHeight() / 2 - 15; - mc.fontRenderer.func_238405_a_(speed, x, y, color); + mc.fontRenderer.func_238405_a_(ms, speed, x, y, color); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 6630fbd3f..99ef77b4f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -33,7 +33,7 @@ public class TileRedStringDispenser extends TileRedStringContainer { if (bind != null) { TileEntity tile = world.getTileEntity(bind); if (tile instanceof DispenserTileEntity) { - world.getPendingBlockTicks().scheduleTick(bind, tile.getBlockState().getBlock(), tile.getBlockState().getBlock().tickRate(world)); + world.getPendingBlockTicks().scheduleTick(bind, tile.getBlockState().getBlock(), 4); } } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index eb904a3ec..e9767fe92 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -34,16 +34,16 @@ import javax.annotation.Nullable; import java.util.UUID; public abstract class EntityThrowableCopy extends ProjectileEntity { - protected EntityThrowableCopy(EntityType type, World worldIn) { + protected EntityThrowableCopy(EntityType type, World worldIn) { super(type, worldIn); } - protected EntityThrowableCopy(EntityType type, double x, double y, double z, World worldIn) { + protected EntityThrowableCopy(EntityType type, double x, double y, double z, World worldIn) { this(type, worldIn); this.setPosition(x, y, z); } - protected EntityThrowableCopy(EntityType type, LivingEntity livingEntityIn, World worldIn) { + protected EntityThrowableCopy(EntityType type, LivingEntity livingEntityIn, World worldIn) { this(type, livingEntityIn.getPosX(), livingEntityIn.getPosYEye() - (double) 0.1F, livingEntityIn.getPosZ(), worldIn); this.setShooter(livingEntityIn); } diff --git a/src/main/java/vazkii/botania/common/item/ItemHorn.java b/src/main/java/vazkii/botania/common/item/ItemHorn.java index 7371b40e7..9d6e452c4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemHorn.java @@ -61,7 +61,7 @@ public class ItemHorn extends Item { public void onUsingTick(ItemStack stack, LivingEntity player, int time) { if (!player.world.isRemote) { if (time != getUseDuration(stack) && time % 5 == 0) { - breakGrass(player.world, stack, new BlockPos(player)); + breakGrass(player.world, stack, player.func_233580_cy_()); } player.world.playSound(null, player.getPosX(), player.getPosY(), player.getPosZ(), SoundEvents.BLOCK_NOTE_BLOCK_BASS, SoundCategory.BLOCKS, 1F, 0.001F); } @@ -87,7 +87,7 @@ public class ItemHorn extends Item { if (block instanceof IHornHarvestable ? ((IHornHarvestable) block).canHornHarvest(world, pos, stack, type) : type == EnumHornType.WILD && block instanceof BushBlock && !block.isIn(ModTags.Blocks.SPECIAL_FLOWERS) - || type == EnumHornType.CANOPY && BlockTags.LEAVES.contains(block) + || type == EnumHornType.CANOPY && BlockTags.LEAVES.func_230235_a_(block) || type == EnumHornType.COVERING && block == Blocks.SNOW) { coords.add(pos.toImmutable()); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index 81a98762d..6e373754a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -37,7 +37,7 @@ public class ItemPoolMinecart extends Item { World world = context.getWorld(); BlockPos blockpos = context.getPos(); BlockState iblockstate = world.getBlockState(blockpos); - if (!iblockstate.isIn(BlockTags.RAILS)) { + if (!iblockstate.func_235714_a_(BlockTags.RAILS)) { return ActionResultType.FAIL; } else { ItemStack itemstack = context.getItem(); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 58a641647..13115df6a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -130,7 +130,7 @@ public class ItemTwigWand extends Item implements ICoordBoundItem { PlayerEntity player = ctx.getPlayer(); GlobalPos bindPos = ((BlockPistonRelay) ModBlocks.pistonRelay).activeBindingAttempts.get(player.getUniqueID()); - if (bindPos != null && bindPos.getDimension() == world.getDimension().getType()) { + if (bindPos != null && bindPos.func_239646_a_() == world.func_234923_W_()) { ((BlockPistonRelay) ModBlocks.pistonRelay).activeBindingAttempts.remove(player.getUniqueID()); BlockPistonRelay.WorldData data = BlockPistonRelay.WorldData.get(world); data.mapping.put(bindPos.getPos(), pos.toImmutable()); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 9bad281d0..d337da648 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -14,6 +14,7 @@ import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.util.text.IFormattableTextComponent; import net.minecraft.util.text.ITextComponent; @@ -34,9 +35,9 @@ import javax.annotation.Nonnull; import java.util.List; public class ItemBlockSpecialFlower extends BlockItem { - private static final Tag GENERATING = ModTags.Items.GENERATING_SPECIAL_FLOWERS; - private static final Tag FUNCTIONAL = ModTags.Items.FUNCTIONAL_SPECIAL_FLOWERS; - private static final Tag MISC = ModTags.Items.MISC_SPECIAL_FLOWERS; + private static final ITag.INamedTag GENERATING = ModTags.Items.GENERATING_SPECIAL_FLOWERS; + private static final ITag.INamedTag FUNCTIONAL = ModTags.Items.FUNCTIONAL_SPECIAL_FLOWERS; + private static final ITag.INamedTag MISC = ModTags.Items.MISC_SPECIAL_FLOWERS; public ItemBlockSpecialFlower(Block block1, Properties props) { super(block1, props); 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 f25f059ca..bacdffc64 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -10,8 +10,10 @@ package vazkii.botania.common.item.brew; import com.google.common.collect.Lists; +import com.mojang.datafixers.util.Pair; import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.ai.attributes.Attribute; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; @@ -22,10 +24,7 @@ import net.minecraft.potion.Effect; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.EffectUtils; import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.util.text.*; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -133,40 +132,40 @@ public class ItemBrewBase extends Item implements IBrewItem { // [VanillaCopy] PotionUtils.addPotionTooltip, with custom effect list @OnlyIn(Dist.CLIENT) public static void addPotionTooltip(List list, List lores, float durationFactor) { - List> list1 = Lists.newArrayList(); + List> list1 = Lists.newArrayList(); if (list.isEmpty()) { lores.add((new TranslationTextComponent("effect.none")).func_240699_a_(TextFormatting.GRAY)); } else { - for (EffectInstance effectinstance : list) { - ITextComponent itextcomponent = new TranslationTextComponent(effectinstance.getEffectName()); + for(EffectInstance effectinstance : list) { + IFormattableTextComponent iformattabletextcomponent = new TranslationTextComponent(effectinstance.getEffectName()); Effect effect = effectinstance.getPotion(); - Map map = effect.getAttributeModifierMap(); + Map map = effect.getAttributeModifierMap(); if (!map.isEmpty()) { - for (Map.Entry entry : map.entrySet()) { + for(Map.Entry entry : map.entrySet()) { AttributeModifier attributemodifier = entry.getValue(); AttributeModifier attributemodifier1 = new AttributeModifier(attributemodifier.getName(), effect.getAttributeModifierAmount(effectinstance.getAmplifier(), attributemodifier), attributemodifier.getOperation()); - list1.add(new Tuple<>(entry.getKey().getName(), attributemodifier1)); + list1.add(new Pair<>(entry.getKey(), attributemodifier1)); } } if (effectinstance.getAmplifier() > 0) { - itextcomponent.appendText(" ").appendSibling(new TranslationTextComponent("potion.potency." + effectinstance.getAmplifier())); + iformattabletextcomponent.func_240702_b_(" ").func_230529_a_(new TranslationTextComponent("potion.potency." + effectinstance.getAmplifier())); } if (effectinstance.getDuration() > 20) { - itextcomponent.appendText(" (").appendText(EffectUtils.getPotionDurationString(effectinstance, durationFactor)).appendText(")"); + iformattabletextcomponent.func_240702_b_(" (").func_240702_b_(EffectUtils.getPotionDurationString(effectinstance, durationFactor)).func_240702_b_(")"); } - lores.add(itextcomponent.func_240699_a_(effect.getEffectType().getColor())); + lores.add(iformattabletextcomponent.func_240699_a_(effect.getEffectType().getColor())); } } if (!list1.isEmpty()) { - lores.add(new StringTextComponent("")); + lores.add(StringTextComponent.field_240750_d_); lores.add((new TranslationTextComponent("potion.whenDrank")).func_240699_a_(TextFormatting.DARK_PURPLE)); - for (Tuple tuple : list1) { - AttributeModifier attributemodifier2 = tuple.getB(); + for(Pair pair : list1) { + AttributeModifier attributemodifier2 = pair.getSecond(); double d0 = attributemodifier2.getAmount(); double d1; if (attributemodifier2.getOperation() != AttributeModifier.Operation.MULTIPLY_BASE && attributemodifier2.getOperation() != AttributeModifier.Operation.MULTIPLY_TOTAL) { @@ -176,10 +175,10 @@ public class ItemBrewBase extends Item implements IBrewItem { } if (d0 > 0.0D) { - lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).func_240699_a_(TextFormatting.BLUE)); + lores.add((new TranslationTextComponent("attribute.modifier.plus." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent(pair.getFirst().func_233754_c_()))).func_240699_a_(TextFormatting.BLUE)); } else if (d0 < 0.0D) { d1 = d1 * -1.0D; - lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent("attribute.name." + tuple.getA()))).func_240699_a_(TextFormatting.RED)); + lores.add((new TranslationTextComponent("attribute.modifier.take." + attributemodifier2.getOperation().getId(), ItemStack.DECIMALFORMAT.format(d1), new TranslationTextComponent(pair.getFirst().func_233754_c_()))).func_240699_a_(TextFormatting.RED)); } } } 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 861ff7651..19db2bcf5 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 @@ -487,7 +487,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { RenderSystem.enableAlphaTest(); RenderSystem.color4f(1F, 1F, 1F, 1F); - mc.textureManager.bindTexture(AbstractGui.GUI_ICONS_LOCATION); + mc.textureManager.bindTexture(AbstractGui.field_230665_h_); } public static int getVariant(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index 7a81f49a1..440991764 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -46,6 +46,6 @@ public class ItemElementiumPick extends ItemManasteelPick { } private static boolean isSemiDisposable(ItemStack stack) { - return ModTags.Items.SEMI_DISPOSABLE.contains(stack.getItem()); + return ModTags.Items.SEMI_DISPOSABLE.func_230235_a_(stack.getItem()); } } 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 b09196d35..f16a9993f 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 @@ -8,6 +8,7 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ThrowableEntity; @@ -103,7 +104,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { ThrowableEntity entity = (ThrowableEntity) burst; AxisAlignedBB axis = new AxisAlignedBB(entity.getPosX(), entity.getPosY(), entity.getPosZ(), entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).grow(1); List entities = entity.world.getEntitiesWithinAABB(LivingEntity.class, axis); - LivingEntity thrower = entity.func_234616_v_(); + Entity thrower = entity.func_234616_v_(); for (LivingEntity living : entities) { if (living == thrower || living instanceof PlayerEntity && thrower instanceof PlayerEntity @@ -121,8 +122,8 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect { DamageSource source = DamageSource.MAGIC; if (thrower instanceof PlayerEntity) { source = DamageSource.causePlayerDamage((PlayerEntity) thrower); - } else if (thrower != null) { - source = DamageSource.causeMobDamage(thrower); + } else if (thrower instanceof LivingEntity) { + source = DamageSource.causeMobDamage((LivingEntity) thrower); } living.attackEntityFrom(source, damage); entity.remove(); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java index 6d45c9c3f..03f4b480f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -53,7 +53,7 @@ public class LensPiston extends Lens { } public static BlockState unWaterlog(BlockState state) { - if (state.has(BlockStateProperties.WATERLOGGED)) { + if (state.func_235901_b_(BlockStateProperties.WATERLOGGED)) { return state.with(BlockStateProperties.WATERLOGGED, false); } else { return state; 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 cdf32f03c..67b90b699 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -17,6 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.EffectInstance; import net.minecraft.potion.Effects; +import net.minecraft.tags.ITag; import net.minecraft.tags.Tag; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; @@ -40,7 +41,7 @@ import java.util.ArrayList; import java.util.List; public class ItemGravityRod extends Item implements IManaUsingItem { - private static final Tag> BLACKLIST = ModTags.Entities.SHADED_MESA_BLACKLIST; + private static final ITag.INamedTag> BLACKLIST = ModTags.Entities.SHADED_MESA_BLACKLIST; private static final float RANGE = 3F; private static final int COST = 2;