Other changes from 20.4

build.gradle

@@ -152,11 +152,17 @@ tasks.withType(JavaCompile).configureEach {
 
 tasks.withType(ProcessResources).configureEach {
     var replaceProperties = [
-            mod_version: mod_version
+        minecraft_version       : minecraft_version,
+        minecraft_version_range : minecraft_version_range,
+        neo_version             : neo_version,
+        neo_version_range       : neo_version_range,
+        loader_version_range    : loader_version_range,
+        mod_license             : mod_license,
+        mod_version             : mod_version,
     ]
     inputs.properties replaceProperties
 
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+    filesMatching(['META-INF/mods.toml']) {
         expand replaceProperties + [project: project]
     }
 }

gradle.properties

@@ -4,16 +4,22 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 org.gradle.caching=true # -30~ seconds trimmed from gradle --scan opt
 
+## Environment Properties
 minecraft_version=1.20.1
+minecraft_version_range=[1.20.1,1.21)
 neo_version=47.1.63
+neo_version_range=[47,)
+loader_version_range=[47,)
 
-# Possible values: official / parchment
+## Possible values: official / parchment
 mappings_channel=parchment
 mappings_version=2023.08.06-1.20.1
 
+## Mod Properties
 mod_version=1.0.11
+mod_license=https://github.com/railcraft-reborn/railcraft/blob/1.20.x/LICENSE.md
 
-# Deps
+# Dependencies
 mixin_version=0.8.5
 jei_version=15.2.0.27
 patchouli_version=1.20.1-84-FORGE

src/api/java/mods/railcraft/api/core/RecipeJsonKeys.java

@@ -17,7 +17,6 @@ public final class RecipeJsonKeys {
   public static final String CREOSOTE_OUTPUT = "creosoteOutput";
   public static final String PROBABILITY = "probability";
   public static final String OUTPUTS = "outputs";
-  public static final String GROUP = "group";
   public static final String ITEM = "item";
   public static final String COUNT = "count";
   public static final String PATTERN = "pattern";

src/main/java/mods/railcraft/Railcraft.java

@@ -35,7 +35,7 @@
 import mods.railcraft.tags.RailcraftTags;
 import mods.railcraft.util.EntitySearcher;
 import mods.railcraft.util.capability.CapabilityUtil;
-import mods.railcraft.util.capability.FluidBottleWrapper;
+import mods.railcraft.util.fluids.FluidBottleWrapper;
 import mods.railcraft.world.damagesource.RailcraftDamageSources;
 import mods.railcraft.world.effect.RailcraftMobEffects;
 import mods.railcraft.world.entity.RailcraftEntityTypes;

src/main/java/mods/railcraft/data/loot/RailcraftLootTableProvider.java

@@ -17,14 +17,9 @@
 public class RailcraftLootTableProvider extends LootTableProvider {
 
   public RailcraftLootTableProvider(PackOutput packOutput) {
-    super(packOutput, Set.of(), List.of());
-  }
-
-  @Override
-  public List<LootTableProvider.SubProviderEntry> getTables() {
-    return List.of(
+    super(packOutput, Set.of(), List.of(
         new LootTableProvider.SubProviderEntry(RailcraftBlockLoot::new, LootContextParamSets.BLOCK),
-        new LootTableProvider.SubProviderEntry(RailcraftChestLoot::new, LootContextParamSets.CHEST));
+        new LootTableProvider.SubProviderEntry(RailcraftChestLoot::new, LootContextParamSets.CHEST)));
   }
 
   @Override

src/main/java/mods/railcraft/data/recipes/builders/AbstractCookingRecipeBuilder.java

@@ -21,8 +21,6 @@ public abstract class AbstractCookingRecipeBuilder implements RecipeBuilder {
   protected final float experience;
   protected final int cookingTime;
   protected final Advancement.Builder advancement = Advancement.Builder.advancement();
-  @Nullable
-  protected String group;
 
   public AbstractCookingRecipeBuilder(ItemLike result, int count, Ingredient ingredient,
       float experience, int cookingTime) {
@@ -41,8 +39,7 @@ public RecipeBuilder unlockedBy(String name, CriterionTriggerInstance trigger) {
 
   @Override
   public RecipeBuilder group(String group) {
-    this.group = group;
-    return this;
+    throw new IllegalStateException("Group not allow");
   }
 
   @Override
@@ -53,7 +50,6 @@ public Item getResult() {
   public static abstract class AbstractResult implements FinishedRecipe {
 
     private final ResourceLocation id;
-    private final String group;
     private final Item result;
     private final int count;
     private final Ingredient ingredient;
@@ -62,11 +58,10 @@ public static abstract class AbstractResult implements FinishedRecipe {
     private final Advancement.Builder advancement;
     private final ResourceLocation advancementId;
 
-    public AbstractResult(ResourceLocation id, String group, Item result, int count,
+    public AbstractResult(ResourceLocation id, Item result, int count,
         Ingredient ingredient, float experience, int cookingTime, Advancement.Builder advancement,
         ResourceLocation advancementId) {
       this.id = id;
-      this.group = group;
       this.result = result;
       this.count = count;
       this.ingredient = ingredient;
@@ -78,10 +73,6 @@ public AbstractResult(ResourceLocation id, String group, Item result, int count,
 
     @Override
     public final void serializeRecipeData(JsonObject json) {
-      if (!group.isEmpty()) {
-        json.addProperty(RecipeJsonKeys.GROUP, group);
-      }
-
       json.add(RecipeJsonKeys.INGREDIENT, ingredient.toJson());
       var resultJson = new JsonObject();
       resultJson.addProperty(RecipeJsonKeys.ITEM, ForgeRegistries.ITEMS.getKey(result).toString());

src/main/java/mods/railcraft/data/recipes/builders/BlastFurnaceRecipeBuilder.java

@@ -52,18 +52,18 @@ public void save(Consumer<FinishedRecipe> finishedRecipe, ResourceLocation resou
     var advancementId = customResourceLocation.withPrefix("recipes/");
 
     finishedRecipe.accept(new Result(customResourceLocation,
-        this.group == null ? "" : this.group, this.result, this.count, this.ingredient,
+        this.result, this.count, this.ingredient,
         this.experience, this.cookingTime, this.slagOutput, this.advancement, advancementId));
   }
 
   private static class Result extends AbstractCookingRecipeBuilder.AbstractResult {
 
     private final int slagOutput;
 
-    public Result(ResourceLocation id, String group, Item result, int count, Ingredient ingredient,
+    public Result(ResourceLocation id, Item result, int count, Ingredient ingredient,
         float experience, int cookingTime, int slagOutput, Advancement.Builder advancement,
         ResourceLocation advancementId) {
-      super(id, group, result, count, ingredient, experience, cookingTime, advancement,
+      super(id, result, count, ingredient, experience, cookingTime, advancement,
           advancementId);
       this.slagOutput = slagOutput;
     }

src/main/java/mods/railcraft/data/recipes/builders/CokeOvenRecipeBuilder.java

@@ -50,19 +50,18 @@ public void save(Consumer<FinishedRecipe> finishedRecipe, ResourceLocation resou
     var advancementId = customResourceLocation.withPrefix("recipes/");
 
     finishedRecipe.accept(new Result(customResourceLocation,
-        this.group == null ? "" : this.group, this.result, this.count, this.ingredient,
+        this.result, this.count, this.ingredient,
         this.experience, this.cookingTime, this.creosoteOutput, this.advancement, advancementId));
   }
 
   private static class Result extends AbstractCookingRecipeBuilder.AbstractResult {
 
     private final int creosoteOutput;
 
-    public Result(ResourceLocation id, String group, Item result, int count, Ingredient ingredient,
+    public Result(ResourceLocation id, Item result, int count, Ingredient ingredient,
         float experience, int cookingTime, int creosoteOutput, Advancement.Builder advancement,
         ResourceLocation advancementId) {
-      super(id, group, result, count, ingredient, experience, cookingTime, advancement,
-          advancementId);
+      super(id, result, count, ingredient, experience, cookingTime, advancement, advancementId);
       this.creosoteOutput = creosoteOutput;
     }
 

src/main/java/mods/railcraft/integrations/jei/JeiSearchable.java

@@ -3,5 +3,6 @@
 import net.minecraft.network.chat.Component;
 
 public interface JeiSearchable {
+
   Component jeiDescription();
 }

src/main/java/mods/railcraft/integrations/jei/RailcraftJeiPlugin.java

@@ -1,5 +1,6 @@
 package mods.railcraft.integrations.jei;
 
+import java.util.function.Supplier;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.registration.IGuiHandlerRegistration;
@@ -106,14 +107,14 @@ public void registerRecipes(IRecipeRegistration registration) {
 
     RailcraftBlocks.entries()
         .stream()
-        .filter(x -> x.get() instanceof JeiSearchable)
         .map(RegistryObject::get)
+        .filter(JeiSearchable.class::isInstance)
         .forEach(x ->
             registration.addItemStackInfo(new ItemStack(x), ((JeiSearchable)x).jeiDescription()));
     RailcraftItems.entries()
         .stream()
-        .filter(x -> x.get() instanceof JeiSearchable)
         .map(RegistryObject::get)
+        .filter(JeiSearchable.class::isInstance)
         .forEach(x ->
             registration.addItemStackInfo(new ItemStack(x), ((JeiSearchable)x).jeiDescription()));
   }

src/main/java/mods/railcraft/util/JsonUtil.java

@@ -3,7 +3,11 @@
 import java.util.Optional;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import mods.railcraft.api.core.RecipeJsonKeys;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.registries.IForgeRegistry;
 
 public final class JsonUtil {
@@ -34,4 +38,11 @@ public static Optional<JsonElement> get(JsonObject object, String memberName) {
         ? Optional.of(object.get(memberName))
         : Optional.empty();
   }
+
+  public static ItemStack itemFromJson(JsonObject json) {
+    if (!json.has(RecipeJsonKeys.ITEM)) {
+      throw new JsonParseException("No item key found");
+    }
+    return CraftingHelper.getItemStack(json, true);
+  }
 }

src/main/java/mods/railcraft/util/CompositeFluidHandler.java → src/main/java/mods/railcraft/util/fluids/CompositeFluidHandler.java

@@ -1,4 +1,4 @@
-package mods.railcraft.util;
+package mods.railcraft.util.fluids;
 
 import java.util.Arrays;
 import java.util.Collection;

src/main/java/mods/railcraft/util/capability/FluidBottleWrapper.java → src/main/java/mods/railcraft/util/fluids/FluidBottleWrapper.java

@@ -1,4 +1,4 @@
-package mods.railcraft.util.capability;
+package mods.railcraft.util.fluids;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/mods/railcraft/util/FluidTools.java → src/main/java/mods/railcraft/util/fluids/FluidTools.java

@@ -1,4 +1,4 @@
-package mods.railcraft.util;
+package mods.railcraft.util.fluids;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/mods/railcraft/world/entity/vehicle/MinecartHandler.java

@@ -4,7 +4,6 @@
 import org.joml.Vector2d;
 import mods.railcraft.RailcraftConfig;
 import mods.railcraft.api.carts.RollingStock;
-import mods.railcraft.api.carts.Side;
 import mods.railcraft.api.track.TrackUtil;
 import mods.railcraft.util.EntitySearcher;
 import mods.railcraft.util.ModEntitySelector;
@@ -45,13 +44,13 @@ public void onEntityCollision(AbstractMinecart cart, Entity other) {
 
     var rollingStock = RollingStock.getOrThrow(cart);
 
-    var link = rollingStock.linkAt(Side.BACK)
+    var link = rollingStock.backLink()
         .map(RollingStock::entity)
         .orElse(null);
     if (link != null && (link == other || link.hasPassenger(other))) {
       return;
     }
-    link = rollingStock.linkAt(Side.FRONT)
+    link = rollingStock.frontLink()
         .map(RollingStock::entity)
         .orElse(null);
     if (link != null && (link == other || link.hasPassenger(other))) {

src/main/java/mods/railcraft/world/entity/vehicle/TankMinecart.java

@@ -5,7 +5,7 @@
 import mods.railcraft.RailcraftConfig;
 import mods.railcraft.api.carts.FluidTransferHandler;
 import mods.railcraft.api.carts.RollingStock;
-import mods.railcraft.util.FluidTools;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.util.container.ContainerTools;
 import mods.railcraft.world.entity.RailcraftEntityTypes;

src/main/java/mods/railcraft/world/entity/vehicle/TrainImpl.java

@@ -7,7 +7,7 @@
 import java.util.stream.Stream;
 import mods.railcraft.api.carts.RollingStock;
 import mods.railcraft.api.carts.Train;
-import mods.railcraft.util.CompositeFluidHandler;
+import mods.railcraft.util.fluids.CompositeFluidHandler;
 import mods.railcraft.util.FunctionalUtil;
 import mods.railcraft.world.entity.vehicle.locomotive.Locomotive;
 import net.minecraft.nbt.CompoundTag;

src/main/java/mods/railcraft/world/entity/vehicle/locomotive/BaseSteamLocomotive.java

@@ -7,8 +7,8 @@
 import mods.railcraft.particle.RailcraftParticleTypes;
 import mods.railcraft.season.Seasons;
 import mods.railcraft.sounds.RailcraftSoundEvents;
-import mods.railcraft.util.FluidTools;
-import mods.railcraft.util.FluidTools.ProcessType;
+import mods.railcraft.util.fluids.FluidTools;
+import mods.railcraft.util.fluids.FluidTools.ProcessType;
 import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.world.level.material.RailcraftFluids;
 import mods.railcraft.world.level.material.StandardTank;

src/main/java/mods/railcraft/world/item/FluidBottleItem.java

@@ -2,7 +2,7 @@
 
 import java.util.function.Supplier;
 import org.jetbrains.annotations.Nullable;
-import mods.railcraft.util.capability.FluidBottleWrapper;
+import mods.railcraft.util.fluids.FluidBottleWrapper;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;