mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 23:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Moss, Paper, Scissors

Browse source 
- Dripstone and Lush Caves can now replace exposed create stone types with their own generated blocks
This commit is contained in:
simibubi 2021-12-28 13:48:30 +01:00
parent 8e4dcb958d
commit 3deb23303d
8 changed files with 60 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2125,7 +2125,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear
a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json
b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json
5049f72c327a88f175f6f9425909e098fc711100 assets/create/sounds.json
0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json
5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json
613e64b44bed959da899fdd54c1cacb227fb33f2 data/create/advancements/andesite_alloy.json
81885c6bfb85792c88aaa7c9b70f58832945d31f data/create/advancements/andesite_casing.json
83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json
@ -5207,10 +5207,14 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/forge/tags/items/storage_blocks.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
7f71a774800111e50b42de0e6159ed2d2a807d32 data/forge/tags/items/storage_blocks/zinc.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/dripstone_replaceable_blocks.json
69f596fcb065e26b02ce246760432b5174191b76 data/minecraft/tags/blocks/impermeable.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/lush_ground_replaceable.json
59681910c06f8b7385c6641a409d352056235506 data/minecraft/tags/blocks/mineable/axe.json
f8c66b3808efb61d2d928748783bb7eb8a1357f9 data/minecraft/tags/blocks/mineable/pickaxe.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/moss_replaceable.json
e157c1d3af30e409e34bbefbe15a037e6e1c8daa data/minecraft/tags/blocks/needs_iron_tool.json
a08f67865337f62601c5e333b4011382d10020e4 data/minecraft/tags/blocks/needs_stone_tool.json
6bcabbc1c0479caa80a0ebc676bb34ce0052efb0 data/minecraft/tags/blocks/rails.json

4
src/generated/resources/data/create/advancements/aesthetics.json
View file

@ -28,8 +28,8 @@
"trigger": "create:bracket_apply",
"conditions": {
"accepted_entries": [
"create:cogwheel",
"create:large_cogwheel"
"create:large_cogwheel",
"create:cogwheel"
]
}
},

12
src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json Normal file
View file

@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"create:asurine",
"create:crimsite",
"create:limestone",
"create:ochrum",
"create:scoria",
"create:scorchia",
"create:veridium"
]
}

12
src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json Normal file
View file

@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"create:asurine",
"create:crimsite",
"create:limestone",
"create:ochrum",
"create:scoria",
"create:scorchia",
"create:veridium"
]
}

12
src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json Normal file
View file

@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"create:asurine",
"create:crimsite",
"create:limestone",
"create:ochrum",
"create:scoria",
"create:scorchia",
"create:veridium"
]
}

12
src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json Normal file
View file

@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"create:asurine",
"create:crimsite",
"create:limestone",
"create:ochrum",
"create:scoria",
"create:scorchia",
"create:veridium"
]
}

18
src/main/java/com/simibubi/create/content/palettes/PaletteBlockPattern.java
View file

@ -153,24 +153,6 @@ public class PaletteBlockPattern {
return this;
}
// @SafeVarargs
// private final PaletteBlockPattern blockTags(Tag.Named<Block>... tags) {
// blockTags = tags;
// return this;
// }
//
// @SafeVarargs
// private final PaletteBlockPattern itemTags(Tag.Named<Item>... tags) {
// itemTags = tags;
// return this;
// }
//
// private PaletteBlockPattern addRecipes(
// NonNullFunction<NonNullSupplier<Block>, NonNullBiConsumer<DataGenContext<Block, ? extends Block>, RegistrateRecipeProvider>> func) {
// this.additionalRecipes = func;
// return this;
// }
private PaletteBlockPattern connectedTextures(Function<String, ConnectedTextureBehaviour> factory) {
this.ctFactory = Optional.of(factory);
return this;

5
src/main/java/com/simibubi/create/foundation/data/CreateRegistrate.java
View file

@ -33,6 +33,7 @@ import com.tterrag.registrate.util.nullness.NonNullFunction;
import com.tterrag.registrate.util.nullness.NonNullSupplier;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.tags.BlockTags;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
@ -146,6 +147,10 @@ public class CreateRegistrate extends AbstractRegistrate<CreateRegistrate> {
p.simpleBlock(c.get(), p.models()
.cubeAll(c.getName(), p.modLoc(location)));
})
.tag(BlockTags.DRIPSTONE_REPLACEABLE)
.tag(BlockTags.AZALEA_ROOT_REPLACEABLE)
.tag(BlockTags.MOSS_REPLACEABLE)
.tag(BlockTags.LUSH_GROUND_REPLACEABLE)
.item()
.build();
return builder;