mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-02-27 04:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Port new Changes

Browse source
This commit is contained in:
simibubi 2022-12-13 13:27:01 +01:00
parent 6854f14bf5
commit 131e41497c
20 changed files with 47 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -8,7 +8,7 @@ mod_version = 0.5.0.g
artifact_minecraft_version = 1.19.2 artifact_minecraft_version = 1.19.2
minecraft_version = 1.19.2 minecraft_version = 1.19.2
forge_version = 43.1.0 forge_version = 43.1.52
# build dependency versions # build dependency versions
forgegradle_version = 5.1.53 forgegradle_version = 5.1.53

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

@ -1,4 +1,4 @@
// 1.19.2 2022-09-23T20:53:24.9127077 Create's Sequenced Assembly Recipes // 1.19.2 2022-12-13T12:20:23.5206136 Create's Sequenced Assembly Recipes
e6efd0d76dc451a44b663a453cef6e6656ad523f data/create/recipes/sequenced_assembly/precision_mechanism.json e6efd0d76dc451a44b663a453cef6e6656ad523f data/create/recipes/sequenced_assembly/precision_mechanism.json
0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json 0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json
1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json

2
src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba
View file

@ -1,4 +1,4 @@
// 1.19.2 2022-09-23T20:53:24.9106842 Create's Advancements // 1.19.2 2022-12-13T12:20:23.5066508 Create's Advancements
2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json 2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json
082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json 082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json
4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json 4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json

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

@ -1,4 +1,4 @@
// 1.19.2 2022-09-23T20:53:24.9127077 Create's Mechanical Crafting Recipes // 1.19.2 2022-12-13T12:20:23.5196156 Create's Mechanical Crafting Recipes
f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json
694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json
3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.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 2022-09-23T20:53:24.8237936 Create's Standard Recipes // 1.19.2 2022-12-13T12:20:23.5206136 Create's Standard Recipes
b397254b7cdb19d1c64ed1c30e1f6aa5c8af7270 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json b397254b7cdb19d1c64ed1c30e1f6aa5c8af7270 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
c14aec90afe9450b7dd472ff612e2f8013d09abf data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json c14aec90afe9450b7dd472ff612e2f8013d09abf data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
fd9a8eb94364c8424f23c510900ef9cd0904b53e data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json fd9a8eb94364c8424f23c510900ef9cd0904b53e data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json

5
src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9
View file

@ -1,4 +1,4 @@
// 1.19.2 2022-11-22T16:16:47.7397787 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 2022-12-13T12:20:23.5246022 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 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@ -4482,7 +4482,8 @@ fd2aaa5ab155c675e7ef4c143106428f181056af data/create/recipes/weathered_copper_ti
f1a03ac86925e26cbec6aeeada2eafb40008fc8e data/create/recipes/weathered_copper_tile_stairs_from_weathered_copper_tiles_stonecutting.json f1a03ac86925e26cbec6aeeada2eafb40008fc8e data/create/recipes/weathered_copper_tile_stairs_from_weathered_copper_tiles_stonecutting.json
8b98a671e80724e815a3af0c3764d760e4170e02 data/create/tags/blocks/brittle.json 8b98a671e80724e815a3af0c3764d760e4170e02 data/create/tags/blocks/brittle.json
8b6c0b444b15f7fb2d55b9cbcb68537c1269f877 data/create/tags/blocks/casing.json 8b6c0b444b15f7fb2d55b9cbcb68537c1269f877 data/create/tags/blocks/casing.json
6be9cc8768e2e76e2dc09ac77d18b28741a580a8 data/create/tags/blocks/fan_transparent.json e00f26584b23b7c3d9c3c5cc461b6418de4ee0fa data/create/tags/blocks/fan_transparent.json
0b91b64f3b81f85dcb9e56c50264c78f17727303 data/create/tags/blocks/movable_empty_collider.json
4970078b49ddac1b1d500ed0469cedf42bdc3d35 data/create/tags/blocks/non_movable.json 4970078b49ddac1b1d500ed0469cedf42bdc3d35 data/create/tags/blocks/non_movable.json
06e13efbb7b0d09ff7ecd1a7dc45a0760b91ad67 data/create/tags/blocks/ore_override_stone.json 06e13efbb7b0d09ff7ecd1a7dc45a0760b91ad67 data/create/tags/blocks/ore_override_stone.json
a5874f73c7dc0a3ae12999e6ae8abf45bc7fb9be data/create/tags/blocks/passive_boiler_heaters.json a5874f73c7dc0a3ae12999e6ae8abf45bc7fb9be data/create/tags/blocks/passive_boiler_heaters.json

20
src/generated/resources/.cache/4c6aefd01d2f404cb6dd8a4f408ce8f3778751da → src/generated/resources/.cache/9b718366ce2ebddbc65bf65c103939e2cf56b4af
View file

@ -1,18 +1,20 @@
// 1.19.2 2022-09-25T12:22:44.7537946 Lang merger // 1.19.2 2022-12-13T12:20:23.5056534 Create's lang merger
4b9ffd38401c3366dc8fba48bd867b580bd7a016 assets/create/lang/en_us.json 4b9ffd38401c3366dc8fba48bd867b580bd7a016 assets/create/lang/en_us.json
c2d8149ca2c7db92f0c8c3c7d68e7e63302878df assets/create/lang/unfinished/de_de.json e465ee61e15a5d79376d3701820121e73765aa23 assets/create/lang/unfinished/da_dk.json
e529f1aa29a16fcb586bed82201088d0e7dba79a assets/create/lang/unfinished/de_de.json
a0e1127515d1cf6868741eaa864d9342f552a99c assets/create/lang/unfinished/es_cl.json a0e1127515d1cf6868741eaa864d9342f552a99c assets/create/lang/unfinished/es_cl.json
917cb1979c9ad8785864351d42eaafa3fa29ea1d assets/create/lang/unfinished/es_es.json 917cb1979c9ad8785864351d42eaafa3fa29ea1d assets/create/lang/unfinished/es_es.json
b5ed9782c171eac41695f2b12b71870cded97fa6 assets/create/lang/unfinished/fr_fr.json 76fe238f89a7d5a64aea2334d520898bd25d095b assets/create/lang/unfinished/es_mx.json
a253fa32573b2fb9941dddeff32325a81dea8850 assets/create/lang/unfinished/it_it.json b9690299fcbf172e0d6aa4df708a04f35b233503 assets/create/lang/unfinished/fr_fr.json
d21e3535c795ac4db5224bb57baceab62fc2a51b assets/create/lang/unfinished/ja_jp.json 3a2beeeae0c4814817a59f10ae3353c02ecb78c0 assets/create/lang/unfinished/it_it.json
da47fd6bc5192384df742f2e5dd556a697c15659 assets/create/lang/unfinished/ko_kr.json 6caad7d8cb2fac2362c126178d03c37e53f95e7f assets/create/lang/unfinished/ja_jp.json
32babc881a7f928a6fa93d20b46d52f0165d6ba7 assets/create/lang/unfinished/nl_nl.json 098b41625e4a7542e737c1d15e16f57da4ce7a7d assets/create/lang/unfinished/ko_kr.json
cef2a874b6957fa2e82d7d435f9aab26060a8e0c assets/create/lang/unfinished/nl_nl.json
b88ce42806a06cd65203e2e296057e0911733d06 assets/create/lang/unfinished/pl_pl.json b88ce42806a06cd65203e2e296057e0911733d06 assets/create/lang/unfinished/pl_pl.json
c3bc8db145cdc14dc3403fdf7f9bdf4fc3ed5f45 assets/create/lang/unfinished/pt_br.json c3bc8db145cdc14dc3403fdf7f9bdf4fc3ed5f45 assets/create/lang/unfinished/pt_br.json
338d90442da4075a5c8facbc0e9fca8d2accfcd2 assets/create/lang/unfinished/pt_pt.json 338d90442da4075a5c8facbc0e9fca8d2accfcd2 assets/create/lang/unfinished/pt_pt.json
c3afd5e860c6e2956cda4d55ee1167e8b987ade6 assets/create/lang/unfinished/ro_ro.json c3afd5e860c6e2956cda4d55ee1167e8b987ade6 assets/create/lang/unfinished/ro_ro.json
ba3c585e3ba61138fec85ece927b0c47c98e33e8 assets/create/lang/unfinished/ru_ru.json 2f81508831a76f4f2a4a9d486bdab055fafb1f8c assets/create/lang/unfinished/ru_ru.json
5f2d947d98adbcc2e79eeb792352a4b5596e76dc assets/create/lang/unfinished/uk_ua.json 5f2d947d98adbcc2e79eeb792352a4b5596e76dc assets/create/lang/unfinished/uk_ua.json
a38e0091abafd7e6caa62e20fae7b7d9541abb99 assets/create/lang/unfinished/zh_cn.json a38e0091abafd7e6caa62e20fae7b7d9541abb99 assets/create/lang/unfinished/zh_cn.json
400a4ebd430a0ca749898a3d8a068a7f15d2e62a assets/create/lang/unfinished/zh_tw.json 6796cb804307290a7bcf1e011b7f85aa2aab214b assets/create/lang/unfinished/zh_tw.json

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

@ -1,4 +1,4 @@
// 1.19.2 2022-09-28T21:49:27.0879193 Create's Processing Recipes // 1.19.2 2022-12-13T12:20:23.5794567 Create's Processing Recipes
3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json

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

@ -1,2 +1,2 @@
// 1.19.2 2022-09-23T20:53:24.9116814 Create's Custom Sounds // 1.19.2 2022-12-13T12:20:23.5176215 Create's Custom Sounds
043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json 043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json

4
src/generated/resources/assets/create/lang/unfinished/da_dk.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 1308", "_": "Missing Localizations: 1310",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "Stationær mekanisme", "entity.create.stationary_contraption": "Stationær mekanisme",
"entity.create.super_glue": "Superlim", "entity.create.super_glue": "Superlim",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "Eliksir", "fluid.create.potion": "Eliksir",
"fluid.create.tea": "Håndværkerens te", "fluid.create.tea": "Håndværkerens te",

4
src/generated/resources/assets/create/lang/unfinished/de_de.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 0", "_": "Missing Localizations: 2",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "Stationäre Vorrichtung", "entity.create.stationary_contraption": "Stationäre Vorrichtung",
"entity.create.super_glue": "Sekundenkleber", "entity.create.super_glue": "Sekundenkleber",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "Trank", "fluid.create.potion": "Trank",
"fluid.create.tea": "Bauherrentee", "fluid.create.tea": "Bauherrentee",

4
src/generated/resources/assets/create/lang/unfinished/es_mx.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 8", "_": "Missing Localizations: 10",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "Artefacto estacionario", "entity.create.stationary_contraption": "Artefacto estacionario",
"entity.create.super_glue": "Pegamento", "entity.create.super_glue": "Pegamento",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "Poción", "fluid.create.potion": "Poción",
"fluid.create.tea": "Té del Constructor", "fluid.create.tea": "Té del Constructor",

4
src/generated/resources/assets/create/lang/unfinished/fr_fr.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 0", "_": "Missing Localizations: 2",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "Machine stationnaire", "entity.create.stationary_contraption": "Machine stationnaire",
"entity.create.super_glue": "Colle extra-forte", "entity.create.super_glue": "Colle extra-forte",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "Potion", "fluid.create.potion": "Potion",
"fluid.create.tea": "Thé du constructeur", "fluid.create.tea": "Thé du constructeur",

4
src/generated/resources/assets/create/lang/unfinished/it_it.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 0", "_": "Missing Localizations: 2",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "Macchinario stazionario", "entity.create.stationary_contraption": "Macchinario stazionario",
"entity.create.super_glue": "Super colla", "entity.create.super_glue": "Super colla",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "Pozione", "fluid.create.potion": "Pozione",
"fluid.create.tea": "Tè del costruttore", "fluid.create.tea": "Tè del costruttore",

2
src/generated/resources/assets/create/lang/unfinished/ja_jp.json
View file

@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "付設からくり", "entity.create.stationary_contraption": "付設からくり",
"entity.create.super_glue": "超粘着剤", "entity.create.super_glue": "超粘着剤",
"fluid.create.chocolate": "チョコレート",
"fluid.create.honey": "ハチミツ",
"fluid.create.potion": "ポーション", "fluid.create.potion": "ポーション",
"fluid.create.tea": "建築家のお茶", "fluid.create.tea": "建築家のお茶",

4
src/generated/resources/assets/create/lang/unfinished/ko_kr.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 2", "_": "Missing Localizations: 4",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "고정된 구조물", "entity.create.stationary_contraption": "고정된 구조물",
"entity.create.super_glue": "강력 접착제", "entity.create.super_glue": "강력 접착제",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "포션", "fluid.create.potion": "포션",
"fluid.create.tea": "건축가의 차", "fluid.create.tea": "건축가의 차",

4
src/generated/resources/assets/create/lang/unfinished/zh_tw.json
View file

@ -1,5 +1,5 @@
{ {
"_": "Missing Localizations: 0", "_": "Missing Localizations: 2",
"_": "->------------------------] Game Elements [------------------------<-", "_": "->------------------------] Game Elements [------------------------<-",
@ -576,6 +576,8 @@
"entity.create.stationary_contraption": "固定結構", "entity.create.stationary_contraption": "固定結構",
"entity.create.super_glue": "強力膠", "entity.create.super_glue": "強力膠",
"fluid.create.chocolate": "UNLOCALIZED: Chocolate",
"fluid.create.honey": "UNLOCALIZED: Honey",
"fluid.create.potion": "藥水", "fluid.create.potion": "藥水",
"fluid.create.tea": "茶", "fluid.create.tea": "茶",

1
src/generated/resources/data/create/tags/blocks/movable_empty_collider.json
View file

@ -1,5 +1,4 @@
{ {
"replace": false,
"values": [ "values": [
"minecraft:cobweb", "minecraft:cobweb",
"minecraft:powder_snow", "minecraft:powder_snow",

4
src/main/java/com/simibubi/create/compat/storageDrawers/StorageDrawers.java
View file

@ -5,14 +5,14 @@ import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBe
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
public class StorageDrawers { public class StorageDrawers {
public static boolean isDrawer(BlockEntity tile) { public static boolean isDrawer(BlockEntity tile) {
return tile != null && Mods.STORAGEDRAWERS.asId() return tile != null && Mods.STORAGEDRAWERS.asId()
.equals(tile.getType() .equals(BlockEntityType.getKey(tile.getType())
.getRegistryName()
.getNamespace()); .getNamespace());
} }

2
src/main/java/com/simibubi/create/content/contraptions/components/deployer/ManualApplicationRecipe.java
View file

@ -79,7 +79,7 @@ public class ManualApplicationRecipe extends ItemApplicationRecipe {
recipe.rollResults() recipe.rollResults()
.forEach(stack -> Block.popResource(level, pos, stack)); .forEach(stack -> Block.popResource(level, pos, stack));
boolean creative = event.getPlayer() != null && event.getPlayer() boolean creative = event.getEntity() != null && event.getEntity()
.isCreative(); .isCreative();
boolean unbreakable = heldItem.hasTag() && heldItem.getTag() boolean unbreakable = heldItem.hasTag() && heldItem.getTag()
.getBoolean("Unbreakable"); .getBoolean("Unbreakable");