mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-13 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port fixups

Browse Source
This commit is contained in:
simibubi 2023-09-20 18:47:28 +02:00
parent cfff4e42a0
commit 7e7cc05121
22 changed files with 5108 additions and 3262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-05-21T22:23:35.9793713 Create's Sequenced Assembly Recipes
// 1.19.2 2023-09-20T18:40:42.830819 Create's Sequenced Assembly Recipes
dbaca5a5aa312f3bc7b826e51e665d32e798a5d7 data/create/recipes/sequenced_assembly/precision_mechanism.json
0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json
1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json

4
src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-05-21T22:23:36.0591568 Create's Advancements
// 1.19.2 2023-09-20T18:40:42.8358053 Create's Advancements
2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json
082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json
4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json
@ -29,7 +29,7 @@ f175d1f816f32e1c50891321331e475863ce1e89 data/create/advancements/deployer.json
62ffffc6834c54ae1abca584522c577226f7f891 data/create/advancements/display_board_0.json
68749521feb4832c8da666454c70f883129f9335 data/create/advancements/display_link.json
dfa5e42ee372df8c810e1ccf8a6928e4f1299f37 data/create/advancements/diving_suit.json
836e914e3139f8cbf4cdd78ae53bd9bdd041a693 data/create/advancements/diving_suit_lava.json
63566cf0cf03ebb6cd30ee030e67159e2cffcf66 data/create/advancements/diving_suit_lava.json
2d19468ffed9345ebe8cecf220acc15651917082 data/create/advancements/drain.json
492d8ebc5d10e7efd100570f1507413d78723782 data/create/advancements/ejector_maxed.json
7e19fd15b675494d2a8d5ac3cef4a50cf58c203f data/create/advancements/encased_fan.json

2
src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-05-21T22:23:36.0521757 Create's Mechanical Crafting Recipes
// 1.19.2 2023-09-20T18:40:42.8358053 Create's Mechanical Crafting Recipes
f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json
694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json
3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json

2
src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-05-21T22:23:36.0541715 Create's Standard Recipes
// 1.19.2 2023-09-20T18:40:42.8318162 Create's Standard Recipes
ff6a181c36dba79ed4fe7945823f7529bd7913fe data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
106354a9eb7379a53eae40a1775f43bf67225919 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
bb548877a89f41e1bdfe987dd3ec05b6023daa81 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json

18
src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-07-04T13:25:50.900324 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
// 1.19.2 2023-09-20T18:40:42.7769625 Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -585,8 +585,8 @@ b0d8f08968763a5f74e5cd5644377a76a9f39753 assets/create/blockstates/yellow_toolbo
fe8c497aacc641c2f01cec90bba9f19e59cc2ed2 assets/create/blockstates/yellow_valve_handle.json
e819e93fdcbe9fd9c050a052d2718ff3b3539365 assets/create/blockstates/zinc_block.json
64121dcb216381c83b4fe28aa361ea07c24c9ad0 assets/create/blockstates/zinc_ore.json
3a1e0c68a9f1d6a252f47b3f7311278711f2aae0 assets/create/lang/en_ud.json
a0c0e4f23540bef4b1796ad9f4e4ace609d2919b assets/create/lang/en_us.json
5928bedff54fa1b7a0c81e0e38684aae3fe48fa8 assets/create/lang/en_ud.json
f5b292e499f60617534a757f5dd067a5737835da assets/create/lang/en_us.json
a97e1060e00ae701a02e39cd4ef8054cf345fac4 assets/create/models/block/acacia_window.json
103e032c0b1a0a6a27c67da8c91179a564bd281c assets/create/models/block/acacia_window_pane_noside.json
fb00b627abda76ad4fea867ca57dbfadd24fffa3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -4171,6 +4171,10 @@ f1a03ac86925e26cbec6aeeada2eafb40008fc8e data/create/recipes/weathered_copper_ti
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/blocks/contraption_inventory_deny.json
c7ec0dbc18e9c1b58e568ed925287b89df11a136 data/create/tags/blocks/copycat_allow.json
876eb9210f4a14898a2fe6d225699c66b5bdfeef data/create/tags/blocks/copycat_deny.json
f675c20350ed60da4878b5d6301f02c8c05624bd data/create/tags/blocks/fan_processing_catalysts/blasting.json
0592b99f657415f6546564ed8efa1fcbef07ba15 data/create/tags/blocks/fan_processing_catalysts/haunting.json
9386dd9a1d234813f9b8ae4ec88866d396aa1d37 data/create/tags/blocks/fan_processing_catalysts/smoking.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/blocks/fan_processing_catalysts/splashing.json
6858173c670bb593664ac3c62ded726d57d581f1 data/create/tags/blocks/fan_transparent.json
2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/girdable_tracks.json
a1e21c22f32354fd1a82a1b0a59dd786c0deaba0 data/create/tags/blocks/movable_empty_collider.json
@ -4188,6 +4192,10 @@ da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/blocks/valve_handles.j
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/entity_types/ignore_seat.json
894e1e4fd1e32712abdda18ec64ab13750d3c039 data/create/tags/fluids/bottomless/allow.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/bottomless/deny.json
e191d5f912e05091b3a0b1df17f4c4181e04d96f data/create/tags/fluids/fan_processing_catalysts/blasting.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/fan_processing_catalysts/haunting.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/fluids/fan_processing_catalysts/smoking.json
c9ae54a7510073b17edf82f7591e14bdb2c51837 data/create/tags/fluids/fan_processing_catalysts/splashing.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/create/tags/items/blaze_burner_fuel/regular.json
8ba98bf390a326abeebfd5d84be5f740c935a8b6 data/create/tags/items/blaze_burner_fuel/special.json
8b6c0b444b15f7fb2d55b9cbcb68537c1269f877 data/create/tags/items/casing.json
@ -4195,8 +4203,8 @@ f43cac8216e2a9347e48cf93a43de95dd810ca20 data/create/tags/items/contraption_cont
d371dfd35e49a7bef19f59c03e7f4ae20992f03d data/create/tags/items/create_ingots.json
910d0f5ccbc4c84b224eca1f1588b1695f41447b data/create/tags/items/crushed_raw_materials.json
0fa526e7e742573b603ad26b09526cf724efa1dc data/create/tags/items/deployable_drink.json
99d3f12c67bd4c1f14fa9e6cbc1de5ed209ef402 data/create/tags/items/modded_stripped_logs.json
b49ad07e47fbb4b12c1d95d72f752e6e6839a815 data/create/tags/items/modded_stripped_wood.json
ab45dc78be188d430c71904015b2b034908db64e data/create/tags/items/modded_stripped_logs.json
864fb582620b267894ad4016af8f0fd793bac5e8 data/create/tags/items/modded_stripped_wood.json
695d75b352fd190b303c724d1aaee9bb786a903b data/create/tags/items/pressurized_air_sources.json
2cd3adffd8b151354df137a990dcb97996a665bb data/create/tags/items/sandpaper.json
79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/items/seats.json

2
src/generated/resources/.cache/9b718366ce2ebddbc65bf65c103939e2cf56b4af
View File

@ -1,2 +0,0 @@
// 1.19.2 2023-09-20T14:31:50.8818458 Create's lang merger
532d323119782de6b62f1fe52672941cc9209a40 assets/create/lang/en_us.json

2
src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034
View File

@ -1,4 +1,4 @@
// 1.19.2 2023-07-04T13:25:50.9302443 Create's Processing Recipes
// 1.19.2 2023-09-20T18:40:42.8238372 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json

2
src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139
View File

@ -1,2 +1,2 @@
// 1.19.2 2023-05-21T22:23:36.0531731 Create's Custom Sounds
// 1.19.2 2023-09-20T18:40:42.8447813 Create's Custom Sounds
043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json

2
src/generated/resources/.cache/e0a39a97205b7149114f15de91b614248d05fd95
View File

@ -1,2 +1,2 @@
// 1.19.2 2023-08-24T18:35:23.8733985 Create's Recipe Serializer Tags
// 1.19.2 2023-09-20T18:40:42.8378002 Create's Recipe Serializer Tags
0d8718f7383761bc5d7bc45306ed266ebf25dc1d data/create/tags/recipe_serializer/automation_ignore.json

2193
src/generated/resources/assets/create/lang/en_ud.json
View File

File diff suppressed because it is too large Load Diff

6100
src/generated/resources/assets/create/lang/en_us.json
View File

File diff suppressed because it is too large Load Diff

6
src/generated/resources/data/create/advancements/diving_suit_lava.json
View File

@ -1,5 +1,5 @@
{
"parent": "create:backtank",
"parent": "create:foods",
"criteria": {
"0": {
"conditions": {},
@ -13,9 +13,9 @@
"translate": "advancement.create.diving_suit_lava.desc"
},
"frame": "goal",
"hidden": true,
"hidden": false,
"icon": {
"item": "create:copper_diving_helmet",
"item": "create:netherite_diving_helmet",
"nbt": "{Damage:0}"
},
"show_toast": true,

1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/blasting.json
View File

@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"create:blaze_burner"
]

1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/haunting.json
View File

@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"create:lit_blaze_burner",
"minecraft:soul_fire",

1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/smoking.json
View File

@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"create:blaze_burner",
"create:lit_blaze_burner",

1
src/generated/resources/data/create/tags/blocks/fan_processing_catalysts/splashing.json
View File

@ -1,4 +1,3 @@
{
"replace": false,
"values": []
}

1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/blasting.json
View File

@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"minecraft:lava",
"minecraft:flowing_lava"

1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/haunting.json
View File

@ -1,4 +1,3 @@
{
"replace": false,
"values": []
}

1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/smoking.json
View File

@ -1,4 +1,3 @@
{
"replace": false,
"values": []
}

1
src/generated/resources/data/create/tags/fluids/fan_processing_catalysts/splashing.json
View File

@ -1,5 +1,4 @@
{
"replace": false,
"values": [
"minecraft:water",
"minecraft:flowing_water"

14
src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java
View File

@ -22,7 +22,7 @@ import com.tterrag.registrate.providers.ProviderType;
import net.minecraft.data.DataGenerator;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.data.event.GatherDataEvent;
public class CreateDatagen {
public static void gatherData(GatherDataEvent event) {
@ -32,17 +32,17 @@ public class CreateDatagen {
ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
if (event.includeClient()) {
generator.addProvider(AllSoundEvents.provider(generator));
generator.addProvider(true, AllSoundEvents.provider(generator));
}
if (event.includeServer()) {
generator.addProvider(new CreateRecipeSerializerTagsProvider(generator, existingFileHelper));
generator.addProvider(true, new CreateRecipeSerializerTagsProvider(generator, existingFileHelper));
generator.addProvider(new AllAdvancements(generator));
generator.addProvider(true, new AllAdvancements(generator));
generator.addProvider(new StandardRecipeGen(generator));
generator.addProvider(new MechanicalCraftingRecipeGen(generator));
generator.addProvider(new SequencedAssemblyRecipeGen(generator));
generator.addProvider(true, new StandardRecipeGen(generator));
generator.addProvider(true, new MechanicalCraftingRecipeGen(generator));
generator.addProvider(true, new SequencedAssemblyRecipeGen(generator));
ProcessingRecipeGen.registerAll(generator);
// AllOreFeatureConfigEntries.gatherData(event);

13
src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
View File

@ -54,6 +54,7 @@ public class CreateRegistrateTags {
prov.tag(AllBlockTags.FAN_TRANSPARENT.tag)
.add(Blocks.IRON_BARS)
.add(Blocks.MANGROVE_ROOTS)
.addTag(BlockTags.CAMPFIRES)
.addTag(BlockTags.FENCES)
.addTag(BlockTags.LEAVES);
@ -75,7 +76,7 @@ public class CreateRegistrateTags {
.addTag(BlockTags.SIGNS);
prov.tag(AllBlockTags.TREE_ATTACHMENTS.tag)
.add(Blocks.BEE_NEST, Blocks.COCOA, Blocks.MOSS_CARPET, Blocks.SHROOMLIGHT, Blocks.VINE);
.add(Blocks.BEE_NEST, Blocks.COCOA, Blocks.MANGROVE_PROPAGULE, Blocks.MOSS_CARPET, Blocks.SHROOMLIGHT, Blocks.VINE);
prov.tag(AllBlockTags.WINDMILL_SAILS.tag)
.addTag(BlockTags.WOOL);
@ -128,13 +129,13 @@ public class CreateRegistrateTags {
prov.tag(AllItemTags.VANILLA_STRIPPED_LOGS.tag)
.add(Items.STRIPPED_ACACIA_LOG, Items.STRIPPED_BIRCH_LOG, Items.STRIPPED_CRIMSON_STEM,
Items.STRIPPED_DARK_OAK_LOG, Items.STRIPPED_JUNGLE_LOG, Items.STRIPPED_OAK_LOG,
Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_WARPED_STEM);
Items.STRIPPED_DARK_OAK_LOG, Items.STRIPPED_JUNGLE_LOG, Items.STRIPPED_MANGROVE_LOG,
Items.STRIPPED_OAK_LOG, Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_WARPED_STEM);
prov.tag(AllItemTags.VANILLA_STRIPPED_WOOD.tag)
.add(Items.STRIPPED_ACACIA_WOOD, Items.STRIPPED_BIRCH_WOOD,
Items.STRIPPED_CRIMSON_HYPHAE, Items.STRIPPED_DARK_OAK_WOOD, Items.STRIPPED_JUNGLE_WOOD,
Items.STRIPPED_OAK_WOOD, Items.STRIPPED_SPRUCE_WOOD, Items.STRIPPED_WARPED_HYPHAE);
.add(Items.STRIPPED_ACACIA_WOOD, Items.STRIPPED_BIRCH_WOOD, Items.STRIPPED_CRIMSON_HYPHAE,
Items.STRIPPED_DARK_OAK_WOOD, Items.STRIPPED_JUNGLE_WOOD, Items.STRIPPED_MANGROVE_WOOD,
Items.STRIPPED_OAK_WOOD, Items.STRIPPED_SPRUCE_WOOD, Items.STRIPPED_WARPED_HYPHAE);
prov.tag(ItemTags.BEACON_PAYMENT_ITEMS)
.addTag(AllItemTags.CREATE_INGOTS.tag);