Skip to content

Commit

Permalink
1748 errors to go
Browse files Browse the repository at this point in the history
  • Loading branch information
@IThundxr
IThundxr committed Nov 12, 2023
1 parent 182e666 commit 2165c1d
Show file tree
Hide file tree
Showing 17 changed files with 101 additions and 94 deletions.
17 changes: 13 additions & 4 deletions src/main/java/org/violetmoon/quark/content/client/tooltip/AttributeTooltips.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -81,7 +84,7 @@ public static void receiveAttributes(Map<String, AttributeIconEntry> 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;
}
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/org/violetmoon/quark/content/experimental/module/AdjustableChatModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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);
}
}

}
6 changes: 4 additions & 2 deletions src/main/java/org/violetmoon/quark/content/management/module/AutomaticToolRestockModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
17 changes: 8 additions & 9 deletions src/main/java/org/violetmoon/quark/content/mobs/ai/ActWaryGoal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -95,7 +94,7 @@ public boolean canUse() {
if (startled || stoneling.isPlayerMade())
return false;

List<Player> playersAround = stoneling.level.getEntitiesOfClass(Player.class, stoneling.getBoundingBox().inflate(range),
List<Player> playersAround = stoneling.getCommandSenderWorld().getEntitiesOfClass(Player.class, stoneling.getBoundingBox().inflate(range),
(player) -> player != null && !player.getAbilities().instabuild && player.distanceToSqr(stoneling) < range * range);

if (playersAround.isEmpty())
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/tools/item/AbacusItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/violetmoon/quark/content/tools/item/AncientTomeItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -54,7 +55,7 @@ public static ItemStack getEnchantedItemStack(Enchantment ench) {
public void fillItemCategory(@Nonnull CreativeModeTab group, @Nonnull NonNullList<ItemStack> 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)) {
Expand Down
39 changes: 20 additions & 19 deletions src/main/java/org/violetmoon/quark/content/tools/module/AbacusModule.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand All @@ -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))
Expand All @@ -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);
}
}
}
Expand Down
31 changes: 15 additions & 16 deletions src/main/java/org/violetmoon/quark/content/tools/module/AmbientDiscsModule.java
View file
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {
Expand Down Expand Up @@ -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);
}
}
Expand All @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/violetmoon/quark/content/tools/module/AncientTomesModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/org/violetmoon/quark/content/tweaks/module/AutomaticRecipeUnlockModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down Expand Up @@ -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;
Expand All @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/violetmoon/quark/content/tweaks/module/ZombieVillagersOnNormalModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
Loading

0 comments on commit 2165c1d

Please sign in to comment.