diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java index 81306f05de..6d99767bce 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockBooleanDirectrix.java @@ -70,7 +70,7 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di @Override public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) { - // No entering from the front, no entering from the back. + // No entering from either of the output faces return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING); } diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java index 3853f17805..703b46350b 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockEmptyDirectrix.java @@ -43,7 +43,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di @Override public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) { - return true; + // No entering from either of the output faces + return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING); } @Override diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java index 0143d8e3f7..f8b8511f94 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/directrix/BlockRedstoneDirectrix.java @@ -46,7 +46,8 @@ public ControlFlow acceptControlFlow(CastingImage imageIn, CircleCastEnv env, Di @Override public boolean canEnterFromDirection(Direction enterDir, BlockPos pos, BlockState bs, ServerLevel world) { - return true; + // No entering from either of the output faces + return enterDir != bs.getValue(FACING).getOpposite() && enterDir != bs.getValue(FACING); } @Override diff --git a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockEntityRedstoneImpetus.java b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockEntityRedstoneImpetus.java index b776d156ce..ca7af5d23f 100644 --- a/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockEntityRedstoneImpetus.java +++ b/Common/src/main/java/at/petrak/hexcasting/common/blocks/circles/impetuses/BlockEntityRedstoneImpetus.java @@ -69,8 +69,6 @@ public void updatePlayerProfile() { this.storedPlayerProfile = newProfile; this.setChanged(); } - } else { - this.storedPlayerProfile = null; } } @@ -88,7 +86,11 @@ public ServerPlayer getStoredPlayer() { if (e instanceof ServerPlayer player) { return player; } else { - HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e); + // if owner is offline then getEntity will return null + // if e is somehow neither null nor a player, something is very wrong + if (e != null) { + HexAPI.LOGGER.error("Entity {} stored in a cleric impetus wasn't a player somehow", e); + } return null; } } diff --git a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 index 331a158405..ef70aad6e0 100644 --- a/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 +++ b/Common/src/main/resources/assets/hexcasting/lang/en_us.flatten.json5 @@ -381,6 +381,14 @@ "": "Greater Teleport Splats Items", "@Tooltip": "Whether items should fly out of the player's inventory when using Greater Teleport" }, + doesTrueNameHaveAmbit: { + "": "Does True Name Have Ambit", + "@Tooltip": "Whether True Names (ie entity references to a player) should allow targeting the referenced player even outside of normal ambit", + }, + tpDimDenylist: { + "": "Teleport Dimension Deny List", + "@Tooltip": "Resource locations of dimensions where teleportation is not allowed", + }, villagersOffendedByMindMurder: { "": "Villagers Offended By Mind Murder", "@Tooltip": "Whether villagers should be angry at the player when other villagers are mindflayed", @@ -802,7 +810,7 @@ arcsin: "Inverse Sine Purification", arccos: "Inverse Cosine Purification", arctan: "Inverse Tangent Purification", - arctan2: "Inverse Tangent Purification II", + arctan2: "Inverse Tangent Distillation", random: "Entropy Reflection", logarithm: "Logarithmic Distillation", coerce_axial: "Axial Purification", @@ -933,7 +941,7 @@ arcsin: "Inverse Sine Prfn.", arccos: "Inverse Cosine Prfn.", arctan: "Inverse Tangent Prfn.", - arctan2: "Inverse Tan. Prfn. II", + arctan2: "Inverse Tangent Dstl.", "const/vec/": { x: "Vector Rfln. +X/-X", @@ -1037,9 +1045,9 @@ entity: { "": "an entity", + mob: "a mob", item: "an item entity", player: "a player", - villager: "a villager", living: "a living entity", }, diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_false.png b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_false.png index e93da18646..fe9a7db264 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_false.png and b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_false.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_true.png b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_true.png index c4e385e49e..81bb72228d 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_true.png and b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/boolean/right_true.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_dim.png b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_dim.png index 23ee08082f..fda21c7547 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_dim.png and b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_dim.png differ diff --git a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_lit.png b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_lit.png index 0a2f3c7cde..92ac1e67ce 100644 Binary files a/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_lit.png and b/Common/src/main/resources/assets/hexcasting/textures/block/circle/directrix/empty/top_lit.png differ