Merge branch 'master' into 1.21.2

FrozenBlock · Oct 19, 2024 · 9e3fcb2 · 9e3fcb2
2 parents b948843 + 784a50a
commit 9e3fcb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/main/java/net/frozenblock/trailiertales/TrailierTales.java b/src/main/java/net/frozenblock/trailiertales/TrailierTales.java
@@ -10,7 +10,7 @@
 import net.frozenblock.trailiertales.config.TTMiscConfig;
 import net.frozenblock.trailiertales.datafix.trailiertales.TTDataFixer;
 import net.frozenblock.trailiertales.mod_compat.TTModIntegrations;
-import net.frozenblock.trailiertales.networking.TrailierNetworking;
+import net.frozenblock.trailiertales.networking.TTNetworking;
 import net.frozenblock.trailiertales.registry.TTBlockEntityTypes;
 import net.frozenblock.trailiertales.registry.TTBlocks;
 import net.frozenblock.trailiertales.registry.TTEnchantments;
@@ -47,8 +47,6 @@ public TrailierTales() {
 
 	@Override
 	public void onInitialize(String modId, ModContainer container) {
-		TTConstants.startMeasuring(this);
-
 		if (FrozenBools.IS_DATAGEN) {
 			TTFeatureFlags.init();
 			FrozenFeatureFlags.rebuild();
@@ -76,7 +74,7 @@ public void onInitialize(String modId, ModContainer container) {
 		TTJukeboxSongs.init();
 		TTRuleBlockEntityModifiers.init();
 		TTVillagerTrades.init();
-		TrailierNetworking.init();
+		TTNetworking.init();
 
 		TTModIntegrations.init();
 
@@ -98,7 +96,5 @@ public void onResourceManagerReload(@NotNull ResourceManager resourceManager) {
 				RuinsPieces.reloadPiecesFromDirectories(resourceManager);
 			}
 		});
-
-		TTConstants.stopMeasuring(this);
 	}
 }
diff --git a/...rtales/networking/TrailierNetworking.java → ...railiertales/networking/TTNetworking.java b/...rtales/networking/TrailierNetworking.java → ...railiertales/networking/TTNetworking.java
@@ -5,7 +5,7 @@
 import net.frozenblock.trailiertales.networking.packet.CoffinRemoveDebugPacket;
 import net.minecraft.network.RegistryFriendlyByteBuf;
 
-public class TrailierNetworking {
+public class TTNetworking {
 	public static void init() {
 		PayloadTypeRegistry<RegistryFriendlyByteBuf> registry = PayloadTypeRegistry.playS2C();
 		registry.register(CoffinDebugPacket.PACKET_TYPE, CoffinDebugPacket.CODEC);