mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

General code cleanup and small fixes (#6343)

Browse Source 
* redo switch statement using modern java's arrow case

* fix: Add moss carpet to brittle tag

fixes #6342

* update tags

* run datagen

* formatting

* fix comment

* fix comment
This commit is contained in:
IThundxr 2024-07-25 06:34:02 -04:00 committed by GitHub
parent 3d84836422
commit 2c98728b20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 96 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/generated/resources/.cache/cache
View File

@ -5754,18 +5754,19 @@ d79c82bc6cf59b073b2f51f5fea9c98e81d14b68 data/create/recipes/weathered_copper_ti
452d480dd50b97fce72e0c89429cf68db534c6b2 data/create/recipes/weathered_copper_tile_slab_from_weathered_copper_tiles_stonecutting.json
ac265a674626e0e832330086fd18fe0be37fc327 data/create/recipes/weathered_copper_tile_stairs.json
5942a571f79c40524bbf408775cf91de4715f2b6 data/create/recipes/weathered_copper_tile_stairs_from_weathered_copper_tiles_stonecutting.json
2a2700b43614f86d3294726595cb28ed7dca4387 data/create/tags/blocks/brittle.json
c6ebd818a43e51dd369b2c5ffd1aa8a918da4f1b data/create/tags/blocks/brittle.json
d99d5c67bdffff60789a19bd51a5c5267c75e0a4 data/create/tags/blocks/casing.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/contraption_inventory_deny.json
bc203f09dd7f48965d146d0bd035fb904cb75e7d data/create/tags/blocks/copycat_allow.json
d4a3b66f4b763b9a2dcdea74b7273f0ae85cb335 data/create/tags/blocks/copycat_deny.json
34cb3537d3c9b99fcc4ed6d20be93300084f2452 data/create/tags/blocks/corals.json
5dc11813fcc096750528ed3ea681947b4939758b data/create/tags/blocks/fan_processing_catalysts/blasting.json
53735494c1e4af154adb4d1d39359a42747dde22 data/create/tags/blocks/fan_processing_catalysts/haunting.json
95c28b97149d4f689a52ccf99bc3178e2bfa5d1c data/create/tags/blocks/fan_processing_catalysts/smoking.json
74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/create/tags/blocks/fan_processing_catalysts/splashing.json
73c2c85233075d2854d209b71ff2160308a7919c data/create/tags/blocks/fan_transparent.json
ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/create/tags/blocks/girdable_tracks.json
5445d23a146003f0aa8de86643c4315d4afd4ef6 data/create/tags/blocks/movable_empty_collider.json
bdef538d08f848cb91bf8fa596472d7881de1ea4 data/create/tags/blocks/movable_empty_collider.json
6e5d3b2123fbb00e7f439c091623619502551bca data/create/tags/blocks/non_movable.json
10781e8cfcbb3486327aace3aa00e437fb44b331 data/create/tags/blocks/ore_override_stone.json
760adb521c2e475a6414f97291f46c02d294fa74 data/create/tags/blocks/passive_boiler_heaters.json

12
src/generated/resources/data/create/tags/blocks/brittle.json
View File

@ -28,6 +28,18 @@
"minecraft:bell",
"minecraft:cocoa",
"minecraft:flower_pot",
"minecraft:moss_carpet",
"minecraft:bamboo_sapling",
"minecraft:big_dripleaf",
"minecraft:vine",
"minecraft:twisting_vines_plant",
"minecraft:twisting_vines",
"minecraft:weeping_vines_plant",
"minecraft:weeping_vines",
"minecraft:cake",
"#create:corals",
"#minecraft:cave_vines",
"#minecraft:banners",
"#minecraft:beds",
"#minecraft:doors"
]

35
src/generated/resources/data/create/tags/blocks/corals.json Normal file
View File

@ -0,0 +1,35 @@
{
"replace": false,
"values": [
"minecraft:dead_tube_coral",
"minecraft:dead_brain_coral",
"minecraft:dead_bubble_coral",
"minecraft:dead_fire_coral",
"minecraft:dead_horn_coral",
"minecraft:tube_coral",
"minecraft:brain_coral",
"minecraft:bubble_coral",
"minecraft:fire_coral",
"minecraft:horn_coral",
"minecraft:dead_tube_coral_fan",
"minecraft:dead_brain_coral_fan",
"minecraft:dead_bubble_coral_fan",
"minecraft:dead_fire_coral_fan",
"minecraft:dead_horn_coral_fan",
"minecraft:tube_coral_fan",
"minecraft:brain_coral_fan",
"minecraft:bubble_coral_fan",
"minecraft:fire_coral_fan",
"minecraft:horn_coral_fan",
"minecraft:dead_tube_coral_wall_fan",
"minecraft:dead_brain_coral_wall_fan",
"minecraft:dead_bubble_coral_wall_fan",
"minecraft:dead_fire_coral_wall_fan",
"minecraft:dead_horn_coral_wall_fan",
"minecraft:tube_coral_wall_fan",
"minecraft:brain_coral_wall_fan",
"minecraft:bubble_coral_wall_fan",
"minecraft:fire_coral_wall_fan",
"minecraft:horn_coral_wall_fan"
]
}

11
src/generated/resources/data/create/tags/blocks/movable_empty_collider.json
View File

@ -5,6 +5,15 @@
"minecraft:powder_snow",
"minecraft:tripwire",
"minecraft:tripwire_hook",
"#minecraft:fence_gates"
"minecraft:bamboo_sapling",
"minecraft:vine",
"minecraft:twisting_vines_plant",
"minecraft:twisting_vines",
"minecraft:weeping_vines_plant",
"minecraft:weeping_vines",
"#create:corals",
"#minecraft:cave_vines",
"#minecraft:fence_gates",
"#minecraft:banners"
]
}

2
src/main/java/com/simibubi/create/AllTags.java
View File

@ -102,6 +102,8 @@ public class AllTags {
WINDMILL_SAILS,
WRENCH_PICKUP,
CORALS,
RELOCATION_NOT_SUPPORTED(FORGE),
WG_STONE(FORGE),

16
src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerFakePlayer.java
View File

@ -160,16 +160,12 @@ public class DeployerFakePlayer extends FakePlayer {
CKinetics.DeployerAggroSetting setting = AllConfigs.server().kinetics.ignoreDeployerAttacks.get();
switch (setting) {
case ALL:
event.setCanceled(true);
break;
case CREEPERS:
if (mob instanceof Creeper)
event.setCanceled(true);
break;
case NONE:
default:
switch(setting) {
case ALL -> event.setCanceled(true);
case CREEPERS -> {
if (mob instanceof Creeper)
event.setCanceled(true);
}
}
}

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

@ -32,7 +32,13 @@ public class CreateRegistrateTags {
private static void genBlockTags(RegistrateTagsProvider<Block> prov) {
prov.tag(AllBlockTags.BRITTLE.tag)
.add(Blocks.BELL, Blocks.COCOA, Blocks.FLOWER_POT)
.add(Blocks.BELL, Blocks.COCOA, Blocks.FLOWER_POT, Blocks.MOSS_CARPET, Blocks.BAMBOO_SAPLING,
Blocks.BIG_DRIPLEAF, Blocks.VINE, Blocks.TWISTING_VINES_PLANT, Blocks.TWISTING_VINES,
Blocks.WEEPING_VINES_PLANT, Blocks.WEEPING_VINES, Blocks.CAKE
)
.addTag(AllBlockTags.CORALS.tag)
.addTag(BlockTags.CAVE_VINES)
.addTag(BlockTags.BANNERS)
.addTag(BlockTags.BEDS)
.addTag(BlockTags.DOORS);
@ -59,8 +65,14 @@ public class CreateRegistrateTags {
.addTag(BlockTags.LEAVES);
prov.tag(AllBlockTags.MOVABLE_EMPTY_COLLIDER.tag)
.add(Blocks.COBWEB, Blocks.POWDER_SNOW, Blocks.TRIPWIRE, Blocks.TRIPWIRE_HOOK)
.addTag(BlockTags.FENCE_GATES);
.add(Blocks.COBWEB, Blocks.POWDER_SNOW, Blocks.TRIPWIRE, Blocks.TRIPWIRE_HOOK, Blocks.BAMBOO_SAPLING,
Blocks.VINE, Blocks.TWISTING_VINES_PLANT, Blocks.TWISTING_VINES, Blocks.WEEPING_VINES_PLANT,
Blocks.WEEPING_VINES
)
.addTag(AllBlockTags.CORALS.tag)
.addTag(BlockTags.CAVE_VINES)
.addTag(BlockTags.FENCE_GATES)
.addTag(BlockTags.BANNERS);
prov.tag(AllBlockTags.ORE_OVERRIDE_STONE.tag)
.addTag(BlockTags.STONE_ORE_REPLACEABLES);
@ -88,6 +100,19 @@ public class CreateRegistrateTags {
.addTag(BlockTags.PRESSURE_PLATES)
.addTag(BlockTags.RAILS);
prov.tag(AllBlockTags.CORALS.tag)
.add(Blocks.DEAD_TUBE_CORAL, Blocks.DEAD_BRAIN_CORAL, Blocks.DEAD_BUBBLE_CORAL, Blocks.DEAD_FIRE_CORAL,
Blocks.DEAD_HORN_CORAL, Blocks.TUBE_CORAL, Blocks.BRAIN_CORAL, Blocks.BUBBLE_CORAL,
Blocks.FIRE_CORAL, Blocks.HORN_CORAL, Blocks.DEAD_TUBE_CORAL_FAN,
Blocks.DEAD_BRAIN_CORAL_FAN, Blocks.DEAD_BUBBLE_CORAL_FAN, Blocks.DEAD_FIRE_CORAL_FAN,
Blocks.DEAD_HORN_CORAL_FAN, Blocks.TUBE_CORAL_FAN, Blocks.BRAIN_CORAL_FAN,
Blocks.BUBBLE_CORAL_FAN, Blocks.FIRE_CORAL_FAN, Blocks.HORN_CORAL_FAN,
Blocks.DEAD_TUBE_CORAL_WALL_FAN, Blocks.DEAD_BRAIN_CORAL_WALL_FAN,
Blocks.DEAD_BUBBLE_CORAL_WALL_FAN, Blocks.DEAD_FIRE_CORAL_WALL_FAN,
Blocks.DEAD_HORN_CORAL_WALL_FAN, Blocks.TUBE_CORAL_WALL_FAN, Blocks.BRAIN_CORAL_WALL_FAN,
Blocks.BUBBLE_CORAL_WALL_FAN, Blocks.FIRE_CORAL_WALL_FAN, Blocks.HORN_CORAL_WALL_FAN
);
// COMPAT
TagGen.addOptional(prov.tag(AllBlockTags.NON_MOVABLE.tag), Mods.IE,