amy/almostunified
1
0
Fork 0
mirror of https://github.com/AlmostReliable/almostunified.git synced 2024-11-14 19:25:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

partial 1.19.4 port

Browse source
This commit is contained in:
Relentless 2023-03-25 19:11:29 +01:00
parent 7f941373d9
commit d0e5e01f37
No known key found for this signature in database
GPG key ID: 50C5FD225130D790
7 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -4,12 +4,12 @@ on:
workflow_dispatch:
push:
branches:
- '1.19.3'
- '1.19.4'
tags-ignore:
- '**'
pull_request:
branches:
- '1.19.3'
- '1.19.4'
env:
JAVA_DIST: 'zulu'

2
.github/workflows/release.yml vendored
View file

@ -4,7 +4,7 @@ on:
workflow_dispatch:
push:
tags:
- 'v1.19.3-*.*.*'
- 'v1.19.4-*.*.*'
env:
JAVA_DIST: 'zulu'

4
Common/build.gradle.kts
View file

@ -29,8 +29,8 @@ dependencies {
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api:$reiVersion") // required for common rei plugin
compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer on jei plugin
testCompileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // don't question this, it's required for compiling
modCompileOnlyApi("mezz.jei:jei-$minecraftVersion-common:$jeiVersion") // required for common jei plugin
modCompileOnly("mezz.jei:jei-$minecraftVersion-gui:$jeiVersion") // required for jei mixin
// modCompileOnlyApi("mezz.jei:jei-$minecraftVersion-common:$jeiVersion") // required for common jei plugin
// modCompileOnly("mezz.jei:jei-$minecraftVersion-gui:$jeiVersion") // required for jei mixin
// The Fabric loader is required here to use the @Environment annotations and to get the mixin dependencies.
// Do NOT use other classes from the Fabric loader!

5
Common/src/main/java/com/almostreliable/unified/recipe/ClientRecipeTracker.java
View file

@ -5,6 +5,7 @@ import com.almostreliable.unified.utils.Utils;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import net.minecraft.core.RegistryAccess;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.Container;
@ -67,7 +68,7 @@ public class ClientRecipeTracker implements Recipe<Container> {
}
@Override
public ItemStack assemble(Container container) {
public ItemStack assemble(Container container, RegistryAccess registryAccess) {
return ItemStack.EMPTY;
}
@ -77,7 +78,7 @@ public class ClientRecipeTracker implements Recipe<Container> {
}
@Override
public ItemStack getResultItem() {
public ItemStack getResultItem(RegistryAccess registryAccess) {
return ItemStack.EMPTY;
}

2
Fabric/build.gradle.kts
View file

@ -33,7 +33,7 @@ dependencies {
modCompileOnly("me.shedaniel:RoughlyEnoughItems-api-fabric:$reiVersion") // required for common rei plugin
compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer on jei plugin
testCompileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // don't question this, it's required for compiling
modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion") // required for common jei plugin and mixin
// modCompileOnly("mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion") // required for common jei plugin and mixin
when (fabricRecipeViewer) { // runtime only
"rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-fabric:$reiVersion")
"jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-fabric:$jeiVersion")

2
Forge/build.gradle.kts
View file

@ -44,7 +44,7 @@ dependencies {
modCompileOnly("me.shedaniel:RoughlyEnoughItems-forge:$reiVersion") // required for common rei plugin | api does not work here
compileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // required to disable rei compat layer on jei plugin
testCompileOnly("me.shedaniel:REIPluginCompatibilities-forge-annotations:9.+") // don't question this, it's required for compiling
modCompileOnly("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false } // required for common jei plugin and mixin, transitivity is off because it breaks the forge runtime
// modCompileOnly("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false } // required for common jei plugin and mixin, transitivity is off because it breaks the forge runtime
when (forgeRecipeViewer) { // runtime only
"rei" -> modLocalRuntime("me.shedaniel:RoughlyEnoughItems-forge:$reiVersion")
"jei" -> modLocalRuntime("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion") { isTransitive = false }

12
gradle.properties
View file

@ -8,7 +8,7 @@ extraModsDirectory = extra-mods
junitVersion = 5.9.0
# Minecraft
minecraftVersion = 1.19.3
minecraftVersion = 1.19.4
# Mod
modVersion = 0.3.6
@ -19,17 +19,17 @@ modAuthor = Almost Reliable
modDescription = Unify all resources.
# Mod Dependencies
reiVersion = 10.0.586
reiVersion = 11.0.597
jeiVersion = 12.1.1.10
# Fabric Settings
fabricLoaderVersion = 0.14.13
fabricApiVersion = 0.73.2
fabricLoaderVersion = 0.14.18
fabricApiVersion = 0.76.0
fabricRecipeViewer = rei
# Forge Settings
forgeVersion = 44.1.5
forgeRecipeViewer = jei
forgeVersion = 45.0.24
forgeRecipeViewer = rei
# Github
githubUser = AlmostReliable