Skip to content

Commit ba42158

Browse files
committed
Add GregTech Drawers
1 parent 3b81cdb commit ba42158

File tree

2 files changed

+94
-42
lines changed

2 files changed

+94
-42
lines changed

groovy/postInit/storage_drawers.groovy

Lines changed: 89 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
11

2-
def create_drawer(planks, slab, wood_name) {
3-
basic_drawer(planks, wood_name)
4-
basic_drawer_1_2(planks, wood_name)
5-
basic_drawer_2_2(planks, wood_name)
6-
half_drawer_1_2(slab, wood_name)
7-
half_drawer_2_2(slab, wood_name)
2+
def create_drawer(planks, slab, wood_name, boolean isGT) {
3+
basic_drawer(planks, wood_name, isGT)
4+
basic_drawer_1_2(planks, wood_name, isGT)
5+
basic_drawer_2_2(planks, wood_name, isGT)
6+
half_drawer_1_2(slab, wood_name, isGT)
7+
half_drawer_2_2(slab, wood_name, isGT)
88
}
99

10-
def basic_drawer(planks, wood_name) {
11-
crafting.remove('storagedrawers:basicdrawers_fulldrawers1_' + wood_name)
12-
13-
def output = item('storagedrawers:basicdrawers').withNbt([
14-
'material': wood_name
15-
])
10+
def basic_drawer(planks, wood_name, boolean isGT) {
11+
if (isGT) {
12+
crafting.remove('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood_fulldrawers1_gregtech_' + wood_name + '_wood.0')
13+
} else {
14+
crafting.remove('storagedrawers:basicdrawers_fulldrawers1_' + wood_name)
15+
}
16+
17+
var output
18+
if (isGT) {
19+
output = item('gregtechdrawers:basicdrawers_gregtech_' + wood_name + "_wood")
20+
} else {
21+
output = item('storagedrawers:basicdrawers').withNbt([
22+
'material': wood_name
23+
])
24+
}
1625

1726
crafting.shapedBuilder().name('basicdrawers_fulldrawers1_' + wood_name)
1827
.output(output)
@@ -31,12 +40,21 @@ def basic_drawer(planks, wood_name) {
3140
.duration(100).EUt(16).buildAndRegister()
3241
}
3342

34-
def basic_drawer_1_2(planks, wood_name) {
35-
crafting.remove('storagedrawers:basicdrawers_fulldrawers2_' + wood_name)
36-
37-
def output = item('storagedrawers:basicdrawers', 1).withNbt([
38-
'material': wood_name
39-
])
43+
def basic_drawer_1_2(planks, wood_name, boolean isGT) {
44+
if (isGT) {
45+
crafting.remove('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood_fulldrawers2_gregtech_' + wood_name + '_wood.0')
46+
} else {
47+
crafting.remove('storagedrawers:basicdrawers_fulldrawers2_' + wood_name)
48+
}
49+
50+
var output
51+
if (isGT) {
52+
output = item('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood', 1)
53+
} else {
54+
output = item('storagedrawers:basicdrawers', 1).withNbt([
55+
'material': wood_name
56+
])
57+
}
4058

4159
crafting.shapedBuilder().name('basicdrawers_fulldrawers2_' + wood_name)
4260
.output(output)
@@ -55,12 +73,21 @@ def basic_drawer_1_2(planks, wood_name) {
5573
.duration(100).EUt(16).buildAndRegister()
5674
}
5775

58-
def basic_drawer_2_2(planks, wood_name) {
59-
crafting.remove('storagedrawers:basicdrawers_fulldrawers4_' + wood_name)
60-
61-
def output = item('storagedrawers:basicdrawers', 2).withNbt([
62-
'material': wood_name
63-
])
76+
def basic_drawer_2_2(planks, wood_name, boolean isGT) {
77+
if (isGT) {
78+
crafting.remove('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood_fulldrawers4_gregtech_' + wood_name + '_wood.0')
79+
} else {
80+
crafting.remove('storagedrawers:basicdrawers_fulldrawers4_' + wood_name)
81+
}
82+
83+
var output
84+
if (isGT) {
85+
output = item('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood', 2)
86+
} else {
87+
output = item('storagedrawers:basicdrawers', 2).withNbt([
88+
'material': wood_name
89+
])
90+
}
6491

6592
crafting.shapedBuilder().name('basicdrawers_fulldrawers4_' + wood_name)
6693
.output(output)
@@ -79,12 +106,21 @@ def basic_drawer_2_2(planks, wood_name) {
79106
.duration(100).EUt(16).buildAndRegister()
80107
}
81108

82-
def half_drawer_1_2(slab, wood_name) {
83-
crafting.remove('storagedrawers:basicdrawers_halfdrawers2_' + wood_name)
84-
85-
def output = item('storagedrawers:basicdrawers', 3).withNbt([
86-
'material': wood_name
87-
])
109+
def half_drawer_1_2(slab, wood_name, boolean isGT) {
110+
if (isGT) {
111+
crafting.remove('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood_halfdrawers2_gregtech_' + wood_name + '_wood.0')
112+
} else {
113+
crafting.remove('storagedrawers:basicdrawers_halfdrawers2_' + wood_name)
114+
}
115+
116+
var output
117+
if (isGT) {
118+
output = item('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood', 3)
119+
} else {
120+
output = item('storagedrawers:basicdrawers', 3).withNbt([
121+
'material': wood_name
122+
])
123+
}
88124

89125
crafting.shapedBuilder().name('basicdrawers_halfdrawers2_' + wood_name)
90126
.output(output)
@@ -103,12 +139,21 @@ def half_drawer_1_2(slab, wood_name) {
103139
.duration(100).EUt(16).buildAndRegister()
104140
}
105141

106-
def half_drawer_2_2(slab, wood_name) {
107-
crafting.remove('storagedrawers:basicdrawers_halfdrawers4_' + wood_name)
108-
109-
def output = item('storagedrawers:basicdrawers', 4).withNbt([
110-
'material': wood_name
111-
])
142+
def half_drawer_2_2(slab, wood_name, boolean isGT) {
143+
if (isGT) {
144+
crafting.remove('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood_halfdrawers4_gregtech_' + wood_name + '_wood.0')
145+
} else {
146+
crafting.remove('storagedrawers:basicdrawers_halfdrawers4_' + wood_name)
147+
}
148+
149+
var output
150+
if (isGT) {
151+
output = item('gregtechdrawers:basicdrawers_gregtech_' + wood_name + '_wood', 4)
152+
} else {
153+
output = item('storagedrawers:basicdrawers', 4).withNbt([
154+
'material': wood_name
155+
])
156+
}
112157

113158
crafting.shapedBuilder().name('basicdrawers_halfdrawers4_' + wood_name)
114159
.output(output)
@@ -128,12 +173,14 @@ def half_drawer_2_2(slab, wood_name) {
128173
}
129174

130175
// Drawers
131-
create_drawer(item('minecraft:planks'), item('minecraft:wooden_slab'), 'oak')
132-
create_drawer(item('minecraft:planks', 1), item('minecraft:wooden_slab', 1), 'spruce')
133-
create_drawer(item('minecraft:planks', 2), item('minecraft:wooden_slab', 2), 'birch')
134-
create_drawer(item('minecraft:planks', 3), item('minecraft:wooden_slab', 3), 'jungle')
135-
create_drawer(item('minecraft:planks', 4), item('minecraft:wooden_slab', 4), 'acacia')
136-
create_drawer(item('minecraft:planks', 5), item('minecraft:wooden_slab', 5), 'dark_oak')
176+
create_drawer(item('minecraft:planks'), item('minecraft:wooden_slab'), 'oak', false)
177+
create_drawer(item('minecraft:planks', 1), item('minecraft:wooden_slab', 1), 'spruce', false)
178+
create_drawer(item('minecraft:planks', 2), item('minecraft:wooden_slab', 2), 'birch', false)
179+
create_drawer(item('minecraft:planks', 3), item('minecraft:wooden_slab', 3), 'jungle', false)
180+
create_drawer(item('minecraft:planks', 4), item('minecraft:wooden_slab', 4), 'acacia', false)
181+
create_drawer(item('minecraft:planks', 5), item('minecraft:wooden_slab', 5), 'dark_oak', false)
182+
create_drawer(item('gregtech:planks'), item('gregtech:wood_slab'), 'rubber', true)
183+
create_drawer(item('gregtech:planks', 1), item('gregtech:wood_slab', 1), 'treated', true)
137184

138185
// Framing Table
139186
crafting.remove('storagedrawers:framing_table')

manifest.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,11 @@
441441
"projectID": 943734,
442442
"fileID": 4928154,
443443
"required": true
444+
},
445+
{
446+
"projectID": 845779,
447+
"fileID": 5006537,
448+
"required": true
444449
}
445450
]
446451
}

0 commit comments

Comments
 (0)