diff --git a/src/main/java/com/Da_Technomancer/crossroads/blocks/rotary/RotaryDrillTileEntity.java b/src/main/java/com/Da_Technomancer/crossroads/blocks/rotary/RotaryDrillTileEntity.java index f6ee09855..0bb775b7d 100644 --- a/src/main/java/com/Da_Technomancer/crossroads/blocks/rotary/RotaryDrillTileEntity.java +++ b/src/main/java/com/Da_Technomancer/crossroads/blocks/rotary/RotaryDrillTileEntity.java @@ -2,7 +2,6 @@ import com.Da_Technomancer.crossroads.ambient.particles.CRParticles; import com.Da_Technomancer.crossroads.api.CRProperties; -import com.Da_Technomancer.crossroads.api.MiscUtil; import com.Da_Technomancer.crossroads.api.rotary.IAxleCapable; import com.Da_Technomancer.crossroads.api.rotary.IAxleHandler; import com.Da_Technomancer.crossroads.api.templates.ModuleTE; @@ -26,6 +25,7 @@ import net.neoforged.neoforge.common.util.FakePlayerFactory; import javax.annotation.Nullable; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.UUID; @@ -42,6 +42,7 @@ public RotaryDrillTileEntity(BlockPos pos, BlockState state){ private static final double SPEED_PER_HARDNESS = .2D; private static final float DAMAGE_PER_SPEED = 0.5F; public static final double[] INERTIA = {50, 100}; + private static final GameProfile DRILL_PROFILE = new GameProfile(UUID.nameUUIDFromBytes("crossroads:rotary_drill".getBytes(StandardCharsets.UTF_8)), "crossroads:rotary_drill"); public boolean isGolden(){ return getBlockState().getBlock() == CRBlocks.rotaryDrillGold; @@ -62,7 +63,7 @@ private Direction getFacing(){ } private static FakePlayer getFakePlayer(ServerLevel level){ - return FakePlayerFactory.get(level, new GameProfile(UUID.randomUUID(), "drill_player_" + MiscUtil.getDimensionName(level))); + return FakePlayerFactory.get(level, DRILL_PROFILE); } @Override diff --git a/src/main/java/com/Da_Technomancer/crossroads/effects/beam_effects/PlaceEffect.java b/src/main/java/com/Da_Technomancer/crossroads/effects/beam_effects/PlaceEffect.java index e6f708b84..277215e46 100644 --- a/src/main/java/com/Da_Technomancer/crossroads/effects/beam_effects/PlaceEffect.java +++ b/src/main/java/com/Da_Technomancer/crossroads/effects/beam_effects/PlaceEffect.java @@ -3,7 +3,6 @@ import com.Da_Technomancer.crossroads.CRConfig; import com.Da_Technomancer.crossroads.Crossroads; import com.Da_Technomancer.crossroads.advancements.GolemBuiltTrigger; -import com.Da_Technomancer.crossroads.api.MiscUtil; import com.Da_Technomancer.crossroads.api.beams.BeamHit; import com.Da_Technomancer.crossroads.api.beams.EnumBeamAlignments; import com.mojang.authlib.GameProfile; @@ -30,14 +29,16 @@ import net.neoforged.neoforge.common.util.FakePlayer; import net.neoforged.neoforge.common.util.FakePlayerFactory; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.UUID; public class PlaceEffect extends BeamEffect{ + private static final GameProfile BLOCK_PLACER_PROFILE = new GameProfile(UUID.nameUUIDFromBytes("crossroads:block_placer".getBytes(StandardCharsets.UTF_8)), "crossroads:block_placer"); + public static FakePlayer getBlockFakePlayer(ServerLevel world){ - GameProfile fakePlayerProfile = new GameProfile(UUID.randomUUID(), Crossroads.MODID + "-block-fake-player-" + MiscUtil.getDimensionName(world)); - return FakePlayerFactory.get(world, fakePlayerProfile); + return FakePlayerFactory.get(world, BLOCK_PLACER_PROFILE); } @Override