From b7d52fa581a5166e6d80f5ea60ca0ff9ea5edebf Mon Sep 17 00:00:00 2001
From: modmuss50 <modmuss50@gmail.com>
Date: Wed, 4 Mar 2020 20:59:37 +0000
Subject: [PATCH] 20w10a
---
build.gradle | 4 ++--
fabric-biomes-v1/build.gradle | 2 +-
.../src/main/resources/fabric.mod.json | 2 +-
fabric-events-interaction-v0/build.gradle | 2 +-
.../event/interaction/MixinMinecraftClient.java | 2 +-
fabric-item-groups-v0/build.gradle | 2 +-
.../item/group/FabricCreativeGuiComponents.java | 14 +++++++-------
.../client/MixinCreativePlayerInventoryGui.java | 9 +++++----
fabric-object-builders-v0/build.gradle | 2 +-
.../fabric/api/entity/FabricEntityTypeBuilder.java | 4 +++-
.../impl/object/builder/FabricEntityType.java | 4 ++--
fabric-resource-loader-v0/build.gradle | 2 +-
.../api/resource/SimpleResourceReloadListener.java | 2 +-
src/main/resources/fabric.mod.json | 2 +-
14 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/build.gradle b/build.gradle
index 6abb9b2ec..f71b468af 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,8 +12,8 @@ plugins {
def ENV = System.getenv()
class Globals {
- static def baseVersion = "0.4.33"
- static def mcVersion = "20w09a"
+ static def baseVersion = "0.4.34"
+ static def mcVersion = "20w10a"
static def yarnVersion = "+build.1"
}
diff --git a/fabric-biomes-v1/build.gradle b/fabric-biomes-v1/build.gradle
index a11ff9278..e391e78e0 100644
--- a/fabric-biomes-v1/build.gradle
+++ b/fabric-biomes-v1/build.gradle
@@ -1,2 +1,2 @@
archivesBaseName = "fabric-biomes-v1"
-version = getSubprojectVersion(project, "0.2.0")
+version = getSubprojectVersion(project, "0.2.1")
diff --git a/fabric-biomes-v1/src/main/resources/fabric.mod.json b/fabric-biomes-v1/src/main/resources/fabric.mod.json
index a189f35bb..2bc6e9fe4 100644
--- a/fabric-biomes-v1/src/main/resources/fabric.mod.json
+++ b/fabric-biomes-v1/src/main/resources/fabric.mod.json
@@ -17,7 +17,7 @@
],
"depends": {
"fabricloader": ">=0.4.0",
- "minecraft": ">=1.16-alpha.20.6.a"
+ "minecraft": ">=1.16-alpha.20.10.a"
},
"description": "Hooks for adding biomes to the default world generator.",
"mixins": [
diff --git a/fabric-events-interaction-v0/build.gradle b/fabric-events-interaction-v0/build.gradle
index d9512eb3a..e506f5a73 100644
--- a/fabric-events-interaction-v0/build.gradle
+++ b/fabric-events-interaction-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-events-interaction-v0"
-version = getSubprojectVersion(project, "0.2.8")
+version = getSubprojectVersion(project, "0.2.9")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinMinecraftClient.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinMinecraftClient.java
index b12129b01..256277603 100644
--- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinMinecraftClient.java
+++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/mixin/event/interaction/MixinMinecraftClient.java
@@ -68,7 +68,7 @@ public abstract class MixinMinecraftClient {
// I don't like that we clone vanilla logic here, but it's our best bet for now.
PlayerInventory playerInventory = client.player.inventory;
- if (client.player.abilities.creativeMode && Screen.hasControlDown() && client.crosshairTarget.getType() == HitResult.Type.BLOCK) {
+ if (client.player.abilities.creativeMode && Screen.method_25441() && client.crosshairTarget.getType() == HitResult.Type.BLOCK) {
BlockEntity be = client.world.getBlockEntity(((BlockHitResult) client.crosshairTarget).getBlockPos());
if (be != null) {
diff --git a/fabric-item-groups-v0/build.gradle b/fabric-item-groups-v0/build.gradle
index 9c2cef11a..ad5370154 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.6")
+version = getSubprojectVersion(project, "0.1.7")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/FabricCreativeGuiComponents.java b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/FabricCreativeGuiComponents.java
index 3f257ab73..85968d454 100644
--- a/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/FabricCreativeGuiComponents.java
+++ b/fabric-item-groups-v0/src/main/java/net/fabricmc/fabric/impl/item/group/FabricCreativeGuiComponents.java
@@ -52,19 +52,19 @@ public class FabricCreativeGuiComponents {
}
@Override
- public void render(int mouseX, int mouseY, float float_1) {
- this.visible = extensions.fabric_isButtonVisible(type);
- this.active = extensions.fabric_isButtonEnabled(type);
+ public void method_25394(int mouseX, int mouseY, float float_1) {
+ this.field_22764 = extensions.fabric_isButtonVisible(type);
+ this.field_22763 = extensions.fabric_isButtonEnabled(type);
- if (this.visible) {
+ if (this.field_22764) {
MinecraftClient minecraftClient = MinecraftClient.getInstance();
minecraftClient.getTextureManager().bindTexture(BUTTON_TEX);
RenderSystem.disableLighting();
RenderSystem.color4f(1F, 1F, 1F, 1F);
- this.blit(this.x, this.y, (type == Type.NEXT ? 12 : 0), (active ? 0 : 12), 12, 12);
+ this.method_25302(this.field_22760, this.field_22761, (type == Type.NEXT ? 12 : 0), (field_22763 ? 0 : 12), 12, 12);
- if (mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height) {
- gui.renderTooltip(I18n.translate("fabric.gui.creativeTabPage", extensions.fabric_currentPage() + 1, ((ItemGroup.GROUPS.length - 12) / 9) + 2), mouseX, mouseY);
+ if (mouseX >= this.field_22760 && mouseY >= this.field_22761 && mouseX < this.field_22760 + this.field_22758 && mouseY < this.field_22761 + this.field_22759) {
+ gui.method_25424(I18n.translate("fabric.gui.creativeTabPage", extensions.fabric_currentPage() + 1, ((ItemGroup.GROUPS.length - 12) / 9) + 2), mouseX, mouseY);
}
}
}
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 f6b48ee9f..dc5eddb71 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
@@ -26,6 +26,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import net.minecraft.client.gui.screen.ingame.AbstractInventoryScreen;
import net.minecraft.client.gui.screen.ingame.CreativeInventoryScreen;
import net.minecraft.container.Container;
+import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.item.ItemGroup;
import net.minecraft.text.Text;
@@ -115,15 +116,15 @@ public abstract class MixinCreativePlayerInventoryGui extends AbstractInventoryS
}
}
- @Inject(method = "init", at = @At("RETURN"), remap = false)
- private void init(CallbackInfo info) {
+ @Inject(method = "<init>", at = @At("RETURN"), remap = false)
+ private void init(PlayerEntity playerEntity, CallbackInfo info) {
fabric_updateSelection();
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));
+ method_25411(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos + 10, ypos, FabricCreativeGuiComponents.Type.NEXT, this));
+ method_25411(new FabricCreativeGuiComponents.ItemGroupButtonWidget(xpos, ypos, FabricCreativeGuiComponents.Type.PREVIOUS, this));
}
@Inject(method = "setSelectedTab", at = @At("HEAD"), cancellable = true)
diff --git a/fabric-object-builders-v0/build.gradle b/fabric-object-builders-v0/build.gradle
index f1595bf14..e208b125f 100644
--- a/fabric-object-builders-v0/build.gradle
+++ b/fabric-object-builders-v0/build.gradle
@@ -1,5 +1,5 @@
archivesBaseName = "fabric-object-builders"
-version = getSubprojectVersion(project, "0.1.3")
+version = getSubprojectVersion(project, "0.1.4")
dependencies {
compile project(path: ':fabric-api-base', configuration: 'dev')
diff --git a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/entity/FabricEntityTypeBuilder.java b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/entity/FabricEntityTypeBuilder.java
index 59569777a..9e376e3e9 100644
--- a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/entity/FabricEntityTypeBuilder.java
+++ b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/api/entity/FabricEntityTypeBuilder.java
@@ -46,6 +46,8 @@ public class FabricEntityTypeBuilder<T extends Entity> {
private int updateIntervalTicks = -1;
private Boolean alwaysUpdateVelocity;
private boolean immuneToFire = false;
+ private int maxDespawnDistance = 128;
+ private int minDespawnDistance = 32;
private EntityDimensions size = EntityDimensions.changing(-1.0f, -1.0f);
protected FabricEntityTypeBuilder(EntityCategory category, EntityType.EntityFactory<T> function) {
@@ -116,7 +118,7 @@ public class FabricEntityTypeBuilder<T extends Entity> {
}
boolean figureMeOut1 = this.category == EntityCategory.CREATURE || this.category == EntityCategory.MISC; // TODO
- EntityType<T> type = new FabricEntityType<T>(this.function, this.category, this.saveable, this.summonable, this.immuneToFire, figureMeOut1, size, trackingDistance, updateIntervalTicks, alwaysUpdateVelocity);
+ EntityType<T> type = new FabricEntityType<T>(this.function, this.category, this.saveable, this.summonable, this.immuneToFire, figureMeOut1, maxDespawnDistance, minDespawnDistance, size, trackingDistance, updateIntervalTicks, alwaysUpdateVelocity);
return type;
}
diff --git a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java
index ba30066ed..ae1729faf 100644
--- a/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java
+++ b/fabric-object-builders-v0/src/main/java/net/fabricmc/fabric/impl/object/builder/FabricEntityType.java
@@ -25,8 +25,8 @@ public class FabricEntityType<T extends Entity> extends EntityType<T> {
private final int maxTrackDistance, trackTickInterval;
private final Boolean alwaysUpdateVelocity;
- public FabricEntityType(EntityFactory<T> entityType$EntityFactory_1, EntityCategory entityCategory_1, boolean boolean_1, boolean boolean_2, boolean boolean_3, boolean boolean_4, EntityDimensions entitySize_1, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) {
- super(entityType$EntityFactory_1, entityCategory_1, boolean_1, boolean_2, boolean_3, boolean_4, entitySize_1);
+ public FabricEntityType(EntityType.EntityFactory<T> factory, EntityCategory category, boolean bl, boolean summonable, boolean fireImmune, boolean spawnableFarFromPlayer, int i, int j, EntityDimensions entityDimensions, int maxTrackDistance, int trackTickInterval, Boolean alwaysUpdateVelocity) {
+ super(factory, category, bl, summonable, fireImmune, spawnableFarFromPlayer, i, j, entityDimensions);
this.maxTrackDistance = maxTrackDistance;
this.trackTickInterval = trackTickInterval;
this.alwaysUpdateVelocity = alwaysUpdateVelocity;
diff --git a/fabric-resource-loader-v0/build.gradle b/fabric-resource-loader-v0/build.gradle
index a8c84ae66..315242b18 100644
--- a/fabric-resource-loader-v0/build.gradle
+++ b/fabric-resource-loader-v0/build.gradle
@@ -1,2 +1,2 @@
archivesBaseName = "fabric-resource-loader-v0"
-version = getSubprojectVersion(project, "0.1.10")
+version = getSubprojectVersion(project, "0.1.11")
diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/SimpleResourceReloadListener.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/SimpleResourceReloadListener.java
index 5871f2211..526766090 100644
--- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/SimpleResourceReloadListener.java
+++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/api/resource/SimpleResourceReloadListener.java
@@ -45,7 +45,7 @@ import net.minecraft.util.profiler.Profiler;
*/
public interface SimpleResourceReloadListener<T> extends IdentifiableResourceReloadListener {
@Override
- default CompletableFuture<Void> reload(ResourceReloadListener.Synchronizer helper, ResourceManager manager, Profiler loadProfiler, Profiler applyProfiler, Executor loadExecutor, Executor applyExecutor) {
+ default CompletableFuture<Void> method_25931(ResourceReloadListener.Synchronizer helper, ResourceManager manager, Profiler loadProfiler, Profiler applyProfiler, Executor loadExecutor, Executor applyExecutor) {
return load(manager, loadProfiler, loadExecutor).thenCompose(helper::whenPrepared).thenCompose(
(o) -> apply(o, manager, applyProfiler, applyExecutor)
);
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 22629bfeb..d2458d1d6 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -17,7 +17,7 @@
],
"depends": {
"fabricloader": ">=0.7.8",
- "minecraft": "~1.16-alpha.20.6.a"
+ "minecraft": "~1.16-alpha.20.10.a"
},
"description": "Core API module providing key hooks and intercompatibility features."
}