Merge branch 'main' into 1.21.8

Author: AViewFromTheTop

CHANGELOG.md

@@ -1,3 +1,7 @@
 Please clear changelog after each release.
 Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED.
 -----------------
+- Fixed Observers using the incorrect render type, now being able to display their emissive layers properly.
+- Glowtone overlay textures that are completely transparent will no longer be loaded.
+  - This means the texture will not be added to and indexed in Minecraft's texture atlas.
+  - This also means that blocks which would've received an additional overlay model face for the texture will no longer add these additional faces.

CONTRIBUTING.md

@@ -56,11 +56,11 @@ Avoid the use of abbreviations in javadocs, except if they describe the name of
 `@ModifyConstant` should never be used in a case where a `ModifyExpressionValue` could be used.
 
 The `$` character can be used in mixins to mark a semantic separation in the name.
-It allows to separate the actual name of the variable and the namespace, `wilderWild`.
+It allows to separate the actual name of the variable and the namespace, `glowtone`.
 
-Fields marked as `@Unique` must be prefixed with `wilderWild$` or `WILDERWILD$` if the field is static and final.
+Fields marked as `@Unique` must be prefixed with `glowtone$` or `GLOWTONE$` if the field is static and final.
 
-Methods marked with `@Unique` must be prefixed with `wilderWild$`.
+Methods marked with `@Unique` must be prefixed with `glowtone$`.
 
 Injector or modifier methods do not need to be prefixed. Fabric takes care of that.
 

gradle.properties

@@ -16,7 +16,7 @@
 
 # Mod Properties
     mod_id = glowtone
-	mod_version = 1.0
+	mod_version = 1.0.2
 	maven_group = net.frozenblock
 	archives_base_name = Glowtone
 

settings.gradle.kts

@@ -14,4 +14,4 @@ pluginManagement {
     }
 }
 
-rootProject.name = "FrozenLib"
+rootProject.name = "Glowtone"

src/main/java/net/frozenblock/glowtone/mixin/client/SpriteResourceLoaderMixin.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2025 FrozenBlock
+ * This file is part of Glowtone.
+ *
+ * This program is free software; you can modify it under
+ * the terms of version 1 of the FrozenBlock Modding Oasis License
+ * as published by FrozenBlock Modding Oasis.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * FrozenBlock Modding Oasis License for more details.
+ *
+ * You should have received a copy of the FrozenBlock Modding Oasis License
+ * along with this program; if not, see <https://github.com/FrozenBlock/Licenses>.
+ */
+
+package net.frozenblock.glowtone.mixin.client;
+
+import com.llamalad7.mixinextras.sugar.Local;
+import java.util.Arrays;
+import com.mojang.blaze3d.platform.NativeImage;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.frozenblock.glowtone.GlowtoneConstants;
+import net.minecraft.client.renderer.texture.SpriteContents;
+import net.minecraft.client.renderer.texture.atlas.SpriteResourceLoader;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ARGB;
+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.callback.CallbackInfoReturnable;
+
+@Environment(EnvType.CLIENT)
+@Mixin(SpriteResourceLoader.class)
+public interface SpriteResourceLoaderMixin {
+
+	@Inject(
+		method = "method_52851",
+		at = @At(
+			value = "INVOKE",
+			target = "Lnet/minecraft/server/packs/resources/ResourceMetadata;getSection(Lnet/minecraft/server/packs/metadata/MetadataSectionType;)Ljava/util/Optional;"
+		),
+		cancellable = true
+	)
+	private static void glowtone$discardEmptyOverlays(
+		CallbackInfoReturnable<SpriteContents> info,
+		@Local(argsOnly = true) ResourceLocation id,
+		@Local NativeImage image
+	) {
+		if (!GlowtoneConstants.GLOWTONE_EMISSIVES) return;
+		if (image == null) return;
+		if (!id.getPath().endsWith("_glowtone_emissive")) return;
+
+		try {
+			final int[] pixels = image.getPixels();
+			if (Arrays.stream(pixels).allMatch(pixel -> ARGB.alpha(pixel) == 0)) info.setReturnValue(null);
+		} catch (Exception ignored) {}
+	}
+
+}

src/main/resources/assets/minecraft/textures/block/creaking_heart_awake_glowtone_emissive.png

@@ -14,6 +14,7 @@
     "client.ModelManagerMixin",
     "client.SimpleUnbakedGeometryMixin",
     "client.SpriteLoaderMixin",
+    "client.SpriteResourceLoaderMixin",
     "client.block.BlocksMixin",
     "client.redstone_dust_particle.DustColorTransitionOptionsMixin",
     "client.redstone_dust_particle.DustColorTransitionParticleMixin",