Skip to content

Commit d8b2972

Browse files
committed
Performed some consistency updates to things based on vanilla changes between 1.20.2 and 1.20.6:
- Made various teleportations use the new player teleport sound instead of enderman teleport sound - Allow enchanting hazmat gear
1 parent 3333c4b commit d8b2972

File tree

20 files changed

+53
-49
lines changed

20 files changed

+53
-49
lines changed

build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,8 @@ dependencies {
386386
compileOnly("curse.maven:jade-api-324717:${jade_api_id}")
387387
localRuntime("curse.maven:jade-324717:${jade_id}")
388388
compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
389+
//localRuntime("mcp.mobius.waila:wthit:neo-${wthit_version}")
390+
//localRuntime('lol.bai:badpackets:neo-0.8.1')
389391

390392
def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${minecraft_version}:${crafttweaker_version}"
391393
compileOnly(crt)

src/additions/java/mekanism/additions/common/block/BlockObsidianTNT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public static boolean createAndAddEntity(@NotNull Level world, @NotNull BlockPos
126126
PrimedTnt tnt = EntityObsidianTNT.create(world, pos.getX() + 0.5F, pos.getY(), pos.getZ() + 0.5F, igniter);
127127
if (tnt != null) {
128128
world.addFreshEntity(tnt);
129-
world.playSound(null, tnt.getX(), tnt.getY(), tnt.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS, 1.0F, 1.0F);
129+
world.playSound(null, tnt.getX(), tnt.getY(), tnt.getZ(), SoundEvents.TNT_PRIMED, SoundSource.BLOCKS);
130130
return true;
131131
}
132132
return false;

src/datagen/generated/mekanism/.cache/f4271571320fe007f5d8ba9eb4461ed6922f6a93

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/entity_type/can_breathe_under_water.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/item/enchantable/chest_armor.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/item/enchantable/durability.json

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/item/enchantable/equippable.json

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/item/enchantable/foot_armor.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/minecraft/tags/item/enchantable/head_armor.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)