Migrate to new RecipeMap

This commit is contained in:
miozune committed 2023-12-01 14:43:18 +09:00
1 parent c207fad52d
commit b2108eb2c5
6 files changed
+18 -27

No files matched your search

-12
View File
@@ -1,12 +0,0 @@
#!/usr/bin/env bash
if ! git diff --name-only HEAD HEAD~1 | grep -qF 'build.gradle'; then
new_version="$(date +%s)"
sed --in-place "s!^//version:.*!//version: $new_version!g" build.gradle
git add build.gradle
git commit -m "[ci skip] update build script version to $new_version"
git push
printf 'Updated buildscript version to %s\n' "$new_version"
else
printf 'Ignored buildscript version update: no changes detected\n'
fi
+6
View File
@@ -30,3 +30,9 @@ src/main/resources/mixins.*([!.]).json
*.bat
*.DS_Store
!gradlew.bat
.factorypath
addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
layout.json
+5 -6
View File
@@ -1,4 +1,4 @@
//version: 1696952014
//version: 1700844281
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -302,7 +302,7 @@ if (apiPackage) {
}
if (accessTransformersFile) {
for (atFile in accessTransformersFile.split(",")) {
for (atFile in accessTransformersFile.split(" ")) {
String targetFile = "src/main/resources/META-INF/" + atFile.trim()
if (!getFile(targetFile).exists()) {
throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
@@ -646,7 +646,7 @@ repositories {
def mixinProviderGroup = "io.github.legacymoddingmc"
def mixinProviderModule = "unimixins"
def mixinProviderVersion = "0.1.7.1"
def mixinProviderVersion = "0.1.13"
def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
ext.mixinProviderSpec = mixinProviderSpec
@@ -798,7 +798,7 @@ dependencies {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
if (modId != 'hodgepodge') {
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7')
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17')
}
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
@@ -1187,9 +1187,8 @@ publishing {
version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
}
}
repositories {
if (usesMavenPublishing.toBoolean()) {
if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
maven {
url = mavenPublishUrl
allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven
+1 -1
View File
@@ -1,6 +1,6 @@
dependencies {
implementation('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.36:dev')
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.92-pre:dev')
implementation('curse.maven:cofh-lib-220333:2388748')
implementation(deobf('https://forum.industrial-craft.net/core/attachment/4519-gravisuite-1-7-10-2-0-3-jar'))
}
+2 -1
View File
@@ -1 +1,2 @@
repositories {}
repositories {
}
@@ -1,7 +1,5 @@
package com.gtnewhorizons.gravisuiteneo.util;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
import java.util.stream.Collectors;
@@ -10,17 +8,16 @@ import net.minecraftforge.fluids.FluidStack;
import org.apache.commons.lang3.tuple.Pair;
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
public class GregTechAPIHelper {
public static Map<Fluid, Integer> getGTPlasmaFluids() {
Collection<GT_Recipe> mRecipeList = GT_Recipe_Map.sPlasmaFuels.mRecipeList;
return mRecipeList == null ? Collections.emptyMap()
: mRecipeList.parallelStream().map(GregTechAPIHelper::getFluidAndValue).filter(p -> p.getLeft() != null)
.collect(Collectors.toMap(p -> p.getLeft().getFluid(), Pair::getRight));
return RecipeMaps.plasmaFuels.getAllRecipes().parallelStream().map(GregTechAPIHelper::getFluidAndValue)
.filter(p -> p.getLeft() != null)
.collect(Collectors.toMap(p -> p.getLeft().getFluid(), Pair::getRight));
}
private static Pair<FluidStack, Integer> getFluidAndValue(GT_Recipe recipe) {