From 40ab2dda8d678d1fc09a8fd2ce5ec898f8a45df4 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 31 Mar 2020 02:03:04 -0300 Subject: [PATCH] mappings --- gradle.properties | 2 +- src/main/java/carpet/helpers/OptimizedExplosion.java | 4 ++-- src/main/java/carpet/mixins/ExplosionAccessor.java | 2 +- src/main/java/carpet/mixins/ProjectileEntityMixin.java | 2 +- src/main/java/carpet/mixins/SpawnHelperMixin.java | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index c01837f2..96c95b15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w13b - yarn_mappings=20w13b+build.7 + yarn_mappings=20w13b+build.11 loader_version=0.7.8+build.189 # Mod Properties diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index 26f43ec6..081d5287 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -184,7 +184,7 @@ public class OptimizedExplosion double posY = eAccess.getY(); double posZ = eAccess.getZ(); - boolean damagesTerrain = eAccess.getBlockDestructionType() != Explosion.DestructionType.NONE; + boolean damagesTerrain = eAccess.getDestructionType() != Explosion.DestructionType.NONE; // explosionSound incremented till disabling the explosion particles and sound if (explosionSound < 100 || explosionSound % 100 == 0) @@ -249,7 +249,7 @@ public class OptimizedExplosion .put(LootContextParameters.TOOL, ItemStack.EMPTY) .putNullable(LootContextParameters.BLOCK_ENTITY, blockEntity); - if (eAccess.getBlockDestructionType() == Explosion.DestructionType.DESTROY) + if (eAccess.getDestructionType() == Explosion.DestructionType.DESTROY) lootBuilder.put(LootContextParameters.EXPLOSION_RADIUS, eAccess.getPower()); state.getDroppedStacks(lootBuilder).forEach((itemStackx) -> { diff --git a/src/main/java/carpet/mixins/ExplosionAccessor.java b/src/main/java/carpet/mixins/ExplosionAccessor.java index 1a864ec6..f75510fc 100644 --- a/src/main/java/carpet/mixins/ExplosionAccessor.java +++ b/src/main/java/carpet/mixins/ExplosionAccessor.java @@ -15,7 +15,7 @@ public interface ExplosionAccessor { boolean isCreateFire(); @Accessor - Explosion.DestructionType getBlockDestructionType(); + Explosion.DestructionType getDestructionType(); @Accessor World getWorld(); diff --git a/src/main/java/carpet/mixins/ProjectileEntityMixin.java b/src/main/java/carpet/mixins/ProjectileEntityMixin.java index a5583f19..9da4b575 100644 --- a/src/main/java/carpet/mixins/ProjectileEntityMixin.java +++ b/src/main/java/carpet/mixins/ProjectileEntityMixin.java @@ -46,7 +46,7 @@ public abstract class ProjectileEntityMixin extends Entity } } - @Inject(method = "method_24920", at = @At("RETURN")) // on block hit + @Inject(method = "onBlockHit", at = @At("RETURN")) private void removeOnBlock(BlockHitResult blockHitResult, CallbackInfo ci) { if (LoggerRegistry.__projectiles && logHelper != null) diff --git a/src/main/java/carpet/mixins/SpawnHelperMixin.java b/src/main/java/carpet/mixins/SpawnHelperMixin.java index 509e3e7f..255841d5 100644 --- a/src/main/java/carpet/mixins/SpawnHelperMixin.java +++ b/src/main/java/carpet/mixins/SpawnHelperMixin.java @@ -142,7 +142,7 @@ public class SpawnHelperMixin return entityType.create(world_1); } - @Redirect(method = "method_24930", at = @At( + @Redirect(method = "spawnEntitiesInChunk(Lnet/minecraft/entity/EntityCategory;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;)V", at = @At( value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;spawnEntity(Lnet/minecraft/entity/Entity;)Z" )) @@ -165,7 +165,7 @@ public class SpawnHelperMixin return false; } - @Redirect(method = "method_24930", at = @At( + @Redirect(method = "spawnEntitiesInChunk(Lnet/minecraft/entity/EntityCategory;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;)V", at = @At( value = "INVOKE", target = "Lnet/minecraft/entity/mob/MobEntity;initialize(Lnet/minecraft/world/IWorld;Lnet/minecraft/world/LocalDifficulty;Lnet/minecraft/entity/SpawnType;Lnet/minecraft/entity/EntityData;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/entity/EntityData;" )) @@ -176,7 +176,7 @@ public class SpawnHelperMixin return null; } - @Redirect(method = "method_24930", at = @At( + @Redirect(method = "spawnEntitiesInChunk(Lnet/minecraft/entity/EntityCategory;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;)V", at = @At( value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;squaredDistanceTo(DDD)D" ))