From 9c15c890d1106949553f93d50d8f7475684af44c Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 18 Sep 2019 19:01:22 +0100
Subject: [PATCH] Update mappings
---
build.gradle | 2 +-
.../net/fabricmc/fabric/api/loot/v1/FabricLootPool.java | 4 ++--
.../fabricmc/fabric/api/loot/v1/FabricLootPoolBuilder.java | 6 +++---
.../fabricmc/fabric/mixin/loot/LootPoolBuilderHooks.java | 4 ++--
.../java/net/fabricmc/fabric/mixin/loot/MixinLootPool.java | 6 +++---
settings.gradle | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6cdf8f5fd..f81138cc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ def ENV = System.getenv()
class Globals {
static def baseVersion = "0.3.2"
static def mcVersion = "19w38b"
- static def yarnVersion = "+build.3"
+ static def yarnVersion = "+build.4"
}
import org.apache.commons.codec.digest.DigestUtils
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPool.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPool.java
index c0619ba67..f551a1e53 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPool.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/api/loot/v1/FabricLootPool.java
@@ -16,9 +16,9 @@
package net.fabricmc.fabric.api.loot.v1;
-import net.minecraft.class_4570;
import net.minecraft.world.loot.LootPool;
import net.minecraft.world.loot.LootTableRange;
+import net.minecraft.world.loot.condition.LootCondition;
import net.minecraft.world.loot.entry.LootEntry;
import net.minecraft.world.loot.function.LootFunction;
@@ -33,7 +33,7 @@ public interface FabricLootPool {
return (LootPool) this;
}
List<LootEntry> getEntries();
- List<class_4570> getConditions();
+ List<LootCondition> getConditions();
List<LootFunction> getFunctions();
LootTableRange getRollsRange();
}
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 456e533dc..156e59970 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
@@ -17,9 +17,9 @@
package net.fabricmc.fabric.api.loot.v1;
import net.fabricmc.fabric.mixin.loot.LootPoolBuilderHooks;
-import net.minecraft.class_4570;
import net.minecraft.world.loot.LootPool;
import net.minecraft.world.loot.LootTableRange;
+import net.minecraft.world.loot.condition.LootCondition;
import net.minecraft.world.loot.entry.LootEntry;
import net.minecraft.world.loot.function.LootFunction;
@@ -45,7 +45,7 @@ public class FabricLootPoolBuilder extends LootPool.Builder {
}
@Override
- public FabricLootPoolBuilder withCondition(class_4570.Builder condition) {
+ public FabricLootPoolBuilder withCondition(LootCondition.Builder condition) {
super.method_356(condition);
return this;
}
@@ -61,7 +61,7 @@ public class FabricLootPoolBuilder extends LootPool.Builder {
return this;
}
- public FabricLootPoolBuilder withCondition(class_4570 condition) {
+ public FabricLootPoolBuilder withCondition(LootCondition condition) {
extended.getConditions().add(condition);
return this;
}
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/LootPoolBuilderHooks.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/LootPoolBuilderHooks.java
index da588f1c6..52868eb25 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/LootPoolBuilderHooks.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/LootPoolBuilderHooks.java
@@ -16,8 +16,8 @@
package net.fabricmc.fabric.mixin.loot;
-import net.minecraft.class_4570;
import net.minecraft.world.loot.LootPool;
+import net.minecraft.world.loot.condition.LootCondition;
import net.minecraft.world.loot.entry.LootEntry;
import net.minecraft.world.loot.function.LootFunction;
import org.spongepowered.asm.mixin.Mixin;
@@ -30,7 +30,7 @@ public interface LootPoolBuilderHooks {
@Accessor
List<LootEntry> getEntries();
@Accessor
- List<class_4570> getConditions();
+ List<LootCondition> getConditions();
@Accessor
List<LootFunction> getFunctions();
}
diff --git a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/MixinLootPool.java b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/MixinLootPool.java
index dd431c4b2..f78e3fce1 100644
--- a/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/MixinLootPool.java
+++ b/fabric-loot-tables-v1/src/main/java/net/fabricmc/fabric/mixin/loot/MixinLootPool.java
@@ -17,9 +17,9 @@
package net.fabricmc.fabric.mixin.loot;
import net.fabricmc.fabric.api.loot.v1.FabricLootPool;
-import net.minecraft.class_4570;
import net.minecraft.world.loot.LootPool;
import net.minecraft.world.loot.LootTableRange;
+import net.minecraft.world.loot.condition.LootCondition;
import net.minecraft.world.loot.entry.LootEntry;
import net.minecraft.world.loot.function.LootFunction;
import org.spongepowered.asm.mixin.Final;
@@ -34,7 +34,7 @@ import java.util.List;
public abstract class MixinLootPool implements FabricLootPool {
@Shadow @Final private LootEntry[] entries;
- @Shadow @Final private class_4570[] conditions;
+ @Shadow @Final private LootCondition[] conditions;
@Shadow @Final private LootFunction[] functions;
@@ -44,7 +44,7 @@ public abstract class MixinLootPool implements FabricLootPool {
}
@Override
- public List<class_4570> getConditions() {
+ public List<LootCondition> getConditions() {
return Arrays.asList(conditions);
}
diff --git a/settings.gradle b/settings.gradle
index 1ffd5c5a8..a23024668 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -31,7 +31,7 @@ include 'fabric-networking-blockentity-v0'
include 'fabric-object-builders-v0'
include 'fabric-registry-sync-v0'
include 'fabric-renderer-api-v1'
-include 'fabric-renderer-indigo'
+//include 'fabric-renderer-indigo'
include 'fabric-rendering-v0'
include 'fabric-rendering-data-attachment-v1'
include 'fabric-rendering-fluids-v1'