From ac074fe93afe744fac3bed527ddbfe23d53692e6 Mon Sep 17 00:00:00 2001 From: HollowedWanderer <122174504+HollowedWanderer@users.noreply.github.com> Date: Sat, 14 Jun 2025 10:31:31 -0400 Subject: [PATCH 1/4] =?UTF-8?q?lemon=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- gradle.properties | 8 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../lemon/content/registry/ModItems.java | 3 -- .../lemon/content/test_freezer/Freezer.java | 20 ----------- .../content/test_freezer/ParryOverlay.java | 34 ------------------- .../lemon/content/test_stick/TestStick.java | 12 ++++--- .../freeze_frames/FreezeFrameManager.java | 1 - src/main/resources/fabric.mod.json | 2 +- 9 files changed, 15 insertions(+), 69 deletions(-) delete mode 100644 src/main/java/net/dustley/lemon/content/test_freezer/Freezer.java delete mode 100644 src/main/java/net/dustley/lemon/content/test_freezer/ParryOverlay.java diff --git a/build.gradle b/build.gradle index 5147deb..47290aa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.9-SNAPSHOT' + id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' } diff --git a/gradle.properties b/gradle.properties index b3c74f7..a114d4f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.1 -yarn_mappings=1.21.1+build.3 -loader_version=0.16.10 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.12 # Mod Properties mod_version=1.0.0 @@ -14,5 +14,5 @@ maven_group=com.github.Dusty-Development archives_base_name=LemonLib # Dependencies -fabric_version=0.115.0+1.21.1 +fabric_version=0.119.6+1.21.5 dominion_version=0.9.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..cea7a79 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/net/dustley/lemon/content/registry/ModItems.java b/src/main/java/net/dustley/lemon/content/registry/ModItems.java index 7ff1dba..e065182 100644 --- a/src/main/java/net/dustley/lemon/content/registry/ModItems.java +++ b/src/main/java/net/dustley/lemon/content/registry/ModItems.java @@ -1,7 +1,6 @@ package net.dustley.lemon.content.registry; import net.dustley.lemon.LemonLib; -import net.dustley.lemon.content.test_freezer.Freezer; import net.dustley.lemon.content.test_stick.TestStick; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.Item; @@ -13,7 +12,6 @@ public class ModItems { // Items // public static final Item TESTER = registerItem("tester", new TestStick()); - public static final Item FREEZER = registerItem("freezer", new Freezer()); // Utility Functions // private static Item registerItem(String name, Item item) { @@ -26,7 +24,6 @@ public static void registerModItems() { ItemGroupEvents.modifyEntriesEvent(ItemGroups.OPERATOR).register(entries -> { entries.add(TESTER); - entries.add(FREEZER); }); } } diff --git a/src/main/java/net/dustley/lemon/content/test_freezer/Freezer.java b/src/main/java/net/dustley/lemon/content/test_freezer/Freezer.java deleted file mode 100644 index 6e9a98a..0000000 --- a/src/main/java/net/dustley/lemon/content/test_freezer/Freezer.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.dustley.lemon.content.test_freezer; - -import net.dustley.lemon.modules.camera_effects.freeze_frames.FreezeFrameManager; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Hand; -import net.minecraft.util.Rarity; -import net.minecraft.util.TypedActionResult; -import net.minecraft.world.World; - -public class Freezer extends Item { - public Freezer() { super(new Settings().rarity(Rarity.EPIC).maxCount(1)); } - - @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - FreezeFrameManager.triggerFreeze(5, new ParryOverlay()); - return super.use(world, user, hand); - } -} \ No newline at end of file diff --git a/src/main/java/net/dustley/lemon/content/test_freezer/ParryOverlay.java b/src/main/java/net/dustley/lemon/content/test_freezer/ParryOverlay.java deleted file mode 100644 index 218bbf6..0000000 --- a/src/main/java/net/dustley/lemon/content/test_freezer/ParryOverlay.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.dustley.lemon.content.test_freezer; - -import com.mojang.blaze3d.systems.RenderSystem; -import net.dustley.lemon.LemonLib; -import net.dustley.lemon.modules.camera_effects.freeze_frames.FreezeFrameManager; -import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.render.RenderTickCounter; -import net.minecraft.util.Identifier; - -public class ParryOverlay implements HudRenderCallback { - - private static final Identifier PARRY_OVERLAY = LemonLib.id("textures/parry.png"); - - @Override - public void onHudRender(DrawContext context, RenderTickCounter counter) { - MinecraftClient client = MinecraftClient.getInstance(); - - if (client == null || client.player == null) { - return; // Ensure the client and player are valid - } - - RenderSystem.enableBlend(); - - int screenWidth = client.getWindow().getScaledWidth(); - int screenHeight = client.getWindow().getScaledHeight(); - - // Draw the texture stretched over the entire screen - if (FreezeFrameManager.getOverlayTime()) { - context.drawTexture(PARRY_OVERLAY, 0, 0, 0, 0, screenWidth, screenHeight, screenWidth, screenHeight); - } - } -} \ No newline at end of file diff --git a/src/main/java/net/dustley/lemon/content/test_stick/TestStick.java b/src/main/java/net/dustley/lemon/content/test_stick/TestStick.java index be7a636..bd0c20a 100644 --- a/src/main/java/net/dustley/lemon/content/test_stick/TestStick.java +++ b/src/main/java/net/dustley/lemon/content/test_stick/TestStick.java @@ -1,6 +1,7 @@ package net.dustley.lemon.content.test_stick; import dev.dominion.ecs.api.Entity; +import net.dustley.lemon.LemonLib; import net.dustley.lemon.modules.citrus_physics.PhysicsWorld; import net.dustley.lemon.modules.citrus_physics.component.ActorComponent; import net.dustley.lemon.modules.citrus_physics.component.collision.colliders.SphereCollider; @@ -9,10 +10,11 @@ import net.dustley.lemon.modules.citrus_physics.component.constraint.single.StaticConstraint; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DebugStickItem; -import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Rarity; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import org.joml.Vector2i; import org.joml.Vector2ic; @@ -20,10 +22,12 @@ import org.joml.Vector3dc; public class TestStick extends DebugStickItem { - public TestStick() { super(new Settings().rarity(Rarity.EPIC).maxCount(1)); } + public TestStick() { + super(new Settings().rarity(Rarity.EPIC).maxCount(1).registryKey(RegistryKey.of(RegistryKeys.ITEM, LemonLib.id("tester")))); + } @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + public ActionResult use(World world, PlayerEntity user, Hand hand) { var physics = PhysicsWorld.getFromWorld(world); Vector2ic size = new Vector2i(32, 32); diff --git a/src/main/java/net/dustley/lemon/modules/camera_effects/freeze_frames/FreezeFrameManager.java b/src/main/java/net/dustley/lemon/modules/camera_effects/freeze_frames/FreezeFrameManager.java index 0d839c8..c5371eb 100644 --- a/src/main/java/net/dustley/lemon/modules/camera_effects/freeze_frames/FreezeFrameManager.java +++ b/src/main/java/net/dustley/lemon/modules/camera_effects/freeze_frames/FreezeFrameManager.java @@ -40,7 +40,6 @@ public static void tick() { public static void renderFreeze() { // Pause the game's frame progression MinecraftClient client = MinecraftClient.getInstance(); - client.getFramebuffer().beginWrite(false); } public static HudRenderCallback getOverlay() { diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 8d9e59c..bf50ed7 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -28,7 +28,7 @@ ], "depends": { "fabricloader": ">=0.16.10", - "minecraft": "~1.21.1", + "minecraft": "~1.21.5", "java": ">=21", "fabric-api": "*" }, From d2ade98c8c269dfd892b4830c260153ba921ff83 Mon Sep 17 00:00:00 2001 From: HollowedWanderer <122174504+HollowedWanderer@users.noreply.github.com> Date: Sat, 14 Jun 2025 10:33:03 -0400 Subject: [PATCH 2/4] =?UTF-8?q?lemon=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/dustley/lemon/content/registry/ModItems.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/dustley/lemon/content/registry/ModItems.java b/src/main/java/net/dustley/lemon/content/registry/ModItems.java index e065182..bb9a822 100644 --- a/src/main/java/net/dustley/lemon/content/registry/ModItems.java +++ b/src/main/java/net/dustley/lemon/content/registry/ModItems.java @@ -24,6 +24,7 @@ public static void registerModItems() { ItemGroupEvents.modifyEntriesEvent(ItemGroups.OPERATOR).register(entries -> { entries.add(TESTER); + }); } } From 7f91b4c6eeb994f001655318bd5267d92af0c27d Mon Sep 17 00:00:00 2001 From: HollowedWanderer <122174504+HollowedWanderer@users.noreply.github.com> Date: Sat, 14 Jun 2025 10:48:34 -0400 Subject: [PATCH 3/4] =?UTF-8?q?lemon=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/dustley/lemon/content/registry/ModItems.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/dustley/lemon/content/registry/ModItems.java b/src/main/java/net/dustley/lemon/content/registry/ModItems.java index bb9a822..220c2b5 100644 --- a/src/main/java/net/dustley/lemon/content/registry/ModItems.java +++ b/src/main/java/net/dustley/lemon/content/registry/ModItems.java @@ -27,4 +27,4 @@ public static void registerModItems() { }); } -} +} \ No newline at end of file From 6bee794a5bcb356cc4bb98fbca148727e67d22bf Mon Sep 17 00:00:00 2001 From: HollowedWanderer <122174504+HollowedWanderer@users.noreply.github.com> Date: Sat, 14 Jun 2025 11:01:43 -0400 Subject: [PATCH 4/4] fixed --- .../dustley/lemon/content/test_shake/Shaker.java | 13 ++++++++----- .../screen_shake/ScreenShakeManager.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/net/dustley/lemon/content/test_shake/Shaker.java b/src/main/java/net/dustley/lemon/content/test_shake/Shaker.java index bd63bbf..a7e1e59 100644 --- a/src/main/java/net/dustley/lemon/content/test_shake/Shaker.java +++ b/src/main/java/net/dustley/lemon/content/test_shake/Shaker.java @@ -1,21 +1,24 @@ package net.dustley.lemon.content.test_shake; +import net.dustley.lemon.LemonLib; import net.dustley.lemon.modules.camera_effects.screen_shake.ScreenShake; import net.dustley.lemon.modules.camera_effects.screen_shake.ScreenShakeManager; -import net.dustley.lemon.modules.math.easing.Easing; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.DebugStickItem; -import net.minecraft.item.ItemStack; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.Rarity; -import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; public class Shaker extends DebugStickItem { - public Shaker() { super(new Settings().rarity(Rarity.EPIC).maxCount(1)); } + public Shaker() { + super(new Settings().rarity(Rarity.EPIC).maxCount(1).registryKey(RegistryKey.of(RegistryKeys.ITEM, LemonLib.id("shaker")))); + } @Override - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + public ActionResult use(World world, PlayerEntity user, Hand hand) { ScreenShakeManager.createScreenShake(new ScreenShake(40, 0.5f)); return super.use(world, user, hand); } diff --git a/src/main/java/net/dustley/lemon/modules/camera_effects/screen_shake/ScreenShakeManager.java b/src/main/java/net/dustley/lemon/modules/camera_effects/screen_shake/ScreenShakeManager.java index 9f2441b..7582c4b 100644 --- a/src/main/java/net/dustley/lemon/modules/camera_effects/screen_shake/ScreenShakeManager.java +++ b/src/main/java/net/dustley/lemon/modules/camera_effects/screen_shake/ScreenShakeManager.java @@ -42,7 +42,7 @@ public static void createScreenShake(ScreenShake instance) { public static float randomizeOffset(int offset) { float sampled = 0; if (MinecraftClient.getInstance().world != null) { - sampled = (float) noise.sample((MinecraftClient.getInstance().world.getTime() % 24000 + MinecraftClient.getInstance().getRenderTickCounter().getTickDelta(false))/intensity, offset, 0) * 1.5f; + sampled = (float) noise.sample((MinecraftClient.getInstance().world.getTime() % 24000 + MinecraftClient.getInstance().getRenderTickCounter().getTickProgress(false))/intensity, offset, 0) * 1.5f; } return -intensity * 2 >= intensity * 2 ? -intensity * 2 : sampled * intensity * 2; }