Username404-59/SnowyGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish first try at porting to 1.21.11

Browse Source 
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
This commit is contained in:
Username404-59 2026-02-05 21:23:57 +01:00
parent 90d4e7b8b4
commit 019e62f33b
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/kotlin/fr/username404/snowygui/utils/RenderingUtil.kt
View File

@ -51,7 +51,7 @@ object RenderingUtil {
Matrix4f() Matrix4f()
) )
fun renderBufferWithPipeline( fun renderBufferWithPipeline(
name: String? = "Dynamic vertex buffer", name: String = "Dynamic vertex buffer",
renderPipeline: RenderPipeline, renderPipeline: RenderPipeline,
renderTarget: RenderTarget = Minecraft.getInstance().mainRenderTarget, renderTarget: RenderTarget = Minecraft.getInstance().mainRenderTarget,
uniformAndSamplerConsumer: ((RenderPass) -> Unit)? = null, uniformAndSamplerConsumer: ((RenderPass) -> Unit)? = null,

9
fabric/src/main/java/fr/username404/snowygui/mixins/KeyMappings.java
View File

@ -25,14 +25,11 @@ abstract class KeyMappings {
@Inject(method = "<init>*", at = @At("RETURN")) @Inject(method = "<init>*", at = @At("RETURN"))
private void onSettingsConstructed(Minecraft minecraft, File file, CallbackInfo ci) { private void onSettingsConstructed(Minecraft minecraft, File file, CallbackInfo ci) {
final var categoryMap = KeysAccessor.getSortedCategoryMap(); final var categoryList = KeysAccessor.getSortedCategoryList();
var newKeys = Lists.newArrayList(keyMappings); var newKeys = Lists.newArrayList(keyMappings);
for (KeyMapping key : keysToAdd) { for (KeyMapping key : keysToAdd) {
if (!categoryMap.containsKey(key.getCategory())) { if (!categoryList.contains(key.getCategory()))
Optional<Integer> biggest = categoryMap.values().stream().max(Integer::compareTo); categoryList.add(key.getCategory());
int biggestInt = biggest.orElse(0);
categoryMap.put(key.getCategory(), biggestInt + 1);
}
newKeys.remove(key); newKeys.remove(key);
newKeys.add(key); newKeys.add(key);
} }

8
fabric/src/main/java/fr/username404/snowygui/mixins/KeysAccessor.java
View File

@ -4,10 +4,10 @@ import net.minecraft.client.KeyMapping;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
import java.util.Map; import java.util.List;
@Mixin(KeyMapping.class) @Mixin(KeyMapping.Category.class)
public interface KeysAccessor { public interface KeysAccessor {
@Accessor("CATEGORY_SORT_ORDER") @Accessor("SORT_ORDER")
static Map<String, Integer> getSortedCategoryMap() { throw new AssertionError(); } static List<KeyMapping.Category> getSortedCategoryList() { throw new AssertionError(); }
} }

2
fabric/src/main/kotlin/fr/username404/snowygui/fabric/FabricInit.kt
View File

@ -21,7 +21,7 @@ class FabricInit: Snowy(), ClientModInitializer {
EVENT.register( EVENT.register(
object: HudRenderCallback, EventSnowy { object: HudRenderCallback, EventSnowy {
override val type: String = "HudRender" override val type: String = "HudRender"
override fun onHudRender(guiGraphics: GuiGraphics?, tickCounter: DeltaTracker?) = fire(guiGraphics) override fun onHudRender(guiGraphics: GuiGraphics, tickCounter: DeltaTracker) = fire(guiGraphics)
} }
) )
} }