Skip to content

Commit 3227876

Browse files
committed
fixes for 2.6.0
- Fixed a bug where lower EU-tier Disassemblers are not registered. - Fixed a bug that causes 2.6.0 to crash. - Updated dependencies
1 parent 6f5b895 commit 3227876

File tree

5 files changed

+31
-24
lines changed

5 files changed

+31
-24
lines changed

dependencies.gradle

+14-14
Original file line numberDiff line numberDiff line change
@@ -36,32 +36,32 @@
3636
dependencies {
3737
// generated code start - DON'T CHANGE!
3838
// CodeChickenCore
39-
implementation("com.github.GTNewHorizons:CodeChickenCore:1.1.13:dev")
39+
implementation("com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev")
4040
// CodeChickenLib
41-
implementation("com.github.GTNewHorizons:CodeChickenLib:1.1.10:dev")
41+
implementation("com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev")
4242
// Gregtech
43-
implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.44.110:dev")
43+
implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.163:dev")
4444
// GT++
45-
implementation("com.github.GTNewHorizons:GTplusplus:1.10.54:dev")
45+
implementation("com.github.GTNewHorizons:GTplusplus:1.11.58:dev")
4646
// GTNHLib
47-
implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev")
47+
implementation("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
4848
// NewHorizonsCore
49-
implementation("com.github.GTNewHorizons:NewHorizonsCoreMod:2.2.55:dev")
49+
implementation("com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.50:dev")
5050
// GoodGenerator
51-
implementation("com.github.GTNewHorizons:GoodGenerator:0.7.17:dev")
51+
implementation("com.github.GTNewHorizons:GoodGenerator:0.8.22:dev")
5252
// TecTech
53-
implementation("com.github.GTNewHorizons:TecTech:5.3.23:dev")
53+
implementation("com.github.GTNewHorizons:TecTech:5.3.45:dev")
5454
// Forestry
55-
implementation("com.github.GTNewHorizons:ForestryMC:4.7.1:api") { transitive = false }
55+
implementation("com.github.GTNewHorizons:ForestryMC:4.8.9:api") { transitive = false }
5656
// Railcraft
57-
implementation("com.github.GTNewHorizons:Railcraft:9.15.3:dev") { transitive = false }
57+
implementation("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false }
5858
// Buildcraft
59-
implementation("com.github.GTNewHorizons:BuildCraft:7.1.38:dev") { transitive = false }
59+
implementation("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
6060
// EnderIO
61-
implementation("com.github.GTNewHorizons:EnderIO:2.5.9:dev") { transitive = false }
61+
implementation("com.github.GTNewHorizons:EnderIO:2.7.4:dev") { transitive = false }
6262
// ProjectRed
63-
implementation("com.github.GTNewHorizons:ProjectRed:4.8.1-GTNH:dev") { transitive = false }
63+
implementation("com.github.GTNewHorizons:ProjectRed:4.9.5-GTNH:dev") { transitive = false }
6464
// TinkerConstruct
65-
implementation("com.github.GTNewHorizons:TinkersConstruct:1.10.13-GTNH:dev") { transitive = false }
65+
implementation("com.github.GTNewHorizons:TinkersConstruct:1.11.15-GTNH:dev") { transitive = false }
6666
// generated code end
6767
}

src/main/java/cn/taskeren/gtnn/GTNN.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ public class GTNN {
1717
static final String MOD_NAME = "GT-NO-NERF";
1818

1919
static final String DEPENDENCIES
20-
= "required-after:gregtech"
21-
+ "required-after:miscutils" // gt++
22-
+ "required-after:GoodGenerator"
23-
+ "required-after:dreamcraft" // new-horizons-core
24-
+ "required-after:tectech"
25-
+ "required-after:gtnhlib"
26-
+ "required-after:bartworks"
20+
= "required-after:gregtech;"
21+
+ "required-after:miscutils;" // gt++
22+
+ "required-after:GoodGenerator;"
23+
+ "required-after:dreamcraft;" // new-horizons-core
24+
+ "required-after:tectech;"
25+
+ "required-after:gtnhlib;"
26+
+ "required-after:bartworks;"
2727
;
2828

2929
@SidedProxy(clientSide = "cn.taskeren.gtnn.client.ClientProxy", serverSide = "cn.taskeren.gtnn.common.CommonProxy")

src/main/java/cn/taskeren/gtnn/mixin/gtpp/GT_MTE_LargeTurbine_SCSteamMixin.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public GT_MTE_LargeTurbine_SCSteamMixin(int aID, String aName, String aNameRegio
2424
* @reason revert supercritical duranium ichorium nerf
2525
*/
2626
@Overwrite
27-
int fluidIntoPower(ArrayList<FluidStack> aFluids, long aOptFlow, int aBaseEff, float[] flowMultipliers) {
27+
long fluidIntoPower(ArrayList<FluidStack> aFluids, long aOptFlow, int aBaseEff, float[] flowMultipliers) {
2828
int tEU = 0;
2929
int totalFlow = 0; // Byproducts are based on actual flow
3030
int flow = 0;
@@ -58,6 +58,6 @@ int fluidIntoPower(ArrayList<FluidStack> aFluids, long aOptFlow, int aBaseEff, f
5858
tEU = MathUtils.safeInt((long) tEU * (long) aBaseEff / 10000L);
5959
}
6060

61-
return (int) Math.min(tEU * 100L, Integer.MAX_VALUE);
61+
return Math.min(tEU * 100L, Integer.MAX_VALUE);
6262
}
6363
}

src/main/java/cn/taskeren/gtnn/mixinplugin/Feature.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ public enum Feature {
77

88
ReturnDisassembler(
99
"Add disassemblers back to the game.",
10+
Mixin.GTLoaderMetaTileEntities,
1011
Mixin.GTLoaderMachinesMixin,
1112
Mixin.GTShapedRecipe,
1213
Mixin.GTShapelessRecipe

src/main/java/cn/taskeren/gtnn/mod/gt5u/util/DisassemblerRecipes.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import org.apache.logging.log4j.MarkerManager;
1818

1919
import java.util.ArrayList;
20+
import java.util.Arrays;
2021
import java.util.List;
22+
import java.util.stream.Collectors;
2123

2224
import static gregtech.api.enums.Mods.AppliedEnergistics2;
2325
import static gregtech.api.enums.Mods.IndustrialCraft2;
@@ -124,9 +126,13 @@ public static void loadAssemblerRecipes() {
124126
}
125127
}
126128

129+
var outputItemStack = Arrays.stream(originalRecipe.mInputs)
130+
.filter(i -> !GT_Utility.isAnyIntegratedCircuit(i))
131+
.collect(Collectors.toList()).toArray(new ItemStack[0]);
132+
127133
GT_Values.RA.stdBuilder()
128134
.itemInputs(originalRecipe.mOutputs)
129-
.itemOutputs(originalRecipe.mInputs)
135+
.itemOutputs(outputItemStack)
130136
.duration(originalRecipe.mDuration)
131137
.eut(originalRecipe.mEUt)
132138
.addTo(DISASSEMBLER_RECIPES)

0 commit comments

Comments
 (0)