Skip to content

Commit db967e8

Browse files
PyritiePyritie
committed
who up tweakin they mars crops
1 parent 89767a2 commit db967e8

File tree

7 files changed

+163
-46
lines changed

7 files changed

+163
-46
lines changed

‎kubejs/assets/betterend/lang/en_us.json‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
"block.betterend.blossom_berry": "Blossom Berry",
1212
"block.betterend.blossom_berry_wild": "Wild Blossom Berry",
1313
"block.betterend.blossom_berry_dead": "Dead Blossom Berry",
14-
"block.betterend.bolux_mushroom": "Bolux Mushroom",
14+
"block.betterend.bolux_mushroom": "Bolux Mushroom Colony",
15+
"block.betterend.bolux_mushroom_wild": "Wild Bolux Mushroom Colony",
16+
"block.betterend.bolux_mushroom_dead": "Dead Bolux Mushroom Colony",
1517
"block.betterend.bushy_grass": "Novagrass",
1618
"block.betterend.cave_bush": "Carmine Bush",
1719
"block.betterend.cave_grass": "Vermilligma",
@@ -27,9 +29,9 @@
2729
"block.betterend.charnia_red": "Red Charnia",
2830
"block.betterend.chorus_grass": "Chorus Grass",
2931
"block.betterend.chorus_lily": "Chorus Lily",
30-
"block.betterend.chorus_mushroom": "Chalmie Mushroom",
31-
"block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom",
32-
"block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom",
32+
"block.betterend.chorus_mushroom": "Chalmie Mushroom Colony",
33+
"block.betterend.chorus_mushroom_wild": "Wild Chalmie Mushroom Colony",
34+
"block.betterend.chorus_mushroom_dead": "Dead Chalmie Mushroom Colony",
3335
"block.betterend.clawfern": "Clawfern",
3436
"block.betterend.crystal_grass": "Crystal Grass",
3537
"block.betterend.end_lily": "Deimos Lily",
@@ -59,9 +61,9 @@
5961
"block.betterend.rubinea": "Rubinea",
6062
"block.betterend.ruscus": "Ruscus Grass",
6163
"block.betterend.salteago": "Salteago",
62-
"block.betterend.shadow_berry": "Nox Berry",
63-
"block.betterend.shadow_berry_wild": "Wild Nox Berry",
64-
"block.betterend.shadow_berry_dead": "Dead Nox Berry",
64+
"block.betterend.shadow_berry": "Nox Berries",
65+
"block.betterend.shadow_berry_wild": "Wild Nox Berries",
66+
"block.betterend.shadow_berry_dead": "Dead Nox Berries",
6567
"block.betterend.small_amaranita_mushroom": "Small Amaranita Mushroom",
6668
"block.betterend.twisted_moss": "Twisted Moss",
6769
"block.betterend.twisted_umbrella_moss": "Twisted Umbrella Moss",
@@ -74,10 +76,17 @@
7476
"item.betterend.amber_root_seeds": "Amber Shoots Seeds",
7577
"item.betterend.blossom_berry_product": "Blossom Berry",
7678
"item.betterend.blossom_berry_seeds": "Blossom Berry Seeds",
79+
"item.betterend.bolux_mushroom_cooked": "Cooked Bolux Mushroom",
80+
"item.betterend.bolux_mushroom_product": "Bolux Mushroom",
81+
"item.betterend.bolux_mushroom_seeds": "Bolux Mushroom Spores",
82+
"item.betterend.cave_pumpkin_chunks": "Bulbkin Chunks",
7783
"item.betterend.cave_pumpkin_product": "Bulbkin",
7884
"item.betterend.cave_pumpkin_plant_seeds": "Bulbkin Seeds",
85+
"item.betterend.cave_pumpkin_pie": "Bulbkin Pie",
86+
"item.betterend.chorus_mushroom_cooked": "Cooked Chalmie Mushroom",
7987
"item.betterend.chorus_mushroom_product": "Chalmie Mushroom",
8088
"item.betterend.chorus_mushroom_seeds": "Chalmie Mushroom Spores",
89+
"item.betterend.shadow_berry_cooked": "Cooked Nox Berry",
8190
"item.betterend.shadow_berry_product": "Nox Berry",
8291
"item.betterend.shadow_berry_seeds": "Nox Berry Seeds"
8392
}

‎kubejs/assets/betterend/models/block/bolux_mushroom_0.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
"elements": [
88
{
99
"__comment": "Box1",
10-
"from": [ 1, 3, 1 ],
11-
"to": [ 9, 7, 9 ],
10+
"from": [ 6, 0, 8 ],
11+
"to": [ 8, 2, 10 ],
1212
"faces": {
13-
"down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
14-
"up": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" },
15-
"north": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
16-
"south": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
17-
"west": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" },
18-
"east": { "uv": [ 8, 12, 16, 16 ], "texture": "#texture" }
13+
"north": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
14+
"south": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
15+
"west": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" },
16+
"east": { "uv": [ 0, 0, 2, 2 ], "texture": "#texture" }
1917
}
2018
},
2119
{
2220
"__comment": "Box1",
23-
"from": [ 2, 7, 2 ],
24-
"to": [ 8, 8, 8 ],
21+
"from": [ 5, 2, 7 ],
22+
"to": [ 9, 4, 11 ],
2523
"faces": {
26-
"up": { "uv": [ 9, 1, 15, 7 ], "texture": "#texture" },
27-
"north": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
28-
"south": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
29-
"west": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" },
30-
"east": { "uv": [ 9, 11, 15, 12 ], "texture": "#texture" }
24+
"down": { "uv": [ 2, 10, 6, 14 ], "texture": "#texture" },
25+
"up": { "uv": [ 4, 4, 8, 8 ], "texture": "#texture" },
26+
"north": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
27+
"south": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
28+
"west": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" },
29+
"east": { "uv": [ 10, 14, 14, 16 ], "texture": "#texture" }
3130
}
3231
},
3332
{
3433
"__comment": "Box1",
35-
"from": [ 4, 0, 4 ],
36-
"to": [ 6, 3, 6 ],
34+
"from": [ 6, 4, 8 ],
35+
"to": [ 8, 5, 10 ],
3736
"faces": {
38-
"north": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" },
39-
"south": { "uv": [ 0, 0, 2, 3 ], "texture": "#texture" },
40-
"west": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" },
41-
"east": { "uv": [ 2, 0, 0, 3 ], "texture": "#texture" }
37+
"up": { "uv": [ 5, 5, 7, 7 ], "texture": "#texture" },
38+
"north": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
39+
"south": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
40+
"west": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" },
41+
"east": { "uv": [ 11, 12, 13, 13 ], "texture": "#texture" }
4242
}
4343
}
4444
]

‎kubejs/server_scripts/betterend/recipes.js‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function registerBetterEndRecipes(event) {
1717
.EUt(GTValues.VA[GTValues.MV])
1818
.dimension('ad_astra:moon')
1919

20-
event.recipes.gtceu.greenhouse(`${recipeId }_helium`)
20+
event.recipes.gtceu.greenhouse(`${recipeId}_helium`)
2121
.notConsumable(element.id)
2222
.inputFluids(Fluid.of('gtceu:helium_3', 500))
2323
.itemOutputs(`8x ${element.id}`)
@@ -28,4 +28,30 @@ function registerBetterEndRecipes(event) {
2828
.EUt(GTValues.VA[GTValues.MV])
2929
.dimension('ad_astra:moon')
3030
});
31+
32+
Ingredient.of('#tfg:mars_plants').stacks.forEach(element => {
33+
const itemId = element.id;
34+
const recipeId = `greenhouse_${itemId.replace(':', '_')}`;
35+
36+
generateGreenHouseRecipe(event, itemId, 'tfg:semiheavy_ammoniacal_water', 8000, `8x ${itemId}`,
37+
recipeId, 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV]);
38+
});
39+
40+
generateGreenHouseRecipe(event, '8x betterend:amber_root_seeds', 'tfg:semiheavy_ammoniacal_water', 8000,
41+
'24x betterend:amber_root_product', 'amber_root', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
42+
43+
generateGreenHouseRecipe(event, '8x betterend:blossom_berry_seeds', 'tfg:semiheavy_ammoniacal_water', 8000,
44+
'24x betterend:blossom_berry_product', 'blossom_berry', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
45+
46+
generateGreenHouseRecipe(event, '8x betterend:bolux_mushroom_seeds', 'tfg:semiheavy_ammoniacal_water', 8000,
47+
'24x betterend:bolux_mushroom_product', 'bolux_mushroom', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
48+
49+
generateGreenHouseRecipe(event, '8x betterend:cave_pumpkin_plant_seeds', 'tfg:semiheavy_ammoniacal_water', 8000,
50+
'24x betterend:cave_pumpkin', 'cave_pumpkin', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
51+
52+
generateGreenHouseRecipe(event, '8x betterend:chorus_mushroom_seeds', 'tfg:semiheavy_ammoniacal_water', 8000,
53+
'24x betterend:chorus_mushroom_product', 'chorus_mushroom', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
54+
55+
generateGreenHouseRecipe(event, '8x betterend:shadow_berry', 'tfg:semiheavy_ammoniacal_water', 8000,
56+
'24x betterend:shadow_berry_product', 'shadow_berry', 'ad_astra:mars', 8, null, GTValues.VA[GTValues.LV])
3157
}

‎kubejs/server_scripts/betterend/tags.js‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,39 @@
33

44
function registerBetterEndItemTags(event) {
55

6-
event.add('tfg:moon_plants', 'betterend:chorus_lily')
7-
event.add('tfg:moon_plants', 'betterend:inflexia')
8-
event.add('tfg:moon_plants', 'betterend:chorus_grass')
6+
event.add('forge:seeds', 'betterend:amber_root_seeds')
7+
event.add('forge:seeds', 'betterend:blossom_berry_seeds')
8+
event.add('forge:seeds', 'betterend:bolux_mushroom_seeds')
9+
event.add('forge:seeds', 'betterend:cave_pumpkin_seeds')
10+
event.add('forge:seeds', 'betterend:shadow_berry_seeds')
11+
12+
event.add('tfc:foods', 'betterend:amber_root_product')
13+
event.add('tfc:foods/grains', 'betterend:amber_root_product')
14+
15+
event.add('tfc:foods', 'betterend:blossom_berry_product')
16+
event.add('tfc:foods/fruit', 'betterend:blossom_berry_product')
17+
18+
event.add('tfc:foods', 'betterend:bolux_mushroom_product')
19+
event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_product')
20+
event.add('forge:mushrooms', 'betterend:bolux_mushroom_product')
21+
event.add('tfc:foods', 'betterend:bolux_mushroom_cooked')
22+
event.add('tfc:foods/vegetables', 'betterend:bolux_mushroom_cooked')
23+
event.add('forge:mushrooms', 'betterend:bolux_mushroom_cooked')
24+
25+
event.add('tfc:foods', 'betterend:cave_pumpkin')
26+
event.add('tfc:foods', 'betterend:cave_pumpkin_chunks')
27+
event.add('tfc:foods/fruit', 'betterend:cave_pumpkin_chunks')
28+
event.add('tfc:foods', 'betterend:cave_pumpkin_pie')
29+
30+
event.add('tfc:foods', 'betterend:chorus_mushroom_product')
31+
event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_product')
32+
event.add('forge:mushrooms', 'betterend:chorus_mushroom_product')
33+
event.add('tfc:foods', 'betterend:chorus_mushroom_cooked')
34+
event.add('tfc:foods/vegetables', 'betterend:chorus_mushroom_cooked')
35+
event.add('forge:mushrooms', 'betterend:chorus_mushroom_cooked')
36+
37+
event.add('tfc:foods', 'betterend:shadow_berry_product')
38+
event.add('tfc:foods/fruit', 'betterend:shadow_berry_product')
39+
event.add('tfc:foods', 'betterend:shadow_berry_cooked')
40+
event.add('tfc:foods/fruit', 'betterend:shadow_berry_cooked')
941
}

‎kubejs/startup_scripts/betterend/items.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,28 @@
77
*/
88
function registerBetterEndItems(event) {
99
event.create('betterend:bolux_mushroom_cooked')
10+
.food(food => {
11+
food.hunger(2)
12+
food.saturation(2.5)
13+
})
1014
event.create('betterend:cave_pumpkin_chunks')
15+
.food(food => {
16+
food.hunger(4)
17+
food.saturation(1)
18+
})
1119
event.create('betterend:cave_pumpkin_pie')
20+
.food(food => {
21+
food.hunger(4)
22+
food.saturation(3)
23+
})
1224
event.create('betterend:chorus_mushroom_cooked')
25+
.food(food => {
26+
food.hunger(2)
27+
food.saturation(2.5)
28+
})
1329
event.create('betterend:shadow_berry_cooked')
30+
.food(food => {
31+
food.hunger(5)
32+
food.saturation(2)
33+
})
1434
}

‎kubejs/startup_scripts/tfg/blocks.crops.js‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ const registerTFGCrops = (event) => {
6060
.nutrient('phosphorous')
6161
.stages(3)
6262
.hardness(0.4)
63+
['productItem(java.util.function.Consumer)'](product => {
64+
product.food(food => {
65+
food.hunger(4)
66+
food.saturation(1)
67+
})
68+
})
6369
.deadBlock(dead => {
6470
dead.hardness(0.2)
6571
dead.soundType('crop')
@@ -80,6 +86,12 @@ const registerTFGCrops = (event) => {
8086
.nutrient('potassium')
8187
.stages(3)
8288
.hardness(0.4)
89+
['productItem(java.util.function.Consumer)'](product => {
90+
product.food(food => {
91+
food.hunger(5)
92+
food.saturation(1)
93+
})
94+
})
8395
.deadBlock(dead => {
8496
dead.hardness(0.2)
8597
dead.soundType('crop')
@@ -99,10 +111,10 @@ const registerTFGCrops = (event) => {
99111
.soundType('cherry_wood')
100112
.tagBlock('minecraft:mineable/axe')
101113
.tagBlock('minecraft:mineable/hoe')
114+
.mapColor('color_red')
102115
.requiresTool(false)
103116
.fullBlock(false)
104117
.opaque(false)
105-
.renderType('cutout')
106118

107119
event.create('betterend:cave_pumpkin_plant', 'tfc:spreading_crop')
108120
.soundType('crop')
@@ -131,6 +143,12 @@ const registerTFGCrops = (event) => {
131143
.nutrient('phosphorous')
132144
.stages(3)
133145
.hardness(0.4)
146+
['productItem(java.util.function.Consumer)'](product => {
147+
product.food(food => {
148+
food.hunger(2)
149+
food.saturation(1)
150+
})
151+
})
134152
.deadBlock(dead => {
135153
dead.hardness(0.2)
136154
dead.soundType('nether_wart')
@@ -152,6 +170,12 @@ const registerTFGCrops = (event) => {
152170
.nutrient('potassium')
153171
.stages(3)
154172
.hardness(0.4)
173+
['productItem(java.util.function.Consumer)'](product => {
174+
product.food(food => {
175+
food.hunger(5)
176+
food.saturation(1)
177+
})
178+
})
155179
.deadBlock(dead => {
156180
dead.hardness(0.2)
157181
dead.soundType('crop')
@@ -172,6 +196,12 @@ const registerTFGCrops = (event) => {
172196
.nutrient('phosphorous')
173197
.stages(3)
174198
.hardness(0.4)
199+
['productItem(java.util.function.Consumer)'](product => {
200+
product.food(food => {
201+
food.hunger(2)
202+
food.saturation(1)
203+
})
204+
})
175205
.deadBlock(dead => {
176206
dead.hardness(0.2)
177207
dead.soundType('nether_wart')

‎kubejs/startup_scripts/tfg/blocks.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const registerTFGBlocks = (event) => {
55
registerTFGNetherBlocks(event)
66
registerTFGSpaceBlocks(event)
77
registerTFGSupportBlocks(event)
8-
registerTFGCrops(event)
8+
registerTFGCrops(event)
99

1010
event.create('tfg:artificial_end_portal_frame')
1111
.stoneSoundType()
@@ -26,7 +26,7 @@ const registerTFGBlocks = (event) => {
2626
.defaultTranslucent()
2727
.mapColor('color_white')
2828
.speedFactor(1.2)
29-
.particleOffset(1, 1, 1)
29+
.particleOffset(1, 1, 1)
3030
.particleVelocity(0.05, 0, 0.05)
3131
.particle('minecraft:campfire_cosy_smoke')
3232
.particleCount(2)
@@ -46,15 +46,15 @@ const registerTFGBlocks = (event) => {
4646
.mapColor('color_light_gray')
4747
})
4848

49-
event.create(`tfg:casings/machine_casing_stainless_evaporation`)
50-
.translationKey(`block.tfg.casings.machine_casing_stainless_evaporation`)
51-
.model(`tfg:block/casings/machine_casing_stainless_evaporation`)
52-
.soundType('copper')
53-
.hardness(5)
54-
.resistance(6)
55-
.tagBlock('minecraft:mineable/pickaxe')
56-
.tagBlock('minecraft:mineable/wrench')
57-
.mapColor('color_light_gray')
49+
event.create(`tfg:casings/machine_casing_stainless_evaporation`)
50+
.translationKey(`block.tfg.casings.machine_casing_stainless_evaporation`)
51+
.model(`tfg:block/casings/machine_casing_stainless_evaporation`)
52+
.soundType('copper')
53+
.hardness(5)
54+
.resistance(6)
55+
.tagBlock('minecraft:mineable/pickaxe')
56+
.tagBlock('minecraft:mineable/wrench')
57+
.mapColor('color_light_gray')
5858

5959
//#endregion
6060

@@ -144,7 +144,7 @@ const registerTFGBlocks = (event) => {
144144

145145
event.create('tfg:pile/brown_sand', 'tfg:layer_block')
146146
.existingItem('tfc:sand/brown')
147-
147+
148148
event.create('tfg:pile/green_sand', 'tfg:layer_block')
149149
.existingItem('tfc:sand/green')
150150

@@ -168,7 +168,7 @@ const registerTFGBlocks = (event) => {
168168

169169
event.create('tfg:pile/venus_sand', 'tfg:layer_block')
170170
.existingItem('ad_astra:venus_sand')
171-
171+
172172

173173
// #endregion
174174

0 commit comments

Comments
 (0)