Update to latest yarn mappings

Legacy-Fabric · Aug 27, 2023 · a53231b · a53231b
1 parent 1e7a5fa
commit a53231b
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/...ain/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/...ain/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/...pi-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/...pi-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/...ain/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/...ain/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/...pi-v1/src/testmod/java/net/legacyfabric/fabric/test/client/keybinding/KeybindingTest.java b/...pi-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/...ain/java/net/legacyfabric/fabric/api/client/event/lifecycle/v1/ClientLifecycleEvents.java b/...ain/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/...i-v1/src/testmod/java/net/legacyfabric/fabric/test/client/rendering/ModelFeatureTest.java b/...i-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/...on/src/main/java/net/legacyfabric/fabric/impl/item/group/FabricCreativeGuiComponents.java b/...on/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/...mmon/src/main/java/net/legacyfabric/fabric/api/client/keybinding/v1/KeyBindingHelper.java b/...mmon/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/.../src/main/java/net/legacyfabric/fabric/impl/client/keybinding/KeyBindingRegistryImpl.java b/.../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<KeyBinding> moddedKeyBindings = Lists.newArrayList();

diff --git a/...ommon/src/main/java/net/legacyfabric/fabric/mixin/client/keybinding/GameOptionsMixin.java b/...ommon/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
@@ -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