Skip to content

Commit edfbbdd

Browse files
committed
buffed gt energy further per tier
1 parent fa18d70 commit edfbbdd

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

build.gradle

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ mixin {
3131
debug.export = true
3232
}
3333

34-
version = "${minecraft_version}-1.1.1"
34+
version = "${minecraft_version}-1.1.2"
3535

3636
group = 'net.deepacat.createpowerlines' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
3737
archivesBaseName = 'createpowerlines'
@@ -180,9 +180,6 @@ repositories {
180180
includeGroup 'com.gregtechceu.gtceu'
181181
}
182182
}
183-
184-
//maven { url = 'https://maven.parchmentmc.org' }
185-
//maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
186183
}
187184

188185
dependencies {

src/main/java/net/deepacat/createpowerlines/GTAddonImpl.java

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,26 @@ public GTRegistrate getRegistrate() {
5858
return null;
5959
}
6060

61+
// midpoint
62+
public int mp(int x, int y){
63+
return ((x+y)/2);
64+
}
65+
// tier multiplier
66+
public int tm(int tier) {
67+
return switch (tier) {
68+
case 9 -> 128;
69+
case 8 -> 112;
70+
case 7 -> 96;
71+
case 6 -> 80;
72+
case 5 -> 64;
73+
case 4 -> 48;
74+
case 3 -> 32;
75+
case 2 -> 24;
76+
case 1 -> 20;
77+
default -> 16;
78+
};
79+
}
80+
6181
@Override
6282
public void initializeAddon() {
6383
if (!Config.USE_GT_CONNECTORS.get()) return;
@@ -78,19 +98,23 @@ public void initializeAddon() {
7898
}
7999
}
80100
}
81-
82101
// Making connectors from wires
83102
connectors = new ConnectorType[MAX_SUPPORTED_TIER + 1][];
84103
List<WireMaterial> acc = new ArrayList<>();
85104
for (int i = MAX_SUPPORTED_TIER; i >= 0; --i) {
86105
if (tierWireMats[i].isEmpty()) continue;
87106
acc.addAll(tierWireMats[i]);
88107
connectors[i] = new ConnectorType[] {
89-
ConnectorTypes.registerOne(GTValues.VN[i], "Small", 4, 16, GTValues.V[i], 4*4, List.copyOf(acc), 1, 0, tierColors[i], ConnectorStyle.SMALL),
90-
ConnectorTypes.registerOne(GTValues.VN[i], "Large", 4, 32, GTValues.V[i], 4*6, List.copyOf(acc), 2, 1, tierColors[i], ConnectorStyle.SMALL),
91-
ConnectorTypes.registerOne(GTValues.VN[i], "Huge", 3, 64, GTValues.V[i], 4*8, List.copyOf(acc), 3, 1, tierColors[i], ConnectorStyle.LARGE),
92-
ConnectorTypes.registerOne(GTValues.VN[i], "Giant", 3, 128, GTValues.V[i], 4*12, List.copyOf(acc), 3, 2, tierColors[i], ConnectorStyle.LARGE),
93-
ConnectorTypes.registerOne(GTValues.VN[i], "Massive", 2, 256, GTValues.V[i], 4*16, List.copyOf(acc), 3, 4, tierColors[i], ConnectorStyle.LARGE)
108+
ConnectorTypes.registerOne(GTValues.VN[i], "Massive", 2, 256, GTValues.V[i], 4*(tm(i)),
109+
List.copyOf(acc), 3, 4, tierColors[i], ConnectorStyle.LARGE),
110+
ConnectorTypes.registerOne(GTValues.VN[i], "Giant", 3, 128, GTValues.V[i], 4*(mp(tm(i), tm(i)/2)),
111+
List.copyOf(acc), 3, 2, tierColors[i], ConnectorStyle.LARGE),
112+
ConnectorTypes.registerOne(GTValues.VN[i], "Huge", 3, 64, GTValues.V[i], 4*(tm(i)/2),
113+
List.copyOf(acc), 3, 1, tierColors[i], ConnectorStyle.LARGE),
114+
ConnectorTypes.registerOne(GTValues.VN[i], "Large", 4, 32, GTValues.V[i], 4*(mp(tm(i), tm(i)/2)/2),
115+
List.copyOf(acc), 2, 1, tierColors[i], ConnectorStyle.SMALL),
116+
ConnectorTypes.registerOne(GTValues.VN[i], "Small", 4, 16, GTValues.V[i], 4*(tm(i)/4),
117+
List.copyOf(acc), 1, 0, tierColors[i], ConnectorStyle.SMALL),
94118
};
95119
}
96120
}

0 commit comments

Comments
 (0)