From c8a2e2cccccda12207f0700734cc1f828a3df8fb Mon Sep 17 00:00:00 2001 From: zenfyr Date: Sat, 29 Nov 2025 16:56:00 +0700 Subject: [PATCH] rename locals and internals to mojmap --- .../pulsar/client/fakeworld/FakeWorld.java | 12 ++- .../particles/AbstractScreenParticle.java | 6 +- .../client/particles/ItemStackParticle.java | 14 +-- .../pulsar/client/particles/Particle.java | 6 +- .../particles/ScreenParticleHelper.java | 30 +++--- .../client/particles/VanillaParticle.java | 50 +++++----- .../pulsar/codec/JsonCodecDataLoader.java | 10 +- ...ftClientMixin.java => MinecraftMixin.java} | 2 +- .../{WorldMixin.java => LevelMixin.java} | 4 +- ...ixin.java => RegistrySetBuilderMixin.java} | 4 +- ... => CreativeModeInventoryScreenMixin.java} | 10 +- ...upMixin.java => CreativeModeTabMixin.java} | 4 +- .../client/particles/GameRendererMixin.java | 4 +- ...ftClientMixin.java => MinecraftMixin.java} | 2 +- ...essor.java => ParticleEngineAccessor.java} | 2 +- ...gerMixin.java => ParticleEngineMixin.java} | 4 +- ...va => ReloadableServerResourcesMixin.java} | 6 +- ...l.java => CreativeModeTabBuilderImpl.java} | 6 +- .../pulsar/itemgroup/ItemGroupAnimaton.java | 14 +-- .../pulsar/itemgroup/ItemGroupBuilder.java | 2 +- ...ns.java => CreativeModeTabExtensions.java} | 2 +- .../pulsar/itemstack/ItemStackUtil.java | 36 +++---- .../dev/zenfyr/pulsar/nbt/NbtBuilderImpl.java | 48 +++++----- .../java/dev/zenfyr/pulsar/nbt/NbtUtil.java | 96 +++++++++---------- .../zenfyr/pulsar/registry/RegistryUtil.java | 16 ++-- .../resources/DataPackContentsAccessor.java | 2 +- .../zenfyr/pulsar/resources/ReloaderType.java | 2 +- .../pulsar/saveddata/DeserializableData.java | 2 +- .../pulsar/saveddata/SavedDataHelper.java | 24 ++--- .../dev/zenfyr/pulsar/util/PlayerUtil.java | 23 +++-- src/main/resources/pulsar.mixins.json | 18 ++-- 31 files changed, 235 insertions(+), 226 deletions(-) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/{MinecraftClientMixin.java => MinecraftMixin.java} (95%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/{WorldMixin.java => LevelMixin.java} (93%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/{RegistriesMixin.java => RegistrySetBuilderMixin.java} (91%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/{CreativeInventoryScreenMixin.java => CreativeModeInventoryScreenMixin.java} (85%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/{ItemGroupMixin.java => CreativeModeTabMixin.java} (81%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/{MinecraftClientMixin.java => MinecraftMixin.java} (96%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/{ParticleManagerAccessor.java => ParticleEngineAccessor.java} (92%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/{ParticleManagerMixin.java => ParticleEngineMixin.java} (91%) rename src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/{DataPackContentsMixin.java => ReloadableServerResourcesMixin.java} (94%) rename src/main/java/dev/zenfyr/pulsar/itemgroup/{ItemGroupBuilderImpl.java => CreativeModeTabBuilderImpl.java} (92%) rename src/main/java/dev/zenfyr/pulsar/itemgroup/impl/{ItemGroupExtensions.java => CreativeModeTabExtensions.java} (92%) diff --git a/src/main/java/dev/zenfyr/pulsar/client/fakeworld/FakeWorld.java b/src/main/java/dev/zenfyr/pulsar/client/fakeworld/FakeWorld.java index a4f17a6..b1b481d 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/fakeworld/FakeWorld.java +++ b/src/main/java/dev/zenfyr/pulsar/client/fakeworld/FakeWorld.java @@ -28,11 +28,12 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.dimension.BuiltinDimensionTypes; import net.minecraft.world.level.levelgen.WorldDimensions; import net.minecraft.world.level.levelgen.presets.WorldPresets; +import org.jetbrains.annotations.ApiStatus; @UtilityClass public class FakeWorld { - public static final ThreadLocal LOADING = ThreadLocal.withInitial(() -> false); + private static final ThreadLocal LOADING = ThreadLocal.withInitial(() -> false); public static final Supplier INSTANCE = Suppliers.memoize(() -> { try { @@ -71,6 +72,14 @@ public class FakeWorld { } }); + /** + * Returns if the current loading world is the fake {@link ClientLevel}. + * @return if the current loading world is the fake {@link ClientLevel}. + */ + public static boolean isLoading() { + return LOADING.get(); + } + private static LayeredRegistryAccess getRegistries() { LayeredRegistryAccess combinedDynamicRegistries = RegistryLayer.createRegistryAccess(); @@ -110,6 +119,7 @@ public class FakeWorld { return cdr.replaceFrom(RegistryLayer.WORLDGEN, immutable1); } + @ApiStatus.Internal public static void init() { AfterFirstReload.EVENT.register(INSTANCE::get); } diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java b/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java index d2fe97c..d24b118 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/client/particles/AbstractScreenParticle.java @@ -29,7 +29,7 @@ public abstract class AbstractScreenParticle implements Renderable { @Override @ApiStatus.OverrideOnly - public abstract void render(GuiGraphics context, int mouseX, int mouseY, float delta); + public abstract void render(GuiGraphics graphics, int mouseX, int mouseY, float delta); @ApiStatus.OverrideOnly protected abstract void tick(); @@ -44,9 +44,9 @@ public abstract class AbstractScreenParticle implements Renderable { } @ApiStatus.Internal - public final void renderInternal(GuiGraphics context, int mouseX, int mouseY, float delta) { + public final void renderInternal(GuiGraphics graphics, int mouseX, int mouseY, float delta) { if (removed || (screen != null && client.screen != screen)) return; - render(context, mouseX, mouseY, delta); + render(graphics, mouseX, mouseY, delta); } @ApiStatus.Internal diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java b/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java index ec4fb7b..6055308 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/client/particles/ItemStackParticle.java @@ -20,16 +20,16 @@ public class ItemStackParticle extends AbstractScreenParticle { } @Override - public void render(GuiGraphics context, int mouseX, int mouseY, float delta) { - PoseStack matrices = context.pose(); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + PoseStack pose = graphics.pose(); float x = (float) Mth.lerp(delta, this.prevX, this.x); float y = (float) Mth.lerp(delta, this.prevY, this.y); - matrices.pushPose(); - matrices.translate(x, y, 500); + pose.pushPose(); + pose.translate(x, y, 500); float angle = (float) Math.toDegrees(Math.atan2(velY, velX) * 0.5); - matrices.mulPose(Axis.ZP.rotationDegrees(angle)); - context.renderItem(stack, -8, -8); - matrices.popPose(); + pose.mulPose(Axis.ZP.rotationDegrees(angle)); + graphics.renderItem(stack, -8, -8); + pose.popPose(); } @Override diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/Particle.java b/src/main/java/dev/zenfyr/pulsar/client/particles/Particle.java index 4042187..ac4d538 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/Particle.java +++ b/src/main/java/dev/zenfyr/pulsar/client/particles/Particle.java @@ -19,12 +19,12 @@ public class Particle extends AbstractScreenParticle { } @Override - public void render(GuiGraphics context, int mouseX, int mouseY, float delta) { - PoseStack matrices = context.pose(); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + PoseStack matrices = graphics.pose(); matrices.pushPose(); float x = (float) Mth.lerp(delta, prevX, this.x); float y = (float) Mth.lerp(delta, prevY, this.y); - context.fillGradient((int) x, (int) y, (int) (x + 3), (int) (y + 3), 500, color, color); + graphics.fillGradient((int) x, (int) y, (int) (x + 3), (int) (y + 3), 500, color, color); matrices.popPose(); } diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java b/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java index 7497f6e..2c30e8c 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java +++ b/src/main/java/dev/zenfyr/pulsar/client/particles/ScreenParticleHelper.java @@ -52,14 +52,14 @@ public final class ScreenParticleHelper { } public static void addParticles( - ParticleOptions parameters, + ParticleOptions options, double x, double y, double deltaX, double deltaY, double speed, int count) { - ScreenParticleHelper.addScreenParticles(null, parameters, x, y, deltaX, deltaY, speed, count); + ScreenParticleHelper.addScreenParticles(null, options, x, y, deltaX, deltaY, speed, count); } ///////////////////////////// @@ -69,13 +69,13 @@ public final class ScreenParticleHelper { } public static void addScreenParticle( - ParticleOptions parameters, double x, double y, double velX, double velY) { - ScreenParticleHelper.addScreenParticle(current(), parameters, x, y, velX, velY); + ParticleOptions options, double x, double y, double velX, double velY) { + ScreenParticleHelper.addScreenParticle(current(), options, x, y, velX, velY); } public static void addScreenParticle( - ParticleOptions parameters, double x, double y, double velX, double velY, double velZ) { - ScreenParticleHelper.addScreenParticle(current(), parameters, x, y, velX, velY, velZ); + ParticleOptions options, double x, double y, double velX, double velY, double velZ) { + ScreenParticleHelper.addScreenParticle(current(), options, x, y, velX, velY, velZ); } public static void addScreenParticles(AbstractScreenParticle... particles) { @@ -91,15 +91,14 @@ public final class ScreenParticleHelper { } public static void addScreenParticles( - ParticleOptions parameters, + ParticleOptions options, double x, double y, double deltaX, double deltaY, double speed, int count) { - ScreenParticleHelper.addScreenParticles( - current(), parameters, x, y, deltaX, deltaY, speed, count); + ScreenParticleHelper.addScreenParticles(current(), options, x, y, deltaX, deltaY, speed, count); } ///////////////////////////// @@ -110,21 +109,21 @@ public final class ScreenParticleHelper { } public static void addScreenParticle( - Screen screen, ParticleOptions parameters, double x, double y, double velX, double velY) { - VanillaParticle particle = new VanillaParticle(parameters, x, y, velX, velY); + Screen screen, ParticleOptions options, double x, double y, double velX, double velY) { + VanillaParticle particle = new VanillaParticle(options, x, y, velX, velY); particle.bindToScreen(screen); SCREEN_PARTICLES.add(particle); } public static void addScreenParticle( Screen screen, - ParticleOptions parameters, + ParticleOptions options, double x, double y, double velX, double velY, double velZ) { - VanillaParticle particle = new VanillaParticle(parameters, x, y, velX, velY, velZ); + VanillaParticle particle = new VanillaParticle(options, x, y, velX, velY, velZ); particle.bindToScreen(screen); SCREEN_PARTICLES.add(particle); } @@ -154,7 +153,7 @@ public final class ScreenParticleHelper { public static void addScreenParticles( Screen screen, - ParticleOptions parameters, + ParticleOptions options, double x, double y, double deltaX, @@ -169,8 +168,7 @@ public final class ScreenParticleHelper { double velX = random().nextGaussian() * speed; double velY = random().nextGaussian() * speed; - VanillaParticle particle = - new VanillaParticle(parameters, x + offsetX, y + offsetY, velX, velY); + VanillaParticle particle = new VanillaParticle(options, x + offsetX, y + offsetY, velX, velY); particle.bindToScreen(screen); SCREEN_PARTICLES.add(particle); } diff --git a/src/main/java/dev/zenfyr/pulsar/client/particles/VanillaParticle.java b/src/main/java/dev/zenfyr/pulsar/client/particles/VanillaParticle.java index eaa8b42..9378932 100644 --- a/src/main/java/dev/zenfyr/pulsar/client/particles/VanillaParticle.java +++ b/src/main/java/dev/zenfyr/pulsar/client/particles/VanillaParticle.java @@ -6,7 +6,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.Tesselator; import dev.zenfyr.pulsar.client.fakeworld.AlwaysBrightLightmapTextureManager; import dev.zenfyr.pulsar.client.fakeworld.FakeWorld; -import dev.zenfyr.pulsar.impl.mixin.client.particles.ParticleManagerAccessor; +import dev.zenfyr.pulsar.impl.mixin.client.particles.ParticleEngineAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.CrashReport; @@ -19,24 +19,26 @@ import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.Particle; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.core.particles.ParticleOptions; +import org.jetbrains.annotations.ApiStatus; /** - * Render vanilla particle types on screen! + * Render vanilla particle types on screen! Please use the {@link ScreenParticleHelper} methods instead of this class! *

* Inspired by the removed {@code gesundheit} module of Lib39 */ +@ApiStatus.Internal @Environment(EnvType.CLIENT) public class VanillaParticle extends AbstractScreenParticle { - public static final ThreadLocal WORLD = ThreadLocal.withInitial(() -> null); + public static final ThreadLocal LEVEL = ThreadLocal.withInitial(() -> null); private static final Camera CAMERA = new Camera(); private final Particle particle; public VanillaParticle( - ParticleOptions parameters, double x, double y, double velX, double velY, double velZ) { + ParticleOptions options, double x, double y, double velX, double velY, double velZ) { super(0, 0, 0, 0); - this.particle = createScreenParticle(parameters, x, y, velX, velY, velZ); + this.particle = createScreenParticle(options, x, y, velX, velY, velZ); if (this.particle != null) { this.particle.hasPhysics = false; } else { @@ -44,8 +46,8 @@ public class VanillaParticle extends AbstractScreenParticle { } } - public VanillaParticle(ParticleOptions parameters, double x, double y, double velX, double velY) { - this(parameters, x, y, velX, velY, 0); + public VanillaParticle(ParticleOptions options, double x, double y, double velX, double velY) { + this(options, x, y, velX, velY, 0); } public VanillaParticle(Particle particle) { @@ -65,19 +67,19 @@ public class VanillaParticle extends AbstractScreenParticle { } @Override - public void render(GuiGraphics context, int mouseX, int mouseY, float delta) { - PoseStack matrices = context.pose(); + public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) { + PoseStack pose = graphics.pose(); RenderSystem.disableCull(); RenderSystem.enableDepthTest(); - matrices.pushPose(); - PoseStack matrixStack = RenderSystem.getModelViewStack(); - matrixStack.pushPose(); - matrixStack.translate(0, 0, 500); - matrixStack.scale(24, 24, 1); - matrixStack.translate(0, client.getWindow().getGuiScaledHeight() / 24f, 0); - matrixStack.scale(1, -1, 1); - matrixStack.mulPoseMatrix(matrices.last().pose()); + pose.pushPose(); + PoseStack poseStack = RenderSystem.getModelViewStack(); + poseStack.pushPose(); + poseStack.translate(0, 0, 500); + poseStack.scale(24, 24, 1); + poseStack.translate(0, client.getWindow().getGuiScaledHeight() / 24f, 0); + poseStack.scale(1, -1, 1); + poseStack.mulPoseMatrix(pose.last().pose()); RenderSystem.applyModelViewMatrix(); AlwaysBrightLightmapTextureManager.INSTANCE.turnOnLightLayer(); @@ -103,9 +105,9 @@ public class VanillaParticle extends AbstractScreenParticle { particle.getRenderType().end(tessellator); AlwaysBrightLightmapTextureManager.INSTANCE.turnOffLightLayer(); - matrixStack.popPose(); + poseStack.popPose(); RenderSystem.applyModelViewMatrix(); - matrices.popPose(); + pose.popPose(); RenderSystem.depthMask(true); RenderSystem.enableCull(); @@ -118,13 +120,13 @@ public class VanillaParticle extends AbstractScreenParticle { } public static Particle createScreenParticle( - T parameters, double x, double y, double velocityX, double velocityY, double velocityZ) { + T options, double x, double y, double velocityX, double velocityY, double velocityZ) { Particle particle; try { - WORLD.set(FakeWorld.INSTANCE.get()); - particle = ((ParticleManagerAccessor) Minecraft.getInstance().particleEngine) + LEVEL.set(FakeWorld.INSTANCE.get()); + particle = ((ParticleEngineAccessor) Minecraft.getInstance().particleEngine) .pulsar$createParticle( - parameters, + options, x / 24, (Minecraft.getInstance().getWindow().getGuiScaledHeight() - y) / 24, 0, @@ -132,7 +134,7 @@ public class VanillaParticle extends AbstractScreenParticle { velocityY, velocityZ); } finally { - WORLD.remove(); + LEVEL.remove(); } return particle; } diff --git a/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java b/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java index 101b33b..4cabc14 100644 --- a/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java +++ b/src/main/java/dev/zenfyr/pulsar/codec/JsonCodecDataLoader.java @@ -30,18 +30,18 @@ public abstract class JsonCodecDataLoader extends SimpleJsonResourceReloadLis }; } - private final ResourceLocation identifier; + private final ResourceLocation location; private final Codec codec; - public JsonCodecDataLoader(ResourceLocation identifier, Codec codec) { - super(new Gson(), identifier.toString().replace(':', '/')); - this.identifier = identifier; + public JsonCodecDataLoader(ResourceLocation location, Codec codec) { + super(new Gson(), location.toString().replace(':', '/')); + this.location = location; this.codec = codec; } @Override public final ResourceLocation getFabricId() { - return this.identifier; + return this.location; } @Override diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftClientMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java similarity index 95% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftClientMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java index 7bf3488..962dd38 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftClientMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/events/MinecraftMixin.java @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) -public class MinecraftClientMixin { +public class MinecraftMixin { @Inject(method = "method_29338", at = @At("TAIL"), require = 0) private void pulsar$init(CallbackInfo ci) { Minecraft.getInstance().tell(() -> { diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/WorldMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/LevelMixin.java similarity index 93% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/WorldMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/LevelMixin.java index a360fc2..db55c20 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/WorldMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/LevelMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(Level.class) -public class WorldMixin { +public class LevelMixin { @WrapOperation( at = @@ -21,7 +21,7 @@ public class WorldMixin { method = "") private DamageSources pulsar$ignoreDamageSources( RegistryAccess registryManager, Operation original) { - if (FakeWorld.LOADING.get()) { + if (FakeWorld.isLoading()) { return null; } return original.call(registryManager); diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistriesMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistrySetBuilderMixin.java similarity index 91% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistriesMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistrySetBuilderMixin.java index 832cf39..db7c484 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistriesMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/fakeworld/RegistrySetBuilderMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(RegistrySetBuilder.class) -public class RegistriesMixin { +public class RegistrySetBuilderMixin { @WrapWithCondition( at = @@ -18,6 +18,6 @@ public class RegistriesMixin { method = "build(Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/core/HolderLookup$Provider;") private boolean pulsar$validateRefs(RegistrySetBuilder.BuildState instance) { - return !FakeWorld.LOADING.get(); + return !FakeWorld.isLoading(); } } diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeInventoryScreenMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java similarity index 85% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeInventoryScreenMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java index 061c50e..da6f4b0 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeInventoryScreenMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeInventoryScreenMixin.java @@ -1,7 +1,7 @@ package dev.zenfyr.pulsar.impl.mixin.client.itemgroup; import com.llamalad7.mixinextras.sugar.Local; -import dev.zenfyr.pulsar.itemgroup.impl.ItemGroupExtensions; +import dev.zenfyr.pulsar.itemgroup.impl.CreativeModeTabExtensions; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen; import net.minecraft.client.gui.screens.inventory.EffectRenderingInventoryScreen; @@ -14,10 +14,10 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(CreativeModeInventoryScreen.class) -public abstract class CreativeInventoryScreenMixin +public abstract class CreativeModeInventoryScreenMixin extends EffectRenderingInventoryScreen { - public CreativeInventoryScreenMixin( + public CreativeModeInventoryScreenMixin( CreativeModeInventoryScreen.ItemPickerMenu screenHandler, Inventory playerInventory, Component text) { @@ -41,8 +41,8 @@ public abstract class CreativeInventoryScreenMixin @Local(index = 4) boolean bl2, @Local(index = 8) int l, @Local(index = 9) int m) { - if (((ItemGroupExtensions) group).pulsar$getIconAnimation() != null) { - ((ItemGroupExtensions) group) + if (((CreativeModeTabExtensions) group).pulsar$getIconAnimation() != null) { + ((CreativeModeTabExtensions) group) .pulsar$getIconAnimation() .animateIcon(group, context, l, m, bl, bl2); ci.cancel(); diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/ItemGroupMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java similarity index 81% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/ItemGroupMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java index dbf24d5..7dd24e8 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/ItemGroupMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/itemgroup/CreativeModeTabMixin.java @@ -1,13 +1,13 @@ package dev.zenfyr.pulsar.impl.mixin.client.itemgroup; import dev.zenfyr.pulsar.itemgroup.ItemGroupAnimaton; -import dev.zenfyr.pulsar.itemgroup.impl.ItemGroupExtensions; +import dev.zenfyr.pulsar.itemgroup.impl.CreativeModeTabExtensions; import net.minecraft.world.item.CreativeModeTab; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @Mixin(CreativeModeTab.class) -public class ItemGroupMixin implements ItemGroupExtensions { +public class CreativeModeTabMixin implements CreativeModeTabExtensions { @Unique private ItemGroupAnimaton pulsar$animation; diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java index 369264b..6d82061 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/GameRendererMixin.java @@ -27,9 +27,9 @@ public class GameRendererMixin { ordinal = 1, shift = At.Shift.BEFORE)) private void pulsar$renderScreenParticles( - float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local GuiGraphics context) { + float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local GuiGraphics graphics) { this.minecraft.getProfiler().push("pulsar_particles"); - ScreenParticleHelper.renderParticles(this.minecraft, context); + ScreenParticleHelper.renderParticles(this.minecraft, graphics); this.minecraft.getProfiler().pop(); } } diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftClientMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java similarity index 96% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftClientMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java index f3d292f..c3ea310 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftClientMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/MinecraftMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) -public abstract class MinecraftClientMixin { +public abstract class MinecraftMixin { @Inject( method = "tick", diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerAccessor.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerAccessor.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java index fbdcbca..581d074 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerAccessor.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineAccessor.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(ParticleEngine.class) -public interface ParticleManagerAccessor { +public interface ParticleEngineAccessor { @Invoker("makeParticle") Particle pulsar$createParticle( diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java similarity index 91% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java index 3aa560e..8a12af4 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleManagerMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/client/particles/ParticleEngineMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @Mixin(ParticleEngine.class) -public class ParticleManagerMixin { +public class ParticleEngineMixin { @ModifyExpressionValue( at = @@ -18,7 +18,7 @@ public class ParticleManagerMixin { "Lnet/minecraft/client/particle/ParticleEngine;level:Lnet/minecraft/client/multiplayer/ClientLevel;"), method = "makeParticle") private ClientLevel pulsar$modifyWorld(ClientLevel value) { - var w = VanillaParticle.WORLD.get(); + var w = VanillaParticle.LEVEL.get(); if (w != null) return w; return value; } diff --git a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/DataPackContentsMixin.java b/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java similarity index 94% rename from src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/DataPackContentsMixin.java rename to src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java index 893bcb7..6983e2c 100644 --- a/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/DataPackContentsMixin.java +++ b/src/main/java/dev/zenfyr/pulsar/impl/mixin/resources/ReloadableServerResourcesMixin.java @@ -23,7 +23,7 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; @Mixin(value = ReloadableServerResources.class, priority = 1100) -abstract class DataPackContentsMixin implements InternalContentsAccessor { +abstract class ReloadableServerResourcesMixin implements InternalContentsAccessor { @Unique private final Map reloadersByIdentifier = new HashMap<>(); @@ -36,9 +36,9 @@ abstract class DataPackContentsMixin implements InternalContentsAccessor { var reloader = this.reloadersByType.get(type); if (reloader == null) { synchronized (this.reloadersByIdentifier) { - reloader = this.reloadersByIdentifier.get(type.identifier()); + reloader = this.reloadersByIdentifier.get(type.location()); if (reloader == null) - throw new NoSuchElementException("Missing reloader %s".formatted(type.identifier())); + throw new NoSuchElementException("Missing reloader %s".formatted(type.location())); this.reloadersByType.put(type, reloader); } } diff --git a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilderImpl.java b/src/main/java/dev/zenfyr/pulsar/itemgroup/CreativeModeTabBuilderImpl.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilderImpl.java rename to src/main/java/dev/zenfyr/pulsar/itemgroup/CreativeModeTabBuilderImpl.java index cb6e638..173d6bf 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilderImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/itemgroup/CreativeModeTabBuilderImpl.java @@ -12,7 +12,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.ItemStack; -class ItemGroupBuilderImpl implements ItemGroupBuilder { +class CreativeModeTabBuilderImpl implements ItemGroupBuilder { private final ResourceLocation identifier; private Supplier icon = () -> ItemStack.EMPTY; @@ -21,7 +21,7 @@ class ItemGroupBuilderImpl implements ItemGroupBuilder { private BooleanSupplier register = Utilities.getTruth(); private Component displayName; - public ItemGroupBuilderImpl(ResourceLocation identifier) { + public CreativeModeTabBuilderImpl(ResourceLocation identifier) { this.identifier = identifier; } @@ -66,7 +66,7 @@ class ItemGroupBuilderImpl implements ItemGroupBuilder { CreativeModeTab.Builder builder = new CreativeModeTab.Builder(null, -1); builder.displayItems((displayContext, operatorEnabled) -> {}); - builder.icon(() -> ItemGroupBuilderImpl.this.icon.get()); + builder.icon(() -> CreativeModeTabBuilderImpl.this.icon.get()); builder.title(Objects.requireNonNullElseGet( this.displayName, diff --git a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupAnimaton.java b/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupAnimaton.java index 837c99c..c0d8be5 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupAnimaton.java +++ b/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupAnimaton.java @@ -1,6 +1,6 @@ package dev.zenfyr.pulsar.itemgroup; -import dev.zenfyr.pulsar.itemgroup.impl.ItemGroupExtensions; +import dev.zenfyr.pulsar.itemgroup.impl.CreativeModeTabExtensions; import java.util.Optional; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -12,26 +12,26 @@ import net.minecraft.world.item.CreativeModeTab; public interface ItemGroupAnimaton { static CreativeModeTab setIconAnimation(CreativeModeTab group, ItemGroupAnimaton animation) { - ((ItemGroupExtensions) group).pulsar$setIconAnimation(animation); + ((CreativeModeTabExtensions) group).pulsar$setIconAnimation(animation); return group; } static Optional getIconAnimation(CreativeModeTab group) { - return Optional.ofNullable(((ItemGroupExtensions) group).pulsar$getIconAnimation()); + return Optional.ofNullable(((CreativeModeTabExtensions) group).pulsar$getIconAnimation()); } /** - * Animates the icon for your item group. + * Animates the icon for your creative tab. * *

This can draw anything you want

* - * @param context the matrix stack used to render the screen + * @param graphics the graphics used to render the screen * @param itemX the x-coordinate of the icon * @param itemY the y-coordinate of the icon */ void animateIcon( - CreativeModeTab group, - GuiGraphics context, + CreativeModeTab tab, + GuiGraphics graphics, int itemX, int itemY, boolean selected, diff --git a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilder.java b/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilder.java index bb53479..51652de 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilder.java +++ b/src/main/java/dev/zenfyr/pulsar/itemgroup/ItemGroupBuilder.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; public interface ItemGroupBuilder { static ItemGroupBuilder create(@NonNull ResourceLocation identifier) { - return new ItemGroupBuilderImpl(identifier); + return new CreativeModeTabBuilderImpl(identifier); } default ItemGroupBuilder icon(ItemStack itemStack) { diff --git a/src/main/java/dev/zenfyr/pulsar/itemgroup/impl/ItemGroupExtensions.java b/src/main/java/dev/zenfyr/pulsar/itemgroup/impl/CreativeModeTabExtensions.java similarity index 92% rename from src/main/java/dev/zenfyr/pulsar/itemgroup/impl/ItemGroupExtensions.java rename to src/main/java/dev/zenfyr/pulsar/itemgroup/impl/CreativeModeTabExtensions.java index e8744b7..5ade474 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemgroup/impl/ItemGroupExtensions.java +++ b/src/main/java/dev/zenfyr/pulsar/itemgroup/impl/CreativeModeTabExtensions.java @@ -6,7 +6,7 @@ import net.fabricmc.api.Environment; import net.minecraft.world.item.CreativeModeTab; @Environment(EnvType.CLIENT) -public interface ItemGroupExtensions { +public interface CreativeModeTabExtensions { default CreativeModeTab pulsar$setIconAnimation(ItemGroupAnimaton animation) { throw new IllegalStateException("Interface not implemented"); diff --git a/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java b/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java index 6e1bf1e..2eac0e3 100644 --- a/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/itemstack/ItemStackUtil.java @@ -26,22 +26,22 @@ public class ItemStackUtil { .orElse(ItemStack.EMPTY); } - public static void spawn(@NonNull BlockPos pos, @NonNull ItemStack stack, @NonNull Level world) { - ItemEntity itemEntity = new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack); + public static void spawn(@NonNull BlockPos pos, @NonNull ItemStack stack, @NonNull Level level) { + ItemEntity itemEntity = new ItemEntity(level, pos.getX(), pos.getY(), pos.getZ(), stack); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } - public static void spawn(@NonNull Vec3 pos, @NonNull ItemStack stack, @NonNull Level world) { - ItemEntity itemEntity = new ItemEntity(world, pos.x(), pos.y(), pos.z(), stack); + public static void spawn(@NonNull Vec3 pos, @NonNull ItemStack stack, @NonNull Level level) { + ItemEntity itemEntity = new ItemEntity(level, pos.x(), pos.y(), pos.z(), stack); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } public static void spawnVelocity( @NonNull BlockPos pos, @NonNull ItemStack stack, - @NonNull Level world, + @NonNull Level level, double minX, double maxX, double minY, @@ -49,7 +49,7 @@ public class ItemStackUtil { double minZ, double maxZ) { ItemEntity itemEntity = new ItemEntity( - world, + level, pos.getX(), pos.getY(), pos.getZ(), @@ -58,13 +58,13 @@ public class ItemStackUtil { MathUtil.nextDouble(minY, maxY), MathUtil.nextDouble(minZ, maxZ)); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } public static void spawnVelocity( @NonNull Vec3 pos, @NonNull ItemStack stack, - @NonNull Level world, + @NonNull Level level, double minX, double maxX, double minY, @@ -72,7 +72,7 @@ public class ItemStackUtil { double minZ, double maxZ) { ItemEntity itemEntity = new ItemEntity( - world, + level, pos.x(), pos.y(), pos.z(), @@ -81,23 +81,23 @@ public class ItemStackUtil { MathUtil.nextDouble(minY, maxY), MathUtil.nextDouble(minZ, maxZ)); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } public static void spawnVelocity( - @NotNull BlockPos pos, @NonNull ItemStack stack, @NonNull Level world, @NotNull Vec3 vec3d) { + @NotNull BlockPos pos, @NonNull ItemStack stack, @NonNull Level level, @NotNull Vec3 vec3d) { ItemEntity itemEntity = - new ItemEntity(world, pos.getX(), pos.getY(), pos.getZ(), stack, vec3d.x, vec3d.y, vec3d.z); + new ItemEntity(level, pos.getX(), pos.getY(), pos.getZ(), stack, vec3d.x, vec3d.y, vec3d.z); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } public static void spawnVelocity( - @NotNull Vec3 pos, @NonNull ItemStack stack, @NonNull Level world, @NotNull Vec3 vec3d) { + @NotNull Vec3 pos, @NonNull ItemStack stack, @NonNull Level level, @NotNull Vec3 vec3d) { ItemEntity itemEntity = - new ItemEntity(world, pos.x(), pos.y(), pos.z(), stack, vec3d.x, vec3d.y, vec3d.z); + new ItemEntity(level, pos.x(), pos.y(), pos.z(), stack, vec3d.x, vec3d.y, vec3d.z); itemEntity.setDefaultPickUpDelay(); - world.addFreshEntity(itemEntity); + level.addFreshEntity(itemEntity); } public static void appendStacks(Collection stacks, Collection list) { diff --git a/src/main/java/dev/zenfyr/pulsar/nbt/NbtBuilderImpl.java b/src/main/java/dev/zenfyr/pulsar/nbt/NbtBuilderImpl.java index 90db9cc..36c8981 100644 --- a/src/main/java/dev/zenfyr/pulsar/nbt/NbtBuilderImpl.java +++ b/src/main/java/dev/zenfyr/pulsar/nbt/NbtBuilderImpl.java @@ -8,109 +8,109 @@ import net.minecraft.nbt.Tag; class NbtBuilderImpl implements NbtBuilder { - private final CompoundTag nbt; + private final CompoundTag tag; - public NbtBuilderImpl(CompoundTag nbt) { - if (nbt == null) nbt = new CompoundTag(); - this.nbt = nbt; + public NbtBuilderImpl(CompoundTag tag) { + if (tag == null) tag = new CompoundTag(); + this.tag = tag; } public NbtBuilderImpl() { - this.nbt = new CompoundTag(); + this.tag = new CompoundTag(); } public NbtBuilder put(String key, @NonNull Tag element) { - nbt.put(key, element); + tag.put(key, element); return this; } @Override public NbtBuilder put(String key, @NonNull NbtBuilder builder) { - nbt.put(key, builder.build()); + tag.put(key, builder.build()); return null; } public NbtBuilder putByte(String key, byte value) { - nbt.putByte(key, value); + tag.putByte(key, value); return this; } public NbtBuilder putShort(String key, short value) { - nbt.putShort(key, value); + tag.putShort(key, value); return this; } public NbtBuilder putInt(String key, int value) { - nbt.putInt(key, value); + tag.putInt(key, value); return this; } public NbtBuilder putLong(String key, long value) { - nbt.putLong(key, value); + tag.putLong(key, value); return this; } public NbtBuilder putUuid(String key, @NonNull UUID uuid) { - nbt.putUUID(key, uuid); + tag.putUUID(key, uuid); return this; } public NbtBuilder putFloat(String key, float value) { - nbt.putFloat(key, value); + tag.putFloat(key, value); return this; } public NbtBuilder putDouble(String key, double value) { - nbt.putDouble(key, value); + tag.putDouble(key, value); return this; } public NbtBuilder putString(String key, @NonNull String string) { - nbt.putString(key, string); + tag.putString(key, string); return this; } public NbtBuilder putByteArray(String key, byte @NonNull [] bytes) { - nbt.putByteArray(key, bytes); + tag.putByteArray(key, bytes); return this; } public NbtBuilder putByteArray(String key, @NonNull List bytes) { - nbt.putByteArray(key, bytes); + tag.putByteArray(key, bytes); return this; } public NbtBuilder putIntArray(String key, int @NonNull [] ints) { - nbt.putIntArray(key, ints); + tag.putIntArray(key, ints); return this; } public NbtBuilder putIntArray(String key, @NonNull List ints) { - nbt.putIntArray(key, ints); + tag.putIntArray(key, ints); return this; } public NbtBuilder putLongArray(String key, long @NonNull [] longs) { - nbt.putLongArray(key, longs); + tag.putLongArray(key, longs); return this; } public NbtBuilder putLongArray(String key, @NonNull List longs) { - nbt.putLongArray(key, longs); + tag.putLongArray(key, longs); return this; } public NbtBuilder putBoolean(String key, boolean value) { - nbt.putBoolean(key, value); + tag.putBoolean(key, value); return this; } @Override public String toString() { - return "NbtBuilder{" + "nbt=" + nbt + '}'; + return "NbtBuilder{" + "nbt=" + tag + '}'; } public CompoundTag build() { - return nbt; + return tag; } } diff --git a/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java b/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java index dcc32f0..6006892 100644 --- a/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/nbt/NbtUtil.java @@ -20,110 +20,110 @@ public class NbtUtil { } /** - * Writes items in an inventory to NbtCompound. + * Writes items in a container to {@link CompoundTag}. * - * @param nbt the NbtCompound to write the inventory to - * @param inventory the inventory to write to the NbtCompound - * @return the NbtCompound with the inventory data written to it + * @param tag the {@link CompoundTag} to write the container to + * @param container the container to write to the {@link CompoundTag} + * @return the {@link CompoundTag} with the container data written to it */ public static @NotNull CompoundTag writeInventoryToNbt( - String key, CompoundTag nbt, @NotNull Container inventory) { - nbt = (nbt == null) ? new CompoundTag() : nbt; + String key, CompoundTag tag, @NotNull Container container) { + tag = (tag == null) ? new CompoundTag() : tag; ListTag nbtList = new ListTag(); - for (int i = 0; i < inventory.getContainerSize(); ++i) { - ItemStack itemStack = inventory.getItem(i); + for (int i = 0; i < container.getContainerSize(); ++i) { + ItemStack itemStack = container.getItem(i); if (!itemStack.isEmpty()) { nbtList.add(itemStack.save(NbtBuilder.create().putByte("Slot", (byte) i).build())); } } - nbt.put(key, nbtList); - return nbt; + tag.put(key, nbtList); + return tag; } - public static void readInventoryFromNbt(CompoundTag nbt, Container inventory) { - readInventoryFromNbt("Items", nbt, inventory); + public static void readInventoryFromNbt(CompoundTag tag, Container inventory) { + readInventoryFromNbt("Items", tag, inventory); } /** - * Reads items in an inventory from a NbtCompound. + * Reads items in a container from a {@link CompoundTag}. * - * @param nbt the NbtCompound to read the inventory from - * @param inventory the inventory to read the data into + * @param tag the {@link CompoundTag} to read the container from + * @param container the container to read the data into */ - public static void readInventoryFromNbt(String key, CompoundTag nbt, Container inventory) { - if (nbt == null) return; - if (!nbt.contains(key)) return; + public static void readInventoryFromNbt(String key, CompoundTag tag, Container container) { + if (tag == null) return; + if (!tag.contains(key)) return; - ListTag nbtList = nbt.getList(key, Tag.TAG_COMPOUND); + ListTag nbtList = tag.getList(key, Tag.TAG_COMPOUND); for (int i = 0; i < nbtList.size(); ++i) { CompoundTag nbtCompound = nbtList.getCompound(i); int j = nbtCompound.getByte("Slot") & 255; //noinspection ConstantConditions - if (j >= 0 && j < inventory.getContainerSize()) { - inventory.setItem(j, ItemStack.of(nbtCompound)); + if (j >= 0 && j < container.getContainerSize()) { + container.setItem(j, ItemStack.of(nbtCompound)); } } } @Contract("null, _, _ -> param3") - public static int getInt(CompoundTag nbt, String name, int defaultValue) { - if (nbt == null || !nbt.contains(name)) return defaultValue; - return nbt.getInt(name); + public static int getInt(CompoundTag tag, String name, int defaultValue) { + if (tag == null || !tag.contains(name)) return defaultValue; + return tag.getInt(name); } @Contract("null, _, _ -> param3") - public static float getFloat(CompoundTag nbt, String name, float defaultValue) { - if (nbt == null || !nbt.contains(name)) return defaultValue; - return nbt.getFloat(name); + public static float getFloat(CompoundTag tag, String name, float defaultValue) { + if (tag == null || !tag.contains(name)) return defaultValue; + return tag.getFloat(name); } @Contract("null, _, _ -> param3") - public static double getDouble(CompoundTag nbt, String name, double defaultValue) { - if (nbt == null || !nbt.contains(name)) return defaultValue; - return nbt.getDouble(name); + public static double getDouble(CompoundTag tag, String name, double defaultValue) { + if (tag == null || !tag.contains(name)) return defaultValue; + return tag.getDouble(name); } @Contract("null, _, _ -> param3") - public static byte getByte(CompoundTag nbt, String name, byte defaultValue) { - if (nbt == null || !nbt.contains(name)) return defaultValue; - return nbt.getByte(name); + public static byte getByte(CompoundTag tag, String name, byte defaultValue) { + if (tag == null || !tag.contains(name)) return defaultValue; + return tag.getByte(name); } @Contract("null, _, _ -> param3") - public static String getString(CompoundTag nbt, String name, String defaultValue) { - if (nbt == null || !nbt.contains(name)) return defaultValue; - return nbt.getString(name); + public static String getString(CompoundTag tag, String name, String defaultValue) { + if (tag == null || !tag.contains(name)) return defaultValue; + return tag.getString(name); } @Deprecated @Contract("null, _, _, _ -> param3") - public static int getInt(CompoundTag nbt, String name, int min, int max) { - if (nbt == null || !nbt.contains(name)) return min; - int i = nbt.getInt(name); + public static int getInt(CompoundTag tag, String name, int min, int max) { + if (tag == null || !tag.contains(name)) return min; + int i = tag.getInt(name); return Mth.clamp(i, min, max); } @Deprecated @Contract("null, _, _, _ -> param3") - public static float getFloat(CompoundTag nbt, String name, float min, float max) { - if (nbt == null || !nbt.contains(name)) return min; - float i = nbt.getFloat(name); + public static float getFloat(CompoundTag tag, String name, float min, float max) { + if (tag == null || !tag.contains(name)) return min; + float i = tag.getFloat(name); return Mth.clamp(i, min, max); } @Deprecated @Contract("null, _, _, _ -> param3") - public static double getDouble(CompoundTag nbt, String name, double min, double max) { - if (nbt == null || !nbt.contains(name)) return min; - double i = nbt.getDouble(name); + public static double getDouble(CompoundTag tag, String name, double min, double max) { + if (tag == null || !tag.contains(name)) return min; + double i = tag.getDouble(name); return Mth.clamp(i, min, max); } @Deprecated @Contract("null, _, _, _ -> param3") - public static float getByte(CompoundTag nbt, String name, byte min, byte max) { - if (nbt == null || !nbt.contains(name)) return min; - byte i = nbt.getByte(name); + public static float getByte(CompoundTag tag, String name, byte min, byte max) { + if (tag == null || !tag.contains(name)) return min; + byte i = tag.getByte(name); return Mth.clamp(i, min, max); } } diff --git a/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java b/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java index 123eaf4..619e70a 100644 --- a/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/registry/RegistryUtil.java @@ -56,8 +56,8 @@ public class RegistryUtil { } @Contract("null -> null") - public T asItem(@Nullable ItemLike convertible) { - return convertible != null ? Utilities.cast(convertible.asItem()) : null; + public T asItem(@Nullable ItemLike item) { + return item != null ? Utilities.cast(item.asItem()) : null; } public Supplier> screenHandlerType( @@ -71,22 +71,22 @@ public class RegistryUtil { } public @Nullable T register( - Registry registry, ResourceLocation id, Supplier entry) { - return register(true, registry, id, entry); + Registry registry, ResourceLocation location, Supplier entry) { + return register(true, registry, location, entry); } public @Nullable T register( @NotNull BooleanSupplier condition, Registry registry, - ResourceLocation id, + ResourceLocation location, Supplier entry) { - return register(condition.getAsBoolean(), registry, id, entry); + return register(condition.getAsBoolean(), registry, location, entry); } public @Nullable T register( - boolean condition, Registry registry, ResourceLocation id, Supplier entry) { + boolean condition, Registry registry, ResourceLocation location, Supplier entry) { if (condition) { - return Registry.register(registry, id, entry.get()); + return Registry.register(registry, location, entry.get()); } return null; } diff --git a/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java b/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java index b0d258f..53b0b4b 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java +++ b/src/main/java/dev/zenfyr/pulsar/resources/DataPackContentsAccessor.java @@ -6,7 +6,7 @@ import net.minecraft.server.packs.resources.PreparableReloadListener; public interface DataPackContentsAccessor { static DataPackContentsAccessor get(MinecraftServer server) { - return ((DataPackContentsAccessor) server); + return server; } T pulsar$getReloader(ReloaderType type); diff --git a/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java b/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java index 08549f3..79781f8 100644 --- a/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java +++ b/src/main/java/dev/zenfyr/pulsar/resources/ReloaderType.java @@ -30,7 +30,7 @@ public final class ReloaderType { public static final ReloaderType LOOT_TABLES = create(ResourceReloadListenerKeys.LOOT_TABLES); - private final ResourceLocation identifier; + private final ResourceLocation location; @Contract("_ -> new") public static @NotNull ReloaderType create( diff --git a/src/main/java/dev/zenfyr/pulsar/saveddata/DeserializableData.java b/src/main/java/dev/zenfyr/pulsar/saveddata/DeserializableData.java index 1f1873a..f223a4a 100644 --- a/src/main/java/dev/zenfyr/pulsar/saveddata/DeserializableData.java +++ b/src/main/java/dev/zenfyr/pulsar/saveddata/DeserializableData.java @@ -3,5 +3,5 @@ package dev.zenfyr.pulsar.saveddata; import net.minecraft.nbt.CompoundTag; public interface DeserializableData { - void readNbt(CompoundTag nbt); + void readNbt(CompoundTag tag); } diff --git a/src/main/java/dev/zenfyr/pulsar/saveddata/SavedDataHelper.java b/src/main/java/dev/zenfyr/pulsar/saveddata/SavedDataHelper.java index aaddfc2..d1921d1 100644 --- a/src/main/java/dev/zenfyr/pulsar/saveddata/SavedDataHelper.java +++ b/src/main/java/dev/zenfyr/pulsar/saveddata/SavedDataHelper.java @@ -17,17 +17,17 @@ import org.jetbrains.annotations.NotNull; public final class SavedDataHelper { public static T getOrCreate( - @NotNull ServerLevel world, + @NotNull ServerLevel level, Function readFunction, Supplier supplier, String id) { - return world.getDataStorage().computeIfAbsent(readFunction, supplier, id); + return level.getDataStorage().computeIfAbsent(readFunction, supplier, id); } public static T getOrCreate( - ServerLevel world, Supplier supplier, String id) { + ServerLevel level, Supplier supplier, String id) { return getOrCreate( - world, + level, nbt -> { T state = supplier.get(); state.readNbt(nbt); @@ -37,27 +37,27 @@ public final class SavedDataHelper { id); } - public static boolean isStateLoaded(@NotNull ServerLevel world, String id) { - return world.getDataStorage().cache.containsKey(id); + public static boolean isStateLoaded(@NotNull ServerLevel level, String id) { + return level.getDataStorage().cache.containsKey(id); } public static void consumeIfLoaded( - ServerLevel world, + ServerLevel level, String id, BiFunction getFunc, Consumer action) { - if (isStateLoaded(world, id)) { - action.accept(getFunc.apply(world, id)); + if (isStateLoaded(level, id)) { + action.accept(getFunc.apply(level, id)); } } public static Optional processIfLoaded( - ServerLevel world, + ServerLevel level, String id, BiFunction getFunc, Function action) { - if (isStateLoaded(world, id)) { - return Optional.ofNullable(action.apply(getFunc.apply(world, id))); + if (isStateLoaded(level, id)) { + return Optional.ofNullable(action.apply(getFunc.apply(level, id))); } return Optional.empty(); } diff --git a/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java b/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java index f8b1c74..eaf63da 100644 --- a/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java +++ b/src/main/java/dev/zenfyr/pulsar/util/PlayerUtil.java @@ -16,36 +16,35 @@ import org.jetbrains.annotations.NotNull; @SuppressWarnings("unused") public class PlayerUtil { - public static List getPlayers( - TargetingConditions targetPredicate, Level world, AABB box) { - return world.players().stream() + public static List getPlayers(TargetingConditions conditions, Level level, AABB box) { + return level.players().stream() .filter(playerEntity -> box.contains(playerEntity.getX(), playerEntity.getY(), playerEntity.getZ()) - && targetPredicate.test(null, playerEntity)) + && conditions.test(null, playerEntity)) .collect(ImmutableList.toImmutableList()); } - public static List findPlayersInRange(Level world, BlockPos pos, int range) { + public static List findPlayersInRange(Level level, BlockPos pos, int range) { return getPlayers( - TargetingConditions.forNonCombat().range(range), world, new AABB(pos).inflate(range)); + TargetingConditions.forNonCombat().range(range), level, new AABB(pos).inflate(range)); } - public static List findNonCreativePlayersInRange(Level world, BlockPos pos, int range) { - return findPlayersInRange(world, pos, range).stream() + public static List findNonCreativePlayersInRange(Level level, BlockPos pos, int range) { + return findPlayersInRange(level, pos, range).stream() .filter(player -> !player.isCreative()) .collect(ImmutableList.toImmutableList()); } public static @NotNull Optional findClosestPlayerInRange( - Level world, BlockPos pos, int range) { - return findPlayersInRange(world, pos, range).stream() + Level level, BlockPos pos, int range) { + return findPlayersInRange(level, pos, range).stream() .min(Comparator.comparingDouble( player -> player.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()))); } public static @NotNull Optional findClosestNonCreativePlayerInRange( - Level world, BlockPos pos, int range) { - return findNonCreativePlayersInRange(world, pos, range).stream() + Level level, BlockPos pos, int range) { + return findNonCreativePlayersInRange(level, pos, range).stream() .min(Comparator.comparingDouble( player -> player.distanceToSqr(pos.getX(), pos.getY(), pos.getZ()))); } diff --git a/src/main/resources/pulsar.mixins.json b/src/main/resources/pulsar.mixins.json index 06d97cc..24e8a8d 100644 --- a/src/main/resources/pulsar.mixins.json +++ b/src/main/resources/pulsar.mixins.json @@ -4,20 +4,20 @@ "package": "dev.zenfyr.pulsar.impl.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "resources.DataPackContentsMixin", + "resources.ReloadableServerResourcesMixin", "resources.MinecraftServerMixin", "resources.ResourceManagerHelperImplMixin" ], "client": [ - "client.events.MinecraftClientMixin", - "client.fakeworld.RegistriesMixin", - "client.fakeworld.WorldMixin", - "client.itemgroup.CreativeInventoryScreenMixin", - "client.itemgroup.ItemGroupMixin", + "client.events.MinecraftMixin", + "client.fakeworld.RegistrySetBuilderMixin", + "client.fakeworld.LevelMixin", + "client.itemgroup.CreativeModeInventoryScreenMixin", + "client.itemgroup.CreativeModeTabMixin", "client.particles.GameRendererMixin", - "client.particles.MinecraftClientMixin", - "client.particles.ParticleManagerAccessor", - "client.particles.ParticleManagerMixin" + "client.particles.MinecraftMixin", + "client.particles.ParticleEngineAccessor", + "client.particles.ParticleEngineMixin" ], "injectors": { "defaultRequire": 1 -- 2.51.2