icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mappings

Browse Source
This commit is contained in:
gnembon committed 2020-03-31 02:03:04 -03:00
1 parent 1d86b4a223
commit 40ab2dda8d
5 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=20w13b minecraft_version=20w13b
yarn_mappings=20w13b+build.7 yarn_mappings=20w13b+build.11
loader_version=0.7.8+build.189 loader_version=0.7.8+build.189
# Mod Properties # Mod Properties
src/main/java/carpet/helpers/OptimizedExplosion.java
+2 -2
View File
@@ -184,7 +184,7 @@ public class OptimizedExplosion
double posY = eAccess.getY(); double posY = eAccess.getY();
double posZ = eAccess.getZ(); 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 // explosionSound incremented till disabling the explosion particles and sound
if (explosionSound < 100 || explosionSound % 100 == 0) if (explosionSound < 100 || explosionSound % 100 == 0)
@@ -249,7 +249,7 @@ public class OptimizedExplosion
.put(LootContextParameters.TOOL, ItemStack.EMPTY) .put(LootContextParameters.TOOL, ItemStack.EMPTY)
.putNullable(LootContextParameters.BLOCK_ENTITY, blockEntity); .putNullable(LootContextParameters.BLOCK_ENTITY, blockEntity);
if (eAccess.getBlockDestructionType() == Explosion.DestructionType.DESTROY) if (eAccess.getDestructionType() == Explosion.DestructionType.DESTROY)
lootBuilder.put(LootContextParameters.EXPLOSION_RADIUS, eAccess.getPower()); lootBuilder.put(LootContextParameters.EXPLOSION_RADIUS, eAccess.getPower());
state.getDroppedStacks(lootBuilder).forEach((itemStackx) -> { state.getDroppedStacks(lootBuilder).forEach((itemStackx) -> {
src/main/java/carpet/mixins/ExplosionAccessor.java
+1 -1
View File
@@ -15,7 +15,7 @@ public interface ExplosionAccessor {
boolean isCreateFire(); boolean isCreateFire();
@Accessor @Accessor
Explosion.DestructionType getBlockDestructionType(); Explosion.DestructionType getDestructionType();
@Accessor @Accessor
World getWorld(); World getWorld();
src/main/java/carpet/mixins/ProjectileEntityMixin.java
+1 -1
View File
@@ -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) private void removeOnBlock(BlockHitResult blockHitResult, CallbackInfo ci)
{ {
if (LoggerRegistry.__projectiles && logHelper != null) if (LoggerRegistry.__projectiles && logHelper != null)
src/main/java/carpet/mixins/SpawnHelperMixin.java
+3 -3
View File
@@ -142,7 +142,7 @@ public class SpawnHelperMixin
return entityType.create(world_1); 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", value = "INVOKE",
target = "Lnet/minecraft/server/world/ServerWorld;spawnEntity(Lnet/minecraft/entity/Entity;)Z" target = "Lnet/minecraft/server/world/ServerWorld;spawnEntity(Lnet/minecraft/entity/Entity;)Z"
)) ))
@@ -165,7 +165,7 @@ public class SpawnHelperMixin
return false; 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", 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;" 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; 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", value = "INVOKE",
target = "Lnet/minecraft/entity/player/PlayerEntity;squaredDistanceTo(DDD)D" target = "Lnet/minecraft/entity/player/PlayerEntity;squaredDistanceTo(DDD)D"
)) ))