diff --git a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java index 572d7a2fff..92405df1c6 100644 --- a/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java +++ b/src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java @@ -10,6 +10,9 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.client.gui.GuiGraphics; +import net.minecraft.core.registries.BuiltInRegistries; +import org.jetbrains.annotations.NotNull; import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.QuarkClient; import org.violetmoon.quark.base.handler.MiscUtil; @@ -81,7 +84,7 @@ public static void receiveAttributes(Map map) { @Nullable private static AttributeIconEntry getIconForAttribute(Attribute attribute) { - ResourceLocation loc = Registry.ATTRIBUTE.getKey(attribute); + ResourceLocation loc = BuiltInRegistries.ATTRIBUTE.getKey(attribute); if (loc != null) return attributes.get(loc); return null; } @@ -336,9 +339,15 @@ private static double getAttribute(Player player, AttributeSlot slot, ItemStack public record AttributeComponent(ItemStack stack, AttributeSlot slot) implements ClientTooltipComponent, TooltipComponent { - @Override public void renderImage(@Nonnull Font font, int tooltipX, int tooltipY, @Nonnull PoseStack pose, @Nonnull ItemRenderer itemRenderer, int something) { + + } + + @Override + public void renderImage(@NotNull Font font, int tooltipX, int tooltipY, @NotNull GuiGraphics guiGraphics) { + PoseStack pose = guiGraphics.pose(); + if (!Screen.hasShiftDown()) { pose.pushPose(); pose.translate(0, 0, 500); @@ -383,7 +392,7 @@ public void renderImage(@Nonnull Font font, int tooltipX, int tooltipY, @Nonnull RenderSystem.setShader(GameRenderer::getPositionTexShader); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); RenderSystem.setShaderTexture(0, MiscUtil.GENERAL_ICONS); - GuiComponent.blit(pose, x, y, 193 + slot.ordinal() * 9, 35, 9, 9, 256, 256); + guiGraphics.blit(pose, x, y, 193 + slot.ordinal() * 9, 35, 9, 9, 256, 256); x += 20; } @@ -395,7 +404,7 @@ public void renderImage(@Nonnull Font font, int tooltipX, int tooltipY, @Nonnull for (Attribute key : slotAttributes.keys()) { if (getIconForAttribute(key) == null) { - mc.font.drawShadow(pose, "[+]", x + 1, y + 1, 0xFFFF55); + guiGraphics.drawString(font, "[+]", x + 1, y + 1, 0xFFFF55, true); break; } } diff --git a/src/main/java/org/violetmoon/quark/content/experimental/module/AdjustableChatModule.java b/src/main/java/org/violetmoon/quark/content/experimental/module/AdjustableChatModule.java index 6c75fd066f..094e2306e8 100644 --- a/src/main/java/org/violetmoon/quark/content/experimental/module/AdjustableChatModule.java +++ b/src/main/java/org/violetmoon/quark/content/experimental/module/AdjustableChatModule.java @@ -8,7 +8,6 @@ @ZetaLoadModule(category = "experimental", enabledByDefault = false) public class AdjustableChatModule extends ZetaModule { - @Config public static int horizontalShift = 0; @Config public static int verticalShift = 0; @@ -17,13 +16,12 @@ public static class Client extends AdjustableChatModule { @PlayEvent public void pre(ZRenderGuiOverlay.ChatPanel.Pre event) { - event.getPoseStack().translate(horizontalShift, verticalShift, 0); + event.getGuiGraphics().pose().translate(horizontalShift, verticalShift, 0); } @PlayEvent public void post(ZRenderGuiOverlay.ChatPanel.Post event) { - event.getPoseStack().translate(-horizontalShift, -verticalShift, 0); + event.getGuiGraphics().pose().translate(-horizontalShift, -verticalShift, 0); } } - } diff --git a/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java b/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java index cbc04c9f87..87209a4f5e 100644 --- a/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java +++ b/src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java @@ -2,6 +2,8 @@ import com.google.common.collect.Lists; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Inventory; @@ -82,8 +84,8 @@ public class AutomaticToolRestockModule extends ZetaModule { @LoadEvent public final void configChanged(ZConfigChanged event) { - importantEnchants = RegistryUtil.massRegistryGet(enchantNames, Registry.ENCHANTMENT); - itemsToIgnore = RegistryUtil.massRegistryGet(ignoredItems, Registry.ITEM); + importantEnchants = RegistryUtil.massRegistryGet(enchantNames, BuiltInRegistries.ENCHANTMENT); + itemsToIgnore = RegistryUtil.massRegistryGet(ignoredItems, BuiltInRegistries.ITEM); } @PlayEvent diff --git a/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java b/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java index 30dcd9bc86..10f35cefdd 100755 --- a/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java +++ b/src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java @@ -10,18 +10,17 @@ */ package org.violetmoon.quark.content.mobs.ai; -import java.util.List; -import java.util.Map; -import java.util.WeakHashMap; -import java.util.function.BooleanSupplier; - -import org.violetmoon.quark.base.util.MutableVectorHolder; -import org.violetmoon.quark.content.mobs.entity.Stoneling; - import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.ai.goal.WaterAvoidingRandomStrollGoal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.phys.Vec3; +import org.violetmoon.quark.base.util.MutableVectorHolder; +import org.violetmoon.quark.content.mobs.entity.Stoneling; + +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; +import java.util.function.BooleanSupplier; public class ActWaryGoal extends WaterAvoidingRandomStrollGoal { @@ -95,7 +94,7 @@ public boolean canUse() { if (startled || stoneling.isPlayerMade()) return false; - List playersAround = stoneling.level.getEntitiesOfClass(Player.class, stoneling.getBoundingBox().inflate(range), + List playersAround = stoneling.getCommandSenderWorld().getEntitiesOfClass(Player.class, stoneling.getBoundingBox().inflate(range), (player) -> player != null && !player.getAbilities().instabuild && player.distanceToSqr(stoneling) < range * range); if (playersAround.isEmpty()) diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java index a7ba761c94..7b447e42be 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java @@ -83,7 +83,7 @@ public static int getCount(ItemStack stack, LivingEntity entityIn) { HitResult result = mc.hitResult; if(result instanceof BlockHitResult) { BlockPos target = ((BlockHitResult) result).getBlockPos(); - count = AbacusItem.getCount(stack, target, player.level); + count = AbacusItem.getCount(stack, target, player.level()); } } diff --git a/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java b/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java index b1f9163f6b..a66a285a4c 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java +++ b/src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java @@ -7,6 +7,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.core.NonNullList; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.EnchantedBookItem; @@ -54,7 +55,7 @@ public static ItemStack getEnchantedItemStack(Enchantment ench) { public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullList items) { if (isEnabled() || group == CreativeModeTab.TAB_SEARCH) { if (group == CreativeModeTab.TAB_SEARCH || group.getEnchantmentCategories().length != 0) { - Registry.ENCHANTMENT.forEach(ench -> { + BuiltInRegistries.ENCHANTMENT.forEach(ench -> { if (!EnchantmentsBegoneModule.shouldBegone(ench) && (!AncientTomesModule.sanityCheck || ench.getMaxLevel() != 1)) { if (!AncientTomesModule.isInitialized() || AncientTomesModule.validEnchants.contains(ench)) { if (group == CreativeModeTab.TAB_SEARCH || group.hasEnchantmentCategory(ench.category)) { diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java index 5efd24205e..1d913238db 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java @@ -1,27 +1,11 @@ package org.violetmoon.quark.content.tools.module; -import java.util.List; - -import org.violetmoon.quark.base.config.Config; -import org.violetmoon.quark.base.config.type.inputtable.RGBAColorConfig; -import org.violetmoon.quark.content.tools.item.AbacusItem; -import org.violetmoon.zeta.client.event.load.ZClientSetup; -import org.violetmoon.zeta.client.event.play.ZHighlightBlock; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; -import org.violetmoon.zeta.event.bus.LoadEvent; -import org.violetmoon.zeta.event.bus.PlayEvent; -import org.violetmoon.zeta.event.load.ZRegister; -import org.violetmoon.zeta.module.ZetaLoadModule; -import org.violetmoon.zeta.module.ZetaModule; -import org.violetmoon.zeta.util.Hint; - import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; -import com.mojang.math.Matrix4f; - import net.minecraft.client.Camera; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.item.ItemProperties; import net.minecraft.core.BlockPos; @@ -36,6 +20,21 @@ import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.joml.Matrix4f; +import org.violetmoon.quark.base.config.Config; +import org.violetmoon.quark.base.config.type.inputtable.RGBAColorConfig; +import org.violetmoon.quark.content.tools.item.AbacusItem; +import org.violetmoon.zeta.client.event.load.ZClientSetup; +import org.violetmoon.zeta.client.event.play.ZHighlightBlock; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; +import org.violetmoon.zeta.event.bus.LoadEvent; +import org.violetmoon.zeta.event.bus.PlayEvent; +import org.violetmoon.zeta.event.load.ZRegister; +import org.violetmoon.zeta.module.ZetaLoadModule; +import org.violetmoon.zeta.module.ZetaModule; +import org.violetmoon.zeta.util.Hint; + +import java.util.List; @ZetaLoadModule(category = "tools") public class AbacusModule extends ZetaModule { @@ -61,6 +60,7 @@ public void clientSetup(ZClientSetup e) { public void onHUDRender(ZRenderGuiOverlay.Crosshair event) { Minecraft mc = Minecraft.getInstance(); Player player = mc.player; + GuiGraphics guiGraphics = event.getGuiGraphics(); if(player != null) { ItemStack stack = player.getMainHandItem(); if(!(stack.getItem() instanceof AbacusItem)) @@ -73,10 +73,11 @@ public void onHUDRender(ZRenderGuiOverlay.Crosshair event) { int x = window.getGuiScaledWidth() / 2 + 10; int y = window.getGuiScaledHeight() / 2 - 7; - mc.getItemRenderer().renderAndDecorateItem(stack, x, y); + guiGraphics.renderItem(stack, x, y); + String distStr = distance < AbacusItem.MAX_COUNT ? Integer.toString(distance + 1) : (AbacusItem.MAX_COUNT + "+"); - mc.font.drawShadow(event.getPoseStack(), distStr, x + 17, y + 5, 0xFFFFFF); + guiGraphics.drawString(mc.font, distStr, x + 17, y + 5, 0xFFFFFF, true); } } } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java index 87e454211a..817b6492e4 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java @@ -1,11 +1,19 @@ package org.violetmoon.quark.content.tools.module; -import java.util.ArrayList; -import java.util.List; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.LevelRenderer; import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.client.resources.sounds.SoundInstance; +import net.minecraft.client.sounds.SoundManager; +import net.minecraft.core.BlockPos; import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; +import net.minecraft.world.entity.monster.Skeleton; +import net.minecraft.world.entity.monster.Spider; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.entity.JukeboxBlockEntity; import org.violetmoon.quark.base.config.Config; import org.violetmoon.quark.base.handler.QuarkSounds; import org.violetmoon.quark.base.item.QuarkMusicDiscItem; @@ -17,17 +25,8 @@ import org.violetmoon.zeta.module.ZetaModule; import org.violetmoon.zeta.util.Hint; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.LevelRenderer; -import net.minecraft.client.resources.sounds.SoundInstance; -import net.minecraft.client.sounds.SoundManager; -import net.minecraft.core.BlockPos; -import net.minecraft.sounds.SoundEvent; -import net.minecraft.world.entity.monster.Skeleton; -import net.minecraft.world.entity.monster.Spider; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.entity.JukeboxBlockEntity; +import java.util.ArrayList; +import java.util.List; @ZetaLoadModule(category = "tools") public class AmbientDiscsModule extends ZetaModule { @@ -58,7 +57,7 @@ private void disc(SoundEvent sound) { @PlayEvent public void onMobDeath(ZLivingDeath event) { if(dropOnSpiderKill && event.getEntity() instanceof Spider && event.getSource().getEntity() instanceof Skeleton) { - Item item = discs.get(event.getEntity().level.random.nextInt(discs.size())); + Item item = discs.get(event.getEntity().getCommandSenderWorld().random.nextInt(discs.size())); event.getEntity().spawnAtLocation(item, 0); } } @@ -77,7 +76,7 @@ public static void onJukeboxLoad(JukeboxBlockEntity tile) { if(sound != null) { soundEngine.play(sound); } else { - ItemStack stack = tile.getRecord(); + ItemStack stack = tile.getFirstItem(); if(stack.getItem() instanceof QuarkMusicDiscItem disc) playAmbientSound(disc, pos); } diff --git a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java index 47e88287f7..19bc77676d 100644 --- a/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java +++ b/src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java @@ -5,6 +5,8 @@ import it.unimi.dsi.fastutil.objects.Object2IntArrayMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import net.minecraft.core.Registry; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.network.chat.Component; @@ -131,7 +133,7 @@ public void register(ZRegister event) { ancient_tome = new AncientTomeItem(this); tomeEnchantType = new LootItemFunctionType(new EnchantTome.Serializer()); - Registry.register(Registry.LOOT_FUNCTION_TYPE, new ResourceLocation(Quark.MOD_ID, "tome_enchant"), tomeEnchantType); + Registry.register(BuiltInRegistries.LOOT_FUNCTION_TYPE, new ResourceLocation(Quark.MOD_ID, "tome_enchant"), tomeEnchantType); overlevelTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("overlevel"); instamineDeepslateTrigger = event.getAdvancementModifierRegistry().registerManualTrigger("instamine_deepslate"); diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java index 24c1c26657..4e787fbfd4 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java @@ -17,9 +17,6 @@ import net.minecraft.world.inventory.RecipeBookType; import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.GameRules; - -import java.util.*; - import org.violetmoon.quark.base.Quark; import org.violetmoon.quark.base.config.Config; import org.violetmoon.zeta.client.event.play.ZEndClientTick; @@ -31,6 +28,8 @@ import org.violetmoon.zeta.module.ZetaLoadModule; import org.violetmoon.zeta.module.ZetaModule; +import java.util.*; + @ZetaLoadModule(category = "tweaks") public class AutomaticRecipeUnlockModule extends ZetaModule { @@ -61,9 +60,9 @@ public void onPlayerLoggedIn(ZPlayer.LoggedIn event) { recipes.removeIf( (recipe) -> recipe == null - || recipe.getResultItem() == null + || recipe.getResultItem(event.getPlayer().getCommandSenderWorld().registryAccess()) == null || ignoredRecipes.contains(Objects.toString(recipe.getId())) - || recipe.getResultItem().isEmpty()); + || recipe.getResultItem(event.getPlayer().getCommandSenderWorld().registryAccess()).isEmpty()); int idx = 0; int maxShift = 1000; @@ -80,7 +79,7 @@ public void onPlayerLoggedIn(ZPlayer.LoggedIn event) { if (forceLimitedCrafting) - player.level.getGameRules().getRule(GameRules.RULE_LIMITED_CRAFTING).set(true, server); + player.getCommandSenderWorld().getGameRules().getRule(GameRules.RULE_LIMITED_CRAFTING).set(true, server); } } } diff --git a/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java b/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java index 6ad3781993..16cf7b9ccb 100644 --- a/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java +++ b/src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java @@ -22,7 +22,7 @@ public class ZombieVillagersOnNormalModule extends ZetaModule { public void onConversion(ZLivingConversion.Pre event) { if(event.getEntity().getType() == EntityType.VILLAGER && event.getOutcome() == EntityType.ZOMBIE_VILLAGER) { Villager villager = (Villager) event.getEntity(); - Level level = villager.level; + Level level = villager.getCommandSenderWorld(); if(level instanceof ServerLevelAccessor serverLevel) { ZombieVillager zombievillager = villager.convertTo(EntityType.ZOMBIE_VILLAGER, false); diff --git a/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java b/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java index c103202533..9676b2422e 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java @@ -6,6 +6,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.ComposterBlock; +import net.minecraft.world.level.material.MapColor; import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.storage.loot.BuiltInLootTables; import net.minecraft.world.level.storage.loot.entries.LootItem; @@ -66,8 +67,8 @@ public void setup(ZCommonSetup e) { @LoadEvent public void register(ZRegister event) { - woodSet = WoodSetHandler.addWoodSet(event, this, "ancient", MaterialColor.TERRACOTTA_WHITE, MaterialColor.TERRACOTTA_WHITE, true); - ancient_leaves = new ZetaLeavesBlock(woodSet.name, this, MaterialColor.PLANT); + woodSet = WoodSetHandler.addWoodSet(event, this, "ancient", MapColor.TERRACOTTA_WHITE, MapColor.TERRACOTTA_WHITE, true); + ancient_leaves = new ZetaLeavesBlock(woodSet.name, this, MapColor.PLANT); ancient_sapling = new AncientSaplingBlock(this); ancient_fruit = new AncientFruitItem(this); diff --git a/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java b/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java index d144a4f7c0..b1ddcbea88 100644 --- a/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java +++ b/src/main/java/org/violetmoon/quark/content/world/module/AzaleaWoodModule.java @@ -1,5 +1,6 @@ package org.violetmoon.quark.content.world.module; +import net.minecraft.world.level.material.MapColor; import org.violetmoon.quark.base.handler.WoodSetHandler; import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet; import org.violetmoon.zeta.event.bus.LoadEvent; @@ -12,7 +13,6 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; -import net.minecraft.world.level.material.MaterialColor; @ZetaLoadModule(category = "world", antiOverlap = { "caverns_and_chasms" }) public class AzaleaWoodModule extends ZetaModule { @@ -21,7 +21,7 @@ public class AzaleaWoodModule extends ZetaModule { @LoadEvent public final void register(ZRegister event) { - woodSet = WoodSetHandler.addWoodSet(event, this, "azalea", MaterialColor.COLOR_LIGHT_GREEN, MaterialColor.COLOR_BROWN, true); + woodSet = WoodSetHandler.addWoodSet(event, this, "azalea", MapColor.COLOR_LIGHT_GREEN, MapColor.COLOR_BROWN, true); //ugly I know but config is fired before this now //TODO: not actually fired by the config lol enabledStatusChanged(true, this.enabled, this.enabled); diff --git a/src/main/java/org/violetmoon/zeta/advancement/modifier/ASeedyPlaceModifier.java b/src/main/java/org/violetmoon/zeta/advancement/modifier/ASeedyPlaceModifier.java index 0bab25f706..98a1929fa9 100644 --- a/src/main/java/org/violetmoon/zeta/advancement/modifier/ASeedyPlaceModifier.java +++ b/src/main/java/org/violetmoon/zeta/advancement/modifier/ASeedyPlaceModifier.java @@ -2,17 +2,16 @@ import com.google.common.collect.ImmutableSet; import net.minecraft.advancements.Criterion; -import net.minecraft.advancements.critereon.PlacedBlockTrigger; -import net.minecraft.core.Registry; +import net.minecraft.advancements.critereon.EnterBlockTrigger; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; - -import java.util.Set; - -import org.violetmoon.zeta.api.IMutableAdvancement; import org.violetmoon.zeta.advancement.AdvancementModifier; +import org.violetmoon.zeta.api.IMutableAdvancement; import org.violetmoon.zeta.module.ZetaModule; +import java.util.Set; + public class ASeedyPlaceModifier extends AdvancementModifier { private static final ResourceLocation TARGET = new ResourceLocation("husbandry/plant_seed"); @@ -33,9 +32,9 @@ public Set getTargets() { @Override public boolean apply(ResourceLocation res, IMutableAdvancement adv) { for(var block : seeds) { - Criterion criterion = new Criterion(PlacedBlockTrigger.TriggerInstance.placedBlock(block)); + Criterion criterion = new Criterion(EnterBlockTrigger.TriggerInstance.entersBlock(block)); - String name = Registry.BLOCK.getKey(block).toString(); + String name = BuiltInRegistries.BLOCK.getKey(block).toString(); adv.addOrCriterion(name, criterion); } diff --git a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java index 1153c21438..32cc3470be 100644 --- a/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java +++ b/src/main/java/org/violetmoon/zeta/client/config/screen/AbstractEditBoxInputScreen.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.client.config.screen; -import javax.annotation.Nonnull; - -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.ChatFormatting; +import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.components.EditBox; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.resources.language.I18n; import net.minecraft.network.chat.Component; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.violetmoon.zeta.client.ZetaClient; import org.violetmoon.zeta.config.ChangeSet; @@ -24,15 +23,15 @@ public AbstractEditBoxInputScreen(ZetaClient zc, Screen parent, ChangeSet change } @Override - public void render(@Nonnull PoseStack mstack, int mouseX, int mouseY, float partialTicks) { - renderBackground(mstack); + public void render(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTicks) { + renderBackground(guiGraphics); - super.render(mstack, mouseX, mouseY, partialTicks); + super.render(guiGraphics, mouseX, mouseY, partialTicks); - drawCenteredString(mstack, font, Component.literal(ext.getGuiDisplayName(changes, def)).withStyle(ChatFormatting.BOLD), width / 2, 20, 0xFFFFFF); - drawCenteredString(mstack, font, I18n.get("quark.gui.config.defaultvalue", def.defaultValue), width / 2, 30, 0xFFFFFF); + guiGraphics.drawCenteredString(font, Component.literal(ext.getGuiDisplayName(changes, def)).withStyle(ChatFormatting.BOLD), width / 2, 20, 0xFFFFFF); + guiGraphics.drawCenteredString(font, I18n.get("quark.gui.config.defaultvalue", def.defaultValue), width / 2, 30, 0xFFFFFF); - input.render(mstack, mouseX, mouseY, partialTicks); + input.render(guiGraphics, mouseX, mouseY, partialTicks); } @Override diff --git a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java index 46d923f601..b04b822aa9 100644 --- a/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java +++ b/src/main/java/org/violetmoon/zeta/client/event/play/ZRenderGuiOverlay.java @@ -1,13 +1,12 @@ package org.violetmoon.zeta.client.event.play; -import org.violetmoon.zeta.event.bus.IZetaPlayEvent; - import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.GuiGraphics; +import org.violetmoon.zeta.event.bus.IZetaPlayEvent; public interface ZRenderGuiOverlay extends IZetaPlayEvent { Window getWindow(); - PoseStack getPoseStack(); + GuiGraphics getGuiGraphics(); float getPartialTick(); boolean shouldDrawSurvivalElements(); diff --git a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java index f2e70c5a9f..940cfd496a 100644 --- a/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java +++ b/src/main/java/org/violetmoon/zetaimplforge/client/event/player/ForgeZRenderGuiOverlay.java @@ -1,12 +1,11 @@ package org.violetmoon.zetaimplforge.client.event.player; -import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; - import com.mojang.blaze3d.platform.Window; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiGraphics; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import net.minecraftforge.client.gui.overlay.ForgeGui; +import org.violetmoon.zeta.client.event.play.ZRenderGuiOverlay; public class ForgeZRenderGuiOverlay implements ZRenderGuiOverlay { private final RenderGuiOverlayEvent e; @@ -21,8 +20,8 @@ public Window getWindow() { } @Override - public PoseStack getPoseStack() { - return e.getPoseStack(); + public GuiGraphics getGuiGraphics() { + return e.getGuiGraphics(); } @Override