From e08a7305d5efdfc6f7e84077ca8237d2da105618 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Mon, 25 Nov 2019 19:28:07 +0000
Subject: [PATCH] 1.15-pre2
---
build.gradle | 6 +++---
fabric-loot-tables-v1/build.gradle | 2 +-
.../fabric/api/loot/v1/FabricLootPoolBuilder.java | 4 ++--
.../fabric/api/loot/v1/FabricLootSupplierBuilder.java | 2 +-
.../fabric/mixin/loot/table/MixinLootManager.java | 2 +-
fabric-networking-blockentity-v0/build.gradle | 2 +-
.../api/block/entity/BlockEntityClientSerializable.java | 2 +-
fabric-textures-v0/build.gradle | 2 +-
.../mixin/client/texture/MixinSpriteAtlasTexture.java | 9 ---------
9 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/build.gradle b/build.gradle
index 92d2df61a..b65634fca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,9 +12,9 @@ plugins {
def ENV = System.getenv()
class Globals {
- static def baseVersion = "0.4.13"
- static def mcVersion = "1.15-pre1"
- static def yarnVersion = "+build.3"
+ static def baseVersion = "0.4.14"
+ static def mcVersion = "1.15-pre2"
+ static def yarnVersion = "+build.1"
}
import org.apache.commons.codec.digest.DigestUtils
diff --git a/fabric-loot-tables-v1/build.gradle b/fabric-loot-tables-v1/build.gradle
index 93c154151..ffa1e37fd 100644
--- a/fabric-loot-tables-v1/build.gradle
+++ b/fabric-loot-tables-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-loot-tables-v1"
-version = getSubprojectVersion(project, "0.1.4")
+version = getSubprojectVersion(project, "0.1.5")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java
index d245481c0..e8232405a 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java
@@ -47,13 +47,13 @@ public class FabricLootPoolBuilder extends LootPool.Builder {
@Override
public FabricLootPoolBuilder withCondition(LootCondition.Builder condition) {
- super.method_356(condition);
+ super.withCondition(condition);
return this;
}
@Override
public FabricLootPoolBuilder withFunction(LootFunction.Builder function) {
- super.method_353(function);
+ super.withFunction(function);
return this;
}
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java
index 67ba52e1d..dc9e56ce3 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootSupplierBuilder.java
@@ -48,7 +48,7 @@ public class FabricLootSupplierBuilder extends LootTable.Builder {
@Override
public FabricLootSupplierBuilder withFunction(LootFunction.Builder function) {
- super.method_335(function);
+ super.withFunction(function);
return this;
}
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java
index ffd2c509b..fb96896ef 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/table/MixinLootManager.java
@@ -40,7 +40,7 @@ import net.fabricmc.fabric.api.loot.v1.event.LootTableLoadingCallback;
public class MixinLootManager {
@Shadow private Map<Identifier, LootTable> suppliers;
- @Inject(method = "method_20712", at = @At("RETURN"))
+ @Inject(method = "apply", at = @At("RETURN"))
private void apply(Map<Identifier, JsonObject> objectMap, ResourceManager manager, Profiler profiler, CallbackInfo info) {
Map<Identifier, LootTable> newSuppliers = new HashMap<>();
diff --git a/fabric-networking-blockentity-v0/build.gradle b/fabric-networking-blockentity-v0/build.gradle
index 53babc42a..451882ca5 100644
--- a/fabric-networking-blockentity-v0/build.gradle
+++ b/fabric-networking-blockentity-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-networking-blockentity-v0"
-version = getSubprojectVersion(project, "0.2.2")
+version = getSubprojectVersion(project, "0.2.3")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/api/block/entity/BlockEntityClientSerializable.java b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/api/block/entity/BlockEntityClientSerializable.java
index a2dfc32c3..93fff419d 100644
--- a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/api/block/entity/BlockEntityClientSerializable.java
+++ b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/api/block/entity/BlockEntityClientSerializable.java
@@ -47,6 +47,6 @@ public interface BlockEntityClientSerializable {
Preconditions.checkNotNull(world); //Maintain distinct failure case from below
if (!(world instanceof ServerWorld)) throw new IllegalStateException("Cannot call sync() on the logical client! Did you check world.isClient first?");
- ((ServerWorld) world).method_14178().markForUpdate(((BlockEntity) this).getPos());
+ ((ServerWorld) world).getChunkManager().markForUpdate(((BlockEntity) this).getPos());
}
}
diff --git a/fabric-textures-v0/build.gradle b/fabric-textures-v0/build.gradle
index d24de7f2f..dbb9bf321 100644
--- a/fabric-textures-v0/build.gradle
+++ b/fabric-textures-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-textures-v0"
-version = getSubprojectVersion(project, "1.0.1")
+version = getSubprojectVersion(project, "1.0.2")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java b/fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java
index acdfba622..5ed9d593b 100644
--- a/fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java
+++ b/fabric-textures-v0/src/main/java/net/fabricmc/fabric/mixin/client/texture/MixinSpriteAtlasTexture.java
@@ -48,19 +48,10 @@ import net.fabricmc.fabric.impl.client.texture.SpriteRegistryCallbackHolder;
@Mixin(SpriteAtlasTexture.class)
public abstract class MixinSpriteAtlasTexture {
- @Unique
- private static Logger FABRIC_LOGGER = LogManager.getLogger();
- @Shadow
- private int mipLevel;
-
- @Shadow
- public abstract Sprite getSprite(Identifier id);
@Shadow
public abstract Identifier method_24106();
- // INJECTION LOGIC
-
private Map<Identifier, Sprite> fabric_injectedSprites;
// Loads in custom sprite object injections.