Move rl static method

railcraft-reborn · Jan 28, 2024 · faf5535 · faf5535
1 parent a70d940
commit faf5535
Show file tree

Hide file tree

Showing 106 changed files with 292 additions and 300 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 
 def isRelease = System.getenv('CURSEFORGE_TOKEN')
 if (!isRelease) {
-    mod_version += "-snapshot"
+    mod_version += '-snapshot'
 }
 
 version = "$minecraft_version-$mod_version"
@@ -147,7 +147,7 @@ test {
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
-    options.compilerArgs.addAll(["-Xmaxerrs", "100000"])
+    options.compilerArgs.addAll(['-Xmaxerrs', '100000'])
 }
 
 tasks.withType(ProcessResources).configureEach {

diff --git a/src/api/java/mods/railcraft/api/core/RailcraftConstants.java b/src/api/java/mods/railcraft/api/core/RailcraftConstants.java
@@ -8,6 +8,7 @@ This work (the API) is licensed under the "MIT" License,
 
 import java.util.UUID;
 import com.mojang.authlib.GameProfile;
+import net.minecraft.resources.ResourceLocation;
 
 public final class RailcraftConstants {
 
@@ -17,4 +18,8 @@ public final class RailcraftConstants {
   public static final String UNKNOWN_PLAYER = "[unknown]";
   public static final GameProfile FAKE_GAMEPROFILE =
       new GameProfile(UUID.nameUUIDFromBytes(RAILCRAFT_PLAYER.getBytes()), RAILCRAFT_PLAYER);
+
+  public static ResourceLocation rl(String path) {
+    return new ResourceLocation(ID, path);
+  }
 }
diff --git a/src/main/java/mods/railcraft/Railcraft.java b/src/main/java/mods/railcraft/Railcraft.java
@@ -64,7 +64,6 @@
 import mods.railcraft.world.level.material.RailcraftFluids;
 import mods.railcraft.world.signal.TokenRingManager;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionResult;
@@ -111,10 +110,6 @@ public class Railcraft {
     }
   }
 
-  public static ResourceLocation rl(String path) {
-    return new ResourceLocation(RailcraftConstants.ID, path);
-  }
-
   private final CrowbarHandler crowbarHandler = new CrowbarHandler();
   private final MinecartHandler minecartHandler = new MinecartHandler();
 
@@ -238,7 +233,7 @@ public void handleAttachEntityCapabilities(AttachCapabilitiesEvent<Entity> event
   public void handleAttachItemStackCapabilities(AttachCapabilitiesEvent<ItemStack> event) {
     var stack = event.getObject();
     if (stack.is(Items.GLASS_BOTTLE)) {
-      event.addCapability(Railcraft.rl("bottle_container"), new FluidBottleWrapper(stack));
+      event.addCapability(RailcraftConstants.rl("bottle_container"), new FluidBottleWrapper(stack));
     }
   }
 

diff --git a/src/main/java/mods/railcraft/advancements/BedCartSleepTrigger.java b/src/main/java/mods/railcraft/advancements/BedCartSleepTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -14,7 +14,7 @@
 
 public class BedCartSleepTrigger extends SimpleCriterionTrigger<BedCartSleepTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("bed_cart_sleep");
+  private static final ResourceLocation ID = RailcraftConstants.rl("bed_cart_sleep");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/CartLinkingTrigger.java b/src/main/java/mods/railcraft/advancements/CartLinkingTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -14,7 +14,7 @@
 
 public class CartLinkingTrigger extends SimpleCriterionTrigger<CartLinkingTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("cart_linking");
+  private static final ResourceLocation ID = RailcraftConstants.rl("cart_linking");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/CartRidingTrigger.java b/src/main/java/mods/railcraft/advancements/CartRidingTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -17,7 +17,7 @@
  */
 public class CartRidingTrigger extends SimpleCriterionTrigger<CartRidingTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("cart_riding");
+  private static final ResourceLocation ID = RailcraftConstants.rl("cart_riding");
   // private static final int FREQUENCY = 20;
 
   // private final Map<ServerPlayerEntity, AbstractMinecartEntity> mounting =

diff --git a/src/main/java/mods/railcraft/advancements/JukeboxCartPlayMusicTrigger.java b/src/main/java/mods/railcraft/advancements/JukeboxCartPlayMusicTrigger.java
@@ -3,7 +3,7 @@
 import java.util.Objects;
 import org.jetbrains.annotations.Nullable;
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -17,7 +17,7 @@
 public class JukeboxCartPlayMusicTrigger
     extends SimpleCriterionTrigger<JukeboxCartPlayMusicTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("jukebox_cart_play_music");
+  private static final ResourceLocation ID = RailcraftConstants.rl("jukebox_cart_play_music");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/KilledByLocomotiveTrigger.java b/src/main/java/mods/railcraft/advancements/KilledByLocomotiveTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -18,7 +18,7 @@
 public class KilledByLocomotiveTrigger
     extends SimpleCriterionTrigger<KilledByLocomotiveTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("killed_by_locomotive");
+  private static final ResourceLocation ID = RailcraftConstants.rl("killed_by_locomotive");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/MultiBlockFormedTrigger.java b/src/main/java/mods/railcraft/advancements/MultiBlockFormedTrigger.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.Conditions;
 import mods.railcraft.util.JsonUtil;
 import mods.railcraft.world.level.block.entity.RailcraftBlockEntity;
@@ -20,7 +20,7 @@
 public class MultiBlockFormedTrigger extends
     SimpleCriterionTrigger<MultiBlockFormedTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("multiblock_formed");
+  private static final ResourceLocation ID = RailcraftConstants.rl("multiblock_formed");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/SetSeasonTrigger.java b/src/main/java/mods/railcraft/advancements/SetSeasonTrigger.java
@@ -2,7 +2,7 @@
 
 import org.jetbrains.annotations.Nullable;
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.season.Season;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
@@ -16,7 +16,7 @@
 
 public class SetSeasonTrigger extends SimpleCriterionTrigger<SetSeasonTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("set_season");
+  private static final ResourceLocation ID = RailcraftConstants.rl("set_season");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/SpikeMaulUseTrigger.java b/src/main/java/mods/railcraft/advancements/SpikeMaulUseTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import mods.railcraft.util.LevelUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
@@ -21,7 +21,7 @@
 
 public class SpikeMaulUseTrigger extends SimpleCriterionTrigger<SpikeMaulUseTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("spike_maul_use");
+  private static final ResourceLocation ID = RailcraftConstants.rl("spike_maul_use");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/SurpriseTrigger.java b/src/main/java/mods/railcraft/advancements/SurpriseTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -14,7 +14,7 @@
 
 public class SurpriseTrigger extends SimpleCriterionTrigger<SurpriseTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("surprise");
+  private static final ResourceLocation ID = RailcraftConstants.rl("surprise");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/advancements/UseTrackKitTrigger.java b/src/main/java/mods/railcraft/advancements/UseTrackKitTrigger.java
@@ -1,7 +1,7 @@
 package mods.railcraft.advancements;
 
 import com.google.gson.JsonObject;
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.util.JsonUtil;
 import net.minecraft.advancements.critereon.AbstractCriterionTriggerInstance;
 import net.minecraft.advancements.critereon.ContextAwarePredicate;
@@ -18,7 +18,7 @@
 
 public class UseTrackKitTrigger extends SimpleCriterionTrigger<UseTrackKitTrigger.Instance> {
 
-  private static final ResourceLocation ID = Railcraft.rl("use_track_kit");
+  private static final ResourceLocation ID = RailcraftConstants.rl("use_track_kit");
 
   @Override
   public ResourceLocation getId() {

diff --git a/src/main/java/mods/railcraft/client/gui/screen/GoldenTicketScreen.java b/src/main/java/mods/railcraft/client/gui/screen/GoldenTicketScreen.java
@@ -1,8 +1,8 @@
 package mods.railcraft.client.gui.screen;
 
 import java.util.List;
-import mods.railcraft.Railcraft;
 import mods.railcraft.Translations;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.client.gui.widget.button.ButtonTexture;
 import mods.railcraft.client.gui.widget.button.RailcraftButton;
 import mods.railcraft.client.util.GuiUtil;
@@ -22,7 +22,7 @@
 public class GoldenTicketScreen extends IngameWindowScreen {
 
   private static final ResourceLocation TICKET_LOCATION =
-      Railcraft.rl("textures/gui/item/golden_ticket.png");
+      RailcraftConstants.rl("textures/gui/item/golden_ticket.png");
   private static final int IMAGE_WIDTH = 256;
   private static final int IMAGE_HEIGHT = 136;
   private static final String PREFIX = "Dest=";

diff --git a/src/main/java/mods/railcraft/client/gui/screen/IngameWindowScreen.java b/src/main/java/mods/railcraft/client/gui/screen/IngameWindowScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.client.util.GuiUtil;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
@@ -10,9 +10,9 @@
 public class IngameWindowScreen extends Screen {
 
   public static final ResourceLocation WIDGETS_TEXTURE =
-      Railcraft.rl("textures/gui/widgets.png");
+      RailcraftConstants.rl("textures/gui/widgets.png");
   public static final ResourceLocation LARGE_WINDOW_TEXTURE =
-      Railcraft.rl("textures/gui/large_window.png");
+      RailcraftConstants.rl("textures/gui/large_window.png");
 
   public static final int TEXT_COLOR = 0xFF404040;
   public static final int DEFAULT_WINDOW_WIDTH = 176;

diff --git a/src/main/java/mods/railcraft/client/gui/screen/RoutingTableBookScreen.java b/src/main/java/mods/railcraft/client/gui/screen/RoutingTableBookScreen.java
@@ -11,8 +11,8 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
-import mods.railcraft.Railcraft;
 import mods.railcraft.Translations;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.client.gui.widget.button.ButtonTexture;
 import mods.railcraft.client.gui.widget.button.RailcraftButton;
 import mods.railcraft.client.gui.widget.button.RailcraftPageButton;
@@ -46,7 +46,7 @@
 public class RoutingTableBookScreen extends Screen {
 
   public static final ResourceLocation BOOK_LOCATION =
-      Railcraft.rl("textures/gui/item/routing_table_book.png");
+      RailcraftConstants.rl("textures/gui/item/routing_table_book.png");
   private static final int TEXT_WIDTH = 220;
   private static final int TEXT_HEIGHT = 128;
   private static final int IMAGE_WIDTH = 256;

diff --git a/src/main/java/mods/railcraft/client/gui/screen/inventory/BlastFurnaceScreen.java b/src/main/java/mods/railcraft/client/gui/screen/inventory/BlastFurnaceScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen.inventory;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.world.inventory.BlastFurnaceMenu;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
@@ -10,7 +10,7 @@
 public class BlastFurnaceScreen extends RailcraftMenuScreen<BlastFurnaceMenu> {
 
   private static final ResourceLocation WIDGETS_TEXTURE =
-      Railcraft.rl("textures/gui/container/blast_furnace.png");
+      RailcraftConstants.rl("textures/gui/container/blast_furnace.png");
 
   public BlastFurnaceScreen(BlastFurnaceMenu menu, Inventory inventory, Component title) {
     super(menu, inventory, title);

diff --git a/src/main/java/mods/railcraft/client/gui/screen/inventory/CartDispenserScreen.java b/src/main/java/mods/railcraft/client/gui/screen/inventory/CartDispenserScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen.inventory;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.world.inventory.CartDispenserMenu;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -9,7 +9,7 @@
 public class CartDispenserScreen extends RailcraftMenuScreen<CartDispenserMenu> {
 
   private static final ResourceLocation WIDGETS_TEXTURE_LOCATION =
-      Railcraft.rl("textures/gui/container/cart_slots.png");
+      RailcraftConstants.rl("textures/gui/container/cart_slots.png");
 
   public CartDispenserScreen(CartDispenserMenu menu, Inventory inventory, Component title) {
     super(menu, inventory, title);

diff --git a/src/main/java/mods/railcraft/client/gui/screen/inventory/CokeOvenScreen.java b/src/main/java/mods/railcraft/client/gui/screen/inventory/CokeOvenScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen.inventory;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.client.gui.screen.inventory.widget.FluidGaugeRenderer;
 import mods.railcraft.world.inventory.CokeOvenMenu;
 import net.minecraft.client.gui.GuiGraphics;
@@ -11,7 +11,7 @@
 public class CokeOvenScreen extends RailcraftMenuScreen<CokeOvenMenu> {
 
   private static final ResourceLocation WIDGETS_TEXTURE =
-      Railcraft.rl("textures/gui/container/coke_oven.png");
+      RailcraftConstants.rl("textures/gui/container/coke_oven.png");
 
   public CokeOvenScreen(CokeOvenMenu menu, Inventory inventory, Component title) {
     super(menu, inventory, title);

diff --git a/src/main/java/mods/railcraft/client/gui/screen/inventory/CreativeLocomotiveScreen.java b/src/main/java/mods/railcraft/client/gui/screen/inventory/CreativeLocomotiveScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen.inventory;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.world.entity.vehicle.locomotive.CreativeLocomotive;
 import mods.railcraft.world.inventory.LocomotiveMenu;
 import net.minecraft.network.chat.Component;
@@ -11,7 +11,7 @@ public class CreativeLocomotiveScreen
     extends LocomotiveScreen<LocomotiveMenu<CreativeLocomotive>> {
 
   private static final ResourceLocation TEXTURE_LOCATION =
-      Railcraft.rl("textures/gui/container/creative_locomotive.png");
+      RailcraftConstants.rl("textures/gui/container/creative_locomotive.png");
 
   public CreativeLocomotiveScreen(LocomotiveMenu<CreativeLocomotive> menu,
       Inventory inventory, Component title) {

diff --git a/src/main/java/mods/railcraft/client/gui/screen/inventory/CrusherScreen.java b/src/main/java/mods/railcraft/client/gui/screen/inventory/CrusherScreen.java
@@ -1,6 +1,6 @@
 package mods.railcraft.client.gui.screen.inventory;
 
-import mods.railcraft.Railcraft;
+import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.client.gui.screen.inventory.widget.AnalogGaugeRenderer;
 import mods.railcraft.world.inventory.CrusherMenu;
 import net.minecraft.client.gui.GuiGraphics;
@@ -11,7 +11,7 @@
 public class CrusherScreen extends RailcraftMenuScreen<CrusherMenu> {
 
   private static final ResourceLocation WIDGETS_TEXTURE =
-      Railcraft.rl("textures/gui/container/crusher.png");
+      RailcraftConstants.rl("textures/gui/container/crusher.png");
 
   public CrusherScreen(CrusherMenu menu, Inventory inventory, Component title) {
     super(menu, inventory, title);