Use withPrefix

railcraft-reborn · Jan 28, 2024 · 8aeaacf · 8aeaacf
1 parent 2bf42d3
commit 8aeaacf
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/src/api/java/mods/railcraft/api/core/RecipeJsonKeys.java b/src/api/java/mods/railcraft/api/core/RecipeJsonKeys.java
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+ Copyright (c) Railcraft Reborn, 2023+
+
+ This work (the API) is licensed under the "MIT" License,
+ see LICENSE.md for details.
+ -----------------------------------------------------------------------------*/
 package mods.railcraft.api.core;
 
 public final class RecipeJsonKeys {

diff --git a/src/main/java/mods/railcraft/data/recipes/builders/BlastFurnaceRecipeBuilder.java b/src/main/java/mods/railcraft/data/recipes/builders/BlastFurnaceRecipeBuilder.java
@@ -48,7 +48,7 @@ public void save(Consumer<FinishedRecipe> finishedRecipe, ResourceLocation resou
     var path = resourceLocation.getPath();
     var customResourceLocation = RailcraftConstants.rl("blast_furnace/" + path);
 
-    var advancementId = RailcraftConstants.rl(String.format("recipes/%s", customResourceLocation.getPath()));
+    var advancementId = customResourceLocation.withPrefix("recipes/");
 
     finishedRecipe.accept(new Result(customResourceLocation,
         this.group == null ? "" : this.group, this.result, this.count, this.ingredient,

diff --git a/src/main/java/mods/railcraft/data/recipes/builders/CokeOvenRecipeBuilder.java b/src/main/java/mods/railcraft/data/recipes/builders/CokeOvenRecipeBuilder.java
@@ -46,7 +46,7 @@ public void save(Consumer<FinishedRecipe> finishedRecipe, ResourceLocation resou
     var path = resourceLocation.getPath();
     var customResourceLocation = RailcraftConstants.rl("coke_oven/" + path);
 
-    var advancementId = RailcraftConstants.rl(String.format("recipes/%s", customResourceLocation.getPath()));
+    var advancementId = customResourceLocation.withPrefix("recipes/");
 
     finishedRecipe.accept(new Result(customResourceLocation,
         this.group == null ? "" : this.group, this.result, this.count, this.ingredient,

diff --git a/src/main/java/mods/railcraft/world/inventory/slot/EmptyFluidContainerSlot.java b/src/main/java/mods/railcraft/world/inventory/slot/EmptyFluidContainerSlot.java
@@ -14,7 +14,7 @@ public EmptyFluidContainerSlot(Container container, int slot, int x, int y) {
   @Override
   public boolean mayPlace(ItemStack item) {
     return !item.isEmpty()
-        //&& item.getCount() == 1
+        && item.getCount() == 1
         && FluidItemHelper.isEmptyContainer(item);
   }
 }