hkuijlman/SurvivalFabric
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Activity

Removed unnecessary imports

Browse Source
This commit is contained in:
Hedzer Kuijlman
2025-06-30 10:02:55 +02:00
parent 14d57c95d5
commit b3e6ec189a
9 changed files with 17 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/java/wtf/hak/survivalfabric/SurvivalFabricClient.java
View File

@@ -3,8 +3,8 @@ package wtf.hak.survivalfabric;
import net.fabricmc.api.ClientModInitializer;
import wtf.hak.survivalfabric.config.client.ClientConfigManager;
import wtf.hak.survivalfabric.features.AngleViewer;
import wtf.hak.survivalfabric.features.RemoveDarknessEffect;
import wtf.hak.survivalfabric.features.CameraShortcut;
import wtf.hak.survivalfabric.features.RemoveDarknessEffect;
import wtf.hak.survivalfabric.features.Zoom;
public class SurvivalFabricClient implements ClientModInitializer {

7
src/client/java/wtf/hak/survivalfabric/features/Zoom.java
View File

@@ -5,7 +5,6 @@ import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import net.minecraft.text.Text;
import org.lwjgl.glfw.GLFW;
import org.spongepowered.asm.mixin.Unique;
@@ -20,14 +19,12 @@ public class Zoom {
@Unique
private static boolean initialSmoothZoom;
@Unique
private static boolean initialRenderHand;
public static void register() {
ClientTickEvents.END_CLIENT_TICK.register(client -> {
if (ZOOM_BIND.isPressed() && !SHOULD_ZOOM) {
if(getConfig().smoothCamera) {
if (getConfig().smoothCamera) {
initialSmoothZoom = MinecraftClient.getInstance().options.smoothCameraEnabled;
MinecraftClient.getInstance().options.smoothCameraEnabled = true;
}
@@ -35,7 +32,7 @@ public class Zoom {
} else if (!ZOOM_BIND.isPressed() && SHOULD_ZOOM) {
SHOULD_ZOOM = false;
ZOOM_STEP = 0;
if(getConfig().smoothCamera) {
if (getConfig().smoothCamera) {
MinecraftClient.getInstance().options.smoothCameraEnabled = initialSmoothZoom;
}
}

5
src/client/java/wtf/hak/survivalfabric/mixin/client/GameRendererMixin.java
View File

@@ -4,10 +4,7 @@ import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.sugar.Local;
import net.fabricmc.fabric.api.client.rendering.v1.hud.HudElement;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.GameRenderer;
import net.minecraft.client.render.RenderTickCounter;
import org.joml.Matrix4f;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -29,7 +26,7 @@ public class GameRendererMixin {
*/
@WrapMethod(method = "renderHand")
public void render(float tickProgress, boolean sleeping, Matrix4f positionMatrix, Operation<Void> original) {
if(!Zoom.isZooming())
if (!Zoom.isZooming())
original.call(tickProgress, sleeping, positionMatrix);
}

4
src/client/java/wtf/hak/survivalfabric/modmenu/YACLConfigScreen.java
View File

@@ -1,7 +1,9 @@
package wtf.hak.survivalfabric.modmenu;
import dev.isxander.yacl3.api.*;
import dev.isxander.yacl3.api.controller.*;
import dev.isxander.yacl3.api.controller.FloatSliderControllerBuilder;
import dev.isxander.yacl3.api.controller.IntegerSliderControllerBuilder;
import dev.isxander.yacl3.api.controller.TickBoxControllerBuilder;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;

6
src/main/java/wtf/hak/survivalfabric/features/TelekinesisHandler.java
View File

@@ -32,7 +32,7 @@ public class TelekinesisHandler {
}
public static int handleBlockExp(int original) {
if(blockThreadLocal.get() != null && ConfigManager.getConfig().blockTelekinesisEnabled) {
if (blockThreadLocal.get() != null && ConfigManager.getConfig().blockTelekinesisEnabled) {
ServerPlayerEntity player = blockThreadLocal.get();
ExperienceOrbEntity fakeExperienceOrb = new ExperienceOrbEntity(player.getWorld(), 0.0, 0.0, 0.0, original);
((ExperienceOrbEntityInvoker) fakeExperienceOrb).invokeRepairPlayerGears(player, original);
@@ -43,7 +43,7 @@ public class TelekinesisHandler {
}
public static void registerLoot(DamageSource source) {
if(source.getAttacker() instanceof ServerPlayerEntity && ConfigManager.getConfig().entityTelekinesisEnabled) {
if (source.getAttacker() instanceof ServerPlayerEntity && ConfigManager.getConfig().entityTelekinesisEnabled) {
entityThreadLocal.set(source);
Scheduler.get().scheduleTask(entityThreadLocal::remove);
}
@@ -61,7 +61,7 @@ public class TelekinesisHandler {
}
public static int handleEntityExp(int original) {
if(entityThreadLocal.get() != null) {
if (entityThreadLocal.get() != null) {
ServerPlayerEntity player = (ServerPlayerEntity) entityThreadLocal.get().getAttacker();
ExperienceOrbEntity fakeExperienceOrb = new ExperienceOrbEntity(player.getWorld(), 0.0, 0.0, 0.0, original);
((ExperienceOrbEntityInvoker) fakeExperienceOrb).invokeRepairPlayerGears(player, original);

2
src/main/java/wtf/hak/survivalfabric/features/veinminer/drills/DrillBase.java
View File

@@ -12,9 +12,7 @@ import wtf.hak.survivalfabric.features.veinminer.Drill;
import wtf.hak.survivalfabric.features.veinminer.VeinMinerSession;
import wtf.hak.survivalfabric.utils.Scheduler;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import static wtf.hak.survivalfabric.SurvivalFabric.LOGGER;

8
src/main/java/wtf/hak/survivalfabric/mixin/BlockMixin.java
View File

@@ -21,8 +21,6 @@ import wtf.hak.survivalfabric.features.TelekinesisHandler;
import java.util.List;
import static net.minecraft.block.Block.getDroppedStacks;
@Mixin(Block.class)
public abstract class BlockMixin {
@@ -34,7 +32,7 @@ public abstract class BlockMixin {
)
)
private static List<ItemStack> modifyDrops(List<ItemStack> original, BlockState state, World world, BlockPos pos, @Nullable BlockEntity blockEntity, @Nullable Entity entity, ItemStack tool) {
if(entity instanceof ServerPlayerEntity player) {
if (entity instanceof ServerPlayerEntity player) {
if (state.getBlock() instanceof CropBlock && ConfigManager.getConfig().replenishEnabled) {
ItemStack mainHand = player.getStackInHand(Hand.MAIN_HAND);
if (mainHand.getItem() instanceof HoeItem) {
@@ -52,8 +50,8 @@ public abstract class BlockMixin {
@ModifyExpressionValue(
method = "dropExperienceWhenMined",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/enchantment/EnchantmentHelper;getBlockExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I")
value = "INVOKE",
target = "Lnet/minecraft/enchantment/EnchantmentHelper;getBlockExperience(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;I)I")
)
private int modifyExp(int original) {
return TelekinesisHandler.handleBlockExp(original);

9
src/main/java/wtf/hak/survivalfabric/mixin/LivingEntityMixin.java
View File

@@ -1,22 +1,15 @@
package wtf.hak.survivalfabric.mixin;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.item.ItemStack;
import net.minecraft.loot.LootTable;
import net.minecraft.loot.context.LootWorldContext;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import wtf.hak.survivalfabric.features.TelekinesisHandler;
import java.util.function.Consumer;
@@ -26,7 +19,7 @@ public abstract class LivingEntityMixin {
@Inject(method = "drop", at = @At("HEAD"))
private void drop(ServerWorld world, DamageSource damageSource, CallbackInfo ci) {
if(damageSource.getAttacker() instanceof ServerPlayerEntity) {
if (damageSource.getAttacker() instanceof ServerPlayerEntity) {
TelekinesisHandler.registerLoot(damageSource);
}
}

7
src/main/java/wtf/hak/survivalfabric/utils/Scheduler.java
View File

@@ -2,7 +2,6 @@ package wtf.hak.survivalfabric.utils;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -14,13 +13,13 @@ public class Scheduler {
public Scheduler() {
ServerTickEvents.END_SERVER_TICK.register((server) -> {
for(Runnable task : tasks.keySet()) {
for (Runnable task : tasks.keySet()) {
long delay = tasks.get(task);
if(delay <= 0) {
if (delay <= 0) {
task.run();
tasks.remove(task);
} else {
tasks.put(task, delay-1);
tasks.put(task, delay - 1);
}
}
});