From ec40b2e12c5ce3557f1d0414342630616bb6ae15 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Tue, 3 Dec 2019 17:02:41 +0000
Subject: [PATCH] 1.15-pre4
a few mapping changes
---
build.gradle | 4 ++--
fabric-item-groups-v0/build.gradle | 2 +-
.../item/group/client/MixinCreativePlayerInventoryGui.java | 4 ++--
fabric-renderer-indigo/build.gradle | 2 +-
.../fabric/impl/client/indigo/renderer/aocalc/AoFace.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/build.gradle b/build.gradle
index 559a8aeff..706cd1636 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,8 @@ plugins {
def ENV = System.getenv()
class Globals {
- static def baseVersion = "0.4.18"
- static def mcVersion = "1.15-pre3"
+ static def baseVersion = "0.4.19"
+ static def mcVersion = "1.15-pre4"
static def yarnVersion = "+build.1"
}
diff --git a/fabric-item-groups-v0/build.gradle b/fabric-item-groups-v0/build.gradle
index 1bf6d5e96..9c2cef11a 100644
--- a/fabric-item-groups-v0/build.gradle
+++ b/fabric-item-groups-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-item-groups-v0"
-version = getSubprojectVersion(project, "0.1.4")
+version = getSubprojectVersion(project, "0.1.6")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java
index 1aa4cbb83..f6b48ee9f 100644
--- a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java
+++ b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/mixin/item/group/client/MixinCreativePlayerInventoryGui.java
@@ -119,8 +119,8 @@ public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryS
private void init(CallbackInfo info) {
fabric_updateSelection();
- int xpos = left + 170;
- int ypos = top + 4;
+ int xpos = x + 170;
+ int ypos = y + 4;
addButton(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 10, ypos, FabricCreativeGuiComponents.Type.NEXT, this));
addButton(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, this));
diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle
index c5224a004..95bed8a3c 100644
--- a/fabric-renderer-indigo/build.gradle
+++ b/fabric-renderer-indigo/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-renderer-indigo"
-version = getSubprojectVersion(project, "0.2.17")
+version = getSubprojectVersion(project, "0.2.18")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoFace.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoFace.java
index a7a3ede2a..34a922ecd 100644
--- a/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoFace.java
+++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/fabric/impl/client/indigo/renderer/aocalc/AoFace.java
@@ -95,7 +95,7 @@ enum AoFace {
this.weightFunc = weightFunc;
}
- private static final AoFace[] values = Util.create(new AoFace[6], (neighborData) -> {
+ private static final AoFace[] values = Util.make(new AoFace[6], (neighborData) -> {
neighborData[DOWN.getId()] = AOF_DOWN;
neighborData[UP.getId()] = AOF_UP;
neighborData[NORTH.getId()] = AOF_NORTH;