From bc612ee9c8ee4ecfe811ad2aa8e3931c882a37ce Mon Sep 17 00:00:00 2001 From: Sen Date: Tue, 5 Aug 2025 01:10:02 +0200 Subject: [PATCH] fix some gui issues --- client/src/main/java/client/Client.java | 4 ++-- client/src/main/java/client/init/DimensionMapping.java | 2 +- server/src/main/java/server/init/UniverseRegistry.java | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 57fab2ed..f61eecef 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -557,9 +557,9 @@ public class Client implements IThreadListener { @Variable(name = "gui_scale", category = CVarCategory.GUI, min = 1, max = 5, display = "Skalierung", unit = "x", callback = RedrawFunction.class) private int scaleVar = 2; @Variable(name = "gui_scale_items", category = CVarCategory.GUI, display = "Gegenstände vergrößern", callback = ItemRedrawFunction.class) - public boolean scaleItems = true; + public boolean scaleItems = false; @Variable(name = "gui_scale_hotbar", category = CVarCategory.GUI, display = "Leiste vergrößern") - public boolean scaleHotbar = true; + public boolean scaleHotbar = false; @Variable(name = "phy_sensitivity", category = CVarCategory.INPUT, min = 0.01f, max = 10.0f, display = "Mausempfindlichkeit", precision = 2, unit = "%") private float sensitivity = 1.0f; @Variable(name = "gui_dclick_delay", category = CVarCategory.INPUT, min = 150, max = 750, display = "Doppelklick bei", unit = "ms") diff --git a/client/src/main/java/client/init/DimensionMapping.java b/client/src/main/java/client/init/DimensionMapping.java index 280f4684..97209b8c 100644 --- a/client/src/main/java/client/init/DimensionMapping.java +++ b/client/src/main/java/client/init/DimensionMapping.java @@ -3,7 +3,7 @@ package client.init; import common.dimension.Dimension; import common.init.DimensionRegistry; -public class DimensionMapping extends DimensionRegistry { +public abstract class DimensionMapping extends DimensionRegistry { public static void put(String name, int id, Dimension dim) { NAME_MAP.put(name, dim); NAMES.put(dim, name); diff --git a/server/src/main/java/server/init/UniverseRegistry.java b/server/src/main/java/server/init/UniverseRegistry.java index 04e94dd1..551d4460 100755 --- a/server/src/main/java/server/init/UniverseRegistry.java +++ b/server/src/main/java/server/init/UniverseRegistry.java @@ -42,6 +42,7 @@ import common.entity.npc.EntitySlime; import common.entity.npc.EntitySpirit; import common.entity.npc.EntityTiefling; import common.entity.npc.EntityUndead; +import common.entity.npc.EntityVampire; import common.entity.npc.EntityWoodElf; import common.entity.npc.EntityZombie; import common.entity.types.EntityLiving; @@ -552,9 +553,6 @@ public abstract class UniverseRegistry extends DimensionRegistry { .addSpawn(EntityMouse.class, 10, 8, 8) .addSpawn(EntityWolf.class, 5, 2, 4) .addSpawn(EntityFox.class, 4, 2, 6) - .addSpawn(EntityWoodElf.class, 100, 4, 16) - .addSpawn(EntityElf.class, 12, 4, 16) - .addSpawn(EntityMerfolk.class, 10, 4, 4) .addSpawn(EntityHorse.class, 5, 2, 6) .addSpawn(EntityCat.class, 2, 1, 1) .addStructure(new MapGenMineshaft(), new MapGenVillage(), new MapGenStronghold(), new MapGenScatteredFeature()), () -> { @@ -658,7 +656,8 @@ public abstract class UniverseRegistry extends DimensionRegistry { .addSpawn(EntityBat.class, 10, 8, 8) .addSpawn(EntityMouse.class, 10, 8, 8) .addSpawn(EntityWolf.class, 5, 2, 4) - .addSpawn(EntityHorse.class, 5, 2, 6), () -> { + .addSpawn(EntityHorse.class, 5, 2, 6) + .addSpawn(EntityVampire.class, 100, 2, 5), () -> { registerMoon("yrdinath", "Eismond Yrdinath", new Moon(0xccccff, 2503812, 46743637L, 17460L, 2.5f, 239.15f, Blocks.snow, Blocks.ice).setDefaultWeather(Weather.SNOW), new GeneratorData().setGenerator(new GeneratorPerlin(0.1F, 0.2F)) .enableSnow()