Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update forge to 37.0.103

Browse Source
This commit is contained in:
IzzelAliz 2021-10-22 16:17:05 +08:00
parent f434cd49d2
commit 4c739f8a5a
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
7 changed files with 10 additions and 9 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 | | Minecraft | Forge | Status | Build |
| :----: | :----: | :---: | :---: | | :----: | :----: | :---: | :---: |
| 1.17.x | 37.0.44 | ACTIVE | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) | | 1.17.x | 37.0.103 | ACTIVE | [![1.17 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-17?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-17) |
| 1.16.x | 36.2.0 | 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.2.0 | 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 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![1.15 Status](https://img.shields.io/appveyor/build/IzzelAliz/arclight-15?style=flat-square)](https://ci.appveyor.com/project/IzzelAliz/arclight-15) | | 1.15.x | 31.2.48 | [LEGACY](https://github.com/IzzelAliz/Arclight/releases/tag/1.15/1.0.19) | [![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) | | 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/src/main/java/io/izzel/arclight/common/mixin/core/fluid/LavaFluidMixin.java
View File

@ -3,6 +3,7 @@ package io.izzel.arclight.common.mixin.core.fluid;
import io.izzel.arclight.common.bridge.core.world.IWorldBridge; import io.izzel.arclight.common.bridge.core.world.IWorldBridge;
import io.izzel.arclight.mixin.Eject; import io.izzel.arclight.mixin.Eject;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.GameRules; import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelAccessor;
@ -26,7 +27,7 @@ public abstract class LavaFluidMixin {
// @formatter:off // @formatter:off
@Shadow protected abstract boolean hasFlammableNeighbours(LevelReader worldIn, BlockPos pos); @Shadow protected abstract boolean hasFlammableNeighbours(LevelReader worldIn, BlockPos pos);
@Shadow protected abstract boolean isFlammable(LevelReader worldIn, BlockPos pos); @Shadow protected abstract boolean isFlammable(LevelReader level, BlockPos pos, Direction face);
// @formatter:on // @formatter:on
/** /**
@ -68,7 +69,7 @@ public abstract class LavaFluidMixin {
return; return;
} }
if (world.isEmptyBlock(blockpos1.above()) && this.isFlammable(world, blockpos1)) { if (world.isEmptyBlock(blockpos1.above()) && this.isFlammable(world, blockpos1, Direction.UP)) {
BlockPos up = blockpos1.above(); BlockPos up = blockpos1.above();
if (world.getBlockState(up).getBlock() != Blocks.FIRE) { if (world.getBlockState(up).getBlock() != Blocks.FIRE) {
if (CraftEventFactory.callBlockIgniteEvent(world, up, pos).isCancelled()) { if (CraftEventFactory.callBlockIgniteEvent(world, up, pos).isCancelled()) {

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

@ -260,7 +260,7 @@ public abstract class ServerLevelMixin extends LevelMixin implements ServerWorld
private transient CreatureSpawnEvent.SpawnReason arclight$reason; private transient CreatureSpawnEvent.SpawnReason arclight$reason;
@Inject(method = "addEntity", cancellable = true, at = @At(value = "INVOKE", remap = false, target = "Lnet/minecraftforge/eventbus/api/IEventBus;post(Lnet/minecraftforge/eventbus/api/Event;)Z")) @Inject(method = "addEntity", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;addNewEntity(Lnet/minecraft/world/level/entity/EntityAccess;)Z"))
private void arclight$addEntityEvent(Entity entityIn, CallbackInfoReturnable<Boolean> cir) { private void arclight$addEntityEvent(Entity entityIn, CallbackInfoReturnable<Boolean> cir) {
CreatureSpawnEvent.SpawnReason reason = arclight$reason == null ? CreatureSpawnEvent.SpawnReason.DEFAULT : arclight$reason; CreatureSpawnEvent.SpawnReason reason = arclight$reason == null ? CreatureSpawnEvent.SpawnReason.DEFAULT : arclight$reason;
arclight$reason = null; arclight$reason = null;

2
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/LivingEntityMixin.java
View File

@ -347,7 +347,7 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt
return false; return false;
} }
MinecraftForge.EVENT_BUS.post(new PotionEvent.PotionAddedEvent((LivingEntity) (Object) this, effectinstance, effectInstanceIn)); MinecraftForge.EVENT_BUS.post(new PotionEvent.PotionAddedEvent((LivingEntity) (Object) this, effectinstance, effectInstanceIn, entity));
if (effectinstance == null) { if (effectinstance == null) {
this.activeEffects.put(effectInstanceIn.getEffect(), effectInstanceIn); this.activeEffects.put(effectInstanceIn.getEffect(), effectInstanceIn);
this.onEffectAdded(effectInstanceIn, entity); this.onEffectAdded(effectInstanceIn, entity);

4
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/world/entity/item/PrimedTntMixin.java
View File

@ -31,13 +31,13 @@ public abstract class PrimedTntMixin extends EntityMixin {
@Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN")) @Inject(method = "<init>(Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V", at = @At("RETURN"))
private void arclight$init(EntityType<? extends PrimedTnt> type, Level worldIn, CallbackInfo ci) { private void arclight$init(EntityType<? extends PrimedTnt> type, Level worldIn, CallbackInfo ci) {
yield = 4; this.yield = 4;
isIncendiary = false; isIncendiary = false;
} }
@Inject(method = "<init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/entity/LivingEntity;)V", at = @At("RETURN")) @Inject(method = "<init>(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/entity/LivingEntity;)V", at = @At("RETURN"))
private void arclight$init(Level worldIn, double x, double y, double z, LivingEntity igniter, CallbackInfo ci) { private void arclight$init(Level worldIn, double x, double y, double z, LivingEntity igniter, CallbackInfo ci) {
yield = 4; this.yield = 4;
isIncendiary = false; isIncendiary = false;
} }

2
build.gradle
View File

@ -14,7 +14,7 @@ allprojects {
ext { ext {
agpVersion = '1.20' agpVersion = '1.20'
minecraftVersion = '1.17.1' minecraftVersion = '1.17.1'
forgeVersion = '37.0.44' forgeVersion = '37.0.103'
apiVersion = '1.1.+' apiVersion = '1.1.+'
toolsVersion = '1.3.+' toolsVersion = '1.3.+'
mixinVersion = '0.8.4' mixinVersion = '0.8.4'

2
forge-installer/src/main/java/io/izzel/arclight/forgeinstaller/ForgeInstaller.java
View File

@ -85,7 +85,7 @@ public class ForgeInstaller {
new URL[]{new File(String.format("forge-%s-%s-installer.jar", installInfo.installer.minecraft, installInfo.installer.forge)).toURI().toURL()}, new URL[]{new File(String.format("forge-%s-%s-installer.jar", installInfo.installer.minecraft, installInfo.installer.forge)).toURI().toURL()},
ForgeInstaller.class.getClassLoader().getParent()); ForgeInstaller.class.getClassLoader().getParent());
Method method = loader.loadClass("net.minecraftforge.installer.SimpleInstaller").getMethod("main", String[].class); Method method = loader.loadClass("net.minecraftforge.installer.SimpleInstaller").getMethod("main", String[].class);
method.invoke(null, (Object) new String[]{"--installServer", "."}); method.invoke(null, (Object) new String[]{"--installServer", ".", "--debug"});
} }
} }
handleFutures(array); handleFutures(array);