Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.9-SNAPSHOT'
id 'fabric-loom' version '1.10-SNAPSHOT'
id 'maven-publish'
}

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ 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
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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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_shake.Shaker;
import net.dustley.lemon.content.test_stick.TestStick;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
Expand All @@ -14,7 +13,6 @@ public class ModItems {

// Items //
public static final Item TESTER = registerItem("tester", new TestStick());
public static final Item FREEZER = registerItem("freezer", new Freezer());
public static final Item SHAKER = registerItem("shaker", new Shaker());

// Utility Functions //
Expand All @@ -28,8 +26,7 @@ public static void registerModItems() {

ItemGroupEvents.modifyEntriesEvent(ItemGroups.OPERATOR).register(entries -> {
entries.add(TESTER);
entries.add(FREEZER);
entries.add(SHAKER);
});
}
}
}
20 changes: 0 additions & 20 deletions src/main/java/net/dustley/lemon/content/test_freezer/Freezer.java

This file was deleted.

This file was deleted.

13 changes: 8 additions & 5 deletions src/main/java/net/dustley/lemon/content/test_shake/Shaker.java
Original file line number Diff line number Diff line change
@@ -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<ItemStack> 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);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,21 +10,24 @@
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;
import org.joml.Vector3d;
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<ItemStack> 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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
],
"depends": {
"fabricloader": ">=0.16.10",
"minecraft": "~1.21.1",
"minecraft": "~1.21.5",
"java": ">=21",
"fabric-api": "*"
},
Expand Down