Merge branch '1.21.2' into 1.21.4

FrozenBlock · Feb 4, 2025 · 16b2146 · 16b2146
2 parents 382fe5e + c5fdd5f
commit 16b2146
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/src/main/java/net/frozenblock/lib/FrozenLibClient.java b/src/main/java/net/frozenblock/lib/FrozenLibClient.java
@@ -31,7 +31,7 @@
 import net.frozenblock.lib.debug.networking.StructureDebugRequestPayload;
 import net.frozenblock.lib.entrypoint.api.FrozenClientEntrypoint;
 import net.frozenblock.lib.integration.api.ModIntegrations;
-import net.frozenblock.lib.menu.api.PanoramaAPI;
+import net.frozenblock.lib.menu.api.PanoramaApi;
 import net.frozenblock.lib.networking.FrozenClientNetworking;
 import net.frozenblock.lib.registry.client.FrozenLibClientRegistries;
 import net.frozenblock.lib.screenshake.api.client.ScreenShaker;
@@ -60,7 +60,7 @@ public void onInitializeClient() {
 		FrozenClientNetworking.registerClientReceivers();
 		DebugRenderManager.init();
 
-		PanoramaAPI.addPanorama(ResourceLocation.withDefaultNamespace("textures/gui/title/background/panorama"));
+		PanoramaApi.addPanorama(ResourceLocation.withDefaultNamespace("textures/gui/title/background/panorama"));
 		ClientCapeData.init();
 
 		ClientCommandRegistrationCallback.EVENT.register((dispatcher, buildContext) -> {

diff --git a/.../lib/feature_flag/api/FeatureFlagAPI.java → .../lib/feature_flag/api/FeatureFlagApi.java b/.../lib/feature_flag/api/FeatureFlagAPI.java → .../lib/feature_flag/api/FeatureFlagApi.java
@@ -27,7 +27,7 @@
  * Used to help with custom {@link net.minecraft.world.flag.FeatureFlag}s.
  */
 @UtilityClass
-public class FeatureFlagAPI {
+public class FeatureFlagApi {
 	@ApiStatus.Internal
 	public static FeatureFlagRegistry.Builder builder;
 

diff --git a/src/main/java/net/frozenblock/lib/feature_flag/mixin/FeatureFlagsMixin.java b/src/main/java/net/frozenblock/lib/feature_flag/mixin/FeatureFlagsMixin.java
@@ -18,7 +18,7 @@
 package net.frozenblock.lib.feature_flag.mixin;
 
 import com.llamalad7.mixinextras.sugar.Local;
-import net.frozenblock.lib.feature_flag.api.FeatureFlagAPI;
+import net.frozenblock.lib.feature_flag.api.FeatureFlagApi;
 import net.minecraft.world.flag.FeatureFlagRegistry;
 import net.minecraft.world.flag.FeatureFlags;
 import org.spongepowered.asm.mixin.Mixin;
@@ -38,6 +38,6 @@ public class FeatureFlagsMixin {
 		)
 	)
 	private static void frozenLib$save(CallbackInfo info, @Local FeatureFlagRegistry.Builder builder) {
-		FeatureFlagAPI.builder = builder;
+		FeatureFlagApi.builder = builder;
 	}
 }
diff --git a/...frozenblock/lib/menu/api/PanoramaAPI.java → ...frozenblock/lib/menu/api/PanoramaApi.java b/...frozenblock/lib/menu/api/PanoramaAPI.java → ...frozenblock/lib/menu/api/PanoramaApi.java
@@ -24,7 +24,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 @Environment(EnvType.CLIENT)
-public class PanoramaAPI {
+public class PanoramaApi {
 	private static final List<ResourceLocation> PANORAMAS = new ArrayList<>();
 
 	public static void addPanorama(ResourceLocation location) {

diff --git a/src/main/java/net/frozenblock/lib/menu/mixin/client/CubeMapMixin.java b/src/main/java/net/frozenblock/lib/menu/mixin/client/CubeMapMixin.java
@@ -25,7 +25,7 @@
 import net.frozenblock.lib.FrozenLibConstants;
 import net.frozenblock.lib.FrozenLibLogUtils;
 import net.frozenblock.lib.math.api.AdvancedMath;
-import net.frozenblock.lib.menu.api.PanoramaAPI;
+import net.frozenblock.lib.menu.api.PanoramaApi;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.CubeMap;
@@ -63,7 +63,7 @@ public class CubeMapMixin {
 		if (this.frozenLib$canReplacePanorama) {
 			this.frozenLib$canReplacePanorama = false;
 			List<ResourceLocation> validPanoramas = new ArrayList<>();
-			for (ResourceLocation panLocation : PanoramaAPI.getPanoramas()) {
+			for (ResourceLocation panLocation : PanoramaApi.getPanoramas()) {
 				String namespace = panLocation.getNamespace();
 				String path = panLocation.getPath();
 				for (int i = 0; i < 6; ++i) {

diff --git a/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestClient.java b/src/testmod/java/net/frozenblock/lib/testmod/FrozenTestClient.java
@@ -21,7 +21,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.frozenblock.lib.FrozenLibConstants;
-import net.frozenblock.lib.menu.api.PanoramaAPI;
+import net.frozenblock.lib.menu.api.PanoramaApi;
 import net.frozenblock.lib.menu.api.SplashTextAPI;
 import net.frozenblock.lib.sound.client.impl.FlyBySoundHub;
 import net.minecraft.resources.ResourceLocation;
@@ -36,7 +36,7 @@ public final class FrozenTestClient implements ClientModInitializer {
     public void onInitializeClient() {
         FlyBySoundHub.AUTO_ENTITIES_AND_SOUNDS.put(EntityType.ARROW, new FlyBySoundHub.FlyBySound(1.0F, 1.0F, SoundSource.NEUTRAL, SoundEvents.AXE_SCRAPE));
 		SplashTextAPI.addSplashLocation(ResourceLocation.fromNamespaceAndPath(FrozenLibConstants.MOD_ID, "texts/splashes.txt"));
-		PanoramaAPI.addPanorama(ResourceLocation.fromNamespaceAndPath(FrozenLibConstants.MOD_ID, "textures/gui/title/background/panorama"));
-		PanoramaAPI.addPanorama(ResourceLocation.fromNamespaceAndPath("this_will_throw_an_error", "textures/gui/title/background/panorama"));
+		PanoramaApi.addPanorama(ResourceLocation.fromNamespaceAndPath(FrozenLibConstants.MOD_ID, "textures/gui/title/background/panorama"));
+		PanoramaApi.addPanorama(ResourceLocation.fromNamespaceAndPath("this_will_throw_an_error", "textures/gui/title/background/panorama"));
     }
 }