Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 13:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Mek has more metals now

Browse source 
- Also reduced speed penalty of coupling hard-collision
This commit is contained in:
simibubi 2020-12-12 17:57:48 +01:00
parent a50b9bc6d1
commit 4b597f7b86
14 changed files with 253 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/generated/resources/.cache/cache
View file

@ -1638,11 +1638,13 @@ db8786e15e2ff39523705f4dd2ee4fb2e04d934b data/create/advancements/mechanical_saw
5012e9d559439d0d62d0b34c2e39de048e8c7699 data/create/advancements/recipes/building_blocks/blasting/aluminum_ingot_compat_silents_mechanisms.json
2e253226c408dffb9dfb828b846f70ebd1cfb16e data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
3f022f89aeb5034f2292ca71daa9f311e8af40ff data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
fb73858cc12c9898a95121407100777da70fb514 data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json
b7232d0e659de3f227289a5275f76a5a2ec578bb data/create/advancements/recipes/building_blocks/blasting/ingot_nickel_compat_immersiveengineering.json
1f527bbe24e79f3f149c06dd8be7016eea42b4e9 data/create/advancements/recipes/building_blocks/blasting/ingot_osmium_compat_mekanism.json
bf68b12cf828b64f5bb407bba6cf6ced8578327c data/create/advancements/recipes/building_blocks/blasting/ingot_silver_compat_immersiveengineering.json
fc07b75f81782fa06990c7eb7febc635621df91a data/create/advancements/recipes/building_blocks/blasting/ingot_tin_compat_mekanism.json
84963b1e8eb81dd20df6a9680028f8b76fef2bae data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_immersiveengineering.json
d8edb7b810ba30aa7b5d281e283ccfd4bcc8af4f data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json
744d8831fde05ee2598ccde10f9289512c45d55b data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_mysticalworld.json
4ef0ac97acddee1c49a0deb402b43feb40af1dc6 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_silents_mechanisms.json
25c6e6736da3a529c4cfb384a2dba707f946ce22 data/create/advancements/recipes/building_blocks/blasting/lead_ingot_compat_thermal.json
@ -1664,11 +1666,13 @@ d192e3f2185ad3cd8cd64f639dd6395aaec89563 data/create/advancements/recipes/buildi
98fe15c805f1d228f1db6a2b35426ef01e9747a8 data/create/advancements/recipes/building_blocks/smelting/glass_from_vertical_framed_glass.json
43d3d2c952f54fdf73e4df422554451ceff899d3 data/create/advancements/recipes/building_blocks/smelting/ingot_aluminum_compat_immersiveengineering.json
48439dd60a0a79f0ab6accc3773a3a8b64b7396e data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_immersiveengineering.json
9dede27b23de5aeafec509a5b232fb83ef7d87fa data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json
7d8325768f249a1ac5d79d60eb58b6eb32c51234 data/create/advancements/recipes/building_blocks/smelting/ingot_nickel_compat_immersiveengineering.json
c2a565459bc3a2b6aa1770e36295373f886b27b3 data/create/advancements/recipes/building_blocks/smelting/ingot_osmium_compat_mekanism.json
d192714def52e54a58ae96f7592055e925d88bb8 data/create/advancements/recipes/building_blocks/smelting/ingot_silver_compat_immersiveengineering.json
e922be59fa4cb031020041f54d06d361f090e6a8 data/create/advancements/recipes/building_blocks/smelting/ingot_tin_compat_mekanism.json
6f0b67b3f49da5c3102a48e68e6c4f834d08b0e2 data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_immersiveengineering.json
2c10ff7aea86bec54b5b84a8fa89e51aba9c771e data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json
847dc1a0bd2275a11ff02624b98cf7fdf0d8f47b data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_mysticalworld.json
79d5f852e9e48e9e8ff5cd42890fbc9ad29e9712 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_silents_mechanisms.json
cdf4697b74e4a6add2ea41825733f4d9ff2b83e6 data/create/advancements/recipes/building_blocks/smelting/lead_ingot_compat_thermal.json
@ -2703,11 +2707,13 @@ c6f0509618f703f1a48313e46d934bd862096699 data/create/recipes/blasting/copper_ing
d9021504be855cd2d4d91503a82b84233052adb0 data/create/recipes/blasting/gold_ingot_from_crushed.json
f2307aa01ddf7accb3fe19c4d3f9b46dec1acf97 data/create/recipes/blasting/ingot_aluminum_compat_immersiveengineering.json
8315c188802bd64f7226a9e942be45173112c7ac data/create/recipes/blasting/ingot_lead_compat_immersiveengineering.json
a000546cea7ea3fcf7fdd741d367d3d2da744871 data/create/recipes/blasting/ingot_lead_compat_mekanism.json
368fd45a8e9d5d2fc0e1f8af1ffb48984b85601c data/create/recipes/blasting/ingot_nickel_compat_immersiveengineering.json
d167828a4fe3a20d765831c1df433fc3c8efeab8 data/create/recipes/blasting/ingot_osmium_compat_mekanism.json
9b5a388f0f8a3a8fae9e6bbf6460913b7c1f6fe7 data/create/recipes/blasting/ingot_silver_compat_immersiveengineering.json
7997e66e5e7aebe2c6da764902d78e3bf5f4c530 data/create/recipes/blasting/ingot_tin_compat_mekanism.json
ba7498521a1e07b9bd46ec230d952fb232eaaba0 data/create/recipes/blasting/ingot_uranium_compat_immersiveengineering.json
ee290750b334b7996ba856a8f66f4948346c99f6 data/create/recipes/blasting/ingot_uranium_compat_mekanism.json
69cda0f54c47cd44c296608cc379db855602410f data/create/recipes/blasting/iron_ingot_from_crushed.json
65a44735ffa0c3e471a1df30b987d8c3cf1764fc data/create/recipes/blasting/lead_ingot_compat_mysticalworld.json
aeb345e5b4c266ac9e2ef6929b153cb535468d01 data/create/recipes/blasting/lead_ingot_compat_silents_mechanisms.json
@ -3398,11 +3404,13 @@ daaa640dbfaa86685de636b89afe2fdd74cd0cf9 data/create/recipes/smelting/glass_pane
b032c79090adad2262ae94609e0b3747327d51a2 data/create/recipes/smelting/gold_ingot_from_crushed.json
5cd79470a32c77fc7347a04ad2096df08769a59f data/create/recipes/smelting/ingot_aluminum_compat_immersiveengineering.json
ce34f496dca15378b5e4b21c70505e9d1184848d data/create/recipes/smelting/ingot_lead_compat_immersiveengineering.json
7a9e989c963ebbb286eb8d7a291e8b6a7a96408c data/create/recipes/smelting/ingot_lead_compat_mekanism.json
428b3981a13c63381115384496d89375e3d20837 data/create/recipes/smelting/ingot_nickel_compat_immersiveengineering.json
36a8f88fe3a9b09674bbba99a8f41c8ac5542cdb data/create/recipes/smelting/ingot_osmium_compat_mekanism.json
456ec25989f6d882fc931764341d8217386cf9ab data/create/recipes/smelting/ingot_silver_compat_immersiveengineering.json
d2ab440819e4534f717315b7a737bcc2883072ed data/create/recipes/smelting/ingot_tin_compat_mekanism.json
7ca0d75c667e171f2abc5faeb96ef17282b130ac data/create/recipes/smelting/ingot_uranium_compat_immersiveengineering.json
6179556218ef8de57e7a7093498b5c810af9bd7f data/create/recipes/smelting/ingot_uranium_compat_mekanism.json
fe3e4c244c34aa6948243fabd6b42f04f80d4992 data/create/recipes/smelting/iron_ingot_from_crushed.json
4a1e8041f44bb36d29ec624fc78bdfd0ac875953 data/create/recipes/smelting/lead_ingot_compat_mysticalworld.json
76433e1605c03dec670d95e9541770c53f4a5aaf data/create/recipes/smelting/lead_ingot_compat_silents_mechanisms.json
@ -3448,8 +3456,10 @@ a43d7c9a6369a48ef7d1396f2c11dc1f3704a61e data/create/recipes/splashing/lime_conc
67d97de29a9075a7ba8edb6e47c997b02600557e data/create/recipes/splashing/limestone.json
862f7b68bb107d7c4ecc82ddd10c788eb0a07b03 data/create/recipes/splashing/magenta_concrete_powder.json
004e05fed3684de8603905d9c9381cbbd789a882 data/create/recipes/splashing/magma_block.json
1ac44e66e1999b7127156492008e08e9607b158e data/create/recipes/splashing/mekanism/crushed_lead_ore.json
f627573eefe0353b32d7c48abd7dcbcf13613004 data/create/recipes/splashing/mekanism/crushed_osmium_ore.json
a1828cb3c934c4146008d1d10d04adb80a80ac94 data/create/recipes/splashing/mekanism/crushed_tin_ore.json
751c1d11d19054d514eb99d24a73945236dc9116 data/create/recipes/splashing/mekanism/crushed_uranium_ore.json
ea4a295149091e3b4b8388cb9d4dd2ab509d666e data/create/recipes/splashing/mysticalworld/crushed_lead_ore.json
1ecac82da1ccc381e303dc64e8033c13cf66fb59 data/create/recipes/splashing/mysticalworld/crushed_quicksilver_ore.json
fd1751c804bfc156c7bd97955fabb19f9a4b94ec data/create/recipes/splashing/mysticalworld/crushed_silver_ore.json

32
src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_lead_compat_mekanism"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "create:crushed_lead_ore"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_lead_compat_mekanism"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

32
src/generated/resources/data/create/advancements/recipes/building_blocks/blasting/ingot_uranium_compat_mekanism.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:blasting/ingot_uranium_compat_mekanism"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "create:crushed_uranium_ore"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:blasting/ingot_uranium_compat_mekanism"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

32
src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_lead_compat_mekanism.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_lead_compat_mekanism"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "create:crushed_lead_ore"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_lead_compat_mekanism"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

32
src/generated/resources/data/create/advancements/recipes/building_blocks/smelting/ingot_uranium_compat_mekanism.json Normal file
View file

@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:smelting/ingot_uranium_compat_mekanism"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"item": "create:crushed_uranium_ore"
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:smelting/ingot_uranium_compat_mekanism"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

15
src/generated/resources/data/create/recipes/blasting/ingot_lead_compat_mekanism.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_lead_ore"
},
"result": "mekanism:ingot_lead",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

15
src/generated/resources/data/create/recipes/blasting/ingot_uranium_compat_mekanism.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:blasting",
"ingredient": {
"item": "create:crushed_uranium_ore"
},
"result": "mekanism:ingot_uranium",
"experience": 0.1,
"cookingtime": 100,
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

15
src/generated/resources/data/create/recipes/smelting/ingot_lead_compat_mekanism.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_lead_ore"
},
"result": "mekanism:ingot_lead",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

15
src/generated/resources/data/create/recipes/smelting/ingot_uranium_compat_mekanism.json Normal file
View file

@ -0,0 +1,15 @@
{
"type": "minecraft:smelting",
"ingredient": {
"item": "create:crushed_uranium_ore"
},
"result": "mekanism:ingot_uranium",
"experience": 0.1,
"cookingtime": 200,
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

25
src/generated/resources/data/create/recipes/splashing/mekanism/crushed_lead_ore.json Normal file
View file

@ -0,0 +1,25 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_lead_ore"
}
],
"results": [
{
"item": "mekanism:nugget_lead",
"count": 10
},
{
"item": "mekanism:nugget_lead",
"count": 5,
"chance": 0.5
}
],
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

25
src/generated/resources/data/create/recipes/splashing/mekanism/crushed_uranium_ore.json Normal file
View file

@ -0,0 +1,25 @@
{
"type": "create:splashing",
"ingredients": [
{
"item": "create:crushed_uranium_ore"
}
],
"results": [
{
"item": "mekanism:nugget_uranium",
"count": 10
},
{
"item": "mekanism:nugget_uranium",
"count": 5,
"chance": 0.5
}
],
"conditions": [
{
"modid": "mekanism",
"type": "forge:mod_loaded"
}
]
}

2
src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingPhysics.java
View file

@ -84,7 +84,7 @@ public class CouplingPhysics {
else {
cart.move(MoverType.SELF, correction);
cart.setMotion(cart.getMotion()
.scale(0.5f));
.scale(0.95f));
}
firstLoop = false;
}

4
src/main/java/com/simibubi/create/foundation/data/recipe/StandardRecipeGen.java
View file

@ -956,10 +956,10 @@ public class StandardRecipeGen extends CreateRecipeProvider {
CRUSHED_PLATINUM = blastModdedCrushedMetal(AllItems.CRUSHED_PLATINUM, "platinum", SM),
CRUSHED_SILVER = blastModdedCrushedMetal(AllItems.CRUSHED_SILVER, "silver", MW, TH, IE, SM),
CRUSHED_TIN = blastModdedCrushedMetal(AllItems.CRUSHED_TIN, "tin", MEK, TH, MW, SM),
CRUSHED_LEAD = blastModdedCrushedMetal(AllItems.CRUSHED_LEAD, "lead", MW, TH, IE, SM),
CRUSHED_LEAD = blastModdedCrushedMetal(AllItems.CRUSHED_LEAD, "lead", MEK, MW, TH, IE, SM),
CRUSHED_QUICKSILVER = blastModdedCrushedMetal(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW),
CRUSHED_BAUXITE = blastModdedCrushedMetal(AllItems.CRUSHED_BAUXITE, "aluminum", IE, SM),
CRUSHED_URANIUM = blastModdedCrushedMetal(AllItems.CRUSHED_URANIUM, "uranium", IE, SM),
CRUSHED_URANIUM = blastModdedCrushedMetal(AllItems.CRUSHED_URANIUM, "uranium", MEK, IE, SM),
CRUSHED_NICKEL = blastModdedCrushedMetal(AllItems.CRUSHED_NICKEL, "nickel", TH, IE, SM)
;

4
src/main/java/com/simibubi/create/foundation/data/recipe/WashingRecipeGen.java
View file

@ -54,10 +54,10 @@ public class WashingRecipeGen extends ProcessingRecipeGen {
CRUSHED_PLATINUM = moddedCrushedOre(AllItems.CRUSHED_PLATINUM, "platinum", SM),
CRUSHED_SILVER = moddedCrushedOre(AllItems.CRUSHED_SILVER, "silver", TH, MW, IE, SM),
CRUSHED_TIN = moddedCrushedOre(AllItems.CRUSHED_TIN, "tin", TH, MEK, MW, SM),
CRUSHED_LEAD = moddedCrushedOre(AllItems.CRUSHED_LEAD, "lead", TH, MW, IE, SM),
CRUSHED_LEAD = moddedCrushedOre(AllItems.CRUSHED_LEAD, "lead", MEK, TH, MW, IE, SM),
CRUSHED_QUICKSILVER = moddedCrushedOre(AllItems.CRUSHED_QUICKSILVER, "quicksilver", MW),
CRUSHED_BAUXITE = moddedCrushedOre(AllItems.CRUSHED_BAUXITE, "aluminum", IE, SM),
CRUSHED_URANIUM = moddedCrushedOre(AllItems.CRUSHED_URANIUM, "uranium", IE, SM),
CRUSHED_URANIUM = moddedCrushedOre(AllItems.CRUSHED_URANIUM, "uranium", MEK, IE, SM),
CRUSHED_NICKEL = moddedCrushedOre(AllItems.CRUSHED_NICKEL, "nickel", TH, IE, SM),
ICE = convert(Blocks.ICE, Blocks.PACKED_ICE), MAGMA_BLOCK = convert(Blocks.MAGMA_BLOCK, Blocks.OBSIDIAN),