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.

Sign up for GitHub

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

change scanning time to new GT format #1

Merged
merged 3 commits into from
Jan 17, 2025
Merged

change scanning time to new GT format #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df5ea8d
change scanning time to new GT format
Dream-Master Jan 16, 2025
14042d7
sa
Dream-Master Jan 16, 2025
6e81de0
deps
Dream-Master Jan 16, 2025
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
18 changes: 9 additions & 9 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,26 @@ dependencies {
implementation("com.github.GTNewHorizons:GTNHLib:0.6.2:dev")
implementation("com.github.GTNewHorizons:ModularUI:1.2.17:dev")

compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta28:api') { transitive = false }
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-521-GTNH:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta29:api') { transitive = false }
compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ArchitectureCraft:1.10.2") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.0:dev") { transitive = false }
compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false }
compileOnly("com.github.GTNewHorizons:EnderIO:2.9.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev") { transitive = false }
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false }
compileOnly("curse.maven:mekanism-268560:2475797") { transitive = false }
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.22-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:OpenComputers:1.11.4-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") { transitive = false }

runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-521-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.73:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.75:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ArchitectureCraft:1.10.2")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.20-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.15:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.22-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.6.16:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForgeMultipart:1.6.2:dev")

compileOnly deobf("https://www.immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar", "immibis-microblocks-59.1.2")
Expand Down
19 changes: 10 additions & 9 deletions ...in/java/com/recursive_pineapple/matter_manipulator/common/recipes/ManipulatorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.api.util.recipe.Scanning;

import appeng.api.AEApi;

Expand Down Expand Up @@ -269,7 +270,7 @@ private static void addMK2Recipes() {
// Power core MK2
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_HPIC.get(2))
.metadata(RESEARCH_TIME, 40 * MINUTES)
.metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.HSSS, 8),
ItemList.Energy_LapotronicOrb2.get(1),
Expand All @@ -292,7 +293,7 @@ private static void addMK2Recipes() {
// Computer core MK2
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1))
.metadata(RESEARCH_TIME, 40 * MINUTES)
.metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.HSSS, 1),
new Object[] {
Expand All @@ -314,7 +315,7 @@ private static void addMK2Recipes() {
// Teleporter core MK2
if (gs) GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1))
.metadata(RESEARCH_TIME, 40 * MINUTES)
.metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Quantium, 1),
ItemList.Emitter_LuV.get(2),
Expand Down Expand Up @@ -349,7 +350,7 @@ private static void addMK2Recipes() {
// Lens MK2
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 1))
.metadata(RESEARCH_TIME, 40 * MINUTES)
.metadata(SCANNING, new Scanning(1 * MINUTES, TierEU.RECIPE_LuV))
.itemInputs(
WerkstoffLoader.RedZircon.get(OrePrefixes.lens, 2),
GTOreDictUnificator.get(OrePrefixes.ring, Materials.HSSS, 4),
Expand Down Expand Up @@ -390,7 +391,7 @@ private static void addMK3Recipe() {
// Power core MK3
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, ItemList.Circuit_Chip_UHPIC.get(2))
.metadata(RESEARCH_TIME, 60 * MINUTES)
.metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.itemCasing, Materials.NaquadahAlloy, 8),
ItemList.Energy_Module.get(1),
Expand All @@ -410,7 +411,7 @@ private static void addMK3Recipe() {
// Computer core MK3
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1))
.metadata(RESEARCH_TIME, 60 * MINUTES)
.metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.NaquadahAlloy, 1),
new Object[] {
Expand All @@ -429,7 +430,7 @@ private static void addMK3Recipe() {
// Teleporter core MK3
if (gs) GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1))
.metadata(RESEARCH_TIME, 60 * MINUTES)
.metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM))
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.MysteriousCrystal, 1),
ItemList.Emitter_ZPM.get(2),
Expand Down Expand Up @@ -465,7 +466,7 @@ private static void addMK3Recipe() {
// Lens MK3
GTValues.RA.stdBuilder()
.metadata(RESEARCH_ITEM, WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 1))
.metadata(RESEARCH_TIME, 60 * MINUTES)
.metadata(SCANNING, new Scanning(2 * MINUTES, TierEU.RECIPE_ZPM))
.itemInputs(
WerkstoffLoader.MagnetoResonaticDust.get(OrePrefixes.lens, 2),
GTOreDictUnificator.get(OrePrefixes.ring, Materials.NaquadahAlloy, 4),
Expand Down Expand Up @@ -525,7 +526,7 @@ private static void addMK3Recipe() {
.maybeStack(1)
.get()
)
.metadata(RESEARCH_TIME, 120 * MINUTES)
.metadata(SCANNING, new Scanning(4 * MINUTES, TierEU.RECIPE_LuV))
.itemInputs(
AEApi.instance()
.definitions()
Expand Down
Loading