Merge pull request #214 from refinedmods/develop

v2.0.0-milestone.2.3

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -35,8 +35,7 @@ body:
             description: |
                 If your Minecraft version isn't listed here, it means that it's no longer supported. In that case, don't create an issue.
             options:
-                - Minecraft 1.18.2
-                - Minecraft 1.19
+                - Minecraft 1.19.2
         validations:
             required: true
     -   type: input

CHANGELOG.md

@@ -9,6 +9,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
+- Ported to Minecraft 1.19.2.
+
+### Fixed
+
+- Fixed mixin crash on startup on Fabric.
+
+## [2.0.0-milestone.2.2] - 2022-08-06
+
+### Changed
+
 - All directional blocks no longer transmit a network signal out of the direction.
 - All directional blocks no longer accept a network signal from the facing direction.
 - Upgrade items now state the applicable destinations in the tooltip.

build.gradle

@@ -10,7 +10,7 @@ allprojects {
 
 subprojects {
     group = 'com.refinedmods.refinedstorage2'
-    version = '2.0.0-milestone.2.2'
+    version = '2.0.0-milestone.2.3'
 
     if (System.getenv('GITHUB_SHA') != null) {
         version += '+' + System.getenv('GITHUB_SHA').substring(0, 7)

gradle.properties

@@ -1,22 +1,22 @@
 # Gradle
 org.gradle.jvmargs=-Xmx1G
 # Test dependencies
-junitVersion=5.8.2
+junitVersion=5.9.0
 # Use the same Log4j API as MC to not break logging in the development environment.
 log4jVersion=2.17.1
-equalsverifierVersion=3.10
-assertJVersion=3.22.0
-mockitoVersion=4.6.0
+equalsverifierVersion=3.10.1
+assertJVersion=3.23.1
+mockitoVersion=4.7.0
 jsr305Version=3.0.2
-checkstyleVersion=10.3.1
+checkstyleVersion=10.3.2
 # Libraries
 apiGuardianVersion=1.1.2
 # MC
-minecraftVersion=1.19.1
-parchmentVersion=2022.05.22
-fabricLoaderVersion=0.14.8
-fabricApiVersion=0.58.5+1.19.1
-forgeVersion=42.0.1
+minecraftVersion=1.19.2
+parchmentVersion=2022.08.21
+fabricLoaderVersion=0.14.9
+fabricApiVersion=0.60.0+1.19.2
+forgeVersion=43.1.3
 # Mod dependencies
 # https://www.curseforge.com/minecraft/mc-mods/auto-config-updated-api/files
 autoconfig1uVersion=3.4.0
@@ -25,10 +25,10 @@ clothConfigVersion=8.0.75
 # https://github.com/TechReborn/Energy
 energyVersion=2.1.0
 # https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items/files
-reiVersion=9.1.518
+reiVersion=9.1.530
 # https://www.curseforge.com/minecraft/mc-mods/modmenu/files
-modMenuVersion=4.0.5
+modMenuVersion=4.0.6
 # https://www.curseforge.com/minecraft/mc-mods/wthit/files
-wthitVersion=5.9.0
+wthitVersion=5.11.3
 # https://www.curseforge.com/minecraft/mc-mods/jei/files
-jeiVersion=11.2.0.241
+jeiVersion=11.2.0.256

refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/QuantityFormatter.java

@@ -4,6 +4,9 @@
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
 
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.1.0")
 public final class QuantityFormatter {
     private static final DecimalFormat FORMATTER_WITH_UNITS = new DecimalFormat(
         "####0.#",

refinedstorage2-core-api/src/main/java/com/refinedmods/refinedstorage2/api/core/registry/OrderedRegistry.java

@@ -39,6 +39,14 @@ public interface OrderedRegistry<I, T> {
      */
     Optional<T> get(I id);
 
+    /**
+     * @param id the id
+     * @return the value, if present, otherwise the default
+     */
+    default T getOrElseDefault(I id) {
+        return get(id).orElseGet(this::getDefault);
+    }
+
     /**
      * @return the default value
      */

refinedstorage2-platform-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/containermenu/AbstractResourceFilterContainerMenu.java

@@ -49,7 +49,7 @@ protected AbstractResourceFilterContainerMenu(final MenuType<?> type,
 
     protected void initializeResourceFilterSlots(final FriendlyByteBuf buf) {
         final ResourceLocation type = buf.readResourceLocation();
-        this.currentResourceType = resourceTypeRegistry.get(type).orElse(resourceTypeRegistry.getDefault());
+        this.currentResourceType = resourceTypeRegistry.getOrElseDefault(type);
         for (final ResourceFilterSlot resourceFilterSlot : resourceFilterSlots) {
             resourceFilterSlot.readFromUpdatePacket(buf);
         }
@@ -121,7 +121,7 @@ public Component getCurrentResourceTypeName() {
     }
 
     public void setCurrentResourceType(final ResourceLocation id) {
-        this.currentResourceType = resourceTypeRegistry.get(id).orElse(resourceTypeRegistry.getDefault());
+        this.currentResourceType = resourceTypeRegistry.getOrElseDefault(id);
     }
 
     @Override

refinedstorage2-platform-fabric/build.gradle

@@ -31,7 +31,7 @@ dependencies {
     minecraft "com.mojang:minecraft:${project.minecraftVersion}"
     mappings loom.layered() {
         officialMojangMappings()
-/* TODO        parchment("org.parchmentmc.data:parchment-${project.minecraftVersion}:${project.parchmentVersion}@zip")*/
+        parchment("org.parchmentmc.data:parchment-${project.minecraftVersion}:${project.parchmentVersion}@zip")
     }
     modImplementation "net.fabricmc:fabric-loader:${project.fabricLoaderVersion}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabricApiVersion}"

refinedstorage2-platform-fabric/src/main/java/com/refinedmods/refinedstorage2/platform/fabric/mixin/ModelBakeryMixin.java

@@ -22,7 +22,7 @@ public class ModelBakeryMixin {
     @Shadow
     private Map<Triple<ResourceLocation, Transformation, Boolean>, BakedModel> bakedCache;
 
-    @Inject(method = "bake", at = @At("RETURN"), cancellable = true, remap = false)
+    @Inject(method = "bake", at = @At("RETURN"), cancellable = true)
     public void onBake(final ResourceLocation resourceLocation,
                        final ModelState modelState,
                        final CallbackInfoReturnable<BakedModel> returnable) {

refinedstorage2-platform-forge/src/main/resources/META-INF/mods.toml

@@ -1,5 +1,5 @@
 modLoader = "javafml"
-loaderVersion = "[42,)"
+loaderVersion = "[43,)"
 issueTrackerURL = "https://github.com/refinedmods/refinedstorage2"
 license = "MIT"
 [[mods]]