From a53231b58feb1fff7caa11566823c25497af65ba Mon Sep 17 00:00:00 2001 From: Grayray75 <69988482+Grayray75@users.noreply.github.com> Date: Sun, 27 Aug 2023 23:28:54 +0200 Subject: [PATCH] Update to latest yarn mappings --- .../client/event/lifecycle/v1/ClientLifecycleEvents.java | 2 +- .../fabric/test/client/keybinding/KeybindingTest.java | 2 +- .../client/event/lifecycle/v1/ClientLifecycleEvents.java | 2 +- .../fabric/test/client/keybinding/KeybindingTest.java | 2 +- .../client/event/lifecycle/v1/ClientLifecycleEvents.java | 2 +- .../fabric/test/client/rendering/ModelFeatureTest.java | 4 ++-- .../impl/item/group/FabricCreativeGuiComponents.java | 4 ++-- .../fabric/api/client/keybinding/v1/KeyBindingHelper.java | 2 +- .../impl/client/keybinding/KeyBindingRegistryImpl.java | 2 +- .../fabric/mixin/client/keybinding/GameOptionsMixin.java | 8 ++++---- gradle.properties | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/1.12.2/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/1.12.2/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java index ebb9032e4..4d190de82 100644 --- a/1.12.2/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java +++ b/1.12.2/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java @@ -18,7 +18,7 @@ package net.legacyfabric.fabric.api.client.event.lifecycle.v1; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.options.GameOptions; +import net.minecraft.client.option.GameOptions; import net.minecraft.world.GameMode; import net.minecraft.world.level.LevelInfo; diff --git a/1.7.10/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/1.7.10/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java index 3e88defc5..6adb69a44 100644 --- a/1.7.10/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java +++ b/1.7.10/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java @@ -19,7 +19,7 @@ import org.lwjgl.input.Keyboard; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; import net.fabricmc.api.ClientModInitializer; diff --git a/1.7.10/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/1.7.10/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java index ebb9032e4..4d190de82 100644 --- a/1.7.10/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java +++ b/1.7.10/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java @@ -18,7 +18,7 @@ package net.legacyfabric.fabric.api.client.event.lifecycle.v1; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.options.GameOptions; +import net.minecraft.client.option.GameOptions; import net.minecraft.world.GameMode; import net.minecraft.world.level.LevelInfo; diff --git a/1.8.9/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/1.8.9/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java index 3e88defc5..6adb69a44 100644 --- a/1.8.9/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java +++ b/1.8.9/legacy-fabric-keybindings-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java @@ -19,7 +19,7 @@ import org.lwjgl.input.Keyboard; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; import net.fabricmc.api.ClientModInitializer; diff --git a/1.8.9/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/1.8.9/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java index ef1bea1af..22387865d 100644 --- a/1.8.9/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java +++ b/1.8.9/legacy-fabric-lifecycle-events-v1/src/main/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java @@ -18,7 +18,7 @@ package net.legacyfabric.fabric.api.client.event.lifecycle.v1; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.options.GameOptions; +import net.minecraft.client.option.GameOptions; import net.minecraft.world.level.LevelInfo; import net.fabricmc.api.EnvType; diff --git a/1.8.9/legacy-fabric-rendering-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/rendering/ModelFeatureTest.java b/1.8.9/legacy-fabric-rendering-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/rendering/ModelFeatureTest.java index f0264f7ae..78d335774 100644 --- a/1.8.9/legacy-fabric-rendering-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/rendering/ModelFeatureTest.java +++ b/1.8.9/legacy-fabric-rendering-api-v1/src/testmod/java/net/legacyfabric/fabric/test/client/rendering/ModelFeatureTest.java @@ -42,8 +42,8 @@ public void onInitializeClient() { public void render(LivingEntity entity, float handSwing, float handSwingAmount, float tickDelta, float age, float headYaw, float headPitch, float scale) { GlStateManager.pushMatrix(); GlStateManager.enableTexture(); - GlStateManager.translatef(0.0F, 1.0F, 0.0F); - GlStateManager.scalef(2, 2, 2); + GlStateManager.translate(0.0F, 1.0F, 0.0F); + GlStateManager.scale(2, 2, 2); MinecraftClient.getInstance().getBlockRenderManager().renderBlockEntity(state, 9923917); GlStateManager.disableTexture(); GlStateManager.popMatrix(); diff --git a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java b/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java index 6748e2f7a..37f565cad 100644 --- a/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java +++ b/common/legacy-fabric-item-groups-v1-common/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java @@ -84,7 +84,7 @@ public boolean isMouseOver(MinecraftClient client, int mouseX, int mouseY) { } @Override - public void renderBg(MinecraftClient client, int mouseX, int mouseY) { + public void mouseDragged(MinecraftClient client, int mouseX, int mouseY) { this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; this.visible = extensions.fabric_isButtonVisible(type); this.active = extensions.fabric_isButtonEnabled(type); @@ -98,7 +98,7 @@ public void renderBg(MinecraftClient client, int mouseX, int mouseY) { try { // 1.8+ GlStateManager.disableLighting(); - GlStateManager.color4f(1F, 1F, 1F, 1F); + GlStateManager.color(1F, 1F, 1F, 1F); } catch (NoClassDefFoundError e) { // 1.7.10- GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); } diff --git a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/api/client/keybinding/v1/KeyBindingHelper.java b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/api/client/keybinding/v1/KeyBindingHelper.java index af8fc9e44..f8d9b6034 100644 --- a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/api/client/keybinding/v1/KeyBindingHelper.java +++ b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/api/client/keybinding/v1/KeyBindingHelper.java @@ -17,7 +17,7 @@ package net.legacyfabric.fabric.api.client.keybinding.v1; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; import net.legacyfabric.fabric.impl.client.keybinding.KeyBindingRegistryImpl; diff --git a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java index 0bf46901f..422c26516 100644 --- a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java +++ b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.KeyBinding; public final class KeyBindingRegistryImpl { private static final List moddedKeyBindings = Lists.newArrayList(); diff --git a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/mixin/client/keybinding/GameOptionsMixin.java b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/mixin/client/keybinding/GameOptionsMixin.java index b26fb579e..86d911f2a 100644 --- a/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/mixin/client/keybinding/GameOptionsMixin.java +++ b/common/legacy-fabric-keybindings-api-v1-common/src/main/java/net/legacyfabric/fabric/mixin/client/keybinding/GameOptionsMixin.java @@ -23,18 +23,18 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import net.minecraft.client.options.GameOptions; -import net.minecraft.client.options.KeyBinding; +import net.minecraft.client.option.GameOptions; +import net.minecraft.client.option.KeyBinding; import net.legacyfabric.fabric.impl.client.keybinding.KeyBindingRegistryImpl; @Mixin(GameOptions.class) public class GameOptionsMixin { @Shadow - public KeyBinding[] keysAll; + public KeyBinding[] allKeys; @Inject(at = @At("HEAD"), method = "load()V") public void api$loadHook(CallbackInfo info) { - keysAll = KeyBindingRegistryImpl.process(keysAll); + allKeys = KeyBindingRegistryImpl.process(allKeys); } } diff --git a/gradle.properties b/gradle.properties index 152fa88f9..c31ef8357 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G base_version = 1.9.1 loader_version = 0.14.22 -yarn_mappings_build = 441 +yarn_mappings_build = 530 ## Module versions legacy-fabric-api-base.version = 1.1.0