Skip to content

Commit

Permalink
Merge pull request #127 from Chainmail-Studios/shnup
Browse files Browse the repository at this point in the history
whoops
  • Loading branch information
Shnupbups authored Jul 1, 2020
2 parents b362dc7 + 37dc2d5 commit eca2029
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ api_version = 0.14.1+build.372-1.16

# Mod
mod_name = astromine
mod_version = 1.0.19
mod_version = 1.0.20
mod_group = com.github.chainmailstudios
version_meta = fabric-1.16.1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ public ActionResult useOnBlock(ItemUsageContext context) {

if ((parent.getPos().getX() != entity.getPos().getX() && parent.getPos().getZ() != entity.getPos().getZ()) || oP.getSquaredDistance(nP) > 65536) {
CACHE.put(world, null);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), entity.getPos().toShortString()).formatted(Formatting.RED), true);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), toShortString(entity.getPos())).formatted(Formatting.RED), true);
world.playSound(context.getPlayer(), context.getBlockPos(), AstromineSounds.HOLOGRAPHIC_CONNECTOR_CLICK, SoundCategory.PLAYERS, 0.5f, 0.33f);
return ActionResult.FAIL;
} else if (parent.getCachedState().get(HorizontalFacingBlock.FACING).getOpposite() != entity.getCachedState().get(HorizontalFacingBlock.FACING)) {
CACHE.put(world, null);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), entity.getPos().toShortString()).formatted(Formatting.RED), true);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_failed", toShortString(parent.getPos()), toShortString(entity.getPos())).formatted(Formatting.RED), true);
world.playSound(context.getPlayer(), context.getBlockPos(), AstromineSounds.HOLOGRAPHIC_CONNECTOR_CLICK, SoundCategory.PLAYERS, 0.5f, 0.33f);
return ActionResult.FAIL;
}
Expand All @@ -85,7 +85,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {

if (world.isClient) {
CACHE.put(world, null);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_successful", parent.getPos().toShortString(), entity.getPos().toShortString()).formatted(Formatting.GREEN), true);
context.getPlayer().sendMessage(new TranslatableText("text.astromine.message.holographic_connection_successful", toShortString(parent.getPos()), toShortString(entity.getPos())).formatted(Formatting.GREEN), true);
world.playSound(context.getPlayer(), context.getBlockPos(), AstromineSounds.HOLOGRAPHIC_CONNECTOR_CLICK, SoundCategory.PLAYERS, 0.5f, 0.33f);
}
}
Expand Down

0 comments on commit eca2029

Please sign in to comment.