From 686e6e57ad66a76aa674f622b0492dda402ea0e3 Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 29 Apr 2020 17:49:19 +0100
Subject: [PATCH] 20w18a
---
build.gradle | 6 +++---
fabric-dimensions-v1/build.gradle | 2 +-
.../dimension/idremap/MixinUnmodifiableLevelProperties.java | 4 ++--
fabric-registry-sync-v0/build.gradle | 2 +-
.../mixin/registry/sync/client/MixinParticleManager.java | 4 ++--
fabric-tool-attribute-api-v1/build.gradle | 2 +-
.../fabric/impl/tool/attribute/AttributeManager.java | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/build.gradle b/build.gradle
index 9567cedc5..eadcd872d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
id 'eclipse'
id 'idea'
id 'maven-publish'
- id 'fabric-loom' version '0.2.7-SNAPSHOT' apply false
+ id 'fabric-loom' version '0.4.3' apply false
id 'net.minecrell.licenser' version '0.4.1'
id "org.ajoberstar.grgit" version "3.1.1"
id 'com.matthewprenger.cursegradle' version "1.4.0"
@@ -12,8 +12,8 @@ plugins {
def ENV = System.getenv()
class Globals {
- static def baseVersion = "0.7.0"
- static def mcVersion = "20w17a"
+ static def baseVersion = "0.7.1"
+ static def mcVersion = "20w18a"
static def yarnVersion = "+build.1"
}
diff --git a/fabric-dimensions-v1/build.gradle b/fabric-dimensions-v1/build.gradle
index 81d17a50d..d5470cfe5 100644
--- a/fabric-dimensions-v1/build.gradle
+++ b/fabric-dimensions-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-dimensions-v1"
-version = getSubprojectVersion(project, "0.4.0")
+version = getSubprojectVersion(project, "0.4.1")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinUnmodifiableLevelProperties.java b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinUnmodifiableLevelProperties.java
index 38a1d790f..8f449be7c 100644
--- a/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinUnmodifiableLevelProperties.java
+++ b/fabric-dimensions-v1/src/main/java/net/fabricmc/fabric/mixin/dimension/idremap/MixinUnmodifiableLevelProperties.java
@@ -22,7 +22,7 @@ import org.spongepowered.asm.mixin.Shadow;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.UnmodifiableLevelProperties;
-import net.minecraft.class_5217;
+import net.minecraft.class_5268;
import net.fabricmc.fabric.impl.dimension.DimensionIdsHolder;
@@ -30,7 +30,7 @@ import net.fabricmc.fabric.impl.dimension.DimensionIdsHolder;
public abstract class MixinUnmodifiableLevelProperties implements DimensionIdsHolder {
@Shadow
@Final
- private class_5217 properties;
+ private class_5268 properties;
/**
* Delegates to the main level properties.
diff --git a/fabric-registry-sync-v0/build.gradle b/fabric-registry-sync-v0/build.gradle
index baa3267c8..c7893b5b0 100644
--- a/fabric-registry-sync-v0/build.gradle
+++ b/fabric-registry-sync-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-registry-sync-v0"
-version = getSubprojectVersion(project, "0.3.0")
+version = getSubprojectVersion(project, "0.3.1")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinParticleManager.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinParticleManager.java
index 2524213de..9c40279a1 100644
--- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinParticleManager.java
+++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/client/MixinParticleManager.java
@@ -27,7 +27,7 @@ import net.minecraft.client.particle.ParticleFactory;
import net.minecraft.client.particle.ParticleManager;
import net.minecraft.client.texture.TextureManager;
import net.minecraft.util.registry.Registry;
-import net.minecraft.world.World;
+import net.minecraft.client.world.ClientWorld;
import net.fabricmc.fabric.impl.registry.sync.trackers.Int2ObjectMapTracker;
@@ -37,7 +37,7 @@ public class MixinParticleManager {
private Int2ObjectMap<ParticleFactory<?>> factories;
@Inject(method = "<init>", at = @At("RETURN"))
- public void onInit(World world, TextureManager textureManager, CallbackInfo info) {
+ public void onInit(ClientWorld world, TextureManager textureManager, CallbackInfo info) {
Int2ObjectMapTracker.register(Registry.PARTICLE_TYPE, "ParticleManager.factories", factories);
}
}
diff --git a/fabric-tool-attribute-api-v1/build.gradle b/fabric-tool-attribute-api-v1/build.gradle
index e85aa34d9..9e6095091 100644
--- a/fabric-tool-attribute-api-v1/build.gradle
+++ b/fabric-tool-attribute-api-v1/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-tool-attribute-api-v1"
-version = getSubprojectVersion(project, "1.0.2")
+version = getSubprojectVersion(project, "1.0.3")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/impl/tool/attribute/AttributeManager.java b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/impl/tool/attribute/AttributeManager.java
index e4dd4bcf7..8ccbba5ea 100644
--- a/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/impl/tool/attribute/AttributeManager.java
+++ b/fabric-tool-attribute-api-v1/src/main/java/net/fabricmc/fabric/impl/tool/attribute/AttributeManager.java
@@ -69,7 +69,7 @@ public final class AttributeManager {
double multTotal = 1;
for (EntityAttributeModifier mod : modifiers) {
- double amount = mod.getAmount();
+ double amount = mod.getValue();
if (amount == 0) continue;
switch (mod.getOperation()) {