From feb567a1933dced276ae483b6febebbc7ad7a637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E9=9B=A8=E8=90=BD?= <53731501+AmemiyaSigure@users.noreply.github.com> Date: Sat, 2 Jan 2021 19:10:24 +0800 Subject: [PATCH] Update forge version to 35.1.28 (#113) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Bump forge to 35.1.15 （还真跑起来了） Signed-off-by: 秋雨落 * Update forge to 35.1.28 Signed-off-by: 秋雨落 * Change forge version number of README.md Signed-off-by: 秋雨落 --- README.md | 2 +- arclight-common/build.gradle | 2 +- .../io/izzel/arclight/common/mixin/core/entity/EntityMixin.java | 2 +- .../arclight/common/mixin/core/entity/LivingEntityMixin.java | 1 - arclight-forge-1.16/build.gradle | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 4c670255..038a236b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin. | Minecraft | Forge | Status | Build | | :----: | :----: | :---: | :---: | -| 1.16.x | 35.1.4 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) | +| 1.16.x | 35.1.28 | ACTIVE | [![1.16 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-16?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-16) | | 1.15.x | 31.2.47 | ACTIVE | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) | | 1.14.x | 28.2.0 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.0.6) | [![1.14 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight) | diff --git a/arclight-common/build.gradle b/arclight-common/build.gradle index 3295a64e..1b310b58 100644 --- a/arclight-common/build.gradle +++ b/arclight-common/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'io.izzel.arclight' ext { minecraftVersion = '1.16.4' - forgeVersion = '35.1.4' + forgeVersion = '35.1.28' } arclight { diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java index d99275a2..c2983121 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/EntityMixin.java @@ -126,7 +126,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge, @Shadow @Nullable public abstract MinecraftServer getServer(); @Shadow public abstract Vector3d getMotion(); @Shadow public abstract EntityType getType(); - @Shadow(remap = false) public abstract void remove(boolean keepData); + @Shadow(remap = false) public void remove(boolean keepData) { } @Shadow @Final protected Random rand; @Shadow public abstract float getWidth(); @Shadow public abstract float getHeight(); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java index 4ba7ffb0..6bdcdddc 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/LivingEntityMixin.java @@ -102,7 +102,6 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt @Shadow public PlayerEntity attackingPlayer; @Shadow public int deathTime; @Shadow protected boolean dead; - @Shadow(remap = false) public void remove(boolean keepData) { } @Shadow public abstract ModifiableAttributeInstance getAttribute(Attribute attribute); @Shadow public boolean potionsNeedUpdate; @Shadow public abstract boolean removePotionEffect(Effect effectIn); diff --git a/arclight-forge-1.16/build.gradle b/arclight-forge-1.16/build.gradle index 1d8d09ae..48ccd1f8 100644 --- a/arclight-forge-1.16/build.gradle +++ b/arclight-forge-1.16/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'maven-publish' ext { minecraftVersion = '1.16.4' - forgeVersion = '35.1.4' + forgeVersion = '35.1.28' } arclight {