Skip to content

Commit 66ccb66

Browse files
JensenJJensenJ
authored
Merge branch 'Creators-of-Create:mc1.18/dev' into mc1.18/dev
2 parents a9ec38d + 80b3ac8 commit 66ccb66

File tree

64 files changed

+665
-305
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+665
-305
lines changed

‎build.gradle

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ minecraft {
5353
workingDirectory project.file('run')
5454
arg '-mixin.config=create.mixins.json'
5555
//jvmArgs '-XX:+UnlockCommercialFeatures' // uncomment for profiling
56+
//jvmArgs '-XX:+IgnoreUnrecognizedVMOptions', '-XX:+AllowEnhancedClassRedefinition' // uncomment with jbr
5657
property 'forge.logging.console.level', 'info'
5758
mods {
5859
create {
@@ -204,8 +205,18 @@ dependencies {
204205
// runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3")
205206
// implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false }
206207
// runtimeOnly fg.deobf("maven.modrinth:spark:1.10.38-forge")
207-
//runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
208-
//runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
208+
// runtimeOnly fg.deobf("curse.maven:forbidden-arcanus-309858:4729924")
209+
// runtimeOnly fg.deobf("curse.maven:valhelsia-core-416935:3886212")
210+
// implementation fg.deobf("curse.maven:modern-ui-352491:5229350")
211+
// runtimeOnly fg.deobf("curse.maven:sophisticated-storage-619320:5194748")
212+
// runtimeOnly fg.deobf("curse.maven:sophisticated-core-618298:5296312")
213+
// runtimeOnly fg.deobf("curse.maven:functional-storage-556861:5271589")
214+
// runtimeOnly fg.deobf("curse.maven:titanium-287342:5151207")
215+
// runtimeOnly fg.deobf("curse.maven:storage-drawers-223852:3807626")
216+
// implementation fg.deobf("curse.maven:ftb-chunks-forge-314906:4494633")
217+
// implementation fg.deobf("curse.maven:architectury-api-419699:4521465")
218+
// implementation fg.deobf("curse.maven:ftb-library-forge-404465:4396792")
219+
// implementation fg.deobf("curse.maven:ftb-teams-forge-404468:4579981")
209220

210221
// https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497
211222
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings

‎src/generated/resources/.cache/cache

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3329,7 +3329,7 @@ c2b075008849e152f20e8da946e89c9722325df6 data/create/loot_tables/blocks/content_
33293329
69b4b25d7d271458177fbbaeba2c797daccc38a2 data/create/loot_tables/blocks/contraption_controls.json
33303330
28856dc862efc6bcc421d035d26386740458f868 data/create/loot_tables/blocks/controller_rail.json
33313331
2c2785e39e1891dff2c50cba93e814b56d935154 data/create/loot_tables/blocks/controls.json
3332-
3abf04f6132955275ad490668cd28f481afb4ec2 data/create/loot_tables/blocks/copper_backtank.json
3332+
ac15351000c44cf0924e8e3b3c6d92e3d54bb084 data/create/loot_tables/blocks/copper_backtank.json
33333333
6697e619d5c6dcb81aad4f5c88ba319d13665b35 data/create/loot_tables/blocks/copper_bars.json
33343334
8010db6b2427536c74312c85425b3ba83abc363c data/create/loot_tables/blocks/copper_casing.json
33353335
ea5fb942c8dfb792daac538e09d286ac120aa199 data/create/loot_tables/blocks/copper_door.json
@@ -3590,7 +3590,7 @@ afdff197c9d1a6940e988c00435135f9705fd0e5 data/create/loot_tables/blocks/metal_gi
35903590
b83a90fbe83906b171fc0de6bdc2d9aa3a8c542e data/create/loot_tables/blocks/millstone.json
35913591
5c1df8443043b3fe3b665dba348e2ff188bcbe31 data/create/loot_tables/blocks/minecart_anchor.json
35923592
1e73d28fdd2e54910074aeadbe5617425a8ae656 data/create/loot_tables/blocks/mysterious_cuckoo_clock.json
3593-
a5fa8fdc10efe534e5c7d8bdb687f226b39f63ef data/create/loot_tables/blocks/netherite_backtank.json
3593+
188de41337119f55117c48eeb8d31cdf12cebd76 data/create/loot_tables/blocks/netherite_backtank.json
35943594
2e21a06c0d671e543bffecb0b67d97b51fa83ddc data/create/loot_tables/blocks/nixie_tube.json
35953595
f6b4095a518a01081f3663d7268d67063bdb44ee data/create/loot_tables/blocks/nozzle.json
35963596
d378be8f13fc7ed625813eae3a50b68e8706a297 data/create/loot_tables/blocks/oak_window.json
@@ -4251,7 +4251,7 @@ fe6620822b1c90527c6b77ab6f6e25873d19487c data/create/recipes/crushing/compat/the
42514251
2670e2454e82fd7dc44e896e40771bce9c515285 data/create/recipes/crushing/copper_ore.json
42524252
4106006671af487158d165c8211553028585ebb3 data/create/recipes/crushing/crimsite.json
42534253
b2ba06eb5bcc907f16e4605fc53f31aa35bc2cfd data/create/recipes/crushing/crimsite_recycling.json
4254-
c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json
4254+
57a02cc2631a232a6bad5e772b622983087ecb18 data/create/recipes/crushing/deepslate_coal_ore.json
42554255
81ae6cf7b0f7dbf8f4966a4670121919de7b5391 data/create/recipes/crushing/deepslate_copper_ore.json
42564256
2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json
42574257
ae3070fc3ae237192949ad06ebb8a4c157f7e832 data/create/recipes/crushing/deepslate_emerald_ore.json
@@ -4265,6 +4265,7 @@ c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_or
42654265
f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json
42664266
38e958ba2e12daeed2fb0bc65a9ab9e04c98b816 data/create/recipes/crushing/diorite_recycling.json
42674267
1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json
4268+
23623c1aa357e96b791019d64bdaf0124652baaf data/create/recipes/crushing/gilded_blackstone.json
42684269
b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json
42694270
159ac6c38b0232fa9bf3ed5e7ea8e23854c96f22 data/create/recipes/crushing/gold_ore.json
42704271
55c0656723bd5a87089965651fe268b2d2956771 data/create/recipes/crushing/golden_horse_armor.json
@@ -5012,7 +5013,7 @@ e6aa8895186358e9d069f5a99909132be49f3bf1 data/create/recipes/diorite_from_stone_
50125013
a90268d38f976327ff5e1b87ff1d72ca2d1ebad6 data/create/recipes/dripstone_block_from_stone_types_dripstone_stonecutting.json
50135014
27d9bf05a610447e90314e658dbbcd191f378fc9 data/create/recipes/dripstone_pillar_from_stone_types_dripstone_stonecutting.json
50145015
d81ceba2946286d374801e698a4ca2116395cbad data/create/recipes/emptying/builders_tea.json
5015-
318ab703224ff1d6f7200675e1e0a4c138b28456 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
5016+
d62f4682fe6cc61df5a1c0231a2004a4ee78a329 data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json
50165017
c26d003e921720308c05ad7b9f3cb57de94a10a8 data/create/recipes/emptying/compat/farmersdelight/milk_bottle.json
50175018
60c0edfb5b759e4f13427b631861f503f8552923 data/create/recipes/emptying/compat/neapolitan/milk_bottle.json
50185019
20b7c7c62fa2e33199e08188dd8836844a6d9cfd data/create/recipes/emptying/honey_bottle.json
@@ -5027,7 +5028,7 @@ c2f40d447fbac4b4975e578fe32635658b73ebf7 data/create/recipes/exposed_copper_tile
50275028
133e79f78a7f2c2f63ac7695d2be57d56e8955f4 data/create/recipes/filling/blaze_cake.json
50285029
642e96ce5dd2f31e7a33c6ef4060eecb0bf2aa86 data/create/recipes/filling/builders_tea.json
50295030
1367357fc36adc4b67467d90589ef91e657380a4 data/create/recipes/filling/chocolate_glazed_berries.json
5030-
61a770607d872ace2be80c3391fba4225182282f data/create/recipes/filling/compat/alexsmobs/milk_bottle.json
5031+
61a770607d872ace2be80c3391fba4225182282f data/create/recipes/filling/compat/alexsmobs/lava_bottle.json
50315032
08dde80a4761e430eaaa18fb813885d307b25bd1 data/create/recipes/filling/compat/byg/lush_grass_block.json
50325033
0e79248178f8c1690b4e5a5ad2ffaf63711ad3c7 data/create/recipes/filling/compat/farmersdelight/milk_bottle.json
50335034
bcfbc3d6617e32732a1e186059694c4880e2d2e4 data/create/recipes/filling/compat/neapolitan/milk_bottle.json

‎src/generated/resources/data/create/loot_tables/blocks/copper_backtank.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@
88
{
99
"type": "minecraft:item",
1010
"functions": [
11-
{
12-
"function": "minecraft:copy_name",
13-
"source": "block_entity"
14-
},
1511
{
1612
"function": "minecraft:copy_nbt",
1713
"source": "block_entity",
1814
"ops": [
1915
{
20-
"source": "Air",
21-
"target": "Air",
22-
"op": "replace"
16+
"source": "VanillaTag",
17+
"target": "{}",
18+
"op": "merge"
2319
}
2420
]
2521
},
@@ -28,8 +24,8 @@
2824
"source": "block_entity",
2925
"ops": [
3026
{
31-
"source": "Enchantments",
32-
"target": "Enchantments",
27+
"source": "Air",
28+
"target": "Air",
3329
"op": "replace"
3430
}
3531
]

‎src/generated/resources/data/create/loot_tables/blocks/netherite_backtank.json

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,14 @@
88
{
99
"type": "minecraft:item",
1010
"functions": [
11-
{
12-
"function": "minecraft:copy_name",
13-
"source": "block_entity"
14-
},
1511
{
1612
"function": "minecraft:copy_nbt",
1713
"source": "block_entity",
1814
"ops": [
1915
{
20-
"source": "Air",
21-
"target": "Air",
22-
"op": "replace"
16+
"source": "VanillaTag",
17+
"target": "{}",
18+
"op": "merge"
2319
}
2420
]
2521
},
@@ -28,8 +24,8 @@
2824
"source": "block_entity",
2925
"ops": [
3026
{
31-
"source": "Enchantments",
32-
"target": "Enchantments",
27+
"source": "Air",
28+
"target": "Air",
3329
"op": "replace"
3430
}
3531
]

‎src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
],
88
"results": [
99
{
10-
"item": "minecraft:coal"
10+
"item": "minecraft:coal",
11+
"count": 2
1112
},
1213
{
1314
"item": "minecraft:coal",
14-
"chance": 0.75
15+
"chance": 0.25
1516
},
1617
{
1718
"item": "create:experience_nugget",
@@ -22,5 +23,5 @@
2223
"chance": 0.125
2324
}
2425
],
25-
"processingTime": 250
26+
"processingTime": 300
2627
}

‎src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"type": "create:crushing",
3+
"ingredients": [
4+
{
5+
"item": "minecraft:gilded_blackstone"
6+
}
7+
],
8+
"results": [
9+
{
10+
"item": "minecraft:gold_nugget",
11+
"count": 18
12+
},
13+
{
14+
"item": "create:experience_nugget",
15+
"chance": 0.75
16+
},
17+
{
18+
"item": "minecraft:blackstone",
19+
"chance": 0.125
20+
}
21+
],
22+
"processingTime": 400
23+
}

‎src/generated/resources/data/create/recipes/emptying/compat/alexsmobs/lava_bottle.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
],
1717
"conditions": [
1818
{
19-
"modid": "atmospheric",
19+
"modid": "alexsmobs",
2020
"type": "forge:mod_loaded"
2121
}
2222
]

‎src/generated/resources/data/create/recipes/filling/compat/alexsmobs/milk_bottle.json renamed to ‎src/generated/resources/data/create/recipes/filling/compat/alexsmobs/lava_bottle.json

File renamed without changes.

‎src/main/java/com/simibubi/create/AllInteractionBehaviours.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6+
import com.simibubi.create.content.contraptions.behaviour.FenceGateMovingInteraction;
7+
68
import org.jetbrains.annotations.Nullable;
79

810
import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
@@ -75,6 +77,15 @@ static void registerDefaults() {
7577
}
7678
return null;
7779
});
80+
81+
FenceGateMovingInteraction fenceGateBehavior = new FenceGateMovingInteraction();
82+
registerBehaviourProvider(state -> {
83+
if (state.is(BlockTags.FENCE_GATES)) {
84+
return fenceGateBehavior;
85+
}
86+
return null;
87+
});
88+
7889
}
7990

8091
public interface BehaviourProvider {

‎src/main/java/com/simibubi/create/compat/Mods.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ public enum Mods {
1818
CONNECTIVITY,
1919
CURIOS,
2020
DYNAMICTREES,
21+
FUNCTIONALSTORAGE,
2122
OCCULTISM,
2223
PACKETFIXER,
24+
SOPHISTICATEDBACKPACKS,
25+
SOPHISTICATEDSTORAGE,
2326
STORAGEDRAWERS,
2427
TCONSTRUCT,
25-
XLPACKETS;
28+
XLPACKETS,
29+
MODERNUI;
2630

2731
private final String id;
2832

0 commit comments

Comments
 (0)