Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ra1 to Ra2 #25

Merged
merged 6 commits into from
Jul 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

dependencies {
api('com.github.GTNewHorizons:AsieLib:0.5.5:dev')
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.11-GTNH:dev')
compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.16-GTNH:dev')
compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.39:dev")
compileOnly('li.cil.tis3d:TIS-3D:MC1.7.10-1.2.4.70:dev')
compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.04.06:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.46.02:dev')
compileOnly('com.github.GTNewHorizons:Draconic-Evolution:1.3.5-GTNH:api')
compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.5-GTNH:api')
compileOnly('com.github.GTNewHorizons:gendustry:1.7.0-GTNH:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.97:dev')
compileOnly('com.github.GTNewHorizons:Draconic-Evolution:1.3.6-GTNH:api')
compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.7-GTNH:api')
compileOnly('com.github.GTNewHorizons:gendustry:1.8.0-GTNH:dev')
compileOnly('de.dfki.mary:voice-cmu-slt-hsmm:5.2.1') {
exclude module: 'commons-io'
}
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
}


Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
package pl.asie.computronics.integration.gregtech.gregtech5;

import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
import static gregtech.api.recipe.RecipeMaps.chemicalReactorRecipes;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import static gregtech.api.util.GT_RecipeBuilder.TICKS;

import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;

Expand All @@ -9,6 +14,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import mods.railcraft.common.items.ItemElectricMeter;
Expand Down Expand Up @@ -81,20 +87,20 @@ public void registerRecipes() {
Blocks.noteblock);
}
if (Computronics.audioCable != null) {
GT_Values.RA.addAssemblerRecipe(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1),
Materials.Bismuth.getMolten(GT_Values.L),
new ItemStack(Computronics.audioCable, 1, 0),
64,
30);
GT_Values.RA.addAssemblerRecipe(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1),
Materials.Lead.getMolten(GT_Values.L),
new ItemStack(Computronics.audioCable, 1, 0),
64,
30);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Bismuth.getMolten(GT_Values.L))
.itemOutputs(new ItemStack(Computronics.audioCable, 1, 0)).duration(3 * SECONDS + 4 * TICKS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1),
GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1))
.fluidInputs(Materials.Lead.getMolten(GT_Values.L))
.itemOutputs(new ItemStack(Computronics.audioCable, 1, 0)).duration(3 * SECONDS + 4 * TICKS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
}
if (Computronics.speaker != null) {
RecipeUtils.addShapedRecipe(
Expand Down Expand Up @@ -592,12 +598,12 @@ public static void registerStandardGregTechRecipes() {
"cellArgon");

// Cr + 2O = CrO2
GT_Values.RA.addChemicalRecipe(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
GT_Utility.getIntegratedCircuit(1),
Materials.Oxygen.getGas(2000),
null,
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ChromiumDioxide, 3),
800);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1),
GT_Utility.getIntegratedCircuit(1))
.fluidInputs(Materials.Oxygen.getGas(2000))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.ChromiumDioxide, 3))
.duration(40 * SECONDS).eut(TierEU.RECIPE_LV).addTo(chemicalReactorRecipes);
}
}