From df53481401facd51237504e81b806e340c91d77d Mon Sep 17 00:00:00 2001 From: YannickMG Date: Sat, 11 Jan 2025 18:12:41 -0500 Subject: [PATCH 1/2] com.dreammaster.item.ItemList -> NHItemList --- .../circuits/CircuitLineHandler.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/circuits/CircuitLineHandler.java b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/circuits/CircuitLineHandler.java index bff06a9..e4aefed 100644 --- a/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/circuits/CircuitLineHandler.java +++ b/src/main/java/com/github/dcysteine/neicustomdiagram/generators/gregtech5/circuits/CircuitLineHandler.java @@ -10,6 +10,7 @@ import javax.annotation.Nullable; import com.dreammaster.gthandler.CustomItemList; +import com.dreammaster.item.NHItemList; import com.github.dcysteine.neicustomdiagram.api.diagram.component.DisplayComponent; import com.github.dcysteine.neicustomdiagram.api.diagram.component.ItemComponent; import com.github.dcysteine.neicustomdiagram.main.Registry; @@ -133,22 +134,21 @@ void initialize() { if (Registry.ModDependency.GTNH_CORE_MOD.isLoaded()) { circuitLinesBuilder.add( CircuitLine.builder().setStartTier(0) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitULV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitLV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitMV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitHV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitEV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitIV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitLuV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitZPM.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUHV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUEV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUIV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUMV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitUXV.getIS())) - .addCircuits(ItemComponent.create(com.dreammaster.item.ItemList.CircuitMAX.getIS())) - .build()); + .addCircuits(ItemComponent.create(NHItemList.CircuitULV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitLV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitMV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitHV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitEV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitIV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitLuV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitZPM.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUHV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUEV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUIV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUMV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitUXV.getIS())) + .addCircuits(ItemComponent.create(NHItemList.CircuitMAX.getIS())).build()); } circuitLinesBuilder .add( From 30f3b5b20de8ea140c7bcea4ea141809d5ff1336 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sat, 11 Jan 2025 23:43:37 +0000 Subject: [PATCH 2/2] update deps --- dependencies.gradle | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index c2726e2..bb3a71b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,11 +4,11 @@ dependencies { compileOnly('com.google.auto.value:auto-value-annotations:1.8.2') annotationProcessor('com.google.auto.value:auto-value:1.8.2') - api('com.github.GTNewHorizons:CodeChickenCore:1.3.10:dev') - api('com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev') - api('com.github.GTNewHorizons:EnderStorage:1.6.4:dev') {transitive=false} - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.08:dev') - api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.7.3:dev') + api('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev') + api('com.github.GTNewHorizons:EnderStorage:1.7.0:dev') {transitive=false} + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.65:dev') + api('com.github.GTNewHorizons:NewHorizonsCoreMod:2.7.47:dev') - compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.19:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.1:dev') }