Skip to content

Commit 1d3d3cb

Browse files
miozuneDream-Master
miozune
and
Dream-Master
authored
Adapt to pipe rename (#1210)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
1 parent 7ba462f commit 1d3d3cb

File tree

2 files changed

+47
-56
lines changed

2 files changed

+47
-56
lines changed

‎gradle.properties

+1-18
Original file line numberDiff line numberDiff line change
@@ -55,23 +55,6 @@ generateGradleTokenClass = com.dreammaster.lib.BuildVersion
5555
# Name of the token containing the project's current version to generate/replace.
5656
gradleTokenVersion = VERSION
5757

58-
# [DEPRECATED] Mod ID replacement token.
59-
gradleTokenModId =
60-
61-
# [DEPRECATED] Mod name replacement token.
62-
gradleTokenModName =
63-
64-
# [DEPRECATED] Mod Group replacement token.
65-
gradleTokenGroupName =
66-
67-
# [DEPRECATED]
68-
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
69-
# public static final String VERSION = "GRADLETOKEN_VERSION";
70-
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
71-
# version in @Mod([...], version = VERSION, [...]).
72-
# Leave these properties empty to skip individual token replacements.
73-
replaceGradleTokenInFile =
74-
7558
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
7659
# leave this property empty.
7760
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
@@ -80,7 +63,7 @@ apiPackage =
8063
# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
8164
# There can be multiple files in a space-separated list.
8265
# Example value: mymodid_at.cfg nei_at.cfg
83-
accessTransformersFile =
66+
accessTransformersFile = dreamcraft_at.cfg
8467

8568
# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
8669
usesMixins = true

‎src/main/java/com/dreammaster/gthandler/GT_Loader_ItemPipes.java

+46-38
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import gregtech.api.enums.Materials;
44
import gregtech.api.enums.OrePrefixes;
5-
import gregtech.api.metatileentity.implementations.MTEItem;
5+
import gregtech.api.metatileentity.implementations.MTEItemPipe;
66
import gregtech.api.util.GTLanguageManager;
77
import gregtech.api.util.GTOreDictUnificator;
88

@@ -18,7 +18,7 @@ public static void registerPipes() {
1818
String displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Brass.mDefaultLocalName;
1919
GTOreDictUnificator.registerOre(
2020
OrePrefixes.pipeTiny.get(Materials.Brass),
21-
new MTEItem(
21+
new MTEItemPipe(
2222
5600,
2323
"GT_Pipe_Brass_Tiny",
2424
"Tiny " + displayName + " Item Pipe",
@@ -30,7 +30,7 @@ public static void registerPipes() {
3030
80).getStackForm(1L));
3131
GTOreDictUnificator.registerOre(
3232
OrePrefixes.pipeSmall.get(Materials.Brass),
33-
new MTEItem(
33+
new MTEItemPipe(
3434
5601,
3535
"GT_Pipe_Brass_Small",
3636
"Small " + displayName + " Item Pipe",
@@ -42,7 +42,7 @@ public static void registerPipes() {
4242
40).getStackForm(1L));
4343
GTOreDictUnificator.registerOre(
4444
OrePrefixes.pipeRestrictiveTiny.get(Materials.Brass),
45-
new MTEItem(
45+
new MTEItemPipe(
4646
5640,
4747
"GT_Pipe_Restrictive_Brass_Tiny",
4848
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -54,7 +54,7 @@ public static void registerPipes() {
5454
80).getStackForm(1L));
5555
GTOreDictUnificator.registerOre(
5656
OrePrefixes.pipeRestrictiveSmall.get(Materials.Brass),
57-
new MTEItem(
57+
new MTEItemPipe(
5858
5641,
5959
"GT_Pipe_Restrictive_Brass_Small",
6060
"Small Restrictive " + displayName + " Item Pipe",
@@ -69,7 +69,7 @@ public static void registerPipes() {
6969
displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Electrum.mDefaultLocalName;
7070
GTOreDictUnificator.registerOre(
7171
OrePrefixes.pipeTiny.get(Materials.Electrum),
72-
new MTEItem(
72+
new MTEItemPipe(
7373
5610,
7474
"GT_Pipe_Electrum_Tiny",
7575
"Tiny " + displayName + " Item Pipe",
@@ -81,7 +81,7 @@ public static void registerPipes() {
8181
40).getStackForm(1L));
8282
GTOreDictUnificator.registerOre(
8383
OrePrefixes.pipeSmall.get(Materials.Electrum),
84-
new MTEItem(
84+
new MTEItemPipe(
8585
5611,
8686
"GT_Pipe_Electrum_Small",
8787
"Small " + displayName + " Item Pipe",
@@ -92,7 +92,7 @@ public static void registerPipes() {
9292
false).getStackForm(1L));
9393
GTOreDictUnificator.registerOre(
9494
OrePrefixes.pipeRestrictiveTiny.get(Materials.Electrum),
95-
new MTEItem(
95+
new MTEItemPipe(
9696
5642,
9797
"GT_Pipe_Restrictive_Electrum_Tiny",
9898
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -104,7 +104,7 @@ public static void registerPipes() {
104104
40).getStackForm(1L));
105105
GTOreDictUnificator.registerOre(
106106
OrePrefixes.pipeRestrictiveSmall.get(Materials.Electrum),
107-
new MTEItem(
107+
new MTEItemPipe(
108108
5643,
109109
"GT_Pipe_Restrictive_Electrum_Small",
110110
"Small Restrictive " + displayName + " Item Pipe",
@@ -118,7 +118,7 @@ public static void registerPipes() {
118118
displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Platinum.mDefaultLocalName;
119119
GTOreDictUnificator.registerOre(
120120
OrePrefixes.pipeTiny.get(Materials.Platinum),
121-
new MTEItem(
121+
new MTEItemPipe(
122122
5620,
123123
"GT_Pipe_Platinum_Tiny",
124124
"Tiny " + displayName + " Item Pipe",
@@ -129,7 +129,7 @@ public static void registerPipes() {
129129
false).getStackForm(1L));
130130
GTOreDictUnificator.registerOre(
131131
OrePrefixes.pipeSmall.get(Materials.Platinum),
132-
new MTEItem(
132+
new MTEItemPipe(
133133
5621,
134134
"GT_Pipe_Platinum_Small",
135135
"Small " + displayName + " Item Pipe",
@@ -140,7 +140,7 @@ public static void registerPipes() {
140140
false).getStackForm(1L));
141141
GTOreDictUnificator.registerOre(
142142
OrePrefixes.pipeRestrictiveTiny.get(Materials.Platinum),
143-
new MTEItem(
143+
new MTEItemPipe(
144144
5644,
145145
"GT_Pipe_Restrictive_Platinum_Tiny",
146146
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -151,7 +151,7 @@ public static void registerPipes() {
151151
true).getStackForm(1L));
152152
GTOreDictUnificator.registerOre(
153153
OrePrefixes.pipeRestrictiveSmall.get(Materials.Platinum),
154-
new MTEItem(
154+
new MTEItemPipe(
155155
5645,
156156
"GT_Pipe_Restrictive_Platinum_Small",
157157
"Small Restrictive " + displayName + " Item Pipe",
@@ -165,7 +165,7 @@ public static void registerPipes() {
165165
displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Osmium.mDefaultLocalName;
166166
GTOreDictUnificator.registerOre(
167167
OrePrefixes.pipeTiny.get(Materials.Osmium),
168-
new MTEItem(
168+
new MTEItemPipe(
169169
5630,
170170
"GT_Pipe_Osmium_Tiny",
171171
"Tiny " + displayName + " Item Pipe",
@@ -176,7 +176,7 @@ public static void registerPipes() {
176176
false).getStackForm(1L));
177177
GTOreDictUnificator.registerOre(
178178
OrePrefixes.pipeSmall.get(Materials.Osmium),
179-
new MTEItem(
179+
new MTEItemPipe(
180180
5631,
181181
"GT_Pipe_Osmium_Small",
182182
"Small " + displayName + " Item Pipe",
@@ -187,7 +187,7 @@ public static void registerPipes() {
187187
false).getStackForm(1L));
188188
GTOreDictUnificator.registerOre(
189189
OrePrefixes.pipeRestrictiveTiny.get(Materials.Osmium),
190-
new MTEItem(
190+
new MTEItemPipe(
191191
5646,
192192
"GT_Pipe_Restrictive_Osmium_Tiny",
193193
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -198,7 +198,7 @@ public static void registerPipes() {
198198
true).getStackForm(1L));
199199
GTOreDictUnificator.registerOre(
200200
OrePrefixes.pipeRestrictiveSmall.get(Materials.Osmium),
201-
new MTEItem(
201+
new MTEItemPipe(
202202
5647,
203203
"GT_Pipe_Restrictive_Osmium_Small",
204204
"Small Restrictive " + displayName + " Item Pipe",
@@ -212,7 +212,7 @@ public static void registerPipes() {
212212
displayName = GTLanguageManager.i18nPlaceholder ? "%material" : Materials.Tin.mDefaultLocalName;
213213
GTOreDictUnificator.registerOre(
214214
OrePrefixes.pipeTiny.get(Materials.Tin),
215-
new MTEItem(
215+
new MTEItemPipe(
216216
5589,
217217
"GT_Pipe_Tin_Tiny",
218218
"Tiny " + displayName + " Item Pipe",
@@ -224,7 +224,7 @@ public static void registerPipes() {
224224
160).getStackForm(1L));
225225
GTOreDictUnificator.registerOre(
226226
OrePrefixes.pipeSmall.get(Materials.Tin),
227-
new MTEItem(
227+
new MTEItemPipe(
228228
5590,
229229
"GT_Pipe_Tin_Small",
230230
"Small " + displayName + " Item Pipe",
@@ -236,11 +236,19 @@ public static void registerPipes() {
236236
80).getStackForm(1L));
237237
GTOreDictUnificator.registerOre(
238238
OrePrefixes.pipeMedium.get(Materials.Tin),
239-
new MTEItem(5591, "GT_Pipe_Tin", displayName + " Item Pipe", 0.5F, Materials.Tin, 1, 65536, false, 40)
240-
.getStackForm(1L));
239+
new MTEItemPipe(
240+
5591,
241+
"GT_Pipe_Tin",
242+
displayName + " Item Pipe",
243+
0.5F,
244+
Materials.Tin,
245+
1,
246+
65536,
247+
false,
248+
40).getStackForm(1L));
241249
GTOreDictUnificator.registerOre(
242250
OrePrefixes.pipeLarge.get(Materials.Tin),
243-
new MTEItem(
251+
new MTEItemPipe(
244252
5592,
245253
"GT_Pipe_Tin_Large",
246254
"Large " + displayName + " Item Pipe",
@@ -251,7 +259,7 @@ public static void registerPipes() {
251259
false).getStackForm(1L));
252260
GTOreDictUnificator.registerOre(
253261
OrePrefixes.pipeHuge.get(Materials.Tin),
254-
new MTEItem(
262+
new MTEItemPipe(
255263
5593,
256264
"GT_Pipe_Tin_Huge",
257265
"Huge " + displayName + " Item Pipe",
@@ -263,7 +271,7 @@ public static void registerPipes() {
263271

264272
GTOreDictUnificator.registerOre(
265273
OrePrefixes.pipeRestrictiveTiny.get(Materials.Tin),
266-
new MTEItem(
274+
new MTEItemPipe(
267275
5594,
268276
"GT_Pipe_Restrictive_Tin_Tiny",
269277
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -275,7 +283,7 @@ public static void registerPipes() {
275283
160).getStackForm(1L));
276284
GTOreDictUnificator.registerOre(
277285
OrePrefixes.pipeRestrictiveSmall.get(Materials.Tin),
278-
new MTEItem(
286+
new MTEItemPipe(
279287
5595,
280288
"GT_Pipe_Restrictive_Tin_Small",
281289
"Small Restrictive " + displayName + " Item Pipe",
@@ -287,7 +295,7 @@ public static void registerPipes() {
287295
80).getStackForm(1L));
288296
GTOreDictUnificator.registerOre(
289297
OrePrefixes.pipeRestrictiveMedium.get(Materials.Tin),
290-
new MTEItem(
298+
new MTEItemPipe(
291299
5596,
292300
"GT_Pipe_Restrictive_Tin",
293301
"Restrictive " + displayName + " Pipe",
@@ -299,7 +307,7 @@ public static void registerPipes() {
299307
40).getStackForm(1L));
300308
GTOreDictUnificator.registerOre(
301309
OrePrefixes.pipeRestrictiveLarge.get(Materials.Tin),
302-
new MTEItem(
310+
new MTEItemPipe(
303311
5597,
304312
"GT_Pipe_Restrictive_Tin_Large",
305313
"Large Restrictive " + displayName + " Item Pipe",
@@ -310,7 +318,7 @@ public static void registerPipes() {
310318
true).getStackForm(1L));
311319
GTOreDictUnificator.registerOre(
312320
OrePrefixes.pipeRestrictiveHuge.get(Materials.Tin),
313-
new MTEItem(
321+
new MTEItemPipe(
314322
5598,
315323
"GT_Pipe_Restrictive_Tin_Huge",
316324
"Huge Restrictive " + displayName + " Item Pipe",
@@ -339,7 +347,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
339347
int baseInvSlots) {
340348
GTOreDictUnificator.registerOre(
341349
OrePrefixes.pipeTiny.get(aMaterial),
342-
new MTEItem(
350+
new MTEItemPipe(
343351
startID,
344352
"GT_Pipe_" + name + "_Tiny",
345353
"Tiny " + displayName + " Item Pipe",
@@ -350,7 +358,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
350358
false).getStackForm(1L));
351359
GTOreDictUnificator.registerOre(
352360
OrePrefixes.pipeSmall.get(aMaterial),
353-
new MTEItem(
361+
new MTEItemPipe(
354362
startID + 1,
355363
"GT_Pipe_" + name + "_Small",
356364
"Small " + displayName + " Item Pipe",
@@ -361,7 +369,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
361369
false).getStackForm(1L));
362370
GTOreDictUnificator.registerOre(
363371
OrePrefixes.pipeMedium.get(aMaterial),
364-
new MTEItem(
372+
new MTEItemPipe(
365373
startID + 2,
366374
"GT_Pipe_" + name,
367375
displayName + " Item Pipe",
@@ -372,7 +380,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
372380
false).getStackForm(1L));
373381
GTOreDictUnificator.registerOre(
374382
OrePrefixes.pipeLarge.get(aMaterial),
375-
new MTEItem(
383+
new MTEItemPipe(
376384
startID + 3,
377385
"GT_Pipe_" + name + "_Large",
378386
"Large " + displayName + " Item Pipe",
@@ -383,7 +391,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
383391
false).getStackForm(1L));
384392
GTOreDictUnificator.registerOre(
385393
OrePrefixes.pipeHuge.get(aMaterial),
386-
new MTEItem(
394+
new MTEItemPipe(
387395
startID + 4,
388396
"GT_Pipe_" + name + "_Huge",
389397
"Huge " + displayName + " Item Pipe",
@@ -394,7 +402,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
394402
false).getStackForm(1L));
395403
GTOreDictUnificator.registerOre(
396404
OrePrefixes.pipeRestrictiveTiny.get(aMaterial),
397-
new MTEItem(
405+
new MTEItemPipe(
398406
startID + 5,
399407
"GT_Pipe_Restrictive_" + name + "_Tiny",
400408
"Tiny Restrictive " + displayName + " Item Pipe",
@@ -405,7 +413,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
405413
true).getStackForm(1L));
406414
GTOreDictUnificator.registerOre(
407415
OrePrefixes.pipeRestrictiveSmall.get(aMaterial),
408-
new MTEItem(
416+
new MTEItemPipe(
409417
startID + 6,
410418
"GT_Pipe_Restrictive_" + name + "_Small",
411419
"Small Restrictive " + displayName + " Item Pipe",
@@ -416,7 +424,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
416424
true).getStackForm(1L));
417425
GTOreDictUnificator.registerOre(
418426
OrePrefixes.pipeRestrictiveMedium.get(aMaterial),
419-
new MTEItem(
427+
new MTEItemPipe(
420428
startID + 7,
421429
"GT_Pipe_Restrictive_" + name,
422430
"Restrictive " + displayName + " Item Pipe",
@@ -427,7 +435,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
427435
true).getStackForm(1L));
428436
GTOreDictUnificator.registerOre(
429437
OrePrefixes.pipeRestrictiveLarge.get(aMaterial),
430-
new MTEItem(
438+
new MTEItemPipe(
431439
startID + 8,
432440
"GT_Pipe_Restrictive_" + name + "_Large",
433441
"Large Restrictive " + displayName + " Item Pipe",
@@ -438,7 +446,7 @@ private static void generateItemPipes(Materials aMaterial, String name, String d
438446
true).getStackForm(1L));
439447
GTOreDictUnificator.registerOre(
440448
OrePrefixes.pipeRestrictiveHuge.get(aMaterial),
441-
new MTEItem(
449+
new MTEItemPipe(
442450
startID + 9,
443451
"GT_Pipe_Restrictive_" + name + "_Huge",
444452
"Huge Restrictive " + displayName + " Item Pipe",

0 commit comments

Comments
 (0)