tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'mc1.17/dev' into mc1.18/dev

Browse source
This commit is contained in:
simibubi 2021-12-10 01:45:35 +01:00
commit 858fbd5c1a
12 changed files with 33 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4074,13 +4074,13 @@ c60542c99008f7abecdd03c47137b51e20a4747b data/create/recipes/crimsite_pillar_fro
4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json 4629d9a1a8a98a6b5b8b82c4507ca9e321c3a210 data/create/recipes/crimson_window.json
72cffde4281a1e34d77aa91c847e811833b68f21 data/create/recipes/crimson_window_pane.json 72cffde4281a1e34d77aa91c847e811833b68f21 data/create/recipes/crimson_window_pane.json
63a5543dbd89b250664fee43c036f2a29fef3fe1 data/create/recipes/crushing/amethyst_cluster.json 63a5543dbd89b250664fee43c036f2a29fef3fe1 data/create/recipes/crushing/amethyst_cluster.json
eeaf32eefa5be50f21dab021ae613c29b6f451f2 data/create/recipes/crushing/asurine.json ace6ea5ed1828f4cbb1be0ae8ef10049bd4a07fc data/create/recipes/crushing/asurine.json
e906ea87be306e76609b9856245779a9f20dd48c data/create/recipes/crushing/asurine_recycling.json 11fb7eaaf31336e0b2d7b0bba217a40bd37bf057 data/create/recipes/crushing/asurine_recycling.json
3da7a3cdb84f44e259b5399a94ddfbf94ebebd37 data/create/recipes/crushing/blaze_rod.json 3da7a3cdb84f44e259b5399a94ddfbf94ebebd37 data/create/recipes/crushing/blaze_rod.json
46ff1282677d08157bed54f1c1fa758e2504496a data/create/recipes/crushing/coal_ore.json 46ff1282677d08157bed54f1c1fa758e2504496a data/create/recipes/crushing/coal_ore.json
2089312b012db32c158858d5624135b11873857a data/create/recipes/crushing/copper_ore.json 2089312b012db32c158858d5624135b11873857a data/create/recipes/crushing/copper_ore.json
2c63cb60722c74c10e0448e1875725a1a42b8d96 data/create/recipes/crushing/crimsite.json 495d8bcc4491fb1e96793580879da2eb3e848ccf data/create/recipes/crushing/crimsite.json
80b07e438caf429565fcfa4ff6c6b95f562bbb63 data/create/recipes/crushing/crimsite_recycling.json 26ae3467194635947f3bc3f3424c7da63de23d6b data/create/recipes/crushing/crimsite_recycling.json
c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json
dedb4d7e958efa2218561686974ad9223848ec30 data/create/recipes/crushing/deepslate_copper_ore.json dedb4d7e958efa2218561686974ad9223848ec30 data/create/recipes/crushing/deepslate_copper_ore.json
2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json 2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json
@ -4108,8 +4108,8 @@ cc5a817901d6f0d68e4ceb3e65d7f2187ab37ceb data/create/recipes/crushing/nether_gol
6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json 6e424d7e9f7d8b585384053a713db28f9d36448b data/create/recipes/crushing/nether_wart_block.json
8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json 8003e7db3ee11066b365c251f04f84028820de94 data/create/recipes/crushing/netherrack.json
dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json dd4b9e88a723f6c3f2456f36ef2354cd86d85433 data/create/recipes/crushing/obsidian.json
93767cfd10019f11de935021a729771430bc114b data/create/recipes/crushing/ochrum.json 6cc26e132efe43afdaacac2ba4f6061e909a86b5 data/create/recipes/crushing/ochrum.json
6112ed91241cb5a2aae62559529e496f5ee205a1 data/create/recipes/crushing/ochrum_recycling.json d3088533d37c75d096c685ad40d8d8d11a6b00a1 data/create/recipes/crushing/ochrum_recycling.json
67197bbbb9667ab481410d21cb014bf9ca71ea60 data/create/recipes/crushing/prismarine_crystals.json 67197bbbb9667ab481410d21cb014bf9ca71ea60 data/create/recipes/crushing/prismarine_crystals.json
3602170b10ed1e0bb5e7aa806dcc73170b999517 data/create/recipes/crushing/raw_copper.json 3602170b10ed1e0bb5e7aa806dcc73170b999517 data/create/recipes/crushing/raw_copper.json
ad62bd9e067efbc026ed7ed0a0e47232d14f2fe5 data/create/recipes/crushing/raw_copper_block.json ad62bd9e067efbc026ed7ed0a0e47232d14f2fe5 data/create/recipes/crushing/raw_copper_block.json
@ -4122,8 +4122,8 @@ cbdbad0020b8a48dd2f5a658e3f93ff9ab648406 data/create/recipes/crushing/raw_iron_b
a2d3e1feb660a89c09038853859302726fa863c1 data/create/recipes/crushing/redstone_ore.json a2d3e1feb660a89c09038853859302726fa863c1 data/create/recipes/crushing/redstone_ore.json
7f6c7b88464ecb023165d379bfe8d0117b2f37d6 data/create/recipes/crushing/tuff.json 7f6c7b88464ecb023165d379bfe8d0117b2f37d6 data/create/recipes/crushing/tuff.json
d984b77c6f9ef221f6fcca8f88bd03de016159e6 data/create/recipes/crushing/tuff_recycling.json d984b77c6f9ef221f6fcca8f88bd03de016159e6 data/create/recipes/crushing/tuff_recycling.json
2517df626a19d7fc489ca7573a573c59513c6b83 data/create/recipes/crushing/veridium.json d4aa6615971d37ecf52bf750925488a7b3559d79 data/create/recipes/crushing/veridium.json
a2cdec54ea9aa9abf533f41a67bb573995a36ca2 data/create/recipes/crushing/veridium_recycling.json 5bc83e378751a393354a03910b27b7953d5ff7a3 data/create/recipes/crushing/veridium_recycling.json
b6b97f139ee0a06a4ec1ed9f43e1f845b3c502d3 data/create/recipes/crushing/wool.json b6b97f139ee0a06a4ec1ed9f43e1f845b3c502d3 data/create/recipes/crushing/wool.json
24ee57fbe5a1656df6b9c63a3f414112b31caf15 data/create/recipes/crushing/zinc_ore.json 24ee57fbe5a1656df6b9c63a3f414112b31caf15 data/create/recipes/crushing/zinc_ore.json
842f2178550ecf8823024fad696a0f2a1237a9c3 data/create/recipes/cut_andesite_brick_slab.json 842f2178550ecf8823024fad696a0f2a1237a9c3 data/create/recipes/cut_andesite_brick_slab.json

4
src/generated/resources/data/create/recipes/crushing/asurine.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_zinc_ore", "item": "create:crushed_zinc_ore",
"chance": 0.2 "chance": 0.3
}, },
{ {
"item": "create:zinc_nugget", "item": "create:zinc_nugget",
"chance": 0.2 "chance": 0.3
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/asurine_recycling.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_zinc_ore", "item": "create:crushed_zinc_ore",
"chance": 0.2 "chance": 0.3
}, },
{ {
"item": "create:zinc_nugget", "item": "create:zinc_nugget",
"chance": 0.2 "chance": 0.3
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/crimsite.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_iron_ore", "item": "create:crushed_iron_ore",
"chance": 0.2 "chance": 0.4
}, },
{ {
"item": "minecraft:iron_nugget", "item": "minecraft:iron_nugget",
"chance": 0.2 "chance": 0.4
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/crimsite_recycling.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_iron_ore", "item": "create:crushed_iron_ore",
"chance": 0.2 "chance": 0.4
}, },
{ {
"item": "minecraft:iron_nugget", "item": "minecraft:iron_nugget",
"chance": 0.2 "chance": 0.4
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/ochrum.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_gold_ore", "item": "create:crushed_gold_ore",
"chance": 0.1 "chance": 0.2
}, },
{ {
"item": "minecraft:gold_nugget", "item": "minecraft:gold_nugget",
"chance": 0.1 "chance": 0.2
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/ochrum_recycling.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_gold_ore", "item": "create:crushed_gold_ore",
"chance": 0.1 "chance": 0.2
}, },
{ {
"item": "minecraft:gold_nugget", "item": "minecraft:gold_nugget",
"chance": 0.1 "chance": 0.2
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/veridium.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_copper_ore", "item": "create:crushed_copper_ore",
"chance": 0.4 "chance": 0.8
}, },
{ {
"item": "create:copper_nugget", "item": "create:copper_nugget",
"chance": 0.4 "chance": 0.8
} }
], ],
"processingTime": 250 "processingTime": 250

4
src/generated/resources/data/create/recipes/crushing/veridium_recycling.json
View file

@ -8,11 +8,11 @@
"results": [ "results": [
{ {
"item": "create:crushed_copper_ore", "item": "create:crushed_copper_ore",
"chance": 0.4 "chance": 0.8
}, },
{ {
"item": "create:copper_nugget", "item": "create:copper_nugget",
"chance": 0.4 "chance": 0.8
} }
], ],
"processingTime": 250 "processingTime": 250

5
src/main/java/com/simibubi/create/foundation/config/CKinetics.java
View file

@ -37,7 +37,9 @@ public class CKinetics extends ConfigBase {
public final ConfigInt maxRopeLength = i(256, 1, "maxRopeLength", Comments.maxRopeLength); public final ConfigInt maxRopeLength = i(256, 1, "maxRopeLength", Comments.maxRopeLength);
public final ConfigInt maxCartCouplingLength = i(32, 1, "maxCartCouplingLength", Comments.maxCartCouplingLength); public final ConfigInt maxCartCouplingLength = i(32, 1, "maxCartCouplingLength", Comments.maxCartCouplingLength);
public final ConfigEnum<ContraptionMovementSetting> spawnerMovement = public final ConfigEnum<ContraptionMovementSetting> spawnerMovement =
e(ContraptionMovementSetting.NO_PICKUP, "movableSpawners", Comments.spawnerMovement); e(ContraptionMovementSetting.NO_PICKUP, "movableSpawners", Comments.spawnerMovement);
public final ConfigEnum<ContraptionMovementSetting> amethystMovement =
e(ContraptionMovementSetting.NO_PICKUP, "amethystMovement", Comments.amethystMovement);
public final ConfigEnum<ContraptionMovementSetting> obsidianMovement = public final ConfigEnum<ContraptionMovementSetting> obsidianMovement =
e(ContraptionMovementSetting.UNMOVABLE, "movableObsidian", Comments.obsidianMovement); e(ContraptionMovementSetting.UNMOVABLE, "movableObsidian", Comments.obsidianMovement);
public final ConfigBool moveItemsToStorage = b(true, "moveItemsToStorage", Comments.moveItemsToStorage); public final ConfigBool moveItemsToStorage = b(true, "moveItemsToStorage", Comments.moveItemsToStorage);
@ -108,6 +110,7 @@ public class CKinetics extends ConfigBase {
static String ejectorScanInterval = static String ejectorScanInterval =
"Time in ticks until the next item launched by an ejector scans blocks for potential collisions"; "Time in ticks until the next item launched by an ejector scans blocks for potential collisions";
static String spawnerMovement = "Configure how Spawner blocks can be moved by contraptions."; static String spawnerMovement = "Configure how Spawner blocks can be moved by contraptions.";
static String amethystMovement = "Configure how Budding Amethyst can be moved by contraptions.";
static String obsidianMovement = "Configure how Obsidian blocks can be moved by contraptions."; static String obsidianMovement = "Configure how Obsidian blocks can be moved by contraptions.";
} }

1
src/main/java/com/simibubi/create/foundation/config/ContraptionMovementSetting.java
View file

@ -22,6 +22,7 @@ public enum ContraptionMovementSetting {
} }
static { static {
register(Blocks.BUDDING_AMETHYST.getRegistryName(), () -> AllConfigs.SERVER.kinetics.amethystMovement.get());
register(Blocks.SPAWNER.getRegistryName(), () -> AllConfigs.SERVER.kinetics.spawnerMovement.get()); register(Blocks.SPAWNER.getRegistryName(), () -> AllConfigs.SERVER.kinetics.spawnerMovement.get());
register(Blocks.OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get()); register(Blocks.OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get());
register(Blocks.CRYING_OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get()); register(Blocks.CRYING_OBSIDIAN.getRegistryName(), () -> AllConfigs.SERVER.kinetics.obsidianMovement.get());

8
src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java
View file

@ -44,16 +44,16 @@ public class CrushingRecipeGen extends ProcessingRecipeGen {
.output(.25f, Items.QUARTZ, 1)), .output(.25f, Items.QUARTZ, 1)),
CRIMSITE = CRIMSITE =
mineralRecycling(AllPaletteStoneTypes.CRIMSITE, AllItems.CRUSHED_IRON::get, () -> Items.IRON_NUGGET, .2f), mineralRecycling(AllPaletteStoneTypes.CRIMSITE, AllItems.CRUSHED_IRON::get, () -> Items.IRON_NUGGET, .4f),
VERIDIUM = mineralRecycling(AllPaletteStoneTypes.VERIDIUM, AllItems.CRUSHED_COPPER::get, VERIDIUM = mineralRecycling(AllPaletteStoneTypes.VERIDIUM, AllItems.CRUSHED_COPPER::get,
() -> AllItems.COPPER_NUGGET::get, .4f), () -> AllItems.COPPER_NUGGET::get, .8f),
ASURINE = mineralRecycling(AllPaletteStoneTypes.ASURINE, AllItems.CRUSHED_ZINC::get, ASURINE = mineralRecycling(AllPaletteStoneTypes.ASURINE, AllItems.CRUSHED_ZINC::get,
() -> AllItems.ZINC_NUGGET::get, .2f), () -> AllItems.ZINC_NUGGET::get, .3f),
OCHRUM = OCHRUM =
mineralRecycling(AllPaletteStoneTypes.OCHRUM, AllItems.CRUSHED_GOLD::get, () -> Items.GOLD_NUGGET, .1f), mineralRecycling(AllPaletteStoneTypes.OCHRUM, AllItems.CRUSHED_GOLD::get, () -> Items.GOLD_NUGGET, .2f),
TUFF = mineralRecycling(AllPaletteStoneTypes.TUFF, b -> b.duration(350) TUFF = mineralRecycling(AllPaletteStoneTypes.TUFF, b -> b.duration(350)
.output(.25f, Items.FLINT, 1) .output(.25f, Items.FLINT, 1)