Compact Course

- Added the Block of Experience
This commit is contained in:
simibubi 2023-05-16 22:27:43 +02:00
parent 0ce0c6939a
commit 3bd2080f61
20 changed files with 224 additions and 9 deletions

View file

@ -220,6 +220,7 @@ ac85f55d82d96fc15750e6b954297cfd1e00d04d assets/create/blockstates/deployer.json
35fc68eb1d031d28ad09b7b603e64ae459634179 assets/create/blockstates/encased_chain_drive.json
7b2b836649e729feafa60972bf95e3afb2143131 assets/create/blockstates/encased_fan.json
d13940ed213d7acbc6ebe3bdd21175ef89e4d613 assets/create/blockstates/encased_fluid_pipe.json
529ea1c70018cd18b387b6da705571bddf2862a0 assets/create/blockstates/experience_block.json
5d2f1f2366b6b70213f06e22545774b3a0d724a9 assets/create/blockstates/exposed_copper_shingle_slab.json
9b5f3a605f48fae074d9b98aca410b68fe72bb2d assets/create/blockstates/exposed_copper_shingle_stairs.json
9849af21d0e48d17fc7fbef4423329b0b073b9f9 assets/create/blockstates/exposed_copper_shingles.json
@ -581,8 +582,8 @@ bf2b0310500213ff853c748c236eb5d01f61658e assets/create/blockstates/yellow_toolbo
5616dda664dd106d576848124fc0fc1de18d0fd3 assets/create/blockstates/yellow_valve_handle.json
7f39521b211441f5c3e06d60c5978cebe16cacfb assets/create/blockstates/zinc_block.json
b7181bcd8182b2f17088e5aa881f374c9c65470c assets/create/blockstates/zinc_ore.json
20ff7c03192498fa2745ab80e479988cfddd1820 assets/create/lang/en_ud.json
d4fca44ef174c323208294db578a1fc4cfd89efe assets/create/lang/en_us.json
4fd8347dfb20e6e5752b8b905850762a88c88c02 assets/create/lang/en_ud.json
7064415e6a6c7fc4707318b7cb88adbb2a2a7dc3 assets/create/lang/en_us.json
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
@ -1048,6 +1049,7 @@ d1c0a266ca0f5ce7ddeb170cd36635b10b8ccc0f assets/create/models/block/diorite_pill
64704a24de13b33326944a6779ca2c0bfd71d803 assets/create/models/block/diorite_pillar_horizontal.json
0d02622fc395760d1807fab74c53e83760e6a91c assets/create/models/block/dripstone_pillar.json
3e00a1807b94a1365cf5ef925c63b55587c11b1d assets/create/models/block/dripstone_pillar_horizontal.json
9567b24e5e79bf877a038189bd447d83de9eef95 assets/create/models/block/experience_block.json
408ac77bce9415ae6fe8f6d98615c1d2c6738fc9 assets/create/models/block/exposed_copper_shingle_slab.json
edb51e91f336afa38004693cd0c7694f0b6013ce assets/create/models/block/exposed_copper_shingle_slab_top.json
0de63a143bc3f862c216d05ad6d07dac0a1c3912 assets/create/models/block/exposed_copper_shingle_stairs.json
@ -1906,6 +1908,7 @@ c25cd4d5cdf67b0d7e15f5a56c63e6bf35fe2917 assets/create/models/item/dripstone_pil
5312db341e777c79feeaec99e5cb85bb99bb76ff assets/create/models/item/empty_schematic.json
cf34fd7e891a131d763126aa070d5b919e304a51 assets/create/models/item/encased_chain_drive.json
250bd0716cc1f04b03892ab74eb0b3a0f32a6158 assets/create/models/item/encased_fan.json
40d493a8730944b7de2f74483bc1fc10c9d8b2d9 assets/create/models/item/experience_block.json
3dbe101503c83630778605c50499d049adbf86ff assets/create/models/item/experience_nugget.json
a6bc828ce1b0727f7db6af68eb2decbda0a2e84b assets/create/models/item/exposed_copper_shingle_slab.json
c7608e082a0ab2de3be5e404919f08bbda1bbc3d assets/create/models/item/exposed_copper_shingle_stairs.json
@ -2556,6 +2559,7 @@ fccf9862a45c8847a45b301b191aef3e138fa1d4 data/create/advancements/recipes/create
90d4658a26a32bfdade4573797ea4d913151c707 data/create/advancements/recipes/create.base/crafting/materials/brass_nugget_from_decompacting.json
dbfba4474ce5229205245d46680a651754a593ce data/create/advancements/recipes/create.base/crafting/materials/copper_nugget.json
a8a032b40204919242bf5043d2920627cd28d348 data/create/advancements/recipes/create.base/crafting/materials/electron_tube.json
97a8312c69aa0dd7f21d1058bdf813b946ed0ef6 data/create/advancements/recipes/create.base/crafting/materials/experience_nugget_from_block.json
121f9d02b1405327ff01113e32c1a1019f9b2f35 data/create/advancements/recipes/create.base/crafting/materials/raw_zinc.json
2d875ed3e78b4840863f2188aea2b9dd23304512 data/create/advancements/recipes/create.base/crafting/materials/red_sand_paper.json
bc58b9bec08df3ae2ba9aa871097f0113e4f9075 data/create/advancements/recipes/create.base/crafting/materials/rose_quartz.json
@ -2665,6 +2669,7 @@ c8721a3c600b4211e7662e42bbaddb8e67ab8240 data/create/advancements/recipes/create
e8c2001863d9819d2a2c1fddeda41a4f126a5c09 data/create/advancements/recipes/create.palettes/crafting/kinetics/yellow_seat_from_other_seat.json
a0227781b6f28feb0cc6ec326eb2dcc4d489af1e data/create/advancements/recipes/create.palettes/crafting/materials/andesite_alloy_block.json
a7d9a6dda3049332f04f4db027340070e1a9e597 data/create/advancements/recipes/create.palettes/crafting/materials/brass_block_from_compacting.json
dc0518f6a62f45ccdb4a7f044b3083c85c6c490b data/create/advancements/recipes/create.palettes/crafting/materials/experience_block.json
433e9dae24a4167b2cbd23e37e59bc84cfe352e5 data/create/advancements/recipes/create.palettes/crafting/materials/raw_zinc_block.json
37ff5e0f0a1224e310c4a63e9690913b525db337 data/create/advancements/recipes/create.palettes/crafting/materials/rose_quartz_tilesfrom_conversion.json
401f3b540c745c05bfb7b24e27367790aa232d74 data/create/advancements/recipes/create.palettes/crafting/materials/small_rose_quartz_tilesfrom_conversion.json
@ -3468,6 +3473,7 @@ fd63effdc29cf565f561f8901a93c8ee3124bcaa data/create/loot_tables/blocks/display_
2186860c4a0cb47a66bdfdefcde302c599cddeea data/create/loot_tables/blocks/encased_chain_drive.json
7fcc15674a7583b965441fb079b8997e4244a4ff data/create/loot_tables/blocks/encased_fan.json
b4df9a8b28f29587e75ffe11ca26d85ddbe926da data/create/loot_tables/blocks/encased_fluid_pipe.json
59a03ed8eebddc5d972fea4ce6cc6a5e87cf8cb2 data/create/loot_tables/blocks/experience_block.json
7b16eb41d59c2fd90319f3e1f0e37a87dda618e3 data/create/loot_tables/blocks/exposed_copper_shingle_slab.json
16e8862269d5794122727de1ce580edfc658692a data/create/loot_tables/blocks/exposed_copper_shingle_stairs.json
d89c4d7d212091b1aee2db2b0dedd252d4c301b9 data/create/loot_tables/blocks/exposed_copper_shingles.json
@ -4117,6 +4123,8 @@ fa23f8ff9f43ed39a70a86d0c9080102d57d14b6 data/create/recipes/crafting/materials/
62ce480f3b5a2f9de27858fdde4f48cf8b91fe2c data/create/recipes/crafting/materials/copper_ingot.json
9a8cef55dc3b7cecef500bad0c7bbb86c51f4b5f data/create/recipes/crafting/materials/copper_nugget.json
399f7148fcec3a5c1eed40069d777f16622ff32d data/create/recipes/crafting/materials/electron_tube.json
545fc5016d59752bfba1664479576581d98927da data/create/recipes/crafting/materials/experience_block.json
f9f553800ed3d4f04e48085379c93d1c6545f4ba data/create/recipes/crafting/materials/experience_nugget_from_block.json
e73e4abd1306e2bfeb59ab5ca2d804c23fc66f7e data/create/recipes/crafting/materials/raw_zinc.json
cc167074d22aff7ba824ec738653e84f131a1bf0 data/create/recipes/crafting/materials/raw_zinc_block.json
9c9e40ffd41ce46c65113080a92ff9b4f27e5fab data/create/recipes/crafting/materials/red_sand_paper.json
@ -5370,7 +5378,7 @@ f3e20d8b3ca5652d3975da680740cc36326fdfc9 data/create/tags/items/vanilla_stripped
9fc688d8fac1033c7b8f4b8de1138e56d2faf527 data/forge/tags/blocks/ores_in_ground/deepslate.json
d5ea262a0f5fb210612d22521818e26cf08e591a data/forge/tags/blocks/ores_in_ground/stone.json
ad8fa04f7bbbafd70d0ce158af78a35e899301e2 data/forge/tags/blocks/relocation_not_supported.json
cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/blocks/storage_blocks.json
75ce17287d1621fce4a05ec98ec8bf856044f605 data/forge/tags/blocks/storage_blocks.json
ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/blocks/storage_blocks/andesite_alloy.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/blocks/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/blocks/storage_blocks/raw_zinc.json
@ -5407,7 +5415,7 @@ fb9bfb4c84ed9cf2da8c4b2fbc4cd4d9f37d3016 data/forge/tags/items/plates/gold.json
d82758dd3c2972fa94736733dc6b3944129f5a11 data/forge/tags/items/plates/obsidian.json
dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials.json
dc96331cded39b2d2f24853f4dd6c1f6f3863115 data/forge/tags/items/raw_materials/zinc.json
cffe82d6f1d2eefdaf200eedfe50b590aa5ffbbb data/forge/tags/items/storage_blocks.json
75ce17287d1621fce4a05ec98ec8bf856044f605 data/forge/tags/items/storage_blocks.json
ecd6eda3669e4d4df367df99a7692cc0dd04e7ee data/forge/tags/items/storage_blocks/andesite_alloy.json
ff1900963bc4cd8ceffa78d58ef1952ceacb2fb7 data/forge/tags/items/storage_blocks/brass.json
823d05187626797205381d4620a84abda3bc8f89 data/forge/tags/items/storage_blocks/raw_zinc.json
@ -5416,14 +5424,14 @@ cfa16b75227c9bf4f245c97ac55999b3903e5471 data/forge/tags/items/stripped_logs.jso
5bfe8bc7ce944566878cd502e6b770c766990484 data/forge/tags/items/stripped_wood.json
e002dfedc5e8762de0f97ea1f3fa546e92e748ae data/forge/tags/items/tools/wrench.json
2db7759fe036160c14c6ed19a68604ca16f4de60 data/minecraft/tags/blocks/azalea_root_replaceable.json
9f7a428085b1aac66da32a43e9d51c7efc1f0d81 data/minecraft/tags/blocks/beacon_base_blocks.json
93b06d1ed71319c77e67d2e8317f065307c48187 data/minecraft/tags/blocks/beacon_base_blocks.json
cf71d9ad48f109da3a8b22a8d2d1a68d4eac99c0 data/minecraft/tags/blocks/climbable.json
45daa588f642e6bb26fa985273f59dfbdc63c976 data/minecraft/tags/blocks/doors.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
b68d565b4befb7b1c542d69eaa81309cc5304327 data/minecraft/tags/blocks/mineable/axe.json
a8384d64b16abfdb7f43453fc1cc09a3aae5ab6c data/minecraft/tags/blocks/mineable/pickaxe.json
a64b73add655b38ee1b4a347597e931199fdb5ab 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

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "create:block/experience_block"
}
}
}

View file

@ -221,6 +221,7 @@
"block.create.encased_chain_drive": "\u01DD\u028C\u0131\u0279\u15E1 u\u0131\u0250\u0265\u0186 p\u01DDs\u0250\u0254u\u018E",
"block.create.encased_fan": "u\u0250\u2132 p\u01DDs\u0250\u0254u\u018E",
"block.create.encased_fluid_pipe": "\u01DDd\u0131\u0500 p\u0131n\u05DF\u2132 p\u01DDs\u0250\u0254u\u018E",
"block.create.experience_block": "\u01DD\u0254u\u01DD\u0131\u0279\u01DDdx\u018E \u025Fo \u029E\u0254o\u05DF\u15FA",
"block.create.exposed_copper_shingle_slab": "q\u0250\u05DFS \u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186 p\u01DDsodx\u018E",
"block.create.exposed_copper_shingle_stairs": "s\u0279\u0131\u0250\u0287S \u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186 p\u01DDsodx\u018E",
"block.create.exposed_copper_shingles": "s\u01DD\u05DFbu\u0131\u0265S \u0279\u01DDddo\u0186 p\u01DDsodx\u018E",

View file

@ -224,6 +224,7 @@
"block.create.encased_chain_drive": "Encased Chain Drive",
"block.create.encased_fan": "Encased Fan",
"block.create.encased_fluid_pipe": "Encased Fluid Pipe",
"block.create.experience_block": "Block of Experience",
"block.create.exposed_copper_shingle_slab": "Exposed Copper Shingle Slab",
"block.create.exposed_copper_shingle_stairs": "Exposed Copper Shingle Stairs",
"block.create.exposed_copper_shingles": "Exposed Copper Shingles",

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "create:block/experience_block"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "create:block/experience_block"
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:crafting/materials/experience_nugget_from_block"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:experience_nugget"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:crafting/materials/experience_nugget_from_block"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,34 @@
{
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"create:crafting/materials/experience_block"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"items": [
"create:experience_nugget"
]
}
]
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "create:crafting/materials/experience_block"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
]
}

View file

@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1.0,
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "create:experience_block"
}
],
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
]
}
]
}

View file

@ -0,0 +1,16 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"CCC",
"CCC",
"CCC"
],
"key": {
"C": {
"item": "create:experience_nugget"
}
},
"result": {
"item": "create:experience_block"
}
}

View file

@ -0,0 +1,12 @@
{
"type": "minecraft:crafting_shapeless",
"ingredients": [
{
"item": "create:experience_block"
}
],
"result": {
"item": "create:experience_nugget",
"count": 9
}
}

View file

@ -4,6 +4,7 @@
"create:raw_zinc_block",
"create:zinc_block",
"create:andesite_alloy_block",
"create:brass_block"
"create:brass_block",
"create:experience_block"
]
}

View file

@ -4,6 +4,7 @@
"create:raw_zinc_block",
"create:zinc_block",
"create:andesite_alloy_block",
"create:brass_block"
"create:brass_block",
"create:experience_block"
]
}

View file

@ -2,6 +2,7 @@
"replace": false,
"values": [
"create:zinc_block",
"create:brass_block"
"create:brass_block",
"create:experience_block"
]
}

View file

@ -186,6 +186,7 @@
"create:rose_quartz_block",
"create:rose_quartz_tiles",
"create:small_rose_quartz_tiles",
"create:experience_block",
"create:copper_shingles",
"create:exposed_copper_shingles",
"create:weathered_copper_shingles",

View file

@ -141,6 +141,7 @@ import com.simibubi.create.content.contraptions.relays.encased.GearshiftBlock;
import com.simibubi.create.content.contraptions.relays.gauge.GaugeBlock;
import com.simibubi.create.content.contraptions.relays.gauge.GaugeGenerator;
import com.simibubi.create.content.contraptions.relays.gearbox.GearboxBlock;
import com.simibubi.create.content.curiosities.ExperienceBlock;
import com.simibubi.create.content.curiosities.armor.BacktankBlock;
import com.simibubi.create.content.curiosities.bell.HauntedBellBlock;
import com.simibubi.create.content.curiosities.bell.HauntedBellMovementBehaviour;
@ -275,6 +276,7 @@ import net.minecraft.core.Registry;
import net.minecraft.data.loot.BlockLoot;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.item.DyeColor;
@ -304,6 +306,7 @@ import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.Tags;
import net.minecraftforge.common.util.ForgeSoundType;
public class AllBlocks {
@ -2302,6 +2305,25 @@ public class AllBlocks {
.lang("Block of Brass")
.register();
public static final BlockEntry<ExperienceBlock> EXPERIENCE_BLOCK =
REGISTRATE.block("experience_block", ExperienceBlock::new)
.initialProperties(SharedProperties::softMetal)
.properties(p -> p.color(MaterialColor.PLANT))
.properties(p -> p.sound(new ForgeSoundType(1, .5f, () -> SoundEvents.AMETHYST_BLOCK_BREAK,
() -> SoundEvents.AMETHYST_BLOCK_STEP, () -> SoundEvents.AMETHYST_BLOCK_PLACE,
() -> SoundEvents.AMETHYST_BLOCK_HIT, () -> SoundEvents.AMETHYST_BLOCK_FALL)))
.properties(p -> p.requiresCorrectToolForDrops())
.properties(p -> p.lightLevel(s -> 13))
.transform(pickaxeOnly())
.lang("Block of Experience")
.tag(Tags.Blocks.STORAGE_BLOCKS)
.tag(BlockTags.BEACON_BASE_BLOCKS)
.item()
.properties(p -> p.rarity(Rarity.UNCOMMON))
.tag(Tags.Items.STORAGE_BLOCKS)
.build()
.register();
public static final BlockEntry<RotatedPillarBlock> ROSE_QUARTZ_BLOCK =
REGISTRATE.block("rose_quartz_block", RotatedPillarBlock::new)
.initialProperties(() -> Blocks.AMETHYST_BLOCK)

View file

@ -0,0 +1,30 @@
package com.simibubi.create.content.curiosities;
import java.util.Random;
import com.simibubi.create.foundation.utility.VecHelper;
import net.minecraft.core.BlockPos;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
public class ExperienceBlock extends Block {
public ExperienceBlock(Properties pProperties) {
super(pProperties);
}
@Override
public void animateTick(BlockState pState, Level pLevel, BlockPos pPos, Random pRand) {
if (pRand.nextInt(5) != 0)
return;
Vec3 vec3 = VecHelper.clampComponentWise(VecHelper.offsetRandomly(Vec3.ZERO, pRand, .75f), .55f)
.add(VecHelper.getCenterOf(pPos));
pLevel.addParticle(ParticleTypes.END_ROD, vec3.x, vec3.y, vec3.z, pRand.nextGaussian() * 0.005D,
pRand.nextGaussian() * 0.005D, pRand.nextGaussian() * 0.005D);
}
}

View file

@ -102,6 +102,17 @@ public class StandardRecipeGen extends CreateRecipeProvider {
.pattern("CCC")
.pattern("CCC")),
EXPERIENCE_FROM_BLOCK = create(AllItems.EXP_NUGGET).withSuffix("_from_block")
.returns(9)
.unlockedBy(AllItems.EXP_NUGGET::get)
.viaShapeless(b -> b.requires(AllBlocks.EXPERIENCE_BLOCK.get())),
EXPERIENCE_BLOCK = create(AllBlocks.EXPERIENCE_BLOCK).unlockedBy(AllItems.EXP_NUGGET::get)
.viaShaped(b -> b.define('C', AllItems.EXP_NUGGET.get())
.pattern("CCC")
.pattern("CCC")
.pattern("CCC")),
BRASS_COMPACTING =
metalCompacting(ImmutableList.of(AllItems.BRASS_NUGGET, AllItems.BRASS_INGOT, AllBlocks.BRASS_BLOCK),
ImmutableList.of(I::brassNugget, I::brass, I::brassBlock)),

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View file

@ -0,0 +1,6 @@
{
"animation": {
"interpolate": false,
"frametime": 3
}
}