Update to forge 36.1.62
This commit is contained in:
parent
47c1884141
commit
d43280ca0d
|
@ -6,7 +6,7 @@ A Bukkit server implementation utilizing Mixin.
|
||||||
|
|
||||||
| Minecraft | Forge | Status | Build |
|
| Minecraft | Forge | Status | Build |
|
||||||
| :----: | :----: | :---: | :---: |
|
| :----: | :----: | :---: | :---: |
|
||||||
| 1.16.x | 36.1.24 | 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.1.62 | 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) |
|
||||||
|
|
||||||
|
|
|
@ -759,7 +759,7 @@ public abstract class EntityMixin implements InternalEntityBridge, EntityBridge,
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
CraftEventFactory.entityDamage = entity;
|
CraftEventFactory.entityDamage = entity;
|
||||||
if (!this.attackEntityFrom(DamageSource.LIGHTNING_BOLT, 5.0F)) {
|
if (!this.attackEntityFrom(DamageSource.LIGHTNING_BOLT, amount)) {
|
||||||
CraftEventFactory.entityDamage = null;
|
CraftEventFactory.entityDamage = null;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -791,8 +791,8 @@ public abstract class LivingEntityMixin extends EntityMixin implements LivingEnt
|
||||||
// CraftBukkit end
|
// CraftBukkit end
|
||||||
float f3 = this.getHealth();
|
float f3 = this.getHealth();
|
||||||
|
|
||||||
this.setHealth(f3 - f);
|
|
||||||
this.getCombatTracker().trackDamage(damagesource, f3, f);
|
this.getCombatTracker().trackDamage(damagesource, f3, f);
|
||||||
|
this.setHealth(f3 - f); // Forge: moved to fix MC-121048
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
if (!human) {
|
if (!human) {
|
||||||
this.setAbsorptionAmount(this.getAbsorptionAmount() - f);
|
this.setAbsorptionAmount(this.getAbsorptionAmount() - f);
|
||||||
|
|
|
@ -272,8 +272,8 @@ public abstract class PlayerEntityMixin extends LivingEntityMixin implements Pla
|
||||||
if (f > 0.0f || f2 > 0.0f) {
|
if (f > 0.0f || f2 > 0.0f) {
|
||||||
final boolean flag = f3 > 0.9f;
|
final boolean flag = f3 > 0.9f;
|
||||||
boolean flag2 = false;
|
boolean flag2 = false;
|
||||||
final byte b0 = 0;
|
float i = (float)this.getAttributeValue(Attributes.ATTACK_KNOCKBACK); // Forge: Initialize this value to the attack knockback attribute of the player, which is by default 0
|
||||||
int i = b0 + EnchantmentHelper.getKnockbackModifier((PlayerEntity) (Object) this);
|
i += EnchantmentHelper.getKnockbackModifier((PlayerEntity) (Object) this);
|
||||||
if (this.isSprinting() && flag) {
|
if (this.isSprinting() && flag) {
|
||||||
this.world.playSound(null, this.getPosX(), this.getPosY(), this.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_KNOCKBACK, this.getSoundCategory(), 1.0f, 1.0f);
|
this.world.playSound(null, this.getPosX(), this.getPosY(), this.getPosZ(), SoundEvents.ENTITY_PLAYER_ATTACK_KNOCKBACK, this.getSoundCategory(), 1.0f, 1.0f);
|
||||||
++i;
|
++i;
|
||||||
|
|
|
@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||||
import net.minecraft.block.Blocks;
|
import net.minecraft.block.Blocks;
|
||||||
import net.minecraft.entity.item.ExperienceOrbEntity;
|
import net.minecraft.entity.item.ExperienceOrbEntity;
|
||||||
import net.minecraft.entity.player.PlayerEntity;
|
import net.minecraft.entity.player.PlayerEntity;
|
||||||
|
import net.minecraft.inventory.ISidedInventory;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.item.Items;
|
import net.minecraft.item.Items;
|
||||||
import net.minecraft.item.crafting.IRecipe;
|
import net.minecraft.item.crafting.IRecipe;
|
||||||
|
@ -86,10 +87,11 @@ public abstract class AbstractFurnaceTileEntityMixin extends LockableTileEntityM
|
||||||
* @reason
|
* @reason
|
||||||
*/
|
*/
|
||||||
@Overwrite
|
@Overwrite
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
private void smelt(@Nullable IRecipe<?> recipe) {
|
private void smelt(@Nullable IRecipe<?> recipe) {
|
||||||
if (recipe != null && this.canSmelt(recipe)) {
|
if (recipe != null && this.canSmelt(recipe)) {
|
||||||
ItemStack itemstack = this.items.get(0);
|
ItemStack itemstack = this.items.get(0);
|
||||||
ItemStack itemstack1 = recipe.getRecipeOutput();
|
ItemStack itemstack1 = ((IRecipe<ISidedInventory>) recipe).getCraftingResult((AbstractFurnaceTileEntity)(Object)this);
|
||||||
ItemStack itemstack2 = this.items.get(2);
|
ItemStack itemstack2 = this.items.get(2);
|
||||||
|
|
||||||
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
|
CraftItemStack source = CraftItemStack.asCraftMirror(itemstack);
|
||||||
|
|
|
@ -169,16 +169,6 @@ public abstract class ServerWorldMixin extends WorldMixin implements ServerWorld
|
||||||
return this.convertable;
|
return this.convertable;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Inject(method = "addEntityIfNotDuplicate", at = @At("HEAD"))
|
|
||||||
private void arclight$worldGenAddStart(Entity entityIn, CallbackInfoReturnable<Boolean> cir) {
|
|
||||||
ArclightCaptures.captureWorldGenAddEntity();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "addEntityIfNotDuplicate", at = @At("RETURN"))
|
|
||||||
private void arclight$worldGenAddEnd(Entity entityIn, CallbackInfoReturnable<Boolean> cir) {
|
|
||||||
ArclightCaptures.resetWorldGenAddEntity();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Inject(method = "onEntityAdded", at = @At("RETURN"))
|
@Inject(method = "onEntityAdded", at = @At("RETURN"))
|
||||||
private void arclight$validEntity(Entity entityIn, CallbackInfo ci) {
|
private void arclight$validEntity(Entity entityIn, CallbackInfo ci) {
|
||||||
((EntityBridge) entityIn).bridge$setValid(true);
|
((EntityBridge) entityIn).bridge$setValid(true);
|
||||||
|
|
|
@ -230,20 +230,6 @@ public class ArclightCaptures {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static transient boolean worldGenAdd;
|
|
||||||
|
|
||||||
public static void captureWorldGenAddEntity() {
|
|
||||||
worldGenAdd = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isWorldGenAdd() {
|
|
||||||
return worldGenAdd;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void resetWorldGenAddEntity() {
|
|
||||||
worldGenAdd = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void recapture(String type) {
|
private static void recapture(String type) {
|
||||||
throw new IllegalStateException("Recapturing " + type);
|
throw new IllegalStateException("Recapturing " + type);
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@ allprojects {
|
||||||
ext {
|
ext {
|
||||||
agpVersion = '1.17'
|
agpVersion = '1.17'
|
||||||
minecraftVersion = '1.16.5'
|
minecraftVersion = '1.16.5'
|
||||||
forgeVersion = '36.1.24'
|
forgeVersion = '36.1.62'
|
||||||
apiVersion = '1.0.+'
|
apiVersion = '1.0.+'
|
||||||
toolsVersion = '1.3.+'
|
toolsVersion = '1.3.+'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user