Skip to content

Commit 7c00d7e

Browse files
raoulvdbergeraoulvdberge
committed
feat: port to minecraft 1.21
1 parent 697bdca commit 7c00d7e

35 files changed

+85
-74
lines changed

‎.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
types: [ opened, synchronize, reopened ]
99
jobs:
1010
build:
11-
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.13.4
11+
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.15.1
1212
with:
1313
mutation-testing: false
1414
secrets: inherit

‎.github/workflows/draft-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
type: string
1818
jobs:
1919
draft:
20-
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.13.4
20+
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.15.1
2121
with:
2222
release-type: ${{ inputs.release-type }}
2323
version-number-override: ${{ inputs.version-number-override }}

‎.github/workflows/issue-for-unsupported-version.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ on:
44
types: [ labeled, unlabeled, reopened ]
55
jobs:
66
unsupported-labeler:
7-
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.13.4
7+
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.15.1

‎.github/workflows/publish-release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- closed
88
jobs:
99
publish-release:
10-
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.13.4
10+
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.15.1
1111
secrets: inherit
1212
with:
1313
project-name: 'Refined Storage - JEI Integration'

‎.github/workflows/resolved-issue-locking.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ on:
44
- cron: '0 0 * * *'
55
jobs:
66
lock:
7-
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.13.4
7+
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.15.1

‎.github/workflows/validate-branch-name.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name: Validate branch name
22
on: [ pull_request ]
33
jobs:
44
validate-branch-name:
5-
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.13.4
5+
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.15.1

‎.github/workflows/validate-changelog.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ on:
44
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
55
jobs:
66
validate-changelog:
7-
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.13.4
7+
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.15.1

‎.github/workflows/validate-commit-messages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ name: Validate commit messages
22
on: [ pull_request ]
33
jobs:
44
validate-commit-messages:
5-
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.13.4
5+
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.15.1

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
99

10+
### Fixed
11+
12+
- Support for Refined Storage v2.0.0-milestone.4.0.
13+
1014
## [0.2.2] - 2024-06-20
1115

1216
### Fixed

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
refinedstorageVersion=2.0.0-milestone.3.13
2-
jeiVersion=17.3.0.52
1+
refinedstorageVersion=2.0.0-milestone.4.1
2+
jeiVersion=19.1.0.17
33
# Gradle
44
org.gradle.jvmargs=-Xmx1G

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎refinedstorage-jei-integration-common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121
commonProject()
2222

2323
dependencies {
24-
api "com.refinedmods.refinedstorage2:refinedstorage2-platform-common:${refinedstorageVersion}"
24+
api "com.refinedmods.refinedstorage:refinedstorage-platform-common:${refinedstorageVersion}"
2525
api "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
2626
api "mezz.jei:jei-${minecraftVersion}-common:${jeiVersion}"
2727
}

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/Common.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3-
import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
3+
import com.refinedmods.refinedstorage.platform.api.PlatformApi;
4+
45
import net.minecraft.resources.ResourceLocation;
56

67
import static java.util.Objects.requireNonNull;
@@ -24,11 +25,11 @@ public static Platform getPlatform() {
2425
public static void init(final PlatformApi platformApi) {
2526
platformApi.addIngredientConverter(new JeiRecipeModIngredientConverter());
2627
platformApi.getGridSynchronizerRegistry().register(
27-
new ResourceLocation(Common.MOD_ID, "jei"),
28+
ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "jei"),
2829
new JeiGridSynchronizer(false)
2930
);
3031
platformApi.getGridSynchronizerRegistry().register(
31-
new ResourceLocation(Common.MOD_ID, "jei_two_way"),
32+
ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "jei_two_way"),
3233
new JeiGridSynchronizer(true)
3334
);
3435
}

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/CraftingGridRecipeTransferHandler.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.api.resource.list.ResourceList;
4+
import com.refinedmods.refinedstorage.platform.common.content.Menus;
5+
import com.refinedmods.refinedstorage.platform.common.grid.CraftingGridContainerMenu;
6+
import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
7+
38
import java.util.List;
49
import java.util.Optional;
510
import java.util.stream.Collectors;
611
import javax.annotation.Nullable;
712

8-
import com.refinedmods.refinedstorage2.api.resource.list.ResourceList;
9-
import com.refinedmods.refinedstorage2.platform.common.content.Menus;
10-
import com.refinedmods.refinedstorage2.platform.common.grid.CraftingGridContainerMenu;
11-
import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
1213
import mezz.jei.api.constants.RecipeTypes;
1314
import mezz.jei.api.gui.ingredient.IRecipeSlotView;
1415
import mezz.jei.api.gui.ingredient.IRecipeSlotsView;

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ExclusionZonesGuiContainerHandler.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
4+
35
import java.util.List;
46

5-
import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
67
import mezz.jei.api.gui.handlers.IGuiContainerHandler;
78
import net.minecraft.client.renderer.Rect2i;
89

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GhostIngredientHandler.java

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.api.PlatformApi;
4+
import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
5+
import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
6+
import com.refinedmods.refinedstorage.platform.common.support.containermenu.AbstractResourceContainerMenu;
7+
import com.refinedmods.refinedstorage.platform.common.support.containermenu.ResourceSlot;
8+
import com.refinedmods.refinedstorage.platform.common.support.packet.c2s.C2SPackets;
9+
310
import java.util.ArrayList;
411
import java.util.Collections;
512
import java.util.List;
613

7-
import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
8-
import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
9-
import com.refinedmods.refinedstorage2.platform.common.Platform;
10-
import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
11-
import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractResourceContainerMenu;
12-
import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ResourceSlot;
1314
import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
1415
import mezz.jei.api.ingredients.ITypedIngredient;
1516
import net.minecraft.client.renderer.Rect2i;
@@ -50,7 +51,7 @@ public void onComplete() {
5051
// no op
5152
}
5253

53-
private class TargetImpl<I> implements Target<I> {
54+
private static class TargetImpl<I> implements Target<I> {
5455
private final Rect2i area;
5556
private final int slotIndex;
5657

@@ -70,10 +71,7 @@ public void accept(final I ingredient) {
7071
}
7172

7273
private void accept(final PlatformResourceKey resource) {
73-
Platform.INSTANCE.getClientToServerCommunications().sendResourceFilterSlotChange(
74-
resource,
75-
slotIndex
76-
);
74+
C2SPackets.sendResourceFilterSlotChange(resource, slotIndex);
7775
}
7876
}
7977
}

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/GridGuiContainerHandler.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.api.PlatformApi;
4+
import com.refinedmods.refinedstorage.platform.api.grid.view.PlatformGridResource;
5+
import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
6+
import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen;
7+
38
import java.util.Optional;
49

5-
import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
6-
import com.refinedmods.refinedstorage2.platform.api.grid.view.PlatformGridResource;
7-
import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
8-
import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
910
import mezz.jei.api.gui.handlers.IGuiContainerHandler;
1011
import mezz.jei.api.ingredients.IIngredientHelper;
1112
import mezz.jei.api.ingredients.ITypedIngredient;

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiGridSynchronizer.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.common.grid.AbstractGridSynchronizer;
4+
35
import javax.annotation.Nullable;
46

5-
import com.refinedmods.refinedstorage2.platform.common.grid.AbstractGridSynchronizer;
67
import net.minecraft.network.chat.Component;
78
import net.minecraft.network.chat.MutableComponent;
89

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/JeiRecipeModIngredientConverter.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
4+
import com.refinedmods.refinedstorage.platform.api.support.resource.RecipeModIngredientConverter;
5+
import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
6+
import com.refinedmods.refinedstorage.platform.common.support.resource.ItemResource;
7+
38
import java.util.Optional;
49

5-
import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
6-
import com.refinedmods.refinedstorage2.platform.api.support.resource.RecipeModIngredientConverter;
7-
import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
8-
import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResource;
910
import mezz.jei.api.helpers.IPlatformFluidHelper;
1011
import mezz.jei.common.platform.Services;
1112
import net.minecraft.world.item.ItemStack;
@@ -24,16 +25,17 @@ public Optional<PlatformResourceKey> convertToResource(final Object ingredient)
2425
}
2526

2627
@Override
28+
@SuppressWarnings("deprecation")
2729
public Optional<Object> convertToIngredient(final PlatformResourceKey resource) {
2830
if (resource instanceof ItemResource itemResource) {
2931
return Optional.of(itemResource.toItemStack());
3032
}
3133
if (resource instanceof FluidResource fluidResource) {
3234
final IPlatformFluidHelper<?> fluidHelper = Services.PLATFORM.getFluidHelper();
3335
return Optional.of(fluidHelper.create(
34-
fluidResource.fluid(),
36+
fluidResource.fluid().builtInRegistryHolder(),
3537
fluidHelper.bucketVolume(),
36-
fluidResource.tag()
38+
fluidResource.components()
3739
));
3840
}
3941
return Optional.empty();

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/Platform.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3-
import java.util.Optional;
3+
import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
44

5-
import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
5+
import java.util.Optional;
66

77
public interface Platform {
88
Optional<FluidResource> convertJeiIngredientToFluid(Object ingredient);

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/RefinedStorageModPlugin.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.common.grid.screen.AbstractGridScreen;
4+
import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
5+
36
import javax.annotation.Nullable;
47

5-
import com.refinedmods.refinedstorage2.platform.common.grid.screen.AbstractGridScreen;
6-
import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
78
import mezz.jei.api.IModPlugin;
89
import mezz.jei.api.JeiPlugin;
910
import mezz.jei.api.constants.RecipeTypes;
@@ -14,7 +15,7 @@
1415

1516
@JeiPlugin
1617
public class RefinedStorageModPlugin implements IModPlugin {
17-
private static final ResourceLocation ID = new ResourceLocation(Common.MOD_ID, "plugin");
18+
private static final ResourceLocation ID = ResourceLocation.fromNamespaceAndPath(Common.MOD_ID, "plugin");
1819
@Nullable
1920
private static IJeiRuntime runtime;
2021

‎refinedstorage-jei-integration-common/src/main/java/com/refinedmods/refinedstorage/jei/common/ResourceGuiContainerHandler.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package com.refinedmods.refinedstorage.jei.common;
22

3+
import com.refinedmods.refinedstorage.platform.api.PlatformApi;
4+
import com.refinedmods.refinedstorage.platform.api.support.resource.PlatformResourceKey;
5+
import com.refinedmods.refinedstorage.platform.common.support.AbstractBaseScreen;
6+
37
import java.util.Optional;
48
import javax.annotation.Nullable;
59

6-
import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
7-
import com.refinedmods.refinedstorage2.platform.api.support.resource.PlatformResourceKey;
8-
import com.refinedmods.refinedstorage2.platform.common.support.AbstractBaseScreen;
910
import mezz.jei.api.gui.handlers.IGuiContainerHandler;
1011
import mezz.jei.api.ingredients.IIngredientHelper;
1112
import mezz.jei.api.ingredients.ITypedIngredient;

‎refinedstorage-jei-integration-fabric/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ repositories {
2929
}
3030

3131
dependencies {
32-
modApi "com.refinedmods.refinedstorage2:refinedstorage2-platform-fabric:${refinedstorageVersion}"
32+
modApi "com.refinedmods.refinedstorage:refinedstorage-platform-fabric:${refinedstorageVersion}"
3333
modRuntimeOnly "mezz.jei:jei-${minecraftVersion}-fabric:${jeiVersion}"
3434
modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-common-api:${jeiVersion}"
3535
modCompileOnlyApi "mezz.jei:jei-${minecraftVersion}-fabric-api:${jeiVersion}"

‎refinedstorage-jei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/jei/fabric/FabricPlatform.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package com.refinedmods.refinedstorage.jei.fabric;
22

33
import com.refinedmods.refinedstorage.jei.common.Platform;
4+
import com.refinedmods.refinedstorage.platform.common.support.resource.FluidResource;
45

56
import java.util.Optional;
67

7-
import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResource;
88
import mezz.jei.api.fabric.ingredients.fluids.IJeiFluidIngredient;
99

10+
import static com.refinedmods.refinedstorage.platform.fabric.support.resource.VariantUtil.ofFluidVariant;
11+
1012
public class FabricPlatform implements Platform {
1113
@Override
1214
public Optional<FluidResource> convertJeiIngredientToFluid(final Object ingredient) {
1315
if (ingredient instanceof IJeiFluidIngredient fluidIngredient) {
14-
return Optional.of(new FluidResource(
15-
fluidIngredient.getFluid(),
16-
fluidIngredient.getTag().orElse(null)
17-
));
16+
return Optional.of(ofFluidVariant(fluidIngredient.getFluidVariant()));
1817
}
1918
return Optional.empty();
2019
}

‎refinedstorage-jei-integration-fabric/src/main/java/com/refinedmods/refinedstorage/jei/fabric/JeiRefinedStoragePlugin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.refinedmods.refinedstorage.jei.fabric;
22

3-
import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
4-
import com.refinedmods.refinedstorage2.platform.api.RefinedStoragePlugin;
3+
import com.refinedmods.refinedstorage.platform.api.PlatformApi;
4+
import com.refinedmods.refinedstorage.platform.api.RefinedStoragePlugin;
55

66
import static com.refinedmods.refinedstorage.jei.common.Common.init;
77

‎refinedstorage-jei-integration-fabric/src/main/resources/fabric.mod.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@
2929
"links": {
3030
"modmenu.discord": "https://discordapp.com/invite/VYzsydb"
3131
},
32-
"parent": "refinedstorage2"
32+
"parent": "refinedstorage"
3333
}
3434
},
3535
"depends": {
3636
"fabricloader": ">=0.14.6",
3737
"fabric-api": "*",
38-
"minecraft": "~1.20.4",
39-
"jei": ">=17",
38+
"minecraft": "~1.21",
39+
"refinedstorage": ">=2.0.0-milestone.4.0",
40+
"jei": ">=19",
4041
"java": ">=17"
4142
}
4243
}

‎refinedstorage-jei-integration-forge/.gitignore

-1
This file was deleted.

‎refinedstorage-jei-integration-neoforge/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
run/

0 commit comments

Comments
 (0)