版本:1.18.2-1.4.7-beta

+ 新加了平滑石英栅栏和石英栅栏
This commit is contained in:
叁玖领域 2025-03-24 11:38:44 +08:00
parent c6044f6123
commit 9582e32f3a
24 changed files with 705 additions and 534 deletions

View File

@ -6,4 +6,4 @@ org.gradle.daemon=false
mod.id = modernlifepatch
mod.group = com.r3944realms.modernlifepatch
mod.author = r3944Realms
mod.version = 1.18.2-1.4.6-beta
mod.version = 1.18.2-1.4.7-beta

View File

@ -17,16 +17,18 @@ bf44b33d66bb5a547d7b22cb9c9ba415292029ca assets/modernlifepatch/blockstates/null
8cc4a69d742b9f9d53822b3c61d1f851d0a2af38 assets/modernlifepatch/blockstates/orange_concrete_barrier.json
ba687d6415b6c54b269570848911ec2432b104c8 assets/modernlifepatch/blockstates/pink_concrete_barrier.json
e0ddd840be4e61f34e07fdb7d7a2e1b04791e0a1 assets/modernlifepatch/blockstates/purple_concrete_barrier.json
211f927f735de1a819fe203123645315d88eb5e0 assets/modernlifepatch/blockstates/quartz_block_barrier.json
bfa6c9feda0cfea0f87ca0b5c80681c9b6e5875f assets/modernlifepatch/blockstates/red_concrete_barrier.json
aaf45b8b7f278b770b9881fd04afde3e69a3a61e assets/modernlifepatch/blockstates/seven_block.json
98343eb7712d5ab1294827097d41b3694bd737a2 assets/modernlifepatch/blockstates/six_block.json
66116c68dc85107b63a00a34f708ce6c7b1ee05a assets/modernlifepatch/blockstates/smooth_quartz_barrier.json
8f9a878ac5383e18cd87ac43b02f0b503c7bfb88 assets/modernlifepatch/blockstates/three_block.json
d5b9c1362a5b10137f0a8b20b4b5774cc2912429 assets/modernlifepatch/blockstates/two_block.json
b9ecfdaadc1a9dd536d7124b65d6054d2d6a2ff5 assets/modernlifepatch/blockstates/white_concrete_barrier.json
a65db9338552468602ea4ed3707f569d88e98ac4 assets/modernlifepatch/blockstates/yellow_concrete_barrier.json
2972f1d246d42a194df6ef0e4aa97637bd81d012 assets/modernlifepatch/blockstates/zero_block.json
66ac57e1e5385fcbece3d3bb88913d2a110faca0 assets/modernlifepatch/lang/en_us.json
4def4a1109f825ea51a47d224437c82e4079ebea assets/modernlifepatch/lang/zh_cn.json
2f8aae98f4738e0f104ece5ed9e14d6d0dc2bd1f assets/modernlifepatch/lang/en_us.json
69cd8638171301da76611d20ca22007792cb5786 assets/modernlifepatch/lang/zh_cn.json
2f9098dc8325d5df5c620c407b6b10ee665e2bc3 assets/modernlifepatch/models/block/black_concrete_barrier.json
7fe678ee95c63aebb23a377ba9936871238006bf assets/modernlifepatch/models/block/blue_concrete_barrier.json
4e6d4ce5154a735fa898431cdf16d6dbd48d795f assets/modernlifepatch/models/block/brown_concrete_barrier.json
@ -46,9 +48,11 @@ dd080450b0fc0355426207d80c86eab1c4d5f67e assets/modernlifepatch/models/block/nin
13d8a1554bba976044a85fd9a09c16cf3de788fa assets/modernlifepatch/models/block/orange_concrete_barrier.json
89c827f9155942e0ffc085ba506f835816f98110 assets/modernlifepatch/models/block/pink_concrete_barrier.json
c8aac0bfecb588c5c5a984597b0a47e95f40903a assets/modernlifepatch/models/block/purple_concrete_barrier.json
88c4a55c6cc5b20069f5caa5a90d475aee97ef5f assets/modernlifepatch/models/block/quartz_block_barrier.json
17d406d701961246f8c892aad69b0cd836a424c4 assets/modernlifepatch/models/block/red_concrete_barrier.json
b65ba24a2e435d2dcd893010e7d39311f880aa4d assets/modernlifepatch/models/block/seven_block.json
77cdec6767b72a69ad5755da585346c828079395 assets/modernlifepatch/models/block/six_block.json
a7d8260dc68880f3110590226a1fb83818587586 assets/modernlifepatch/models/block/smooth_quartz_barrier.json
1e58a73d3909e30e718db936ef93ced5f175c342 assets/modernlifepatch/models/block/three_block.json
dcac21e9dfb5108a3d84c27c4617c9c395b7517d assets/modernlifepatch/models/block/two_block.json
06b847a878809b0a11992974018c231d64ade8b2 assets/modernlifepatch/models/block/white_concrete_barrier.json
@ -76,9 +80,11 @@ c0220b60f875b208ca9be034f5436a01c72ba68b assets/modernlifepatch/models/item/one_
820ca45ce0583fecd57532e96d5e63c588de7857 assets/modernlifepatch/models/item/orange_concrete_barrier.json
c01d9ce9cad70c212304f05e598c5106f6ebf032 assets/modernlifepatch/models/item/pink_concrete_barrier.json
d48d83cd3164a34cd11b659d1b4f68c9621d859d assets/modernlifepatch/models/item/purple_concrete_barrier.json
4b20a7fb96ba97bcd8d55df4c299f03be3c8905a assets/modernlifepatch/models/item/quartz_block_barrier.json
a7b15c8732d9932731417784e20a7d8bf1cf0cb5 assets/modernlifepatch/models/item/red_concrete_barrier.json
cf0270242758457c525f9e94738b566db626e364 assets/modernlifepatch/models/item/seven_block.json
a24f01550201a9de5aa2fd9dfb40cf549175ac81 assets/modernlifepatch/models/item/six_block.json
596c0a1f96a7ce89cfbdd16e7f45d64129fa152c assets/modernlifepatch/models/item/smooth_quartz_barrier.json
ddaaed0180f28afb8dfa1c4270e9872360aca2a7 assets/modernlifepatch/models/item/tall_mirror.json
b9f44e3e4f757b504394e0d56b231127a26a9c74 assets/modernlifepatch/models/item/three_block.json
8a87c68a60901a815b9447ac91a350713bbb1ae0 assets/modernlifepatch/models/item/two_block.json
@ -189,7 +195,7 @@ c37e48280686f3bb8f38ce2cfdf2e17c224c999f data/minecraft/recipes/six_bullet_bulle
59649b1469011a06386657bc10f03e4bd2f6f416 data/minecraft/recipes/white_concrete_barrier_from_white_concrete_stonecutting.json
9d1d3b65fa4845ce713feeb602a3cc8ec68077eb data/minecraft/recipes/yellow_concrete_barrier_from_yellow_concrete_stonecutting.json
1f72d12fce65102b5dc8f7facd82ac90824e1fa4 data/minecraft/recipes/zero_block_from_null_block_stonecutting.json
ae54be9c487afd46fa37fed74b9dbbb34726ed65 data/minecraft/tags/blocks/mineable/pickaxe.json
d47984a56d0e2e269c1653049710f7c111d21e46 data/minecraft/tags/blocks/mineable/pickaxe.json
e3b1f573605d846515a967f0dc47f6cc194054ea data/modernlifepatch/advancements/recipes/decorations/large_mirror.json
2e19bc218d3414988ba9744dde0065b56d8568f1 data/modernlifepatch/advancements/recipes/decorations/massive_mirror.json
5ca06b9db5622369088059c82f7fbd9d6ebdb4e0 data/modernlifepatch/advancements/recipes/decorations/mirror.json
@ -217,9 +223,11 @@ cede4ebab918a30713e597dffe6dd86799fd4fcc data/modernlifepatch/loot_tables/blocks
697a4d3060fc91aa01f5725a66f8d3a40e2a457c data/modernlifepatch/loot_tables/blocks/orange_concrete_barrier.json
dcd569bcf98678d6d178ce4c2219b99c29ff7d81 data/modernlifepatch/loot_tables/blocks/pink_concrete_barrier.json
2045d2300e33ccaf42f3891040bf4e783b1e2e20 data/modernlifepatch/loot_tables/blocks/purple_concrete_barrier.json
a31062ef078d6b139beee23831c74ac4a54fe648 data/modernlifepatch/loot_tables/blocks/quartz_block_barrier.json
03c386cc7a13a8ff1f2711bab72f5f851662ce50 data/modernlifepatch/loot_tables/blocks/red_concrete_barrier.json
a20e5e3d8073e1d2034a9a96fa0f263dd0ef4a16 data/modernlifepatch/loot_tables/blocks/seven_block.json
eb207ede0cd5b1d4af813e3786e948b6b3e6807e data/modernlifepatch/loot_tables/blocks/six_block.json
92586a7f38606e4deaced1f85675df90ae09be8f data/modernlifepatch/loot_tables/blocks/smooth_quartz_barrier.json
2e8f6832411b91b57fe84a63e0f3fe5c855cf732 data/modernlifepatch/loot_tables/blocks/tall_mirror.json
5b07669780ccf2a978eda629eacd177092545c2d data/modernlifepatch/loot_tables/blocks/three_block.json
50f0dac0b998cea6c66bb5fb2cb2e65581575bf4 data/modernlifepatch/loot_tables/blocks/two_block.json
@ -238,7 +246,7 @@ af16229018ba92227ad85a9ade9fa065972342f7 data/modernlifepatch/tags/items/general
f62a523d04996ded165884ea9cce7479084440c7 data/modernlifepatch/tags/items/kitchen.json
2d43417737bb5eef1033e2fa811f1cb2eaa6d5ba data/modernlifepatch/tags/items/lounge.json
f52a1e6b5c7e5a24d7ad539db24a62c8070f0deb data/modernlifepatch/tags/items/m_tool.json
dd1b2d52731a369e500118dff34e48c63bcd3d5e data/modernlifepatch/tags/items/outside.json
07a4097653cddfaa91ae0216c77b5c308347abc8 data/modernlifepatch/tags/items/outside.json
b6ff00d8ce15e61ff485b731f56b5cddc417da2a data/modernlifepatch/tags/items/seat.json
e904c1d09a41897554fec842da01a7db12dc7906 data/modernlifepatch/tags/items/shelf.json
a0bc81b25f981791faee3853ac99ae0fce572349 data/modernlifepatch/tags/items/table.json

View File

@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "modernlifepatch:block/quartz_block_barrier",
"y": 180
},
"facing=south": {
"model": "modernlifepatch:block/quartz_block_barrier"
},
"facing=west": {
"model": "modernlifepatch:block/quartz_block_barrier",
"y": 90
},
"facing=east": {
"model": "modernlifepatch:block/quartz_block_barrier",
"y": 270
}
}
}

View File

@ -0,0 +1,19 @@
{
"variants": {
"facing=north": {
"model": "modernlifepatch:block/smooth_quartz_barrier",
"y": 180
},
"facing=south": {
"model": "modernlifepatch:block/smooth_quartz_barrier"
},
"facing=west": {
"model": "modernlifepatch:block/smooth_quartz_barrier",
"y": 90
},
"facing=east": {
"model": "modernlifepatch:block/smooth_quartz_barrier",
"y": 270
}
}
}

View File

@ -21,9 +21,11 @@
"block.modernlifepatch.orange_concrete_barrier": "Orange Concrete Barrier",
"block.modernlifepatch.pink_concrete_barrier": "Pink Concrete Barrier",
"block.modernlifepatch.purple_concrete_barrier": "Purple Concrete Barrier",
"block.modernlifepatch.quartz_block_barrier": "Quartz Block Barrier",
"block.modernlifepatch.red_concrete_barrier": "Red Concrete Barrier",
"block.modernlifepatch.seven_block": "Seven",
"block.modernlifepatch.six_block": "Six",
"block.modernlifepatch.smooth_quartz_barrier": "Smooth Quartz Block",
"block.modernlifepatch.tall_mirror": "Tall Mirror",
"block.modernlifepatch.three_block": "Three",
"block.modernlifepatch.two_block": "Two",

View File

@ -21,9 +21,11 @@
"block.modernlifepatch.orange_concrete_barrier": "\u6A59\u8272\u6DF7\u51DD\u571F\u6805\u680F",
"block.modernlifepatch.pink_concrete_barrier": "\u7C89\u7EA2\u8272\u6DF7\u51DD\u571F\u6805\u680F",
"block.modernlifepatch.purple_concrete_barrier": "\u7D2B\u8272\u6DF7\u51DD\u571F\u6805\u680F",
"block.modernlifepatch.quartz_block_barrier": "\u77F3\u82F1\u6805\u680F",
"block.modernlifepatch.red_concrete_barrier": "\u7EA2\u8272\u6DF7\u51DD\u571F\u6805\u680F",
"block.modernlifepatch.seven_block": "\u4E03",
"block.modernlifepatch.six_block": "\u516D",
"block.modernlifepatch.smooth_quartz_barrier": "\u5E73\u6ED1\u77F3\u82F1\u6805\u680F",
"block.modernlifepatch.tall_mirror": "\u9AD8\u955C\u5B50",
"block.modernlifepatch.three_block": "\u4E09",
"block.modernlifepatch.two_block": "\u4E8C",

View File

@ -0,0 +1,7 @@
{
"parent": "modernlifepatch:block/barrier",
"textures": {
"0": "minecraft:block/quartz_block_top",
"particle": "minecraft:block/quartz_block_top"
}
}

View File

@ -0,0 +1,7 @@
{
"parent": "modernlifepatch:block/barrier",
"textures": {
"0": "minecraft:block/quartz_block_bottom",
"particle": "minecraft:block/quartz_block_bottom"
}
}

View File

@ -0,0 +1,3 @@
{
"parent": "modernlifepatch:block/quartz_block_barrier"
}

View File

@ -0,0 +1,3 @@
{
"parent": "modernlifepatch:block/smooth_quartz_barrier"
}

View File

@ -17,6 +17,8 @@
"modernlifepatch:green_concrete_barrier",
"modernlifepatch:red_concrete_barrier",
"modernlifepatch:black_concrete_barrier",
"modernlifepatch:quartz_block_barrier",
"modernlifepatch:smooth_quartz_barrier",
"modernlifepatch:null_block",
"modernlifepatch:one_block",
"modernlifepatch:two_block",

View File

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

View File

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

View File

@ -152,6 +152,8 @@
"modernlifepatch:brown_concrete_barrier",
"modernlifepatch:green_concrete_barrier",
"modernlifepatch:red_concrete_barrier",
"modernlifepatch:black_concrete_barrier"
"modernlifepatch:black_concrete_barrier",
"modernlifepatch:quartz_block_barrier",
"modernlifepatch:smooth_quartz_barrier"
]
}

View File

@ -61,6 +61,10 @@ public class ModBlocks {
() -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.RED_CONCRETE)));
public static final RegistryObject<Block> BLACK_CONCRETE_BARRIER = BLOCKS.register("black_concrete_barrier",
() -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.BLACK_CONCRETE)));
public static final RegistryObject<Block> QUARTZ_BLOCK_BARRIER = BLOCKS.register("quartz_block_barrier",
() -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.QUARTZ_BLOCK)));
public static final RegistryObject<Block> SMOOTH_QUARTZ_BARRIER = BLOCKS.register("smooth_quartz_barrier",
() -> new BarrierBlock(BlockBehaviour.Properties.copy(Blocks.SMOOTH_QUARTZ)));
//NUMBER
public static final RegistryObject<Block> NULL_BLOCK = BLOCKS.register("null_block",
() -> new NumberBlock(BlockBehaviour.Properties.copy(Blocks.STONE)));

View File

@ -33,6 +33,9 @@ public class ModItems {
public static final RegistryObject<BlockItem> GREEN_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("green_concrete_barrier", ModBlocks.GREEN_CONCRETE_BARRIER);
public static final RegistryObject<BlockItem> RED_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("red_concrete_barrier", ModBlocks.RED_CONCRETE_BARRIER);
public static final RegistryObject<BlockItem> BLACK_CONCRETE_BARRIER_ITEM = ModBlocks.registerBlockItem("black_concrete_barrier", ModBlocks.BLACK_CONCRETE_BARRIER);
public static final RegistryObject<BlockItem> QUARTZ_BLOCK_BARRIER = ModBlocks.registerBlockItem("quartz_block_barrier", ModBlocks.QUARTZ_BLOCK_BARRIER);
public static final RegistryObject<BlockItem> SMOOTH_QUARTZ_BARRIER = ModBlocks.registerBlockItem("smooth_quartz_barrier", ModBlocks.SMOOTH_QUARTZ_BARRIER);
//NUMBER
public static final RegistryObject<BlockItem> NULL_BLOCK_ITEM = ModBlocks.registerBlockItem("null_block", ModBlocks.NULL_BLOCK);
public static final RegistryObject<BlockItem> ONE_BLOCK_ITEM = ModBlocks.registerBlockItem("one_block", ModBlocks.ONE_BLOCK);

View File

@ -161,6 +161,10 @@ public enum ModLangKeyValue {
RED_CONCRETE_BARRIER(getBlockKey(ModBlocks.RED_CONCRETE_BARRIER.get()), copyEnglish(RED_CONCRETE_BARRIER_ITEM), copySimpleChinese(RED_CONCRETE_BARRIER_ITEM)),
BLACK_CONCRETE_BARRIER_ITEM(getItemKey(ModItems.BLACK_CONCRETE_BARRIER_ITEM.get()), "Black Concrete Barrier", "黑色混凝土栅栏"),
BLACK_CONCRETE_BARRIER(getBlockKey(ModBlocks.BLACK_CONCRETE_BARRIER.get()), copyEnglish(BLACK_CONCRETE_BARRIER_ITEM), copySimpleChinese(BLACK_CONCRETE_BARRIER_ITEM)),
QUARTZ_BLOCK_BARRIER(getBlockKey(ModBlocks.QUARTZ_BLOCK_BARRIER.get()), "Quartz Block Barrier", "石英栅栏"),
QUARTZ_BLOCK_BARRIER_ITEM(getItemKey(ModItems.QUARTZ_BLOCK_BARRIER.get()), getEnglish(QUARTZ_BLOCK_BARRIER), getSimpleChinese(QUARTZ_BLOCK_BARRIER)),
SMOOTH_QUARTZ_BARRIER(getBlockKey(ModBlocks.SMOOTH_QUARTZ_BARRIER.get()), "Smooth Quartz Block", "平滑石英栅栏"),
SMOOTH_QUARTZ_BARRIER_ITEM(getItemKey(ModItems.SMOOTH_QUARTZ_BARRIER.get()), getEnglish(SMOOTH_QUARTZ_BARRIER), getSimpleChinese(SMOOTH_QUARTZ_BARRIER)),
NULL_BLOCK(getBlockKey(ModBlocks.NULL_BLOCK), "Null Block", "空值"),
NULL_BLOCK_ITEM(getItemKey(ModItems.NULL_BLOCK_ITEM.get()), getEnglish(NULL_BLOCK), getSimpleChinese(NULL_BLOCK)),
ONE_BLOCK_ITEM(getItemKey(ModItems.ONE_BLOCK_ITEM.get()), "One", ""),

View File

@ -35,6 +35,9 @@ public class ModBlockModelProvider extends BlockModelProvider {
registerBarrierModel(ModBlocks.GREEN_CONCRETE_BARRIER.get(), new ResourceLocation("block/green_concrete"));
registerBarrierModel(ModBlocks.RED_CONCRETE_BARRIER.get(), new ResourceLocation("block/red_concrete"));
registerBarrierModel(ModBlocks.BLACK_CONCRETE_BARRIER.get(), new ResourceLocation("block/black_concrete"));
registerBarrierModel(ModBlocks.QUARTZ_BLOCK_BARRIER.get(), new ResourceLocation("block/quartz_block_top"));
registerBarrierModel(ModBlocks.SMOOTH_QUARTZ_BARRIER.get(), new ResourceLocation("block/quartz_block_bottom"));
}
public void registerBarrierModel(Block barrierBlock, ResourceLocation vanillaBlock) {
withExistingParent(

View File

@ -34,6 +34,8 @@ public class ModBlockStateProvider extends BlockStateProvider {
registerBarrierStates(ModBlocks.GREEN_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/green_concrete_barrier"));
registerBarrierStates(ModBlocks.RED_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/red_concrete_barrier"));
registerBarrierStates(ModBlocks.BLACK_CONCRETE_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/black_concrete_barrier"));
registerBarrierStates(ModBlocks.QUARTZ_BLOCK_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/quartz_block_barrier"));
registerBarrierStates(ModBlocks.SMOOTH_QUARTZ_BARRIER.get(), new ResourceLocation(ModernLifePatch.MOD_ID, "block/smooth_quartz_barrier"));
registerNumberStates(ModBlocks.NULL_BLOCK.get(), "null");
registerNumberStates(ModBlocks.ONE_BLOCK.get(), "one");
registerNumberStates(ModBlocks.TWO_BLOCK.get(), "two");

View File

@ -33,6 +33,8 @@ public class ModBlockTagProvider extends BlockTagsProvider {
ModBlocks.GREEN_CONCRETE_BARRIER.get(),
ModBlocks.RED_CONCRETE_BARRIER.get(),
ModBlocks.BLACK_CONCRETE_BARRIER.get(),
ModBlocks.QUARTZ_BLOCK_BARRIER.get(),
ModBlocks.SMOOTH_QUARTZ_BARRIER.get(),
ModBlocks.NULL_BLOCK.get(),
ModBlocks.ONE_BLOCK.get(),
ModBlocks.TWO_BLOCK.get(),

View File

@ -29,6 +29,8 @@ public class ModBlockLootTables extends BlockLoot {
this.dropSelf(ModBlocks.GREEN_CONCRETE_BARRIER.get());
this.dropSelf(ModBlocks.RED_CONCRETE_BARRIER.get());
this.dropSelf(ModBlocks.BLACK_CONCRETE_BARRIER.get());
this.dropSelf(ModBlocks.QUARTZ_BLOCK_BARRIER.get());
this.dropSelf(ModBlocks.SMOOTH_QUARTZ_BARRIER.get());
this.dropSelf(ModBlocks.NULL_BLOCK.get());
this.dropSelf(ModBlocks.ONE_BLOCK.get());
this.dropSelf(ModBlocks.TWO_BLOCK.get());

View File

@ -2,7 +2,8 @@
"credit": "Made with Blockbench",
"textures": {
"4": "modernlife:block/birch_planks_deck",
"5": "block/birch_planks"
"5": "block/birch_planks",
"particle": "block/birch_planks"
},
"elements": [
{

View File

@ -2,7 +2,8 @@
"credit": "Made with Blockbench",
"textures": {
"2": "block/oak_planks",
"118": "modernlife:block/oak_planks_deck"
"118": "modernlife:block/oak_planks_deck",
"particle": "block/oak_log"
},
"elements": [
{