Tianpao/Arclight
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Forge 36.0.42

Browse Source
This commit is contained in:
IzzelAliz 2021-02-21 00:36:58 +08:00
parent a392e7c441
commit 141db3dfba
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
| Minecraft | Forge | Status | Build |
| :----: | :----: | :---: | :---: |
| 1.16.x | 36.0.14 | 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 | 36.0.42 | 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.48 | 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) |

5
arclight-common/build.gradle
View File

@ -18,11 +18,6 @@ apply plugin: 'java'
apply plugin: 'idea'
apply plugin: 'io.izzel.arclight'
ext {
minecraftVersion = '1.16.5'
forgeVersion = '36.0.14'
}
arclight {
mcVersion = minecraftVersion
forgeVersion = project.ext.forgeVersion

5
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/ItemStackMixin.java
View File

@ -9,6 +9,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import net.minecraftforge.common.capabilities.CapabilityProvider;
import net.minecraftforge.registries.IRegistryDelegate;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.bukkit.craftbukkit.v.event.CraftEventFactory;
@ -16,7 +17,9 @@ import org.bukkit.craftbukkit.v.inventory.CraftItemStack;
import org.bukkit.craftbukkit.v.util.CraftMagicNumbers;
import org.bukkit.event.player.PlayerItemDamageEvent;
import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Mutable;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
@ -33,6 +36,7 @@ public abstract class ItemStackMixin extends CapabilityProvider<ItemStack> imple
@Shadow @Deprecated private Item item;
@Shadow private int count;
@Shadow(remap = false) private CompoundNBT capNBT;
@Mutable @Shadow @Final private IRegistryDelegate<Item> delegate;
// @formatter:on
protected ItemStackMixin(Class<ItemStack> baseClass) {
@ -92,5 +96,6 @@ public abstract class ItemStackMixin extends CapabilityProvider<ItemStack> imple
@Deprecated
public void setItem(Item item) {
this.item = item;
this.delegate = item.delegate;
}
}

2
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/MinecraftServerMixin.java
View File

@ -371,6 +371,7 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
ChunkPos chunkpos = new ChunkPos(i);
serverWorld.getChunkProvider().forceChunk(chunkpos, true);
}
net.minecraftforge.common.world.ForgeChunkManager.reinstatePersistentChunks(serverWorld, forcedchunkssavedata);
}
}
Bukkit.getPluginManager().callEvent(new WorldLoadEvent(((WorldBridge) serverWorld).bridge$getWorld()));
@ -444,6 +445,7 @@ public abstract class MinecraftServerMixin extends RecursiveEventLoop<TickDelaye
ChunkPos chunkpos = new ChunkPos(i);
serverWorld.getChunkProvider().forceChunk(chunkpos, true);
}
net.minecraftforge.common.world.ForgeChunkManager.reinstatePersistentChunks(serverWorld, forcedchunkssavedata);
}
this.executeModerately();
listener.stop();

5
arclight-forge-1.16/build.gradle
View File

@ -19,11 +19,6 @@ apply plugin: 'idea'
apply plugin: 'io.izzel.arclight'
apply plugin: 'maven-publish'
ext {
minecraftVersion = '1.16.5'
forgeVersion = '36.0.14'
}
arclight {
mcVersion = minecraftVersion
forgeVersion = project.ext.forgeVersion

2
build.gradle
View File

@ -4,6 +4,8 @@ allprojects {
ext {
agpVersion = '1.14'
minecraftVersion = '1.16.5'
forgeVersion = '36.0.42'
}
task cleanBuild {