Skip to content

Commit

Permalink
Run datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
IThundxr committed Sep 3, 2024
1 parent fe31919 commit e3b2af8
Show file tree
Hide file tree
Showing 18 changed files with 36 additions and 36 deletions.
26 changes: 13 additions & 13 deletions src/generated/resources/.cache/cache
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ b3e056a176e86660fc2d3a51f9ba8b01eebb56c5 assets/create/models/block/oak_window_p
1f748ab0b793350314446552693702874e34c910 data/create/loot_tables/blocks/chute.json
7be662a7534de3932eb0790a0387ba4049938e0d assets/create/models/block/dark_oak_window_pane_side.json
469c7e4861883be035c81d1fc1498d4a818235d8 assets/create/models/block/cut_veridium_brick_stairs.json
2ef3cdc8a302cb882c16ae509219e3052186bae7 data/create/recipes/filling/compat/aether/aether_grass_block.json
6ff289152cbc312e940056124d83436ed6c447e0 data/create/recipes/filling/compat/aether/aether_grass_block.json
030d2ebb2c779e41ae0d046cfd82e82f4468510b data/create/recipes/crafting/tree_fertilizer.json
42012f10d893f59e2d6c8f3babedbb4ebb2e5cb8 assets/create/models/block/cut_ochrum_bricks_wall_side_tall.json
c069e2a1d778baed0f511e6d6d4eb40e20d832b0 assets/create/blockstates/polished_cut_asurine_slab.json
Expand Down Expand Up @@ -453,7 +453,7 @@ ef644b33e136692c19cf8e79fcd28431b40dbb62 assets/create/models/block/adjustable_c
f586b7389c46acb2ade3286ea234e5b37bfd728c data/create/advancements/recipes/create.palettes/polished_cut_andesite_slab.json
8292d043ebfe280340526a6a0f96d4160099e213 assets/create/models/block/lime_sail.json
b1f2f8a0f78bcd856e0352d88b6392ca6d5ed74f data/create/recipes/andesite_pillar_from_stone_types_andesite_stonecutting.json
3dbe6c73659d359cffd062e1747eaebe91c53413 data/create/recipes/filling/compat/byg/lush_grass_block.json
6bdf979a14920fab70d363e39e9c9d82c4643fd4 data/create/recipes/filling/compat/byg/lush_grass_block.json
9ff2850a0ad0c1e99c1af11e47060afe364f0432 assets/create/models/block/cut_granite_brick_slab.json
74008bd0d775b0e2e96b43be2e51d0f3c3abdf21 assets/create/models/block/lime_valve_handle.json
06457cfd7ef623d5d7baeb60476afa74bfaa053b assets/create/models/item/cut_limestone_wall.json
Expand Down Expand Up @@ -526,7 +526,7 @@ bfec682e731be428da215a82ad66946dda5a94c8 assets/create/blockstates/waxed_exposed
143b053cdb621078497aec682c7ebef1b076f600 assets/create/models/item/weathered_copper_tile_slab.json
2b73d3b9410cb7bfcec5b8a13e8a397dceffecdc data/create/recipes/crushing/compat/silentgems/beniotite_ore.json
6528e538299d5bfc198b3a89cbfce117bb9f0a1e data/create/recipes/cutting/compat/ecologics/stripped_azalea_wood.json
a0ecfa828757709b6ab9b0847da2cc96545c4b6e data/create/recipes/filling/compat/vampirism/cursed_grass_block.json
abcee525c4238775f0a5c609806b0d16763f58c4 data/create/recipes/filling/compat/vampirism/cursed_grass_block.json
b5a2a1c365c1f8b5d9b3ef7ecabd170e9a6060e3 data/create/recipes/oxidized_copper_tile_slab_from_oxidized_copper_tiles_stonecutting.json
f5f1ad973341f8bebc474d5e65ff877ac6303b0d assets/create/models/item/contraption_controls.json
126e9578c69048189b2369ec664b9718796fcae9 data/create/loot_tables/blocks/layered_scoria.json
Expand Down Expand Up @@ -888,7 +888,7 @@ c5b4113100408a4254910eafd53d97b15588e790 data/create/loot_tables/blocks/lime_too
c8b69dd43fd1e0a998d865de91577c8e8e2f419f data/create/recipes/cutting/compat/projectvibrantjourneys/palm_log.json
2da667f6a71ce6e8f4b7172a3d8981cb08043e30 data/create/loot_tables/blocks/cut_veridium_brick_wall.json
49b0ba1bb71e244f7de23f3a6fb322c77cd3be03 assets/create/models/item/windmill_bearing.json
f5b660f694d930153efe5cc9a546bea5ca869fd4 data/create/recipes/filling/compat/regions_unexplored/silt_grass_block.json
d85877645923281ad457a7744ce76eb8106ffb42 data/create/recipes/filling/compat/regions_unexplored/silt_grass_block.json
1c29bc7be092452fe16823d83f4c4f363bfdc567 assets/create/models/block/small_dripstone_bricks_wall_side_tall.json
f35f31c4ce11e8aaf6eef0e840eced22d969c614 data/create/advancements/recipes/create.palettes/oxidized_copper_tile_slab.json
dccfbda7fd3a7a75c323dea619d8d309ae980469 data/create/loot_tables/blocks/copper_shingles.json
Expand Down Expand Up @@ -2603,7 +2603,7 @@ aef017ab165c7c409a855fbc60d22e348b5d57eb data/create/recipes/milling/compat/regi
90647d88c2351e5bc928ecbfbdbefccb4456cd72 assets/create/models/block/small_veridium_brick_slab.json
f5e17c640b82e16c89f01091b2e74f307a799fe3 data/create/recipes/cut_tuff_stairs_from_stone_types_tuff_stonecutting.json
fb7e03021f0977dbd61f1c5062fb1f8573a4f8d3 data/create/recipes/small_scoria_brick_wall.json
a83ad15c6e5e86fd32c30a716f86c850c077d0d6 data/create/recipes/mixing/compat/regions_unexplored/silt_mud.json
88c5bed97dd94dc416191651efe610f0186093fd data/create/recipes/mixing/compat/regions_unexplored/silt_mud.json
5bad7318b3c241a75fb1ff111c660c755c2181b0 data/create/advancements/recipes/create.palettes/cut_limestone_from_stone_types_limestone_stonecutting.json
55be2b47f52f987fc85e45db9d90fd15e717b3fc data/create/loot_tables/blocks/polished_cut_crimsite_wall.json
b8b33c0992ad6398d1dd70ecb88d311946fc9971 assets/create/blockstates/brass_funnel.json
Expand Down Expand Up @@ -2699,7 +2699,7 @@ f532c56a5d2936f2c10dcee2c69bf7f8936a1c97 data/create/loot_tables/blocks/polished
f706310fc3278670be20652dd67b38a08adca768 data/create/loot_tables/blocks/cut_scorchia.json
e381b146141f1efeb546df0810b7205699e32543 data/create/loot_tables/blocks/cut_calcite_bricks.json
b803bbe30f7365d6c9173a13e17881fe00c82a8a data/create/recipes/splashing/mythicmetals/crushed_raw_silver.json
5a9b1574a3659502fb119375b914a98d8189a139 data/create/recipes/filling/compat/alexsmobs/lava_bottle.json
e125f036282ccab06cd6a4e1b3eb83887943fd35 data/create/recipes/filling/compat/alexsmobs/lava_bottle.json
e9b0dd30768788c2551b837540f8a1d46b62b531 data/create/recipes/smelting/lead_ingot_compat_modern_industrialization.json
c13d818fa02a76abc089b7bd3ae0e7e9e4d1ecbb assets/create/models/block/fluid_pipe/ud_y.json
9b437eadcfff6bb9f7780d1b78d4d587633560d5 assets/create/models/block/polished_cut_veridium_slab_double.json
Expand All @@ -2712,7 +2712,7 @@ dba37cbe101e353934bf3e9eb63c77bfa09fbc5c data/create/recipes/milling/compat/byg/
7a4900a6f65d789a1c37c25ad6c46e5b0e307427 assets/create/blockstates/polished_cut_granite_stairs.json
7122e461341c675f42b6ec57e472325cf47ca8e6 assets/create/models/block/polished_cut_deepslate_stairs_inner.json
81c1a74e5ba340148b8d47faf2614fdc731460e5 data/create/recipes/pressing/compat/byg/lush_grass_path.json
6e420250acc9af995473798fde3c8094c642d666 data/create/recipes/filling/compat/regions_unexplored/peat_grass_block.json
97f03b7c87511e66578ccb5434aa7df05e05e931 data/create/recipes/filling/compat/regions_unexplored/peat_grass_block.json
abee4bdba6eaa5ad74e2b0782250d11f6b5fa6dc data/create/recipes/cutting/compat/regions_unexplored/stripped_pink_bioshroom_hyphae.json
6eb7b166ad302f2fa68a9850f7f70bd9b8c87c12 data/create/advancements/recipes/create.palettes/cut_crimsite_slab_recycling.json
be99e48382ef8ccfb94c227c4dec7b627b4128e7 data/create/loot_tables/blocks/gray_sail.json
Expand Down Expand Up @@ -3741,7 +3741,7 @@ fab3f67e4bf2cef7efc7b7457b5789db319f1012 data/create/recipes/cutting/compat/regi
1808c33e21751252c300f4d4c7a33cdcdedc4e42 data/create/recipes/cutting/compat/atmospheric/aspen_log.json
3fd39bcd1d44ec081126a4020040da68c5aa410e data/create/recipes/small_scorchia_bricks_from_stone_types_scorchia_stonecutting.json
f95da582429673febbda522a624ee228b74ba038 assets/create/models/item/small_veridium_brick_stairs.json
823fb78f4ea2b7b322ecd9cff6703fadfbc96e8a data/create/recipes/filling/compat/neapolitan/milk_bottle.json
aa1c5680857a6ebefb4e31b64a1c9a1533ce598f data/create/recipes/filling/compat/neapolitan/milk_bottle.json
81a0afa1d4bfabf6350bc13a46b98ebccdd7b75a assets/create/models/item/small_asurine_brick_slab.json
a1afb005cc23607cb4d84d42664b4bc28eef9ead data/create/advancements/recipes/transportation/crafting/kinetics/furnace_minecart_from_contraption_cart.json
b30b718b5dd040cd12cf555b5320cbde610456d7 data/create/recipes/haunting/infested_deepslate.json
Expand Down Expand Up @@ -4318,7 +4318,7 @@ e592bec9c7b81232fb60292be1b71d727e570707 assets/create/models/block/polished_cut
4f84e68bc827ccb93867ce202b38bb55f7348630 assets/create/models/block/copper_tiles.json
9c64a60aa3741533d1fe6d43bfcdf52673880651 data/create/advancements/recipes/create.palettes/dripstone_pillar_from_stone_types_dripstone_stonecutting.json
120cb6f4fc6b28d86117dbe059b990c1303c46ee assets/create/models/item/cut_andesite.json
d97569d1ac263718a246f679e1cc05eb4853e5f1 data/create/recipes/mixing/tea.json
4fd8c045ee47ce7b33c5dc2869d9c10b1885b154 data/create/recipes/mixing/tea.json
274cc0b6defbd52ad172d291e1c418e0c3f9c8c7 assets/create/models/block/polished_cut_asurine.json
fd55425f1bdbec22086049f14c2adb8aed65a677 data/create/recipes/splashing/oreganized/crushed_raw_lead.json
b2996c37a3c275fa660efacb5dec09018186ed0d data/create/advancements/recipes/create.palettes/polished_cut_granite_slab.json
Expand Down Expand Up @@ -4454,7 +4454,7 @@ da56d44af111dcd43f23b5afd25f13fb4318363a data/create/recipes/cutting/compat/blue
64a55c739fa4c6b1c70e02882f4efe809228a9f9 data/create/recipes/cutting/compat/biomesoplenty/stripped_umbran_log.json
21862a9eb051b382ad5a57579c3c214cef27ad6c assets/create/models/block/scorchia_pillar_horizontal.json
6edc712d9a04986dee9dd84f3572bcfe22128f95 data/create/recipes/milling/compat/regions_unexplored/wilting_trillium.json
223a306133219e4a625e2f3d3546e88bb71db77e data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
eed9a26111f5c3afe579d1818098b5856ef5c2eb data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
87ddb764bcff88c12686d171540cea4cc6edaf16 data/create/recipes/splashing/red_sand.json
dc5e4c133e3a550a3290dcdafe29b16a0fb61348 data/create/recipes/cut_calcite_slab.json
713f58f198daa0313c5c58d60b2cfd527987545f data/create/recipes/cutting/compat/byg/palo_verde_wood.json
Expand Down Expand Up @@ -4897,7 +4897,7 @@ e72ed82f2f870b2e1d6b50edf5403b5938d95c55 assets/create/models/block/small_granit
9851b3bef451f326ef322a31f85b9a970859590d data/create/tags/blocks/wrench_pickup.json
78b51bdfa1d26f909e2d3a3ddb70a5631f4fa75f assets/create/models/block/gantry_shaft_single_powered.json
83fc4663a012e78cebbb0f08e01a10df06b04873 data/create/recipes/milling/beetroot.json
500d972fa4367493e5313d6427eb72ab95351db3 data/create/recipes/mixing/compat/ae2/fluix_crystal.json
354a09585c331dcc724feb43ebc90379fa529f22 data/create/recipes/mixing/compat/ae2/fluix_crystal.json
7935c7ac72676dc66b2a569f242fe54b7512a3dd data/create/recipes/crafting/kinetics/windmill_bearing.json
d59b1c12331db8a91e9284ed5b9b1e60f7357b94 data/create/recipes/cutting/stripped_jungle_wood.json
6a493177a178f60e63e968ab4c314d3c70a09c1f assets/create/models/block/small_ochrum_brick_slab.json
Expand All @@ -4924,7 +4924,7 @@ b288fd0ce7c483d05f6fc7a336f54c56edf3f5cb data/create/recipes/cutting/compat/ars_
dd5e359d0ffabeb87efc9a03a4f32f6a273a07f3 assets/create/models/block/polished_cut_calcite_stairs_outer.json
2a2baa9e8f12a03ca89c83f459efff8879d2cdae data/create/recipes/milling/compat/regions_unexplored/daisy.json
0496a24f6f2fffe0fff8ac894217fb4cb05b693f data/create/recipes/smelting/osmium_ingot_compat_mythicmetals.json
3803c44ee5d720a4c1332c740ab995a538072606 data/create/recipes/mixing/compat/regions_unexplored/peat_mud.json
d315de47d9e776d03f99c3ca037aaf99183158fe data/create/recipes/mixing/compat/regions_unexplored/peat_mud.json
66076895b875103c45ca0ad4cb6066897040c394 data/create/recipes/crushing/compat/silentgems/pearl_ore.json
3b07f3f1985495051d173725b01ddd52b5f70ac4 assets/create/models/block/orange_valve_handle.json
8d7dfa60630a8b4bae4e8eca5c66e1cfa34dda1f assets/create/blockstates/spruce_window_pane.json
Expand Down Expand Up @@ -5716,7 +5716,7 @@ cbbfcc4eb7a2eb5bee0be7fd13e0d6ab311a1882 data/create/recipes/crushing/compat/sil
a70fcfe474ba023adc9c326218c5664fbd7b58f8 data/create/loot_tables/blocks/andesite_encased_large_cogwheel.json
bbe56a2eb84835f26ed3beb0313ddd8be7a53ead assets/create/models/item/asurine.json
87a49c60384f875d39c93018deb3bb6c525a9bc1 data/create/recipes/cut_granite_from_stone_types_granite_stonecutting.json
841be0a8ce23fa5891baaadd496bb2cb0682c4dd data/create/recipes/emptying/compat/neapolitan/milk_bottle.json
2a3bb254e50f3ef7781134eca2625954a4e143d2 data/create/recipes/emptying/compat/neapolitan/milk_bottle.json
a642330259b86f5a686d86d5d6773e89adb021d5 data/create/loot_tables/blocks/oxidized_copper_tile_stairs.json
bc0310c4425f3b7137f67440c5774b699b3cb203 assets/create/models/block/small_calcite_brick_stairs_outer.json
ae62ce97d3834dfe1a632a795f71a7a9d52a00d2 data/create/loot_tables/blocks/polished_cut_diorite_slab.json
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"fluid": "minecraft:lava",
"amount": 250
"amount": 27000
}
],
"fabric:load_conditions": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
{
"fluid": "milk:still_milk",
"amount": 250
"amount": 27000
}
],
"fabric:load_conditions": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 500
"amount": 40500
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:lava",
"nbt": {},
"amount": 250
"amount": 27000
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 500
"amount": 40500
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
{
"fluidTag": "c:milk",
"amount": 250
"amount": 27000
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 500
"amount": 40500
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 500
"amount": 40500
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 500
"amount": 40500
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 250
"amount": 27000
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 250
"amount": 27000
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"fluid": "minecraft:water",
"nbt": {},
"amount": 250
"amount": 27000
}
],
"results": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"results": [
{
"fluid": "create:tea",
"amount": 54000
"amount": 40500
}
],
"heatRequirement": "heated"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public ProcessingRecipeBuilder<T> output(float chance, ItemStack output) {
public ProcessingRecipeBuilder<T> output(float chance, Mods mod, String id, int amount) {
return output(new ProcessingOutput(Pair.of(mod.asResource(id), amount), chance));
}
public ProcessingRecipeBuilder<T> output(Mods mod, String id) {
public ProcessingRecipeBuilder<T> output(Mods mod, String id) {
return output(1, mod.asResource(id), 1);
}
public ProcessingRecipeBuilder<T> output(float chance, ResourceLocation registryName, int amount) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ public class EmptyingRecipeGen extends ProcessingRecipeGen {

AM_LAVA = create(Mods.AM.recipeId("lava_bottle"), b -> b.require(Mods.AM, "lava_bottle")
.output(Items.GLASS_BOTTLE)
.output(Fluids.LAVA, 250)
.output(Fluids.LAVA, FluidConstants.BOTTLE)
.whenModLoaded(Mods.AM.getId())),

NEO_MILK = create(Mods.NEA.recipeId("milk_bottle"), b -> b.require(Mods.FD, "milk_bottle")
.output(Milk.STILL_MILK, 250)
.output(Milk.STILL_MILK, FluidConstants.BOTTLE)
.output(Items.GLASS_BOTTLE)
.whenModLoaded(Mods.NEA.getId()))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ public class FillingRecipeGen extends ProcessingRecipeGen {
.output(Items.GLOWSTONE_DUST)),


AM_LAVA = create(Mods.AM.recipeId("lava_bottle"), b -> b.require(Fluids.LAVA, 250)
AM_LAVA = create(Mods.AM.recipeId("lava_bottle"), b -> b.require(Fluids.LAVA, FluidConstants.BOTTLE)
.require(Items.GLASS_BOTTLE)
.output(1, Mods.AM, "lava_bottle", 1)
.whenModLoaded(Mods.AM.getId())),

BYG_LUSH_GRASS = create(Mods.BYG.recipeId("lush_grass_block"), b -> b.require(Mods.BYG, "lush_dirt")
.require(Fluids.WATER, 500)
.require(Fluids.WATER, FluidConstants.BUCKET / 2)
.output(Mods.BYG, "lush_grass_block")
.whenModLoaded(Mods.BYG.getId())),

NEA_MILK = create(Mods.NEA.recipeId("milk_bottle"), b -> b.require(Tags.Fluids.MILK, 250)
NEA_MILK = create(Mods.NEA.recipeId("milk_bottle"), b -> b.require(Tags.Fluids.MILK, FluidConstants.BOTTLE)
.require(Items.GLASS_BOTTLE)
.output(1, Mods.NEA, "milk_bottle", 1)
.whenModLoaded(Mods.NEA.getId())),
Expand All @@ -92,7 +92,7 @@ public class FillingRecipeGen extends ProcessingRecipeGen {

public GeneratedRecipe moddedGrass(Mods mod, String name) {
String grass = name + "_grass_block";
return create(mod.recipeId(grass), b -> b.require(Fluids.WATER, 500)
return create(mod.recipeId(grass), b -> b.require(Fluids.WATER, FluidConstants.BUCKET / 2)
.require(mod, name + "_dirt")
.output(mod, grass)
.whenModLoaded(mod.getId()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class MixingRecipeGen extends ProcessingRecipeGen {
TEA = create("tea", b -> b.require(Fluids.WATER, FluidConstants.BOTTLE)
.require(Tags.Fluids.MILK, FluidConstants.BOTTLE)
.require(ItemTags.LEAVES)
.output(AllFluids.TEA.get(), FluidConstants.BOTTLE * 2)
.output(AllFluids.TEA.get(), FluidConstants.BUCKET / 2)
.requiresHeat(HeatCondition.HEATED)),

CHOCOLATE = create("chocolate", b -> b.require(Tags.Fluids.MILK, FluidConstants.BOTTLE)
Expand Down Expand Up @@ -61,7 +61,7 @@ public class MixingRecipeGen extends ProcessingRecipeGen {
// AE2

AE2_FLUIX = create(Mods.AE2.recipeId("fluix_crystal"), b -> b.require(Tags.Items.DUSTS_REDSTONE)
.require(Fluids.WATER, 250)
.require(Fluids.WATER, FluidConstants.BOTTLE)
.require(Mods.AE2, "charged_certus_quartz_crystal")
.require(Tags.Items.GEMS_QUARTZ)
.output(1f, Mods.AE2, "fluix_crystal", 2)
Expand All @@ -76,7 +76,7 @@ public class MixingRecipeGen extends ProcessingRecipeGen {

public GeneratedRecipe moddedMud(Mods mod, String name) {
String mud = name + "_mud";
return create(mod.recipeId(mud), b -> b.require(Fluids.WATER, 250)
return create(mod.recipeId(mud), b -> b.require(Fluids.WATER, FluidConstants.BOTTLE)
.require(mod, name + "_dirt")
.output(mod, mud)
.whenModLoaded(mod.getId()));
Expand Down

0 comments on commit e3b2af8

Please sign in to comment.