More clean up

railcraft-reborn · Aug 27, 2023 · 722a649 · 722a649
1 parent 9b8035f
commit 722a649
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 225 deletions.
diff --git a/src/api/java/mods/railcraft/api/carts/Explosive.java b/src/api/java/mods/railcraft/api/carts/Explosive.java
diff --git a/src/api/java/mods/railcraft/api/core/RailcraftConstantsAPI.java b/src/api/java/mods/railcraft/api/core/RailcraftConstantsAPI.java
@@ -9,11 +9,6 @@ This work (the API) is licensed under the "MIT" License,
 
 public final class RailcraftConstantsAPI {
 
-  public static final String MOD_ID = "railcraft";
-  public static final String API_PREFIX = "railcraft:api_";
-  public static final String CORE_ID = API_PREFIX + "core";
-  public static final String RAILCRAFT_PLAYER = "[" + MOD_ID + "]";
+  public static final String RAILCRAFT_PLAYER = "[railcraft]";
   public static final String UNKNOWN_PLAYER = "[unknown]";
-
-  private RailcraftConstantsAPI() {}
 }
diff --git a/src/api/java/mods/railcraft/api/core/RailcraftFakePlayer.java b/src/api/java/mods/railcraft/api/core/RailcraftFakePlayer.java
@@ -22,8 +22,6 @@ private RailcraftFakePlayer() {}
   public static final GameProfile RAILCRAFT_USER_PROFILE =
       new GameProfile(UUID.nameUUIDFromBytes(RailcraftConstantsAPI.RAILCRAFT_PLAYER.getBytes()),
           RailcraftConstantsAPI.RAILCRAFT_PLAYER);
-  public static final GameProfile UNKNOWN_USER_PROFILE =
-      new GameProfile(null, RailcraftConstantsAPI.UNKNOWN_PLAYER);
 
   public static ServerPlayer get(final ServerLevel world, final double x, final double y,
       final double z) {

diff --git a/src/api/java/mods/railcraft/api/helper/Helpers.java b/src/api/java/mods/railcraft/api/helper/Helpers.java
diff --git a/src/api/java/mods/railcraft/api/helper/StructureHelper.java b/src/api/java/mods/railcraft/api/helper/StructureHelper.java
diff --git a/src/api/java/mods/railcraft/api/helper/package-info.java b/src/api/java/mods/railcraft/api/helper/package-info.java
diff --git a/src/api/java/mods/railcraft/api/item/InvToolsAPI.java b/src/api/java/mods/railcraft/api/item/InvToolsAPI.java
diff --git a/src/api/java/mods/railcraft/api/item/TrackPlacer.java b/src/api/java/mods/railcraft/api/item/TrackPlacer.java
@@ -7,6 +7,7 @@ This work (the API) is licensed under the "MIT" License,
 
 package mods.railcraft.api.item;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -41,7 +42,7 @@ public interface TrackPlacer {
    *        your track, use your default value.
    * @return true if successful
    */
-  default boolean placeTrack(ItemStack stack, @Nullable Player player, Level world,
+  default boolean placeTrack(ItemStack stack, @NotNull Player player, Level world,
       BlockPos pos, @Nullable RailShape trackShape) {
     return stack.getItem().useOn(
         new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(Vec3.ZERO,

diff --git a/src/api/java/mods/railcraft/api/track/RoutingTrack.java b/src/api/java/mods/railcraft/api/track/RoutingTrack.java
diff --git a/src/main/java/mods/railcraft/world/item/RailcraftCreativeModeTabs.java b/src/main/java/mods/railcraft/world/item/RailcraftCreativeModeTabs.java
@@ -260,10 +260,8 @@ public class RailcraftCreativeModeTabs {
           .icon(() -> new ItemStack(RailcraftItems.IRON_DETECTOR_TRACK.get()))
           .displayItems((params, output) -> {
             /* TODO:
-              - Dumping track
               - Messenger track
               - Delayed locking track
-              - Priming track
              */
             output.accept(RailcraftItems.ABANDONED_ACTIVATOR_TRACK.get());
             output.accept(RailcraftItems.ABANDONED_BOOSTER_TRACK.get());