Skip to content

Commit d9336c4

Browse files
onebeastchrisonebeastchris
committed
update
1 parent b6a07bd commit d9336c4

File tree

65 files changed

+259
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+259
-202
lines changed

‎core/src/main/java/org/geysermc/geyser/GeyserImpl.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ private void startInstance() {
602602
}
603603

604604
if (config.isNotifyOnNewBedrockUpdate()) {
605-
VersionCheckUtils.checkForGeyserUpdate(this::getLogger);
605+
VersionCheckUtils.checkForGeyserUpdate(GeyserLogger::get);
606606
}
607607
}
608608

@@ -795,7 +795,7 @@ public PlatformType platformType() {
795795

796796
@Override
797797
public @NonNull CommandSource consoleCommandSource() {
798-
return getLogger();
798+
return GeyserLogger.get();
799799
}
800800

801801
public int buildNumber() {
@@ -828,10 +828,6 @@ public static void start() {
828828
instance.setEnabled(true);
829829
}
830830

831-
public GeyserLogger getLogger() {
832-
return bootstrap.getGeyserLogger();
833-
}
834-
835831
public GeyserConfiguration getConfig() {
836832
return bootstrap.getGeyserConfig();
837833
}
@@ -874,7 +870,7 @@ private void scheduleAuthChainsWrite() {
874870
.withDefaultPrettyPrinter()
875871
.writeValue(writer, this.savedAuthChains);
876872
} catch (IOException e) {
877-
getLogger().error("Unable to write saved refresh tokens!", e);
873+
GeyserLogger.get().error("Unable to write saved refresh tokens!", e);
878874
}
879875
});
880876
}

‎core/src/main/java/org/geysermc/geyser/command/CommandRegistry.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.cloudburstmc.protocol.bedrock.data.command.CommandParamData;
3636
import org.cloudburstmc.protocol.bedrock.data.command.CommandPermission;
3737
import org.geysermc.geyser.GeyserImpl;
38+
import org.geysermc.geyser.GeyserLogger;
3839
import org.geysermc.geyser.api.command.Command;
3940
import org.geysermc.geyser.api.event.EventRegistrar;
4041
import org.geysermc.geyser.api.event.lifecycle.GeyserDefineCommandsEvent;
@@ -236,7 +237,7 @@ protected void register(GeyserCommand command, Map<String, GeyserCommand> comman
236237

237238
command.register(cloud);
238239
commands.put(name, command);
239-
geyser.getLogger().debug(GeyserLocale.getLocaleStringLog("geyser.commands.registered", root + " " + name));
240+
GeyserLogger.get().debug(GeyserLocale.getLocaleStringLog("geyser.commands.registered", root + " " + name));
240241

241242
for (String alias : command.aliases()) {
242243
commands.put(alias, command);
@@ -249,7 +250,7 @@ protected void register(GeyserCommand command, Map<String, GeyserCommand> comman
249250
TriState existingDefault = permissionDefaults.get(permission);
250251
// Extensions might be using the same permission for two different commands
251252
if (existingDefault != null && existingDefault != defaultValue) {
252-
geyser.getLogger().debug("Overriding permission default %s:%s with %s".formatted(permission, existingDefault, defaultValue));
253+
GeyserLogger.get().debug("Overriding permission default %s:%s with %s".formatted(permission, existingDefault, defaultValue));
253254
}
254255

255256
permissionDefaults.put(permission, defaultValue);

‎core/src/main/java/org/geysermc/geyser/command/defaults/ConnectionTestCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
218218
sendLinks(source);
219219
} catch (Exception e) {
220220
source.sendMessage("An error occurred while trying to check your connection! Check the console for more information.");
221-
geyser.getLogger().error("Error while trying to check your connection!", e);
221+
GeyserLogger.get().error("Error while trying to check your connection!", e);
222222
}
223223
});
224224
}

‎core/src/main/java/org/geysermc/geyser/command/defaults/DumpCommand.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.fasterxml.jackson.databind.JsonNode;
3131
import com.fasterxml.jackson.databind.ObjectMapper;
3232
import org.geysermc.geyser.GeyserImpl;
33+
import org.geysermc.geyser.GeyserLogger;
3334
import org.geysermc.geyser.api.util.TriState;
3435
import org.geysermc.geyser.command.GeyserCommand;
3536
import org.geysermc.geyser.command.GeyserCommandSource;
@@ -125,7 +126,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
125126
}
126127
} catch (IOException e) {
127128
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.collect_error", source.locale()));
128-
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
129+
GeyserLogger.get().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.collect_error_short"), e);
129130
return;
130131
}
131132

@@ -140,7 +141,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
140141
outputStream.close();
141142
} catch (IOException e) {
142143
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.write_error", source.locale()));
143-
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
144+
GeyserLogger.get().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.write_error_short"), e);
144145
return;
145146
}
146147

@@ -155,7 +156,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
155156
responseNode = MAPPER.readTree(response);
156157
} catch (IOException e) {
157158
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.commands.dump.upload_error", source.locale()));
158-
geyser.getLogger().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
159+
GeyserLogger.get().error(GeyserLocale.getLocaleStringLog("geyser.commands.dump.upload_error_short"), e);
159160
return;
160161
}
161162

@@ -169,7 +170,7 @@ public void execute(CommandContext<GeyserCommandSource> context) {
169170

170171
source.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.dump.message", source.locale()) + " " + ChatColor.DARK_AQUA + uploadedDumpUrl);
171172
if (!source.isConsole()) {
172-
geyser.getLogger().info(GeyserLocale.getLocaleStringLog("geyser.commands.dump.created", source.name(), uploadedDumpUrl));
173+
GeyserLogger.get().info(GeyserLocale.getLocaleStringLog("geyser.commands.dump.created", source.name(), uploadedDumpUrl));
173174
}
174175
}
175176
}

‎core/src/main/java/org/geysermc/geyser/entity/type/Entity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.cloudburstmc.protocol.bedrock.packet.MoveEntityDeltaPacket;
4242
import org.cloudburstmc.protocol.bedrock.packet.RemoveEntityPacket;
4343
import org.cloudburstmc.protocol.bedrock.packet.SetEntityDataPacket;
44+
import org.geysermc.geyser.GeyserLogger;
4445
import org.geysermc.geyser.api.entity.type.GeyserEntity;
4546
import org.geysermc.geyser.entity.EntityDefinition;
4647
import org.geysermc.geyser.entity.GeyserDirtyMetadata;
@@ -207,7 +208,7 @@ public void spawnEntity() {
207208
if (session.getGeyser().getConfig().isDebugMode() && PRINT_ENTITY_SPAWN_DEBUG) {
208209
EntityType type = definition.entityType();
209210
String name = type != null ? type.name() : getClass().getSimpleName();
210-
session.getGeyser().getLogger().debug("Spawned entity " + name + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
211+
GeyserLogger.get().debug("Spawned entity " + name + " at location " + position + " with id " + geyserId + " (java id " + entityId + ")");
211212
}
212213
}
213214

‎core/src/main/java/org/geysermc/geyser/entity/type/ItemFrameEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
3535
import org.cloudburstmc.protocol.bedrock.packet.BlockEntityDataPacket;
3636
import org.cloudburstmc.protocol.bedrock.packet.UpdateBlockPacket;
37+
import org.geysermc.geyser.GeyserLogger;
3738
import org.geysermc.geyser.entity.EntityDefinition;
3839
import org.geysermc.geyser.session.GeyserSession;
3940
import org.geysermc.geyser.translator.item.ItemTranslator;
@@ -105,7 +106,7 @@ protected void initializeMetadata() {
105106
@Override
106107
public void spawnEntity() {
107108
updateBlock(true);
108-
session.getGeyser().getLogger().debug("Spawned item frame at location " + bedrockPosition + " with java id " + entityId);
109+
GeyserLogger.get().debug("Spawned item frame at location " + bedrockPosition + " with java id " + entityId);
109110
valid = true;
110111
}
111112

‎core/src/main/java/org/geysermc/geyser/entity/type/PaintingEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import org.cloudburstmc.math.vector.Vector3f;
2929
import org.cloudburstmc.protocol.bedrock.packet.AddPaintingPacket;
30+
import org.geysermc.geyser.GeyserLogger;
3031
import org.geysermc.geyser.entity.EntityDefinition;
3132
import org.geysermc.geyser.level.PaintingType;
3233
import org.geysermc.geyser.session.GeyserSession;
@@ -76,7 +77,7 @@ public void setPaintingType(ObjectEntityMetadata<Holder<PaintingVariant>> entity
7677

7778
valid = true;
7879

79-
session.getGeyser().getLogger().debug("Spawned painting on " + position);
80+
GeyserLogger.get().debug("Spawned painting on " + position);
8081
}
8182

8283
@Override

‎core/src/main/java/org/geysermc/geyser/erosion/AbstractGeyserboundPacketHandler.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,16 @@
2626
package org.geysermc.geyser.erosion;
2727

2828
import org.checkerframework.checker.nullness.qual.Nullable;
29-
import org.geysermc.erosion.packet.geyserbound.*;
29+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBatchBlockIdPacket;
30+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockEntityPacket;
31+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockIdPacket;
32+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockLookupFailPacket;
33+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockPlacePacket;
34+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPacket;
35+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPacketHandler;
36+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPickBlockPacket;
37+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPistonEventPacket;
38+
import org.geysermc.geyser.GeyserLogger;
3039
import org.geysermc.geyser.session.GeyserSession;
3140

3241
public abstract class AbstractGeyserboundPacketHandler implements GeyserboundPacketHandler {
@@ -83,6 +92,6 @@ public void close() {
8392
}
8493

8594
protected final void illegalPacket(GeyserboundPacket packet) {
86-
session.getGeyser().getLogger().warning("Illegal packet sent from backend server! " + packet);
95+
GeyserLogger.get().warning("Illegal packet sent from backend server! " + packet);
8796
}
8897
}

‎core/src/main/java/org/geysermc/geyser/erosion/GeyserboundPacketHandlerImpl.java

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,15 @@
4242
import org.geysermc.erosion.packet.ErosionPacketSender;
4343
import org.geysermc.erosion.packet.backendbound.BackendboundInitializePacket;
4444
import org.geysermc.erosion.packet.backendbound.BackendboundPacket;
45-
import org.geysermc.erosion.packet.geyserbound.*;
45+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBatchBlockIdPacket;
46+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockEntityPacket;
47+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockIdPacket;
48+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockLookupFailPacket;
49+
import org.geysermc.erosion.packet.geyserbound.GeyserboundBlockPlacePacket;
50+
import org.geysermc.erosion.packet.geyserbound.GeyserboundHandshakePacket;
51+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPickBlockPacket;
52+
import org.geysermc.erosion.packet.geyserbound.GeyserboundPistonEventPacket;
53+
import org.geysermc.geyser.GeyserLogger;
4654
import org.geysermc.geyser.level.block.BlockStateValues;
4755
import org.geysermc.geyser.level.block.property.Properties;
4856
import org.geysermc.geyser.level.block.type.Block;
@@ -81,7 +89,7 @@ public void handleBatchBlockId(GeyserboundBatchBlockIdPacket packet) {
8189
if (this.pendingBatchLookup != null) {
8290
this.pendingBatchLookup.complete(packet.getBlocks());
8391
} else {
84-
session.getGeyser().getLogger().warning("Batch block ID packet received with no future to complete.");
92+
GeyserLogger.get().warning("Batch block ID packet received with no future to complete.");
8593
}
8694
}
8795

@@ -104,7 +112,7 @@ public void handleBlockId(GeyserboundBlockIdPacket packet) {
104112
future.complete(packet.getBlockId());
105113
return;
106114
}
107-
session.getGeyser().getLogger().warning("Block ID packet received with no future to complete.");
115+
GeyserLogger.get().warning("Block ID packet received with no future to complete.");
108116
}
109117

110118
@Override

‎core/src/main/java/org/geysermc/geyser/extension/GeyserExtensionLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public GeyserExtensionContainer loadExtension(Path path, GeyserExtensionDescript
117117
}
118118

119119
private GeyserExtensionContainer setup(Extension extension, GeyserExtensionDescription description, Path dataFolder, ExtensionEventBus eventBus) {
120-
GeyserExtensionLogger logger = new GeyserExtensionLogger(GeyserImpl.getInstance().getLogger(), description.id());
120+
GeyserExtensionLogger logger = new GeyserExtensionLogger(GeyserLogger.get(), description.id());
121121
return new GeyserExtensionContainer(extension, dataFolder, description, this, logger, eventBus);
122122
}
123123

@@ -159,7 +159,7 @@ void setClass(String name, final Class<?> clazz) {
159159

160160
@Override
161161
protected void loadAllExtensions(@NonNull ExtensionManager extensionManager) {
162-
GeyserLogger logger = GeyserImpl.getInstance().getLogger();
162+
GeyserLogger logger = GeyserLogger.get();
163163
try {
164164
if (Files.notExists(extensionsDirectory)) {
165165
Files.createDirectory(extensionsDirectory);

0 commit comments

Comments
 (0)