diff --git a/.gradle/7.3/checksums/checksums.lock b/.gradle/7.3/checksums/checksums.lock index 8aae4a358..a6287d9a2 100644 Binary files a/.gradle/7.3/checksums/checksums.lock and b/.gradle/7.3/checksums/checksums.lock differ diff --git a/.gradle/7.3/checksums/sha1-checksums.bin b/.gradle/7.3/checksums/sha1-checksums.bin index f81712664..52f79de0a 100644 Binary files a/.gradle/7.3/checksums/sha1-checksums.bin and b/.gradle/7.3/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.3/executionHistory/executionHistory.bin b/.gradle/7.3/executionHistory/executionHistory.bin index 4a055fc6c..c8c89ec08 100644 Binary files a/.gradle/7.3/executionHistory/executionHistory.bin and b/.gradle/7.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3/executionHistory/executionHistory.lock b/.gradle/7.3/executionHistory/executionHistory.lock index 1fbda2cf5..ec164dc48 100644 Binary files a/.gradle/7.3/executionHistory/executionHistory.lock and b/.gradle/7.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3/fileHashes/fileHashes.bin b/.gradle/7.3/fileHashes/fileHashes.bin index eae1225c4..231da2935 100644 Binary files a/.gradle/7.3/fileHashes/fileHashes.bin and b/.gradle/7.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3/fileHashes/fileHashes.lock b/.gradle/7.3/fileHashes/fileHashes.lock index 1709cffdf..ac9033b29 100644 Binary files a/.gradle/7.3/fileHashes/fileHashes.lock and b/.gradle/7.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3/fileHashes/resourceHashesCache.bin index da1c70771..fd7623bb5 100644 Binary files a/.gradle/7.3/fileHashes/resourceHashesCache.bin and b/.gradle/7.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index be86f085b..505cde696 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 611b1a6c3..257ab495b 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.mcreator/FullBackup202200347418.zip b/.mcreator/FullBackup202200347418.zip new file mode 100644 index 000000000..2790e5221 Binary files /dev/null and b/.mcreator/FullBackup202200347418.zip differ diff --git a/.mcreator/modElementThumbnails/ChristmasTree.png b/.mcreator/modElementThumbnails/ChristmasTree.png new file mode 100644 index 000000000..753daf03f Binary files /dev/null and b/.mcreator/modElementThumbnails/ChristmasTree.png differ diff --git a/.mcreator/modElementThumbnails/GrassMonsterSpawn.png b/.mcreator/modElementThumbnails/ChristmasTreePlace.png similarity index 100% rename from .mcreator/modElementThumbnails/GrassMonsterSpawn.png rename to .mcreator/modElementThumbnails/ChristmasTreePlace.png diff --git a/build/classes/java/main/net/mcreator/compressedgrass/block/ChristmasTreeBlock.class b/build/classes/java/main/net/mcreator/compressedgrass/block/ChristmasTreeBlock.class new file mode 100644 index 000000000..c421765d3 Binary files /dev/null and b/build/classes/java/main/net/mcreator/compressedgrass/block/ChristmasTreeBlock.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity$1.class b/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity$1.class index 9927fa13e..ac15806dd 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity$1.class and b/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity$1.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity.class b/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity.class index f9bc008e7..7eb569288 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity.class and b/build/classes/java/main/net/mcreator/compressedgrass/entity/GrassMonsterEntity.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks$ClientSideHandler.class b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks$ClientSideHandler.class new file mode 100644 index 000000000..a2daad5ac Binary files /dev/null and b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks$ClientSideHandler.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.class b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.class index ba98624cb..30a525f04 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.class and b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModItems.class b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModItems.class index a699de83b..dc50ff284 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModItems.class and b/build/classes/java/main/net/mcreator/compressedgrass/init/CompressedGrassModItems.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.class b/build/classes/java/main/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.class similarity index 58% rename from build/classes/java/main/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.class rename to build/classes/java/main/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.class index f32bf87c9..b34cd1c26 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.class and b/build/classes/java/main/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodDieProcedure.class b/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodDieProcedure.class index 81111a16b..d42b35686 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodDieProcedure.class and b/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodDieProcedure.class differ diff --git a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.class b/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.class index 6ca78678c..831e2b307 100644 Binary files a/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.class and b/build/classes/java/main/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.class differ diff --git a/build/resources/main/assets/compressed_grass/blockstates/christmas_tree.json b/build/resources/main/assets/compressed_grass/blockstates/christmas_tree.json new file mode 100644 index 000000000..1b65ab351 --- /dev/null +++ b/build/resources/main/assets/compressed_grass/blockstates/christmas_tree.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "compressed_grass:block/christmas_tree" + } + } +} \ No newline at end of file diff --git a/build/resources/main/assets/compressed_grass/lang/en_us.json b/build/resources/main/assets/compressed_grass/lang/en_us.json index f2bbe9bc9..1a614477b 100644 --- a/build/resources/main/assets/compressed_grass/lang/en_us.json +++ b/build/resources/main/assets/compressed_grass/lang/en_us.json @@ -10,8 +10,8 @@ "item.compressed_grass.winding_grass_sticks": "Winding Grass Sticks", "item.compressed_grass.sextuple_compressed_grass_tools_axe": "SextupleCompressedGrassTools Axe", "block.compressed_grass.grass_wood_pressure_plate": "Grass Wood Pressure Plate", - "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.grass_nugget": "Grass Nugget", + "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.increase_capacity": "Increase Capacity", "block.compressed_grass.grass_wood_fence": "Grass Wood Fence", "item.compressed_grass.enchanted_armor_boots": "Enchanted Grass Boots", @@ -68,6 +68,7 @@ "item.compressed_grass.nonuple_grass_armor_boots": "Nonuple Compressed Grass Boots", "block.compressed_grass.grass_wood_planks": "Grass Wood Planks", "item.compressed_grass.enchanted_axe": "Enchanted Grass Axe", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "DoubleCompressedGrassTools Hoe", "advancements.so_green.title": "So Green", "item.compressed_grass.grass_ingot": "Grass Ingot", diff --git a/build/resources/main/assets/compressed_grass/lang/zh_cn.json b/build/resources/main/assets/compressed_grass/lang/zh_cn.json index 75f673ae0..f7cc399bb 100644 --- a/build/resources/main/assets/compressed_grass/lang/zh_cn.json +++ b/build/resources/main/assets/compressed_grass/lang/zh_cn.json @@ -28,7 +28,7 @@ "item.compressed_grass.limit_armor_leggings": "极限草裤", "item.compressed_grass.septuple_armor_boots": "七级压缩草靴", "item.compressed_grass.big_grass_bag": "大草包", - "advancements.first.descr": "compress the grass constantly", + "advancements.first.descr": "不断地压缩草", "item.compressed_grass.quadruple_compressed_grass": "四级压缩草", "item.compressed_grass.septuple_compressed_grass_tools_hoe": "七级压缩草锄", "block.compressed_grass.grass_chest": "草箱", @@ -42,12 +42,12 @@ "item.compressed_grass.triple_compressed_grass_tools_hoe": "三级压缩草锄", "item.compressed_grass.octuple_grass_pickaxe": "八级压缩草镐", "itemGroup.tabtechno": "Technoblade", - "item.compressed_grass.enchanted_hoe": "Enchanted Hoe", + "item.compressed_grass.enchanted_hoe": "附魔草锄", "item.compressed_grass.grass_bag": "草包", "item.compressed_grass.octuple_armor_chestplate": "八级压缩草胸甲", "entity.compressed_grass.grass_monster": "草怪", "item.compressed_grass.triple_compressed_grass_string": "三级压缩草绳", - "item.compressed_grass.enchanted_sword": "Enchanted Sword", + "item.compressed_grass.enchanted_sword": "附魔草剑", "advancements.enchanted.descr": "so fantastic", "block.compressed_grass.grass_wood_wood": "草木", "itemGroup.tabtools": "草:工具", @@ -67,7 +67,8 @@ "entity.compressed_grass.author": "作者", "item.compressed_grass.nonuple_grass_armor_boots": "九级压缩草靴子", "block.compressed_grass.grass_wood_planks": "草木木板", - "item.compressed_grass.enchanted_axe": "Enchanted Axe", + "item.compressed_grass.enchanted_axe": "附魔草斧", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "二级压缩草锄", "advancements.so_green.title": "太绿了", "item.compressed_grass.grass_ingot": "草锭", @@ -76,7 +77,7 @@ "item.compressed_grass.limit_armor_boots": "极限草靴", "item.compressed_grass.quintuple_compressed_grass_tools_axe": "五级压缩草斧", "item.compressed_grass.god_spawn_egg": "God Spawn Egg", - "advancements.first.title": "Compressed", + "advancements.first.title": "压缩？", "item.compressed_grass.nonuple_grass_hoe": "九级压缩草锄", "item.compressed_grass.double_compressed_grass_tools_shovel": "二级压缩草铲", "item.compressed_grass.triple_compressed_grass_tools_shovel": "三级压缩草铲", @@ -86,9 +87,9 @@ "block.compressed_grass.grass_wood_fence_gate": "草木栅栏门", "block.compressed_grass.compressed_grass_machine": "压缩草生产器", "item.compressed_grass.enchanted_armor_leggings": "附魔草裤", - "item.compressed_grass.enchanted_pickaxe": "Enchanted Pickaxe", + "item.compressed_grass.enchanted_pickaxe": "附魔草镐", "item.compressed_grass.septuple_compressed_grass_tools_pickaxe": "七级压缩草镐", - "item.compressed_grass.limit_pickaxe": "Limit Pickaxe", + "item.compressed_grass.limit_pickaxe": "极限草镐", "item.compressed_grass.quadruple_compressed_grass_tools_hoe": "四级压缩草锄", "item.compressed_grass.octuple_armor_leggings": "八级压缩草护腿", "item.compressed_grass.triple_compressed_grass_armor_armor_chestplate": "三级压缩草胸甲", @@ -108,7 +109,7 @@ "item.compressed_grass.double_compressed_grass_string": "二级压缩草", "item.compressed_grass.quadruple_armor_chestplate": "四级压缩草胸甲", "item.compressed_grass.octuple_armor_helmet": "八级压缩草头盔", - "item.compressed_grass.limit_shovel": "Limit Shovel", + "item.compressed_grass.limit_shovel": "极限草铲", "item.compressed_grass.upgrade_1": "Upgrade-1", "item.compressed_grass.sextuple_compressed_grass_armor_armor_leggings": "六级压缩草护腿", "item.compressed_grass.enchanted_armor_helmet": "附魔草头盔", @@ -120,25 +121,25 @@ "item.compressed_grass.triple_compressed_grass_tools_axe": "三级压缩草斧", "item.compressed_grass.sextuple_compressed_grass": "六级压缩草", "item.compressed_grass.octuple_grass_hoe": "八级压缩草锄", - "item.compressed_grass.enchanted_shovel": "Enchanted Shovel", + "item.compressed_grass.enchanted_shovel": "附魔草铲", "item.compressed_grass.limit_armor_helmet": "极限草头盔", "advancements.how_do_you_have_them.title": "你怎么有这么多的？", "item.compressed_grass.potato_king": "土豆之王", - "item.compressed_grass.limit_hoe": "Limit Hoe", + "item.compressed_grass.limit_hoe": "极限草锄", "item.compressed_grass.limit_compressed_grass": "极限压缩草", "item.compressed_grass.nonuple_grass_sword": "九级压缩草剑", "biome.compressed_grass.grass_biome": "草群系", "item.compressed_grass.septuple_compressed_grass": "七级压缩草", "item.compressed_grass.compressed_grass_armor_armor_leggings": "一级压缩草护腿", "item.compressed_grass.nonuple_grass_armor_chestplate": "九级压缩草胸甲", - "item.compressed_grass.limit_sword": "Limit Sword", + "item.compressed_grass.limit_sword": "极限草剑", "item.compressed_grass.quadruple_compressed_grass_tools_axe": "四级压缩草斧", "item.compressed_grass.quintuple_compressed_grass_armor_armor_chestplate": "五级压缩草胸甲", "item.compressed_grass.octuple_grass_sword": "八级压缩草剑", "item.compressed_grass.triple_compressed_grass": "三级压缩草", "item.compressed_grass.quadruple_compressed_grass_string": "四级压缩草绳", "item.compressed_grass.triple_compressed_grass_armor_armor_helmet": "三级压缩草头盔", - "advancements.enchanted.title": "It can be enchanted?", + "advancements.enchanted.title": "这也可以附魔？", "item.compressed_grass.compressed_axe": "一级压缩草斧", "item.compressed_grass.quadruple_compressed_grass_tools_shovel": "四级压缩草铲", "item.compressed_grass.sextuple_compressed_grass_armor_armor_chestplate": "六级压缩草胸甲", @@ -164,7 +165,7 @@ "item.compressed_grass.sextuple_compressed_grass_tools_hoe": "六级压缩草锄", "subtitles.technoblade_never_dies": "Technoblade Never Dies", "block.compressed_grass.grass_wood_button": "草木按钮", - "item.compressed_grass.limit_axe": "Limit Axe", + "item.compressed_grass.limit_axe": "极限草斧", "item.compressed_grass.nonuple_grass_axe": "九级压缩草斧", "advancements.how_do_you_have_them.descr": "你是不是作弊了!!!", "item.compressed_grass.septuple_compressed_grass_string": "七级压缩草绳", diff --git a/build/resources/main/assets/compressed_grass/models/block/christmas_tree.json b/build/resources/main/assets/compressed_grass/models/block/christmas_tree.json new file mode 100644 index 000000000..285f12bd0 --- /dev/null +++ b/build/resources/main/assets/compressed_grass/models/block/christmas_tree.json @@ -0,0 +1,23 @@ +{ + "parent": "compressed_grass:custom/christmastree", + "textures": { + "all": "compressed_grass:blocks/void", + "particle": "compressed_grass:blocks/void", + "11": "compressed_grass:blocks/leave3-1", + "12": "compressed_grass:blocks/leave3-2", + "13": "compressed_grass:blocks/leave3-3", + "14": "compressed_grass:blocks/leave4-1", + "15": "compressed_grass:blocks/leave4-2", + "16": "compressed_grass:blocks/5", + "1": "compressed_grass:blocks/leave1-1", + "2": "compressed_grass:blocks/leave1-2", + "3": "compressed_grass:blocks/trunk", + "4": "compressed_grass:blocks/leave1-3", + "5": "compressed_grass:blocks/leave1-4", + "6": "compressed_grass:blocks/leave1-5", + "7": "compressed_grass:blocks/leave2-1", + "8": "compressed_grass:blocks/leave2-2", + "9": "compressed_grass:blocks/leave2-3", + "10": "compressed_grass:blocks/leave2-4" + } +} \ No newline at end of file diff --git a/build/resources/main/assets/compressed_grass/models/custom/christmastree.json b/build/resources/main/assets/compressed_grass/models/custom/christmastree.json new file mode 100644 index 000000000..412f47aa3 --- /dev/null +++ b/build/resources/main/assets/compressed_grass/models/custom/christmastree.json @@ -0,0 +1,1191 @@ +{ + "credit": "Made with Blockbench", + "elements": [ + { + "name": "trunk", + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 2, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2, + 5 + ], + "texture": "#3" + }, + "east": { + "uv": [ + 2, + 0, + 4, + 5 + ], + "texture": "#3" + }, + "south": { + "uv": [ + 4, + 0, + 6, + 5 + ], + "texture": "#3" + }, + "west": { + "uv": [ + 0, + 5, + 2, + 10 + ], + "texture": "#3" + }, + "up": { + "uv": [ + 4, + 7, + 2, + 5 + ], + "texture": "#3" + }, + "down": { + "uv": [ + 6, + 5, + 4, + 7 + ], + "texture": "#3" + } + } + }, + { + "name": "leave1-1", + "from": [ + 3, + 2, + 7 + ], + "to": [ + 13, + 3, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 10, + 5 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 5, + 10, + 6 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 2, + 6, + 4, + 7 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 10, + 2, + 0, + 0 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 10, + 2, + 0, + 4 + ], + "texture": "#1" + } + } + }, + { + "name": "leave1-2", + "from": [ + 7, + 2, + 3 + ], + "to": [ + 9, + 3, + 13 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 14, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 4, + 1, + 14, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2, + 10, + 0, + 0 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 10 + ], + "texture": "#2" + } + } + }, + { + "name": "leave1-3", + "from": [ + 6, + 2, + 4 + ], + "to": [ + 10, + 3, + 12 + ], + "faces": { + "north": { + "uv": [ + 8, + 1, + 12, + 2 + ], + "texture": "#4" + }, + "east": { + "uv": [ + 0, + 8, + 8, + 9 + ], + "texture": "#4" + }, + "south": { + "uv": [ + 8, + 2, + 12, + 3 + ], + "texture": "#4" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 1 + ], + "texture": "#4" + }, + "up": { + "uv": [ + 4, + 8, + 0, + 0 + ], + "texture": "#4" + }, + "down": { + "uv": [ + 8, + 0, + 4, + 8 + ], + "texture": "#4" + } + } + }, + { + "name": "leave1-4", + "from": [ + 5, + 2, + 5 + ], + "to": [ + 11, + 3, + 11 + ], + "faces": { + "north": { + "uv": [ + 6, + 0, + 12, + 1 + ], + "texture": "#5" + }, + "east": { + "uv": [ + 6, + 1, + 12, + 2 + ], + "texture": "#5" + }, + "south": { + "uv": [ + 6, + 2, + 12, + 3 + ], + "texture": "#5" + }, + "west": { + "uv": [ + 6, + 3, + 12, + 4 + ], + "texture": "#5" + }, + "up": { + "uv": [ + 6, + 6, + 0, + 0 + ], + "texture": "#5" + }, + "down": { + "uv": [ + 6, + 6, + 0, + 12 + ], + "texture": "#5" + } + } + }, + { + "name": "leave1-5", + "from": [ + 4, + 2, + 6 + ], + "to": [ + 12, + 3, + 10 + ], + "faces": { + "north": { + "uv": [ + 0, + 8, + 8, + 9 + ], + "texture": "#6" + }, + "east": { + "uv": [ + 8, + 1, + 12, + 2 + ], + "texture": "#6" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 1 + ], + "texture": "#6" + }, + "west": { + "uv": [ + 8, + 2, + 12, + 3 + ], + "texture": "#6" + }, + "up": { + "uv": [ + 8, + 4, + 0, + 0 + ], + "texture": "#6" + }, + "down": { + "uv": [ + 8, + 4, + 0, + 8 + ], + "texture": "#6" + } + } + }, + { + "name": "leave2-1", + "from": [ + 7, + 3, + 4 + ], + "to": [ + 9, + 4, + 12 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#7" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 1 + ], + "texture": "#7" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#7" + }, + "west": { + "uv": [ + 4, + 1, + 12, + 2 + ], + "texture": "#7" + }, + "up": { + "uv": [ + 2, + 8, + 0, + 0 + ], + "texture": "#7" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 8 + ], + "texture": "#7" + } + } + }, + { + "name": "leave2-2", + "from": [ + 4, + 3, + 7 + ], + "to": [ + 12, + 4, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 8, + 5 + ], + "texture": "#8" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#8" + }, + "south": { + "uv": [ + 0, + 5, + 8, + 6 + ], + "texture": "#8" + }, + "west": { + "uv": [ + 2, + 6, + 4, + 7 + ], + "texture": "#8" + }, + "up": { + "uv": [ + 8, + 2, + 0, + 0 + ], + "texture": "#8" + }, + "down": { + "uv": [ + 8, + 2, + 0, + 4 + ], + "texture": "#8" + } + } + }, + { + "name": "leave2-3", + "from": [ + 5, + 3, + 6 + ], + "to": [ + 11, + 4, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 0, + 12, + 1 + ], + "texture": "#9" + }, + "east": { + "uv": [ + 6, + 2, + 10, + 3 + ], + "texture": "#9" + }, + "south": { + "uv": [ + 6, + 1, + 12, + 2 + ], + "texture": "#9" + }, + "west": { + "uv": [ + 6, + 3, + 10, + 4 + ], + "texture": "#9" + }, + "up": { + "uv": [ + 6, + 4, + 0, + 0 + ], + "texture": "#9" + }, + "down": { + "uv": [ + 6, + 4, + 0, + 8 + ], + "texture": "#9" + } + } + }, + { + "name": "leave2-4", + "from": [ + 6, + 3, + 5 + ], + "to": [ + 10, + 4, + 11 + ], + "faces": { + "north": { + "uv": [ + 0, + 7, + 4, + 8 + ], + "texture": "#10" + }, + "east": { + "uv": [ + 0, + 6, + 6, + 7 + ], + "texture": "#10" + }, + "south": { + "uv": [ + 4, + 7, + 8, + 8 + ], + "texture": "#10" + }, + "west": { + "uv": [ + 6, + 6, + 12, + 7 + ], + "texture": "#10" + }, + "up": { + "uv": [ + 4, + 6, + 0, + 0 + ], + "texture": "#10" + }, + "down": { + "uv": [ + 8, + 0, + 4, + 6 + ], + "texture": "#10" + } + } + }, + { + "name": "leave3-1", + "from": [ + 7, + 4, + 5 + ], + "to": [ + 9, + 5, + 11 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#11" + }, + "east": { + "uv": [ + 4, + 0, + 10, + 1 + ], + "texture": "#11" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#11" + }, + "west": { + "uv": [ + 4, + 1, + 10, + 2 + ], + "texture": "#11" + }, + "up": { + "uv": [ + 2, + 6, + 0, + 0 + ], + "texture": "#11" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 6 + ], + "texture": "#11" + } + } + }, + { + "name": "leave3-2", + "from": [ + 5, + 4, + 7 + ], + "to": [ + 11, + 5, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 6, + 5 + ], + "texture": "#12" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#12" + }, + "south": { + "uv": [ + 0, + 5, + 6, + 6 + ], + "texture": "#12" + }, + "west": { + "uv": [ + 6, + 0, + 8, + 1 + ], + "texture": "#12" + }, + "up": { + "uv": [ + 6, + 2, + 0, + 0 + ], + "texture": "#12" + }, + "down": { + "uv": [ + 6, + 2, + 0, + 4 + ], + "texture": "#12" + } + } + }, + { + "name": "leave3-3", + "from": [ + 6, + 4, + 6 + ], + "to": [ + 10, + 5, + 10 + ], + "faces": { + "north": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#13" + }, + "east": { + "uv": [ + 4, + 1, + 8, + 2 + ], + "texture": "#13" + }, + "south": { + "uv": [ + 4, + 2, + 8, + 3 + ], + "texture": "#13" + }, + "west": { + "uv": [ + 4, + 3, + 8, + 4 + ], + "texture": "#13" + }, + "up": { + "uv": [ + 4, + 4, + 0, + 0 + ], + "texture": "#13" + }, + "down": { + "uv": [ + 4, + 4, + 0, + 8 + ], + "texture": "#13" + } + } + }, + { + "name": "leave4-1", + "from": [ + 6, + 5, + 7 + ], + "to": [ + 10, + 6, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 4, + 5 + ], + "texture": "#14" + }, + "east": { + "uv": [ + 4, + 1, + 6, + 2 + ], + "texture": "#14" + }, + "south": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#14" + }, + "west": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#14" + }, + "up": { + "uv": [ + 4, + 2, + 0, + 0 + ], + "texture": "#14" + }, + "down": { + "uv": [ + 4, + 2, + 0, + 4 + ], + "texture": "#14" + } + } + }, + { + "name": "leave4-2", + "from": [ + 7, + 5, + 6 + ], + "to": [ + 9, + 6, + 10 + ], + "faces": { + "north": { + "uv": [ + 4, + 1, + 6, + 2 + ], + "texture": "#15" + }, + "east": { + "uv": [ + 0, + 4, + 4, + 5 + ], + "texture": "#15" + }, + "south": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#15" + }, + "west": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#15" + }, + "up": { + "uv": [ + 2, + 4, + 0, + 0 + ], + "texture": "#15" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 4 + ], + "texture": "#15" + } + } + }, + { + "name": "5", + "from": [ + 7, + 6, + 7 + ], + "to": [ + 9, + 7, + 9 + ], + "faces": { + "north": { + "uv": [ + 2, + 0, + 4, + 1 + ], + "texture": "#16" + }, + "east": { + "uv": [ + 2, + 1, + 4, + 2 + ], + "texture": "#16" + }, + "south": { + "uv": [ + 2, + 2, + 4, + 3 + ], + "texture": "#16" + }, + "west": { + "uv": [ + 2, + 3, + 4, + 4 + ], + "texture": "#16" + }, + "up": { + "uv": [ + 2, + 2, + 0, + 0 + ], + "texture": "#16" + }, + "down": { + "uv": [ + 2, + 2, + 0, + 4 + ], + "texture": "#16" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ + 0, + 8, + 1.25 + ] + } + }, + "groups": [ + 0, + { + "name": "leave", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + { + "name": "1", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 1, + 2, + 3, + 4, + 5 + ] + }, + { + "name": "2", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 6, + 7, + 8, + 9 + ] + }, + { + "name": "3", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 10, + 11, + 12 + ] + }, + { + "name": "4", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 13, + 14 + ] + }, + 15 + ] + } + ] +} \ No newline at end of file diff --git a/build/resources/main/assets/compressed_grass/models/item/christmas_tree.json b/build/resources/main/assets/compressed_grass/models/item/christmas_tree.json new file mode 100644 index 000000000..8aabeb9e2 --- /dev/null +++ b/build/resources/main/assets/compressed_grass/models/item/christmas_tree.json @@ -0,0 +1,22 @@ +{ + "parent": "compressed_grass:block/christmas_tree", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/5.png b/build/resources/main/assets/compressed_grass/textures/blocks/5.png new file mode 100644 index 000000000..c19a5e86f Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/5.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/christmas_tree_icon.png b/build/resources/main/assets/compressed_grass/textures/blocks/christmas_tree_icon.png new file mode 100644 index 000000000..b6867ffa8 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/christmas_tree_icon.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave1-1.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-1.png new file mode 100644 index 000000000..34749e4ca Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-1.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave1-2.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-2.png new file mode 100644 index 000000000..76051c043 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-2.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave1-3.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-3.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-3.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave1-4.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-4.png new file mode 100644 index 000000000..416b4170e Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-4.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave1-5.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-5.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave1-5.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave2-1.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-1.png new file mode 100644 index 000000000..955bf885e Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-1.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave2-2.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-2.png new file mode 100644 index 000000000..905a491ca Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-2.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave2-3.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-3.png new file mode 100644 index 000000000..f130d2e30 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-3.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave2-4.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-4.png new file mode 100644 index 000000000..d5589c172 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave2-4.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave3-1.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-1.png new file mode 100644 index 000000000..8ec9659ba Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-1.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave3-2.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-2.png new file mode 100644 index 000000000..ddf5b17ed Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-2.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave3-3.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-3.png new file mode 100644 index 000000000..85764c7ed Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave3-3.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave4-1.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave4-1.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave4-1.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/leave4-2.png b/build/resources/main/assets/compressed_grass/textures/blocks/leave4-2.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/leave4-2.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/trunk.png b/build/resources/main/assets/compressed_grass/textures/blocks/trunk.png new file mode 100644 index 000000000..435f6ec49 Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/trunk.png differ diff --git a/build/resources/main/assets/compressed_grass/textures/blocks/void.png b/build/resources/main/assets/compressed_grass/textures/blocks/void.png new file mode 100644 index 000000000..2f5d2892e Binary files /dev/null and b/build/resources/main/assets/compressed_grass/textures/blocks/void.png differ diff --git a/build/resources/main/data/compressed_grass/recipes/test_axe_recipe.json b/build/resources/main/data/compressed_grass/recipes/test_axe_recipe.json deleted file mode 100644 index fa9431d8b..000000000 --- a/build/resources/main/data/compressed_grass/recipes/test_axe_recipe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GG", - "GS", - " S" - ], - "key": { - "G": { - "item": "compressed_grass:grass_star" - }, - "S": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "compressed_grass:test_axe", - "count": 1 - } -} \ No newline at end of file diff --git a/build/resources/main/data/compressed_grass/recipes/test_hoe_recipe.json b/build/resources/main/data/compressed_grass/recipes/test_hoe_recipe.json deleted file mode 100644 index f34c3675e..000000000 --- a/build/resources/main/data/compressed_grass/recipes/test_hoe_recipe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GG", - " S", - " S" - ], - "key": { - "G": { - "item": "compressed_grass:grass_star" - }, - "S": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "compressed_grass:test_hoe", - "count": 1 - } -} \ No newline at end of file diff --git a/build/resources/main/data/compressed_grass/recipes/test_pickaxe_recipe.json b/build/resources/main/data/compressed_grass/recipes/test_pickaxe_recipe.json deleted file mode 100644 index fc607eb84..000000000 --- a/build/resources/main/data/compressed_grass/recipes/test_pickaxe_recipe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "GGG", - " S ", - " S " - ], - "key": { - "G": { - "item": "compressed_grass:grass_star" - }, - "S": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "compressed_grass:test_pickaxe", - "count": 1 - } -} \ No newline at end of file diff --git a/build/resources/main/data/compressed_grass/recipes/test_shovel_recipe.json b/build/resources/main/data/compressed_grass/recipes/test_shovel_recipe.json deleted file mode 100644 index 9baa0be5b..000000000 --- a/build/resources/main/data/compressed_grass/recipes/test_shovel_recipe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "G", - "S", - "S" - ], - "key": { - "G": { - "item": "compressed_grass:grass_star" - }, - "S": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "compressed_grass:test_shovel", - "count": 1 - } -} \ No newline at end of file diff --git a/build/resources/main/data/compressed_grass/recipes/test_sword_recipe.json b/build/resources/main/data/compressed_grass/recipes/test_sword_recipe.json deleted file mode 100644 index 6673f2421..000000000 --- a/build/resources/main/data/compressed_grass/recipes/test_sword_recipe.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "G", - "G", - "S" - ], - "key": { - "G": { - "item": "compressed_grass:grass_star" - }, - "S": { - "item": "minecraft:stick" - } - }, - "result": { - "item": "compressed_grass:test_sword", - "count": 1 - } -} \ No newline at end of file diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 096b81692..4b60851cb 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/compressed_grass.mcreator b/compressed_grass.mcreator index a4f96fc3b..e727151e5 100644 --- a/compressed_grass.mcreator +++ b/compressed_grass.mcreator @@ -2495,35 +2495,6 @@ "registry_name": "nonuple_compressed_grass_trading", "path": "~/Grass Trading" }, - { - "name": "GrassMonsterSpawn", - "type": "procedure", - "sortid": 267, - "compiles": true, - "locked_code": false, - "registry_name": "grass_monster_spawn", - "metadata": { - "dependencies": [ - { - "name": "x", - "type": "number" - }, - { - "name": "y", - "type": "number" - }, - { - "name": "z", - "type": "number" - }, - { - "name": "world", - "type": "world" - } - ] - }, - "path": "~/Monster" - }, { "name": "AuthorDangHurt", "type": "procedure", @@ -3659,6 +3630,44 @@ ] }, "path": "~/Monster/God" + }, + { + "name": "ChristmasTree", + "type": "block", + "sortid": 370, + "compiles": true, + "locked_code": false, + "registry_name": "christmas_tree", + "path": "~/ChristmasTree" + }, + { + "name": "ChristmasTreePlace", + "type": "procedure", + "sortid": 371, + "compiles": true, + "locked_code": false, + "registry_name": "christmas_tree_place", + "metadata": { + "dependencies": [ + { + "name": "x", + "type": "number" + }, + { + "name": "y", + "type": "number" + }, + { + "name": "z", + "type": "number" + }, + { + "name": "world", + "type": "world" + } + ] + }, + "path": "~/ChristmasTree" } ], "variable_elements": [], @@ -3693,8 +3702,8 @@ "item.compressed_grass.winding_grass_sticks": "Winding Grass Sticks", "item.compressed_grass.sextuple_compressed_grass_tools_axe": "SextupleCompressedGrassTools Axe", "block.compressed_grass.grass_wood_pressure_plate": "Grass Wood Pressure Plate", - "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.grass_nugget": "Grass Nugget", + "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.increase_capacity": "Increase Capacity", "block.compressed_grass.grass_wood_fence": "Grass Wood Fence", "item.compressed_grass.enchanted_armor_boots": "Enchanted Grass Boots", @@ -3751,6 +3760,7 @@ "item.compressed_grass.nonuple_grass_armor_boots": "Nonuple Compressed Grass Boots", "block.compressed_grass.grass_wood_planks": "Grass Wood Planks", "item.compressed_grass.enchanted_axe": "Enchanted Grass Axe", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "DoubleCompressedGrassTools Hoe", "advancements.so_green.title": "So Green", "item.compressed_grass.grass_ingot": "Grass Ingot", @@ -3894,7 +3904,7 @@ "item.compressed_grass.limit_armor_leggings": "极限草裤", "item.compressed_grass.septuple_armor_boots": "七级压缩草靴", "item.compressed_grass.big_grass_bag": "大草包", - "advancements.first.descr": "compress the grass constantly", + "advancements.first.descr": "不断地压缩草", "item.compressed_grass.quadruple_compressed_grass": "四级压缩草", "item.compressed_grass.septuple_compressed_grass_tools_hoe": "七级压缩草锄", "block.compressed_grass.grass_chest": "草箱", @@ -3908,12 +3918,12 @@ "item.compressed_grass.triple_compressed_grass_tools_hoe": "三级压缩草锄", "item.compressed_grass.octuple_grass_pickaxe": "八级压缩草镐", "itemGroup.tabtechno": "Technoblade", - "item.compressed_grass.enchanted_hoe": "Enchanted Hoe", + "item.compressed_grass.enchanted_hoe": "附魔草锄", "item.compressed_grass.grass_bag": "草包", "item.compressed_grass.octuple_armor_chestplate": "八级压缩草胸甲", "entity.compressed_grass.grass_monster": "草怪", "item.compressed_grass.triple_compressed_grass_string": "三级压缩草绳", - "item.compressed_grass.enchanted_sword": "Enchanted Sword", + "item.compressed_grass.enchanted_sword": "附魔草剑", "advancements.enchanted.descr": "so fantastic", "block.compressed_grass.grass_wood_wood": "草木", "itemGroup.tabtools": "草:工具", @@ -3933,7 +3943,8 @@ "entity.compressed_grass.author": "作者", "item.compressed_grass.nonuple_grass_armor_boots": "九级压缩草靴子", "block.compressed_grass.grass_wood_planks": "草木木板", - "item.compressed_grass.enchanted_axe": "Enchanted Axe", + "item.compressed_grass.enchanted_axe": "附魔草斧", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "二级压缩草锄", "advancements.so_green.title": "太绿了", "item.compressed_grass.grass_ingot": "草锭", @@ -3942,7 +3953,7 @@ "item.compressed_grass.limit_armor_boots": "极限草靴", "item.compressed_grass.quintuple_compressed_grass_tools_axe": "五级压缩草斧", "item.compressed_grass.god_spawn_egg": "God Spawn Egg", - "advancements.first.title": "Compressed", + "advancements.first.title": "压缩？", "item.compressed_grass.nonuple_grass_hoe": "九级压缩草锄", "item.compressed_grass.double_compressed_grass_tools_shovel": "二级压缩草铲", "item.compressed_grass.triple_compressed_grass_tools_shovel": "三级压缩草铲", @@ -3952,9 +3963,9 @@ "block.compressed_grass.grass_wood_fence_gate": "草木栅栏门", "block.compressed_grass.compressed_grass_machine": "压缩草生产器", "item.compressed_grass.enchanted_armor_leggings": "附魔草裤", - "item.compressed_grass.enchanted_pickaxe": "Enchanted Pickaxe", + "item.compressed_grass.enchanted_pickaxe": "附魔草镐", "item.compressed_grass.septuple_compressed_grass_tools_pickaxe": "七级压缩草镐", - "item.compressed_grass.limit_pickaxe": "Limit Pickaxe", + "item.compressed_grass.limit_pickaxe": "极限草镐", "item.compressed_grass.quadruple_compressed_grass_tools_hoe": "四级压缩草锄", "item.compressed_grass.octuple_armor_leggings": "八级压缩草护腿", "item.compressed_grass.triple_compressed_grass_armor_armor_chestplate": "三级压缩草胸甲", @@ -3974,7 +3985,7 @@ "item.compressed_grass.double_compressed_grass_string": "二级压缩草", "item.compressed_grass.quadruple_armor_chestplate": "四级压缩草胸甲", "item.compressed_grass.octuple_armor_helmet": "八级压缩草头盔", - "item.compressed_grass.limit_shovel": "Limit Shovel", + "item.compressed_grass.limit_shovel": "极限草铲", "item.compressed_grass.upgrade_1": "Upgrade-1", "item.compressed_grass.sextuple_compressed_grass_armor_armor_leggings": "六级压缩草护腿", "item.compressed_grass.enchanted_armor_helmet": "附魔草头盔", @@ -3986,25 +3997,25 @@ "item.compressed_grass.triple_compressed_grass_tools_axe": "三级压缩草斧", "item.compressed_grass.sextuple_compressed_grass": "六级压缩草", "item.compressed_grass.octuple_grass_hoe": "八级压缩草锄", - "item.compressed_grass.enchanted_shovel": "Enchanted Shovel", + "item.compressed_grass.enchanted_shovel": "附魔草铲", "item.compressed_grass.limit_armor_helmet": "极限草头盔", "advancements.how_do_you_have_them.title": "你怎么有这么多的？", "item.compressed_grass.potato_king": "土豆之王", - "item.compressed_grass.limit_hoe": "Limit Hoe", + "item.compressed_grass.limit_hoe": "极限草锄", "item.compressed_grass.limit_compressed_grass": "极限压缩草", "item.compressed_grass.nonuple_grass_sword": "九级压缩草剑", "biome.compressed_grass.grass_biome": "草群系", "item.compressed_grass.septuple_compressed_grass": "七级压缩草", "item.compressed_grass.compressed_grass_armor_armor_leggings": "一级压缩草护腿", "item.compressed_grass.nonuple_grass_armor_chestplate": "九级压缩草胸甲", - "item.compressed_grass.limit_sword": "Limit Sword", + "item.compressed_grass.limit_sword": "极限草剑", "item.compressed_grass.quadruple_compressed_grass_tools_axe": "四级压缩草斧", "item.compressed_grass.quintuple_compressed_grass_armor_armor_chestplate": "五级压缩草胸甲", "item.compressed_grass.octuple_grass_sword": "八级压缩草剑", "item.compressed_grass.triple_compressed_grass": "三级压缩草", "item.compressed_grass.quadruple_compressed_grass_string": "四级压缩草绳", "item.compressed_grass.triple_compressed_grass_armor_armor_helmet": "三级压缩草头盔", - "advancements.enchanted.title": "It can be enchanted?", + "advancements.enchanted.title": "这也可以附魔？", "item.compressed_grass.compressed_axe": "一级压缩草斧", "item.compressed_grass.quadruple_compressed_grass_tools_shovel": "四级压缩草铲", "item.compressed_grass.sextuple_compressed_grass_armor_armor_chestplate": "六级压缩草胸甲", @@ -4030,7 +4041,7 @@ "item.compressed_grass.sextuple_compressed_grass_tools_hoe": "六级压缩草锄", "subtitles.technoblade_never_dies": "Technoblade Never Dies", "block.compressed_grass.grass_wood_button": "草木按钮", - "item.compressed_grass.limit_axe": "Limit Axe", + "item.compressed_grass.limit_axe": "极限草斧", "item.compressed_grass.nonuple_grass_axe": "九级压缩草斧", "advancements.how_do_you_have_them.descr": "你是不是作弊了!!!", "item.compressed_grass.septuple_compressed_grass_string": "七级压缩草绳", @@ -4219,7 +4230,7 @@ "children": [] }, { - "name": "Test", + "name": "ChristmasTree", "children": [] } ] @@ -4242,5 +4253,5 @@ "modElementsPackage": "net.mcreator.compressedgrass", "lockBaseModFiles": false }, - "mcreatorVersion": 202200347418 + "mcreatorVersion": 202200348217 } \ No newline at end of file diff --git a/elements/ChristmasTree.mod.json b/elements/ChristmasTree.mod.json new file mode 100644 index 000000000..1882943b6 --- /dev/null +++ b/elements/ChristmasTree.mod.json @@ -0,0 +1,144 @@ +{ + "_fv": 34, + "_type": "block", + "definition": { + "texture": "void", + "textureTop": "", + "textureLeft": "", + "textureFront": "", + "textureRight": "", + "textureBack": "", + "renderType": 2, + "customModelName": "christmastree:default", + "rotationMode": 0, + "enablePitch": false, + "emissiveRendering": false, + "displayFluidOverlay": false, + "itemTexture": "", + "particleTexture": "", + "tintType": "No tint", + "isItemTinted": false, + "hasTransparency": true, + "connectedSides": false, + "transparencyType": "SOLID", + "disableOffset": false, + "boundingBoxes": [ + { + "mx": 0.0, + "my": 0.0, + "mz": 0.0, + "Mx": 16.0, + "My": 16.0, + "Mz": 16.0, + "subtract": false + } + ], + "name": "Christmas Tree", + "specialInfo": [ + "Merry Christmas!" + ], + "hardness": 1.0, + "resistance": 10.0, + "hasGravity": false, + "isWaterloggable": false, + "creativeTab": { + "value": "MISC" + }, + "destroyTool": "Not specified", + "customDrop": { + "value": "" + }, + "dropAmount": 1, + "useLootTableForDrops": false, + "requiresCorrectTool": false, + "enchantPowerBonus": 0.0, + "plantsGrowOn": false, + "canRedstoneConnect": false, + "lightOpacity": 0, + "material": { + "value": "PLANTS" + }, + "tickRate": 0, + "tickRandomly": false, + "isReplaceable": false, + "canProvidePower": false, + "emittedRedstonePower": { + "fixedValue": 15.0 + }, + "colorOnMap": "DEFAULT", + "creativePickItem": { + "value": "" + }, + "offsetType": "NONE", + "aiPathNodeType": "DEFAULT", + "flammability": 0, + "fireSpreadSpeed": 0, + "isLadder": false, + "slipperiness": 0.6, + "speedFactor": 1.0, + "jumpFactor": 1.0, + "reactionToPushing": "NORMAL", + "isNotColidable": false, + "isCustomSoundType": false, + "soundOnStep": { + "value": "GROUND" + }, + "breakSound": { + "value": "" + }, + "fallSound": { + "value": "" + }, + "hitSound": { + "value": "" + }, + "placeSound": { + "value": "" + }, + "stepSound": { + "value": "" + }, + "luminance": 0, + "unbreakable": false, + "breakHarvestLevel": 1, + "spawnParticles": false, + "particleToSpawn": { + "value": "CUSTOM:GrassParticles" + }, + "particleSpawningShape": "Spread", + "particleSpawningRadious": 0.5, + "particleAmount": 4, + "hasInventory": false, + "guiBoundTo": "", + "openGUIOnRightClick": false, + "inventorySize": 9, + "inventoryStackSize": 64, + "inventoryDropWhenDestroyed": true, + "inventoryComparatorPower": true, + "inventoryOutSlotIDs": [], + "inventoryInSlotIDs": [], + "hasEnergyStorage": false, + "energyInitial": 0, + "energyCapacity": 400000, + "energyMaxReceive": 200, + "energyMaxExtract": 200, + "isFluidTank": false, + "fluidCapacity": 8000, + "fluidRestrictions": [], + "onBlockAdded": { + "name": "ChristmasTreePlace" + }, + "spawnWorldTypes": [], + "restrictionBiomes": [], + "blocksToReplace": [ + { + "value": "Blocks.STONE" + } + ], + "generationShape": "UNIFORM", + "frequencyPerChunks": 10, + "frequencyOnChunk": 16, + "minGenerateHeight": 0, + "maxGenerateHeight": 64 + } +} \ No newline at end of file diff --git a/elements/ChristmasTreePlace.mod.json b/elements/ChristmasTreePlace.mod.json new file mode 100644 index 000000000..576cc701f --- /dev/null +++ b/elements/ChristmasTreePlace.mod.json @@ -0,0 +1,7 @@ +{ + "_fv": 34, + "_type": "procedure", + "definition": { + "procedurexml": "no_ext_triggertitle @a title {\"text\":\"Merry Christmas!\"}" + } +} \ No newline at end of file diff --git a/elements/GodDie.mod.json b/elements/GodDie.mod.json index 96c02c480..7c3feb181 100644 --- a/elements/GodDie.mod.json +++ b/elements/GodDie.mod.json @@ -2,6 +2,6 @@ "_fv": 34, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerBREAK5DESTROY5" + "procedurexml": "no_ext_triggerBREAK7DESTROY7" } } \ No newline at end of file diff --git a/elements/GodSpawn.mod.json b/elements/GodSpawn.mod.json index fb467e7e7..cdf9fcd66 100644 --- a/elements/GodSpawn.mod.json +++ b/elements/GodSpawn.mod.json @@ -2,6 +2,6 @@ "_fv": 34, "_type": "procedure", "definition": { - "procedurexml": "no_ext_triggerFALSEFALSEADD1FALSEADD2FALSEADD3FALSEMINUS1FALSEMINUS2FALSEMINUS3FALSEADD1ADD1FALSEADD1ADD2FALSEADD1ADD3FALSEADD1MINUS1FALSEADD1MINUS2FALSEADD1MINUS3FALSEADD1FALSEADD2FALSEADD3FALSEMINUS1FALSEMINUS2FALSEMINUS3weather thunder" + "procedurexml": "no_ext_triggerFALSEFALSEADD1FALSEADD2FALSEADD3FALSEMINUS1FALSEMINUS2FALSEMINUS3FALSEADD1ADD1FALSEADD1ADD2FALSEADD1ADD3FALSEADD1MINUS1FALSEADD1MINUS2FALSEADD1MINUS3FALSEADD1FALSEADD2FALSEADD3FALSEMINUS1FALSEMINUS2FALSEMINUS3weather thundertitle @a title {\"text\"=\"I am the GOD!\"}" } } \ No newline at end of file diff --git a/elements/GrassMonster.mod.json b/elements/GrassMonster.mod.json index 96eca0b3f..2cccfba24 100644 --- a/elements/GrassMonster.mod.json +++ b/elements/GrassMonster.mod.json @@ -92,16 +92,13 @@ "stepSound": { "value": "" }, - "spawnParticles": true, + "spawnParticles": false, "particleToSpawn": { "value": "CUSTOM:GrassParticles" }, "particleSpawningShape": "Spread", "particleSpawningRadious": 0.2999999985098839, "particleAmount": 4, - "whenMobIsHurt": { - "name": "GrassMonsterSpawn" - }, "hasAI": true, "aiBase": "(none)", "aixml": "0.5FALSEnull,null0.1null,nullTRUEnull,nullnull,nullnull,null", @@ -115,11 +112,11 @@ "rangedItemType": "Default item", "spawnThisMob": true, "doesDespawnWhenIdle": true, - "spawningProbability": 5, + "spawningProbability": 4, "mobSpawningType": "monster", "minNumberOfMobsPerGroup": 1, "maxNumberOfMobsPerGroup": 2, "restrictionBiomes": [], - "spawnInDungeons": false + "spawnInDungeons": true } } \ No newline at end of file diff --git a/elements/GrassMonsterSpawn.mod.json b/elements/GrassMonsterSpawn.mod.json deleted file mode 100644 index 67b81de49..000000000 --- a/elements/GrassMonsterSpawn.mod.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "_fv": 34, - "_type": "procedure", - "definition": { - "procedurexml": "no_ext_triggerfill ~-2 ~0 ~-2 ~2 ~2 ~2 minecraft:air" - } -} \ No newline at end of file diff --git a/models/ChristmasTree/5.png b/models/ChristmasTree/5.png new file mode 100644 index 000000000..c19a5e86f Binary files /dev/null and b/models/ChristmasTree/5.png differ diff --git a/models/ChristmasTree/ChristmasTree.json b/models/ChristmasTree/ChristmasTree.json new file mode 100644 index 000000000..6a0942e9e --- /dev/null +++ b/models/ChristmasTree/ChristmasTree.json @@ -0,0 +1,272 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "leave1-1", + "2": "leave1-2", + "3": "trunk", + "4": "leave1-3", + "5": "leave1-4", + "6": "leave1-5", + "7": "leave2-1", + "8": "leave2-2", + "9": "leave2-3", + "10": "leave2-4", + "11": "leave3-1", + "12": "leave3-2", + "13": "leave3-3", + "14": "leave4-1", + "15": "leave4-2", + "16": "5", + "particle": "trunk" + }, + "elements": [ + { + "name": "trunk", + "from": [7, 0, 7], + "to": [9, 2, 9], + "faces": { + "north": {"uv": [0, 0, 2, 5], "texture": "#3"}, + "east": {"uv": [2, 0, 4, 5], "texture": "#3"}, + "south": {"uv": [4, 0, 6, 5], "texture": "#3"}, + "west": {"uv": [0, 5, 2, 10], "texture": "#3"}, + "up": {"uv": [4, 7, 2, 5], "texture": "#3"}, + "down": {"uv": [6, 5, 4, 7], "texture": "#3"} + } + }, + { + "name": "leave1-1", + "from": [3, 2, 7], + "to": [13, 3, 9], + "faces": { + "north": {"uv": [0, 4, 10, 5], "texture": "#1"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#1"}, + "south": {"uv": [0, 5, 10, 6], "texture": "#1"}, + "west": {"uv": [2, 6, 4, 7], "texture": "#1"}, + "up": {"uv": [10, 2, 0, 0], "texture": "#1"}, + "down": {"uv": [10, 2, 0, 4], "texture": "#1"} + } + }, + { + "name": "leave1-2", + "from": [7, 2, 3], + "to": [9, 3, 13], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#2"}, + "east": {"uv": [4, 0, 14, 1], "texture": "#2"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#2"}, + "west": {"uv": [4, 1, 14, 2], "texture": "#2"}, + "up": {"uv": [2, 10, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 2, 10], "texture": "#2"} + } + }, + { + "name": "leave1-3", + "from": [6, 2, 4], + "to": [10, 3, 12], + "faces": { + "north": {"uv": [8, 1, 12, 2], "texture": "#4"}, + "east": {"uv": [0, 8, 8, 9], "texture": "#4"}, + "south": {"uv": [8, 2, 12, 3], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 1], "texture": "#4"}, + "up": {"uv": [4, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 0, 4, 8], "texture": "#4"} + } + }, + { + "name": "leave1-4", + "from": [5, 2, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#5"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#5"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#5"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#5"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#5"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#5"} + } + }, + { + "name": "leave1-5", + "from": [4, 2, 6], + "to": [12, 3, 10], + "faces": { + "north": {"uv": [0, 8, 8, 9], "texture": "#6"}, + "east": {"uv": [8, 1, 12, 2], "texture": "#6"}, + "south": {"uv": [8, 0, 16, 1], "texture": "#6"}, + "west": {"uv": [8, 2, 12, 3], "texture": "#6"}, + "up": {"uv": [8, 4, 0, 0], "texture": "#6"}, + "down": {"uv": [8, 4, 0, 8], "texture": "#6"} + } + }, + { + "name": "leave2-1", + "from": [7, 3, 4], + "to": [9, 4, 12], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#7"}, + "east": {"uv": [4, 0, 12, 1], "texture": "#7"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#7"}, + "west": {"uv": [4, 1, 12, 2], "texture": "#7"}, + "up": {"uv": [2, 8, 0, 0], "texture": "#7"}, + "down": {"uv": [4, 0, 2, 8], "texture": "#7"} + } + }, + { + "name": "leave2-2", + "from": [4, 3, 7], + "to": [12, 4, 9], + "faces": { + "north": {"uv": [0, 4, 8, 5], "texture": "#8"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#8"}, + "south": {"uv": [0, 5, 8, 6], "texture": "#8"}, + "west": {"uv": [2, 6, 4, 7], "texture": "#8"}, + "up": {"uv": [8, 2, 0, 0], "texture": "#8"}, + "down": {"uv": [8, 2, 0, 4], "texture": "#8"} + } + }, + { + "name": "leave2-3", + "from": [5, 3, 6], + "to": [11, 4, 10], + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#9"}, + "east": {"uv": [6, 2, 10, 3], "texture": "#9"}, + "south": {"uv": [6, 1, 12, 2], "texture": "#9"}, + "west": {"uv": [6, 3, 10, 4], "texture": "#9"}, + "up": {"uv": [6, 4, 0, 0], "texture": "#9"}, + "down": {"uv": [6, 4, 0, 8], "texture": "#9"} + } + }, + { + "name": "leave2-4", + "from": [6, 3, 5], + "to": [10, 4, 11], + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#10"}, + "east": {"uv": [0, 6, 6, 7], "texture": "#10"}, + "south": {"uv": [4, 7, 8, 8], "texture": "#10"}, + "west": {"uv": [6, 6, 12, 7], "texture": "#10"}, + "up": {"uv": [4, 6, 0, 0], "texture": "#10"}, + "down": {"uv": [8, 0, 4, 6], "texture": "#10"} + } + }, + { + "name": "leave3-1", + "from": [7, 4, 5], + "to": [9, 5, 11], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#11"}, + "east": {"uv": [4, 0, 10, 1], "texture": "#11"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#11"}, + "west": {"uv": [4, 1, 10, 2], "texture": "#11"}, + "up": {"uv": [2, 6, 0, 0], "texture": "#11"}, + "down": {"uv": [4, 0, 2, 6], "texture": "#11"} + } + }, + { + "name": "leave3-2", + "from": [5, 4, 7], + "to": [11, 5, 9], + "faces": { + "north": {"uv": [0, 4, 6, 5], "texture": "#12"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#12"}, + "south": {"uv": [0, 5, 6, 6], "texture": "#12"}, + "west": {"uv": [6, 0, 8, 1], "texture": "#12"}, + "up": {"uv": [6, 2, 0, 0], "texture": "#12"}, + "down": {"uv": [6, 2, 0, 4], "texture": "#12"} + } + }, + { + "name": "leave3-3", + "from": [6, 4, 6], + "to": [10, 5, 10], + "faces": { + "north": {"uv": [4, 0, 8, 1], "texture": "#13"}, + "east": {"uv": [4, 1, 8, 2], "texture": "#13"}, + "south": {"uv": [4, 2, 8, 3], "texture": "#13"}, + "west": {"uv": [4, 3, 8, 4], "texture": "#13"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#13"}, + "down": {"uv": [4, 4, 0, 8], "texture": "#13"} + } + }, + { + "name": "leave4-1", + "from": [6, 5, 7], + "to": [10, 6, 9], + "faces": { + "north": {"uv": [0, 4, 4, 5], "texture": "#14"}, + "east": {"uv": [4, 1, 6, 2], "texture": "#14"}, + "south": {"uv": [4, 0, 8, 1], "texture": "#14"}, + "west": {"uv": [4, 2, 6, 3], "texture": "#14"}, + "up": {"uv": [4, 2, 0, 0], "texture": "#14"}, + "down": {"uv": [4, 2, 0, 4], "texture": "#14"} + } + }, + { + "name": "leave4-2", + "from": [7, 5, 6], + "to": [9, 6, 10], + "faces": { + "north": {"uv": [4, 1, 6, 2], "texture": "#15"}, + "east": {"uv": [0, 4, 4, 5], "texture": "#15"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#15"}, + "west": {"uv": [4, 0, 8, 1], "texture": "#15"}, + "up": {"uv": [2, 4, 0, 0], "texture": "#15"}, + "down": {"uv": [4, 0, 2, 4], "texture": "#15"} + } + }, + { + "name": "5", + "from": [7, 6, 7], + "to": [9, 7, 9], + "faces": { + "north": {"uv": [2, 0, 4, 1], "texture": "#16"}, + "east": {"uv": [2, 1, 4, 2], "texture": "#16"}, + "south": {"uv": [2, 2, 4, 3], "texture": "#16"}, + "west": {"uv": [2, 3, 4, 4], "texture": "#16"}, + "up": {"uv": [2, 2, 0, 0], "texture": "#16"}, + "down": {"uv": [2, 2, 0, 4], "texture": "#16"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 8, 1.25] + } + }, + "groups": [ + 0, + { + "name": "leave", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "1", + "origin": [0, 0, 0], + "color": 0, + "children": [1, 2, 3, 4, 5] + }, + { + "name": "2", + "origin": [0, 0, 0], + "color": 0, + "children": [6, 7, 8, 9] + }, + { + "name": "3", + "origin": [0, 0, 0], + "color": 0, + "children": [10, 11, 12] + }, + { + "name": "4", + "origin": [0, 0, 0], + "color": 0, + "children": [13, 14] + }, + 15 + ] + } + ] +} \ No newline at end of file diff --git a/models/ChristmasTree/leave1-1.png b/models/ChristmasTree/leave1-1.png new file mode 100644 index 000000000..34749e4ca Binary files /dev/null and b/models/ChristmasTree/leave1-1.png differ diff --git a/models/ChristmasTree/leave1-2.png b/models/ChristmasTree/leave1-2.png new file mode 100644 index 000000000..76051c043 Binary files /dev/null and b/models/ChristmasTree/leave1-2.png differ diff --git a/models/ChristmasTree/leave1-3.png b/models/ChristmasTree/leave1-3.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/models/ChristmasTree/leave1-3.png differ diff --git a/models/ChristmasTree/leave1-4.png b/models/ChristmasTree/leave1-4.png new file mode 100644 index 000000000..416b4170e Binary files /dev/null and b/models/ChristmasTree/leave1-4.png differ diff --git a/models/ChristmasTree/leave1-5.png b/models/ChristmasTree/leave1-5.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/models/ChristmasTree/leave1-5.png differ diff --git a/models/ChristmasTree/leave2-1.png b/models/ChristmasTree/leave2-1.png new file mode 100644 index 000000000..955bf885e Binary files /dev/null and b/models/ChristmasTree/leave2-1.png differ diff --git a/models/ChristmasTree/leave2-2.png b/models/ChristmasTree/leave2-2.png new file mode 100644 index 000000000..905a491ca Binary files /dev/null and b/models/ChristmasTree/leave2-2.png differ diff --git a/models/ChristmasTree/leave2-3.png b/models/ChristmasTree/leave2-3.png new file mode 100644 index 000000000..f130d2e30 Binary files /dev/null and b/models/ChristmasTree/leave2-3.png differ diff --git a/models/ChristmasTree/leave2-4.png b/models/ChristmasTree/leave2-4.png new file mode 100644 index 000000000..d5589c172 Binary files /dev/null and b/models/ChristmasTree/leave2-4.png differ diff --git a/models/ChristmasTree/leave3-1.png b/models/ChristmasTree/leave3-1.png new file mode 100644 index 000000000..8ec9659ba Binary files /dev/null and b/models/ChristmasTree/leave3-1.png differ diff --git a/models/ChristmasTree/leave3-2.png b/models/ChristmasTree/leave3-2.png new file mode 100644 index 000000000..ddf5b17ed Binary files /dev/null and b/models/ChristmasTree/leave3-2.png differ diff --git a/models/ChristmasTree/leave3-3.png b/models/ChristmasTree/leave3-3.png new file mode 100644 index 000000000..85764c7ed Binary files /dev/null and b/models/ChristmasTree/leave3-3.png differ diff --git a/models/ChristmasTree/leave4-1.png b/models/ChristmasTree/leave4-1.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/models/ChristmasTree/leave4-1.png differ diff --git a/models/ChristmasTree/leave4-2.png b/models/ChristmasTree/leave4-2.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/models/ChristmasTree/leave4-2.png differ diff --git a/models/ChristmasTree/trunk.png b/models/ChristmasTree/trunk.png new file mode 100644 index 000000000..435f6ec49 Binary files /dev/null and b/models/ChristmasTree/trunk.png differ diff --git a/models/Modelcustom_model.java b/models/Modelcustom_model.java deleted file mode 100644 index 965b529f3..000000000 --- a/models/Modelcustom_model.java +++ /dev/null @@ -1,36 +0,0 @@ -// Made with Blockbench 4.1.5 -// Exported for Minecraft version 1.15 - 1.16 with MCP mappings -// Paste this class into your mod and generate all required imports - -public static class Modelcustom_model extends EntityModel { - private final ModelRenderer bb_main; - - public Modelcustom_model() { - textureWidth = 16; - textureHeight = 16; - - bb_main = new ModelRenderer(this); - bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); - bb_main.setTextureOffset(0, 9).addBox(-1.0F, -3.0F, 0.0F, 1.0F, 3.0F, 1.0F, 0.0F, false); - bb_main.setTextureOffset(5, 8).addBox(-1.0F, -6.0F, 1.0F, 1.0F, 3.0F, 1.0F, 0.0F, false); - bb_main.setTextureOffset(8, 0).addBox(-1.0F, -6.0F, -2.0F, 1.0F, 3.0F, 1.0F, 0.0F, false); - bb_main.setTextureOffset(6, 4).addBox(-1.0F, -3.0F, -1.0F, 1.0F, 3.0F, 1.0F, 0.0F, false); - bb_main.setTextureOffset(0, 4).addBox(-1.0F, -6.0F, -1.0F, 1.0F, 3.0F, 2.0F, 0.0F, false); - bb_main.setTextureOffset(0, 0).addBox(-1.5F, -8.0F, -1.0F, 2.0F, 2.0F, 2.0F, 0.0F, false); - } - - @Override - public void render(MatrixStack matrixStack, IVertexBuilder buffer, int packedLight, int packedOverlay, float red, - float green, float blue, float alpha) { - bb_main.render(matrixStack, buffer, packedLight, packedOverlay); - } - - public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { - modelRenderer.rotateAngleX = x; - modelRenderer.rotateAngleY = y; - modelRenderer.rotateAngleZ = z; - } - - public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5, Entity e) { - } -} \ No newline at end of file diff --git a/models/christmastree.json b/models/christmastree.json new file mode 100644 index 000000000..6a0942e9e --- /dev/null +++ b/models/christmastree.json @@ -0,0 +1,272 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "1": "leave1-1", + "2": "leave1-2", + "3": "trunk", + "4": "leave1-3", + "5": "leave1-4", + "6": "leave1-5", + "7": "leave2-1", + "8": "leave2-2", + "9": "leave2-3", + "10": "leave2-4", + "11": "leave3-1", + "12": "leave3-2", + "13": "leave3-3", + "14": "leave4-1", + "15": "leave4-2", + "16": "5", + "particle": "trunk" + }, + "elements": [ + { + "name": "trunk", + "from": [7, 0, 7], + "to": [9, 2, 9], + "faces": { + "north": {"uv": [0, 0, 2, 5], "texture": "#3"}, + "east": {"uv": [2, 0, 4, 5], "texture": "#3"}, + "south": {"uv": [4, 0, 6, 5], "texture": "#3"}, + "west": {"uv": [0, 5, 2, 10], "texture": "#3"}, + "up": {"uv": [4, 7, 2, 5], "texture": "#3"}, + "down": {"uv": [6, 5, 4, 7], "texture": "#3"} + } + }, + { + "name": "leave1-1", + "from": [3, 2, 7], + "to": [13, 3, 9], + "faces": { + "north": {"uv": [0, 4, 10, 5], "texture": "#1"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#1"}, + "south": {"uv": [0, 5, 10, 6], "texture": "#1"}, + "west": {"uv": [2, 6, 4, 7], "texture": "#1"}, + "up": {"uv": [10, 2, 0, 0], "texture": "#1"}, + "down": {"uv": [10, 2, 0, 4], "texture": "#1"} + } + }, + { + "name": "leave1-2", + "from": [7, 2, 3], + "to": [9, 3, 13], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#2"}, + "east": {"uv": [4, 0, 14, 1], "texture": "#2"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#2"}, + "west": {"uv": [4, 1, 14, 2], "texture": "#2"}, + "up": {"uv": [2, 10, 0, 0], "texture": "#2"}, + "down": {"uv": [4, 0, 2, 10], "texture": "#2"} + } + }, + { + "name": "leave1-3", + "from": [6, 2, 4], + "to": [10, 3, 12], + "faces": { + "north": {"uv": [8, 1, 12, 2], "texture": "#4"}, + "east": {"uv": [0, 8, 8, 9], "texture": "#4"}, + "south": {"uv": [8, 2, 12, 3], "texture": "#4"}, + "west": {"uv": [8, 0, 16, 1], "texture": "#4"}, + "up": {"uv": [4, 8, 0, 0], "texture": "#4"}, + "down": {"uv": [8, 0, 4, 8], "texture": "#4"} + } + }, + { + "name": "leave1-4", + "from": [5, 2, 5], + "to": [11, 3, 11], + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#5"}, + "east": {"uv": [6, 1, 12, 2], "texture": "#5"}, + "south": {"uv": [6, 2, 12, 3], "texture": "#5"}, + "west": {"uv": [6, 3, 12, 4], "texture": "#5"}, + "up": {"uv": [6, 6, 0, 0], "texture": "#5"}, + "down": {"uv": [6, 6, 0, 12], "texture": "#5"} + } + }, + { + "name": "leave1-5", + "from": [4, 2, 6], + "to": [12, 3, 10], + "faces": { + "north": {"uv": [0, 8, 8, 9], "texture": "#6"}, + "east": {"uv": [8, 1, 12, 2], "texture": "#6"}, + "south": {"uv": [8, 0, 16, 1], "texture": "#6"}, + "west": {"uv": [8, 2, 12, 3], "texture": "#6"}, + "up": {"uv": [8, 4, 0, 0], "texture": "#6"}, + "down": {"uv": [8, 4, 0, 8], "texture": "#6"} + } + }, + { + "name": "leave2-1", + "from": [7, 3, 4], + "to": [9, 4, 12], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#7"}, + "east": {"uv": [4, 0, 12, 1], "texture": "#7"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#7"}, + "west": {"uv": [4, 1, 12, 2], "texture": "#7"}, + "up": {"uv": [2, 8, 0, 0], "texture": "#7"}, + "down": {"uv": [4, 0, 2, 8], "texture": "#7"} + } + }, + { + "name": "leave2-2", + "from": [4, 3, 7], + "to": [12, 4, 9], + "faces": { + "north": {"uv": [0, 4, 8, 5], "texture": "#8"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#8"}, + "south": {"uv": [0, 5, 8, 6], "texture": "#8"}, + "west": {"uv": [2, 6, 4, 7], "texture": "#8"}, + "up": {"uv": [8, 2, 0, 0], "texture": "#8"}, + "down": {"uv": [8, 2, 0, 4], "texture": "#8"} + } + }, + { + "name": "leave2-3", + "from": [5, 3, 6], + "to": [11, 4, 10], + "faces": { + "north": {"uv": [6, 0, 12, 1], "texture": "#9"}, + "east": {"uv": [6, 2, 10, 3], "texture": "#9"}, + "south": {"uv": [6, 1, 12, 2], "texture": "#9"}, + "west": {"uv": [6, 3, 10, 4], "texture": "#9"}, + "up": {"uv": [6, 4, 0, 0], "texture": "#9"}, + "down": {"uv": [6, 4, 0, 8], "texture": "#9"} + } + }, + { + "name": "leave2-4", + "from": [6, 3, 5], + "to": [10, 4, 11], + "faces": { + "north": {"uv": [0, 7, 4, 8], "texture": "#10"}, + "east": {"uv": [0, 6, 6, 7], "texture": "#10"}, + "south": {"uv": [4, 7, 8, 8], "texture": "#10"}, + "west": {"uv": [6, 6, 12, 7], "texture": "#10"}, + "up": {"uv": [4, 6, 0, 0], "texture": "#10"}, + "down": {"uv": [8, 0, 4, 6], "texture": "#10"} + } + }, + { + "name": "leave3-1", + "from": [7, 4, 5], + "to": [9, 5, 11], + "faces": { + "north": {"uv": [4, 2, 6, 3], "texture": "#11"}, + "east": {"uv": [4, 0, 10, 1], "texture": "#11"}, + "south": {"uv": [4, 3, 6, 4], "texture": "#11"}, + "west": {"uv": [4, 1, 10, 2], "texture": "#11"}, + "up": {"uv": [2, 6, 0, 0], "texture": "#11"}, + "down": {"uv": [4, 0, 2, 6], "texture": "#11"} + } + }, + { + "name": "leave3-2", + "from": [5, 4, 7], + "to": [11, 5, 9], + "faces": { + "north": {"uv": [0, 4, 6, 5], "texture": "#12"}, + "east": {"uv": [0, 6, 2, 7], "texture": "#12"}, + "south": {"uv": [0, 5, 6, 6], "texture": "#12"}, + "west": {"uv": [6, 0, 8, 1], "texture": "#12"}, + "up": {"uv": [6, 2, 0, 0], "texture": "#12"}, + "down": {"uv": [6, 2, 0, 4], "texture": "#12"} + } + }, + { + "name": "leave3-3", + "from": [6, 4, 6], + "to": [10, 5, 10], + "faces": { + "north": {"uv": [4, 0, 8, 1], "texture": "#13"}, + "east": {"uv": [4, 1, 8, 2], "texture": "#13"}, + "south": {"uv": [4, 2, 8, 3], "texture": "#13"}, + "west": {"uv": [4, 3, 8, 4], "texture": "#13"}, + "up": {"uv": [4, 4, 0, 0], "texture": "#13"}, + "down": {"uv": [4, 4, 0, 8], "texture": "#13"} + } + }, + { + "name": "leave4-1", + "from": [6, 5, 7], + "to": [10, 6, 9], + "faces": { + "north": {"uv": [0, 4, 4, 5], "texture": "#14"}, + "east": {"uv": [4, 1, 6, 2], "texture": "#14"}, + "south": {"uv": [4, 0, 8, 1], "texture": "#14"}, + "west": {"uv": [4, 2, 6, 3], "texture": "#14"}, + "up": {"uv": [4, 2, 0, 0], "texture": "#14"}, + "down": {"uv": [4, 2, 0, 4], "texture": "#14"} + } + }, + { + "name": "leave4-2", + "from": [7, 5, 6], + "to": [9, 6, 10], + "faces": { + "north": {"uv": [4, 1, 6, 2], "texture": "#15"}, + "east": {"uv": [0, 4, 4, 5], "texture": "#15"}, + "south": {"uv": [4, 2, 6, 3], "texture": "#15"}, + "west": {"uv": [4, 0, 8, 1], "texture": "#15"}, + "up": {"uv": [2, 4, 0, 0], "texture": "#15"}, + "down": {"uv": [4, 0, 2, 4], "texture": "#15"} + } + }, + { + "name": "5", + "from": [7, 6, 7], + "to": [9, 7, 9], + "faces": { + "north": {"uv": [2, 0, 4, 1], "texture": "#16"}, + "east": {"uv": [2, 1, 4, 2], "texture": "#16"}, + "south": {"uv": [2, 2, 4, 3], "texture": "#16"}, + "west": {"uv": [2, 3, 4, 4], "texture": "#16"}, + "up": {"uv": [2, 2, 0, 0], "texture": "#16"}, + "down": {"uv": [2, 2, 0, 4], "texture": "#16"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 8, 1.25] + } + }, + "groups": [ + 0, + { + "name": "leave", + "origin": [0, 0, 0], + "color": 0, + "children": [ + { + "name": "1", + "origin": [0, 0, 0], + "color": 0, + "children": [1, 2, 3, 4, 5] + }, + { + "name": "2", + "origin": [0, 0, 0], + "color": 0, + "children": [6, 7, 8, 9] + }, + { + "name": "3", + "origin": [0, 0, 0], + "color": 0, + "children": [10, 11, 12] + }, + { + "name": "4", + "origin": [0, 0, 0], + "color": 0, + "children": [13, 14] + }, + 15 + ] + } + ] +} \ No newline at end of file diff --git a/models/christmastree.json.textures b/models/christmastree.json.textures new file mode 100644 index 000000000..c00a4d6c7 --- /dev/null +++ b/models/christmastree.json.textures @@ -0,0 +1,25 @@ +{ + "mappings": { + "default": { + "map": { + "11": "leave3-1", + "12": "leave3-2", + "13": "leave3-3", + "14": "leave4-1", + "15": "leave4-2", + "16": "5", + "1": "leave1-1", + "2": "leave1-2", + "3": "trunk", + "4": "leave1-3", + "5": "leave1-4", + "6": "leave1-5", + "7": "leave2-1", + "8": "leave2-2", + "9": "leave2-3", + "10": "leave2-4" + }, + "name": "default" + } + } +} \ No newline at end of file diff --git a/run/logs/2022-11-19-1.log.gz b/run/logs/2022-11-19-1.log.gz deleted file mode 100644 index 335aebe5f..000000000 Binary files a/run/logs/2022-11-19-1.log.gz and /dev/null differ diff --git a/run/logs/2022-11-19-10.log.gz b/run/logs/2022-11-19-10.log.gz index 99c7d208f..b926162f8 100644 Binary files a/run/logs/2022-11-19-10.log.gz and b/run/logs/2022-11-19-10.log.gz differ diff --git a/run/logs/2022-11-19-11.log.gz b/run/logs/2022-11-19-11.log.gz new file mode 100644 index 000000000..ca01d66b2 Binary files /dev/null and b/run/logs/2022-11-19-11.log.gz differ diff --git a/run/logs/2022-11-19-12.log.gz b/run/logs/2022-11-19-12.log.gz new file mode 100644 index 000000000..99c7d208f Binary files /dev/null and b/run/logs/2022-11-19-12.log.gz differ diff --git a/run/logs/2022-11-19-2.log.gz b/run/logs/2022-11-19-2.log.gz index 41748c609..544e96fc1 100644 Binary files a/run/logs/2022-11-19-2.log.gz and b/run/logs/2022-11-19-2.log.gz differ diff --git a/run/logs/2022-11-19-3.log.gz b/run/logs/2022-11-19-3.log.gz index 59ebb2cbd..335aebe5f 100644 Binary files a/run/logs/2022-11-19-3.log.gz and b/run/logs/2022-11-19-3.log.gz differ diff --git a/run/logs/2022-11-19-4.log.gz b/run/logs/2022-11-19-4.log.gz index 422116b4d..41748c609 100644 Binary files a/run/logs/2022-11-19-4.log.gz and b/run/logs/2022-11-19-4.log.gz differ diff --git a/run/logs/2022-11-19-5.log.gz b/run/logs/2022-11-19-5.log.gz index 8d1d78f45..59ebb2cbd 100644 Binary files a/run/logs/2022-11-19-5.log.gz and b/run/logs/2022-11-19-5.log.gz differ diff --git a/run/logs/2022-11-19-6.log.gz b/run/logs/2022-11-19-6.log.gz index 758c0ef16..422116b4d 100644 Binary files a/run/logs/2022-11-19-6.log.gz and b/run/logs/2022-11-19-6.log.gz differ diff --git a/run/logs/2022-11-19-7.log.gz b/run/logs/2022-11-19-7.log.gz index 1333f9b59..8d1d78f45 100644 Binary files a/run/logs/2022-11-19-7.log.gz and b/run/logs/2022-11-19-7.log.gz differ diff --git a/run/logs/2022-11-19-8.log.gz b/run/logs/2022-11-19-8.log.gz index b926162f8..758c0ef16 100644 Binary files a/run/logs/2022-11-19-8.log.gz and b/run/logs/2022-11-19-8.log.gz differ diff --git a/run/logs/2022-11-19-9.log.gz b/run/logs/2022-11-19-9.log.gz index ca01d66b2..1333f9b59 100644 Binary files a/run/logs/2022-11-19-9.log.gz and b/run/logs/2022-11-19-9.log.gz differ diff --git a/run/logs/debug-1.log.gz b/run/logs/debug-1.log.gz index 572bcc1d8..5e25dccfc 100644 Binary files a/run/logs/debug-1.log.gz and b/run/logs/debug-1.log.gz differ diff --git a/run/logs/debug-2.log.gz b/run/logs/debug-2.log.gz index e641ad86d..572bcc1d8 100644 Binary files a/run/logs/debug-2.log.gz and b/run/logs/debug-2.log.gz differ diff --git a/run/logs/debug-3.log.gz b/run/logs/debug-3.log.gz index cd5824d7e..e641ad86d 100644 Binary files a/run/logs/debug-3.log.gz and b/run/logs/debug-3.log.gz differ diff --git a/run/logs/debug-4.log.gz b/run/logs/debug-4.log.gz index 323d38479..cd5824d7e 100644 Binary files a/run/logs/debug-4.log.gz and b/run/logs/debug-4.log.gz differ diff --git a/run/logs/debug-5.log.gz b/run/logs/debug-5.log.gz index 58727686d..323d38479 100644 Binary files a/run/logs/debug-5.log.gz and b/run/logs/debug-5.log.gz differ diff --git a/run/options.txt b/run/options.txt index 6216d8226..090d4eb09 100644 --- a/run/options.txt +++ b/run/options.txt @@ -16,7 +16,7 @@ touchscreen:false fullscreen:false bobView:false toggleCrouch:false -toggleSprint:false +toggleSprint:true darkMojangStudiosBackground:false hideLightningFlashes:false mouseSensitivity:0.5 diff --git a/run/saves/text/DIM-1/data/raids.dat b/run/saves/text/DIM-1/data/raids.dat index 9ce8ddd91..4ce613a9c 100644 Binary files a/run/saves/text/DIM-1/data/raids.dat and b/run/saves/text/DIM-1/data/raids.dat differ diff --git a/run/saves/text/DIM1/data/raids_end.dat b/run/saves/text/DIM1/data/raids_end.dat index 9ce8ddd91..4ce613a9c 100644 Binary files a/run/saves/text/DIM1/data/raids_end.dat and b/run/saves/text/DIM1/data/raids_end.dat differ diff --git a/run/saves/text/data/raids.dat b/run/saves/text/data/raids.dat index 9ce8ddd91..4ce613a9c 100644 Binary files a/run/saves/text/data/raids.dat and b/run/saves/text/data/raids.dat differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/data/raids.dat b/run/saves/text/dimensions/compressed_grass/grass_dimension/data/raids.dat index 1ac84541f..00064c465 100644 Binary files a/run/saves/text/dimensions/compressed_grass/grass_dimension/data/raids.dat and b/run/saves/text/dimensions/compressed_grass/grass_dimension/data/raids.dat differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/entities/r.0.-1.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/entities/r.0.-1.mca new file mode 100644 index 000000000..f731178eb Binary files /dev/null and b/run/saves/text/dimensions/compressed_grass/grass_dimension/entities/r.0.-1.mca differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/entities/r.0.0.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/entities/r.0.0.mca new file mode 100644 index 000000000..e69de29bb diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.-1.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.-1.mca index 9f2c3ca9c..918118c41 100644 Binary files a/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.-1.mca and b/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.-1.mca differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.0.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.0.0.mca new file mode 100644 index 000000000..e69de29bb diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.1.-1.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.1.-1.mca new file mode 100644 index 000000000..e69de29bb diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.1.0.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/poi/r.1.0.mca new file mode 100644 index 000000000..e69de29bb diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.-1.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.-1.mca new file mode 100644 index 000000000..4b0f5e349 Binary files /dev/null and b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.-1.mca differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.0.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.0.mca new file mode 100644 index 000000000..2bbf6b3c8 Binary files /dev/null and b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.-1.0.mca differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.-1.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.-1.mca index 005b56e4c..00a871356 100644 Binary files a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.-1.mca and b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.-1.mca differ diff --git a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.0.mca b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.0.mca index 93b6b309e..d9a3e5140 100644 Binary files a/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.0.mca and b/run/saves/text/dimensions/compressed_grass/grass_dimension/region/r.0.0.mca differ diff --git a/run/saves/text/entities/r.0.-1.mca b/run/saves/text/entities/r.0.-1.mca index 2cf72d595..57cbb2965 100644 Binary files a/run/saves/text/entities/r.0.-1.mca and b/run/saves/text/entities/r.0.-1.mca differ diff --git a/run/saves/text/level.dat b/run/saves/text/level.dat index 0dd5c8b60..55cd8c989 100644 Binary files a/run/saves/text/level.dat and b/run/saves/text/level.dat differ diff --git a/run/saves/text/level.dat_old b/run/saves/text/level.dat_old index f3572963c..804c021a8 100644 Binary files a/run/saves/text/level.dat_old and b/run/saves/text/level.dat_old differ diff --git a/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat b/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat index 77e2a4cca..c89eb0980 100644 Binary files a/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat and b/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat differ diff --git a/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old b/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old index 77e2a4cca..c89eb0980 100644 Binary files a/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old and b/run/saves/text/playerdata/380df991-f603-344c-a090-369bad2a924a.dat_old differ diff --git a/run/saves/text/region/r.-1.-1.mca b/run/saves/text/region/r.-1.-1.mca index 70b2b7798..41773527e 100644 Binary files a/run/saves/text/region/r.-1.-1.mca and b/run/saves/text/region/r.-1.-1.mca differ diff --git a/run/saves/text/region/r.-1.-2.mca b/run/saves/text/region/r.-1.-2.mca index e176ede51..f6dcbfdb8 100644 Binary files a/run/saves/text/region/r.-1.-2.mca and b/run/saves/text/region/r.-1.-2.mca differ diff --git a/run/saves/text/region/r.-1.0.mca b/run/saves/text/region/r.-1.0.mca index 3555f0de9..d8d94629b 100644 Binary files a/run/saves/text/region/r.-1.0.mca and b/run/saves/text/region/r.-1.0.mca differ diff --git a/run/saves/text/region/r.0.-1.mca b/run/saves/text/region/r.0.-1.mca index ab9bedae4..8523099aa 100644 Binary files a/run/saves/text/region/r.0.-1.mca and b/run/saves/text/region/r.0.-1.mca differ diff --git a/run/saves/text/region/r.0.-2.mca b/run/saves/text/region/r.0.-2.mca index 1c5d1a805..bffe3903a 100644 Binary files a/run/saves/text/region/r.0.-2.mca and b/run/saves/text/region/r.0.-2.mca differ diff --git a/run/saves/text/region/r.0.0.mca b/run/saves/text/region/r.0.0.mca index 3b4ae2015..1de22267c 100644 Binary files a/run/saves/text/region/r.0.0.mca and b/run/saves/text/region/r.0.0.mca differ diff --git a/run/saves/text/region/r.1.-1.mca b/run/saves/text/region/r.1.-1.mca index 83cab8d6f..52f838235 100644 Binary files a/run/saves/text/region/r.1.-1.mca and b/run/saves/text/region/r.1.-1.mca differ diff --git a/run/saves/text/region/r.1.-2.mca b/run/saves/text/region/r.1.-2.mca index e7426b71c..da63ea065 100644 Binary files a/run/saves/text/region/r.1.-2.mca and b/run/saves/text/region/r.1.-2.mca differ diff --git a/run/saves/text/region/r.1.0.mca b/run/saves/text/region/r.1.0.mca index 7fbbbbdd2..493be76ad 100644 Binary files a/run/saves/text/region/r.1.0.mca and b/run/saves/text/region/r.1.0.mca differ diff --git a/run/saves/text/stats/380df991-f603-344c-a090-369bad2a924a.json b/run/saves/text/stats/380df991-f603-344c-a090-369bad2a924a.json index 40f4fe2f0..0b29a590a 100644 --- a/run/saves/text/stats/380df991-f603-344c-a090-369bad2a924a.json +++ b/run/saves/text/stats/380df991-f603-344c-a090-369bad2a924a.json @@ -1 +1 @@ -{"stats":{"minecraft:killed_by":{"compressed_grass:grass_monster":3,"compressed_grass:author":10},"minecraft:custom":{"minecraft:mob_kills":57,"minecraft:inspect_hopper":7,"minecraft:interact_with_crafting_table":9,"minecraft:damage_dealt_resisted":10259,"minecraft:leave_game":50,"minecraft:time_since_death":1699,"minecraft:time_since_rest":1737,"minecraft:sprint_one_cm":94798,"minecraft:damage_taken":6698,"minecraft:walk_one_cm":133841,"minecraft:drop":5,"minecraft:damage_dealt":40299,"minecraft:talked_to_villager":6,"minecraft:swim_one_cm":192,"minecraft:fly_one_cm":486287,"minecraft:open_chest":12,"minecraft:crouch_one_cm":661,"minecraft:play_time":210268,"minecraft:deaths":20,"minecraft:sneak_time":1709,"minecraft:walk_under_water_one_cm":2942,"minecraft:jump":1045,"minecraft:walk_on_water_one_cm":4749,"minecraft:total_world_time":10811,"minecraft:fall_one_cm":6611},"minecraft:mined":{"minecraft:grass":1},"minecraft:killed":{"compressed_grass:grass_monster":10,"minecraft:creeper":1,"minecraft:horse":4,"minecraft:sheep":3,"minecraft:zombie":4,"compressed_grass:author":33,"minecraft:villager":1},"minecraft:dropped":{"compressed_grass:grass_bag":1,"compressed_grass:nonuple_grass_axe":1,"compressed_grass:nonuple_grass_sword":2,"compressed_grass:author_spawn_egg":1},"minecraft:picked_up":{"minecraft:leather":4,"compressed_grass:octuple_compressed_grass":2,"compressed_grass:nonuple_grass_armor_leggings":2,"minecraft:gunpowder":2,"minecraft:dirt":16,"compressed_grass:septuple_compressed_grass":4,"compressed_grass:grass_monster_spawn_egg":1,"minecraft:wheat_seeds":6,"minecraft:beef":2,"compressed_grass:double_compressed_grass":118,"compressed_grass:nonuple_grass_armor_boots":1,"compressed_grass:grass_star":1,"compressed_grass:triple_compressed_grass":7,"compressed_grass:nonuple_grass_axe":1,"minecraft:redstone":1,"compressed_grass:winding_grass_sticks":3,"compressed_grass:grass_wood_leaves":4,"compressed_grass:nonuple_grass_armor_helmet":3,"compressed_grass:nonuple_grass_armor_chestplate":3,"compressed_grass:grass_bag":1,"minecraft:rotten_flesh":3,"compressed_grass:triple_compressed_grass_tools_sword":1,"compressed_grass:author_spawn_egg":1,"compressed_grass:triple_compressed_grass_armor_armor_helmet":1,"minecraft:grass":752,"compressed_grass:nonuple_grass_sword":5,"minecraft:mutton":3,"minecraft:white_wool":3},"minecraft:used":{"compressed_grass:grass_wood_planks":280,"compressed_grass:grass_dimension":3,"minecraft:iron_bars":1,"minecraft:redstone":1,"minecraft:chest":1,"compressed_grass:septuple_compressed_grass_tools_axe":18,"minecraft:stone":39,"minecraft:composter":1,"compressed_grass:grass_monster_spawn_egg":14,"compressed_grass:author_spawn_egg":37,"minecraft:structure_block":9,"compressed_grass:test_sword":19,"minecraft:crafting_table":1,"minecraft:hopper":3,"compressed_grass:grass_wood_fence":5,"compressed_grass:grass_block":28,"minecraft:granite":9,"minecraft:obsidian":41,"minecraft:sticky_piston":4,"compressed_grass:compressed_grass_machine":13,"minecraft:lever":3,"compressed_grass:nonuple_grass_axe":96,"minecraft:villager_spawn_egg":2,"compressed_grass:grass_chest":17,"minecraft:grass_block":90,"compressed_grass:grass_wood_slab":86,"compressed_grass:compressed_grass_machine_plus":1,"compressed_grass:nonuple_grass_sword":189,"compressed_grass:grass_ore":5,"compressed_grass:grass_wood_log":43,"minecraft:bow":5,"compressed_grass:grass_wood_stairs":51,"compressed_grass:grass_wood_button":3,"minecraft:observer":8,"minecraft:splash_potion":12}},"DataVersion":2975} \ No newline at end of file +{"stats":{"minecraft:custom":{"minecraft:mob_kills":58,"minecraft:inspect_hopper":7,"minecraft:interact_with_crafting_table":9,"minecraft:damage_dealt_resisted":14852,"minecraft:leave_game":51,"minecraft:time_since_death":5639,"minecraft:time_since_rest":5677,"minecraft:sprint_one_cm":100011,"minecraft:damage_taken":6698,"minecraft:walk_one_cm":139046,"minecraft:drop":5,"minecraft:damage_dealt":46906,"minecraft:talked_to_villager":6,"minecraft:swim_one_cm":192,"minecraft:fly_one_cm":552680,"minecraft:open_chest":13,"minecraft:crouch_one_cm":1002,"minecraft:play_time":214208,"minecraft:deaths":20,"minecraft:sneak_time":1830,"minecraft:walk_under_water_one_cm":2942,"minecraft:jump":1098,"minecraft:walk_on_water_one_cm":4837,"minecraft:total_world_time":14861,"minecraft:fall_one_cm":6611},"minecraft:mined":{"minecraft:grass":1},"minecraft:used":{"compressed_grass:grass_wood_planks":280,"compressed_grass:grass_dimension":3,"minecraft:iron_bars":1,"minecraft:redstone":1,"minecraft:chest":1,"compressed_grass:septuple_compressed_grass_tools_axe":18,"compressed_grass:christmas_tree":9,"minecraft:stone":39,"minecraft:composter":1,"compressed_grass:grass_monster_spawn_egg":14,"compressed_grass:author_spawn_egg":37,"minecraft:structure_block":9,"minecraft:crafting_table":1,"minecraft:hopper":3,"compressed_grass:grass_wood_fence":5,"compressed_grass:grass_block":28,"minecraft:granite":9,"minecraft:obsidian":41,"minecraft:sticky_piston":4,"compressed_grass:compressed_grass_machine":13,"minecraft:lever":3,"compressed_grass:nonuple_grass_axe":112,"minecraft:villager_spawn_egg":2,"compressed_grass:grass_chest":17,"minecraft:grass_block":90,"compressed_grass:grass_wood_slab":86,"compressed_grass:compressed_grass_machine_plus":1,"compressed_grass:nonuple_grass_sword":189,"compressed_grass:grass_ore":5,"compressed_grass:grass_wood_log":43,"minecraft:bow":5,"compressed_grass:grass_wood_stairs":51,"compressed_grass:grass_wood_button":3,"minecraft:observer":8,"minecraft:splash_potion":12},"minecraft:killed":{"compressed_grass:grass_monster":10,"minecraft:creeper":1,"minecraft:horse":4,"minecraft:sheep":3,"minecraft:zombie":4,"compressed_grass:author":33,"minecraft:villager":1,"compressed_grass:god":1},"minecraft:picked_up":{"minecraft:leather":4,"compressed_grass:octuple_compressed_grass":2,"compressed_grass:nonuple_grass_armor_leggings":2,"minecraft:gunpowder":2,"minecraft:dirt":16,"compressed_grass:septuple_compressed_grass":4,"compressed_grass:grass_monster_spawn_egg":1,"minecraft:wheat_seeds":6,"minecraft:beef":2,"compressed_grass:double_compressed_grass":118,"compressed_grass:nonuple_grass_armor_boots":1,"compressed_grass:grass_star":1,"compressed_grass:triple_compressed_grass":7,"compressed_grass:nonuple_grass_axe":1,"minecraft:redstone":1,"compressed_grass:winding_grass_sticks":3,"compressed_grass:grass_wood_leaves":10,"compressed_grass:nonuple_grass_armor_helmet":3,"compressed_grass:nonuple_grass_armor_chestplate":3,"compressed_grass:grass_bag":1,"minecraft:rotten_flesh":3,"compressed_grass:triple_compressed_grass_tools_sword":1,"compressed_grass:author_spawn_egg":1,"compressed_grass:triple_compressed_grass_armor_armor_helmet":1,"minecraft:grass":752,"compressed_grass:nonuple_grass_sword":5,"minecraft:mutton":3,"minecraft:white_wool":3},"minecraft:dropped":{"compressed_grass:grass_bag":1,"compressed_grass:nonuple_grass_axe":1,"compressed_grass:nonuple_grass_sword":2,"compressed_grass:author_spawn_egg":1},"minecraft:killed_by":{"compressed_grass:grass_monster":3,"compressed_grass:author":10}},"DataVersion":2975} \ No newline at end of file diff --git a/run/usercache.json b/run/usercache.json index 401ab7205..9ce3de135 100644 --- a/run/usercache.json +++ b/run/usercache.json @@ -1 +1 @@ -[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2022-12-19 18:13:32 +0800"}] \ No newline at end of file +[{"name":"Dev","uuid":"380df991-f603-344c-a090-369bad2a924a","expiresOn":"2023-01-08 12:49:16 +0800"}] \ No newline at end of file diff --git a/src/main/java/net/mcreator/compressedgrass/block/ChristmasTreeBlock.java b/src/main/java/net/mcreator/compressedgrass/block/ChristmasTreeBlock.java new file mode 100644 index 000000000..229fc86bb --- /dev/null +++ b/src/main/java/net/mcreator/compressedgrass/block/ChristmasTreeBlock.java @@ -0,0 +1,69 @@ + +package net.mcreator.compressedgrass.block; + +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; + +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.material.Material; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.item.ItemStack; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.Component; +import net.minecraft.core.BlockPos; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.ItemBlockRenderTypes; + +import net.mcreator.compressedgrass.procedures.ChristmasTreePlaceProcedure; +import net.mcreator.compressedgrass.init.CompressedGrassModBlocks; + +import java.util.List; +import java.util.Collections; + +public class ChristmasTreeBlock extends Block { + public ChristmasTreeBlock() { + super(BlockBehaviour.Properties.of(Material.PLANT).sound(SoundType.GRAVEL).strength(1f, 10f).noOcclusion() + .isRedstoneConductor((bs, br, bp) -> false)); + } + + @Override + public void appendHoverText(ItemStack itemstack, BlockGetter world, List list, TooltipFlag flag) { + super.appendHoverText(itemstack, world, list, flag); + list.add(new TextComponent("Merry Christmas!")); + } + + @Override + public boolean propagatesSkylightDown(BlockState state, BlockGetter reader, BlockPos pos) { + return true; + } + + @Override + public int getLightBlock(BlockState state, BlockGetter worldIn, BlockPos pos) { + return 0; + } + + @Override + public List getDrops(BlockState state, LootContext.Builder builder) { + List dropsOriginal = super.getDrops(state, builder); + if (!dropsOriginal.isEmpty()) + return dropsOriginal; + return Collections.singletonList(new ItemStack(this, 1)); + } + + @Override + public void onPlace(BlockState blockstate, Level world, BlockPos pos, BlockState oldState, boolean moving) { + super.onPlace(blockstate, world, pos, oldState, moving); + ChristmasTreePlaceProcedure.execute(world, pos.getX(), pos.getY(), pos.getZ()); + } + + @OnlyIn(Dist.CLIENT) + public static void registerRenderLayer() { + ItemBlockRenderTypes.setRenderLayer(CompressedGrassModBlocks.CHRISTMAS_TREE.get(), renderType -> renderType == RenderType.cutout()); + } +} diff --git a/src/main/java/net/mcreator/compressedgrass/entity/GrassMonsterEntity.java b/src/main/java/net/mcreator/compressedgrass/entity/GrassMonsterEntity.java index 5254b6bb5..dc32f1c72 100644 --- a/src/main/java/net/mcreator/compressedgrass/entity/GrassMonsterEntity.java +++ b/src/main/java/net/mcreator/compressedgrass/entity/GrassMonsterEntity.java @@ -8,6 +8,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.event.world.BiomeLoadingEvent; import net.minecraftforge.common.ForgeMod; +import net.minecraftforge.common.DungeonHooks; import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.block.state.BlockState; @@ -34,17 +35,13 @@ import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.EntityType; -import net.minecraft.world.entity.Entity; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.Difficulty; import net.minecraft.sounds.SoundEvent; import net.minecraft.resources.ResourceLocation; import net.minecraft.network.protocol.Packet; -import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.core.BlockPos; -import net.mcreator.compressedgrass.procedures.GrassMonsterSpawnProcedure; -import net.mcreator.compressedgrass.init.CompressedGrassModParticleTypes; import net.mcreator.compressedgrass.init.CompressedGrassModItems; import net.mcreator.compressedgrass.init.CompressedGrassModEntities; @@ -53,7 +50,7 @@ public class GrassMonsterEntity extends Monster { @SubscribeEvent public static void addLivingEntityToBiomes(BiomeLoadingEvent event) { event.getSpawns().getSpawner(MobCategory.MONSTER) - .add(new MobSpawnSettings.SpawnerData(CompressedGrassModEntities.GRASS_MONSTER.get(), 5, 1, 2)); + .add(new MobSpawnSettings.SpawnerData(CompressedGrassModEntities.GRASS_MONSTER.get(), 4, 1, 2)); } public GrassMonsterEntity(PlayMessages.SpawnEntity packet, Level world) { @@ -124,7 +121,6 @@ public boolean causeFallDamage(float l, float d, DamageSource source) { @Override public boolean hurt(DamageSource source, float amount) { - GrassMonsterSpawnProcedure.execute(this.level, this.getX(), this.getY(), this.getZ()); if (source.getDirectEntity() instanceof AbstractArrow) return false; if (source == DamageSource.DROWN) @@ -161,26 +157,13 @@ public void setNoGravity(boolean ignored) { public void aiStep() { super.aiStep(); this.setNoGravity(true); - double x = this.getX(); - double y = this.getY(); - double z = this.getZ(); - Entity entity = this; - Level world = this.level; - for (int l = 0; l < 4; ++l) { - double x0 = x - 0.5 + random.nextFloat(); - double y0 = y + random.nextFloat(); - double z0 = z - 0.5 + random.nextFloat(); - double dx = (random.nextFloat() - 0.5D) * 0.2999999985098839D; - double dy = (random.nextFloat() - 0.5D) * 0.2999999985098839D; - double dz = (random.nextFloat() - 0.5D) * 0.2999999985098839D; - world.addParticle((SimpleParticleType) (CompressedGrassModParticleTypes.GRASS_PARTICLES.get()), x0, y0, z0, dx, dy, dz); - } } public static void init() { SpawnPlacements.register(CompressedGrassModEntities.GRASS_MONSTER.get(), SpawnPlacements.Type.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, (entityType, world, reason, pos, random) -> (world.getDifficulty() != Difficulty.PEACEFUL && Monster.isDarkEnoughToSpawn(world, pos, random) && Mob.checkMobSpawnRules(entityType, world, reason, pos, random))); + DungeonHooks.addDungeonMob(CompressedGrassModEntities.GRASS_MONSTER.get(), 180); } public static AttributeSupplier.Builder createAttributes() { diff --git a/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.java b/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.java index 13f987ac2..308f3378d 100644 --- a/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.java +++ b/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModBlocks.java @@ -7,6 +7,10 @@ import net.minecraftforge.registries.RegistryObject; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.api.distmarker.Dist; import net.minecraft.world.level.block.Block; @@ -26,6 +30,7 @@ import net.mcreator.compressedgrass.block.GrassBlockBlock; import net.mcreator.compressedgrass.block.CompressedGrassMachinePlusBlock; import net.mcreator.compressedgrass.block.CompressedGrassMachineBlock; +import net.mcreator.compressedgrass.block.ChristmasTreeBlock; import net.mcreator.compressedgrass.block.BigGrassChestPlusBlock; import net.mcreator.compressedgrass.block.BigGrassChestBlock; import net.mcreator.compressedgrass.CompressedGrassMod; @@ -54,4 +59,14 @@ public class CompressedGrassModBlocks { () -> new GrassDimensionPortalBlock()); public static final RegistryObject GRASS_ORE = REGISTRY.register("grass_ore", () -> new GrassOreBlock()); public static final RegistryObject GRASS_BLOCK = REGISTRY.register("grass_block", () -> new GrassBlockBlock()); + public static final RegistryObject CHRISTMAS_TREE = REGISTRY.register("christmas_tree", () -> new ChristmasTreeBlock()); + + @Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + public static class ClientSideHandler { + @SubscribeEvent + public static void clientSetup(FMLClientSetupEvent event) { + GrassDimensionPortalBlock.registerRenderLayer(); + ChristmasTreeBlock.registerRenderLayer(); + } + } } diff --git a/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModItems.java b/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModItems.java index 56fa3dfcc..a2a869a4d 100644 --- a/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModItems.java +++ b/src/main/java/net/mcreator/compressedgrass/init/CompressedGrassModItems.java @@ -377,6 +377,7 @@ public class CompressedGrassModItems { public static final RegistryObject UPGRADE_1 = REGISTRY.register("upgrade_1", () -> new Upgrade1Item()); public static final RegistryObject GOD = REGISTRY.register("god_spawn_egg", () -> new ForgeSpawnEggItem(CompressedGrassModEntities.GOD, -1, -1, new Item.Properties().tab(null))); + public static final RegistryObject CHRISTMAS_TREE = block(CompressedGrassModBlocks.CHRISTMAS_TREE, CreativeModeTab.TAB_MISC); private static RegistryObject block(RegistryObject block, CreativeModeTab tab) { return REGISTRY.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties().tab(tab))); diff --git a/src/main/java/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.java b/src/main/java/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.java similarity index 86% rename from src/main/java/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.java rename to src/main/java/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.java index 18dae7e1e..c71efcaab 100644 --- a/src/main/java/net/mcreator/compressedgrass/procedures/GrassMonsterSpawnProcedure.java +++ b/src/main/java/net/mcreator/compressedgrass/procedures/ChristmasTreePlaceProcedure.java @@ -8,10 +8,10 @@ import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.CommandSource; -public class GrassMonsterSpawnProcedure { +public class ChristmasTreePlaceProcedure { public static void execute(LevelAccessor world, double x, double y, double z) { if (world instanceof ServerLevel _level) _level.getServer().getCommands().performCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", - new TextComponent(""), _level.getServer(), null).withSuppressedOutput(), "fill ~-2 ~0 ~-2 ~2 ~2 ~2 minecraft:air"); + new TextComponent(""), _level.getServer(), null).withSuppressedOutput(), "title @a title {\"text\":\"Merry Christmas!\"}"); } } diff --git a/src/main/java/net/mcreator/compressedgrass/procedures/GodDieProcedure.java b/src/main/java/net/mcreator/compressedgrass/procedures/GodDieProcedure.java index 53315c9da..c865c479d 100644 --- a/src/main/java/net/mcreator/compressedgrass/procedures/GodDieProcedure.java +++ b/src/main/java/net/mcreator/compressedgrass/procedures/GodDieProcedure.java @@ -7,8 +7,8 @@ public class GodDieProcedure { public static void execute(LevelAccessor world, double x, double y, double z) { if (world instanceof Level _level && !_level.isClientSide()) - _level.explode(null, x, y, z, 5, Explosion.BlockInteraction.BREAK); + _level.explode(null, x, y, z, 7, Explosion.BlockInteraction.BREAK); if (world instanceof Level _level && !_level.isClientSide()) - _level.explode(null, x, y, z, 5, Explosion.BlockInteraction.DESTROY); + _level.explode(null, x, y, z, 7, Explosion.BlockInteraction.DESTROY); } } diff --git a/src/main/java/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.java b/src/main/java/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.java index 76abbe768..ecf1fb493 100644 --- a/src/main/java/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.java +++ b/src/main/java/net/mcreator/compressedgrass/procedures/GodSpawnProcedure.java @@ -130,5 +130,8 @@ public static void execute(LevelAccessor world, double x, double y, double z) { if (world instanceof ServerLevel _level) _level.getServer().getCommands().performCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", new TextComponent(""), _level.getServer(), null).withSuppressedOutput(), "weather thunder"); + if (world instanceof ServerLevel _level) + _level.getServer().getCommands().performCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", + new TextComponent(""), _level.getServer(), null).withSuppressedOutput(), "title @a title {\"text\"=\"I am the GOD!\"}"); } } diff --git a/src/main/resources/assets/compressed_grass/blockstates/christmas_tree.json b/src/main/resources/assets/compressed_grass/blockstates/christmas_tree.json new file mode 100644 index 000000000..1b65ab351 --- /dev/null +++ b/src/main/resources/assets/compressed_grass/blockstates/christmas_tree.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "compressed_grass:block/christmas_tree" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressed_grass/lang/en_us.json b/src/main/resources/assets/compressed_grass/lang/en_us.json index f2bbe9bc9..1a614477b 100644 --- a/src/main/resources/assets/compressed_grass/lang/en_us.json +++ b/src/main/resources/assets/compressed_grass/lang/en_us.json @@ -10,8 +10,8 @@ "item.compressed_grass.winding_grass_sticks": "Winding Grass Sticks", "item.compressed_grass.sextuple_compressed_grass_tools_axe": "SextupleCompressedGrassTools Axe", "block.compressed_grass.grass_wood_pressure_plate": "Grass Wood Pressure Plate", - "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.grass_nugget": "Grass Nugget", + "item.compressed_grass.compressed_pickaxe": "Compressed Pickaxe", "item.compressed_grass.increase_capacity": "Increase Capacity", "block.compressed_grass.grass_wood_fence": "Grass Wood Fence", "item.compressed_grass.enchanted_armor_boots": "Enchanted Grass Boots", @@ -68,6 +68,7 @@ "item.compressed_grass.nonuple_grass_armor_boots": "Nonuple Compressed Grass Boots", "block.compressed_grass.grass_wood_planks": "Grass Wood Planks", "item.compressed_grass.enchanted_axe": "Enchanted Grass Axe", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "DoubleCompressedGrassTools Hoe", "advancements.so_green.title": "So Green", "item.compressed_grass.grass_ingot": "Grass Ingot", diff --git a/src/main/resources/assets/compressed_grass/lang/zh_cn.json b/src/main/resources/assets/compressed_grass/lang/zh_cn.json index 75f673ae0..f7cc399bb 100644 --- a/src/main/resources/assets/compressed_grass/lang/zh_cn.json +++ b/src/main/resources/assets/compressed_grass/lang/zh_cn.json @@ -28,7 +28,7 @@ "item.compressed_grass.limit_armor_leggings": "极限草裤", "item.compressed_grass.septuple_armor_boots": "七级压缩草靴", "item.compressed_grass.big_grass_bag": "大草包", - "advancements.first.descr": "compress the grass constantly", + "advancements.first.descr": "不断地压缩草", "item.compressed_grass.quadruple_compressed_grass": "四级压缩草", "item.compressed_grass.septuple_compressed_grass_tools_hoe": "七级压缩草锄", "block.compressed_grass.grass_chest": "草箱", @@ -42,12 +42,12 @@ "item.compressed_grass.triple_compressed_grass_tools_hoe": "三级压缩草锄", "item.compressed_grass.octuple_grass_pickaxe": "八级压缩草镐", "itemGroup.tabtechno": "Technoblade", - "item.compressed_grass.enchanted_hoe": "Enchanted Hoe", + "item.compressed_grass.enchanted_hoe": "附魔草锄", "item.compressed_grass.grass_bag": "草包", "item.compressed_grass.octuple_armor_chestplate": "八级压缩草胸甲", "entity.compressed_grass.grass_monster": "草怪", "item.compressed_grass.triple_compressed_grass_string": "三级压缩草绳", - "item.compressed_grass.enchanted_sword": "Enchanted Sword", + "item.compressed_grass.enchanted_sword": "附魔草剑", "advancements.enchanted.descr": "so fantastic", "block.compressed_grass.grass_wood_wood": "草木", "itemGroup.tabtools": "草:工具", @@ -67,7 +67,8 @@ "entity.compressed_grass.author": "作者", "item.compressed_grass.nonuple_grass_armor_boots": "九级压缩草靴子", "block.compressed_grass.grass_wood_planks": "草木木板", - "item.compressed_grass.enchanted_axe": "Enchanted Axe", + "item.compressed_grass.enchanted_axe": "附魔草斧", + "block.compressed_grass.christmas_tree": "Christmas Tree", "item.compressed_grass.double_compressed_grass_tools_hoe": "二级压缩草锄", "advancements.so_green.title": "太绿了", "item.compressed_grass.grass_ingot": "草锭", @@ -76,7 +77,7 @@ "item.compressed_grass.limit_armor_boots": "极限草靴", "item.compressed_grass.quintuple_compressed_grass_tools_axe": "五级压缩草斧", "item.compressed_grass.god_spawn_egg": "God Spawn Egg", - "advancements.first.title": "Compressed", + "advancements.first.title": "压缩？", "item.compressed_grass.nonuple_grass_hoe": "九级压缩草锄", "item.compressed_grass.double_compressed_grass_tools_shovel": "二级压缩草铲", "item.compressed_grass.triple_compressed_grass_tools_shovel": "三级压缩草铲", @@ -86,9 +87,9 @@ "block.compressed_grass.grass_wood_fence_gate": "草木栅栏门", "block.compressed_grass.compressed_grass_machine": "压缩草生产器", "item.compressed_grass.enchanted_armor_leggings": "附魔草裤", - "item.compressed_grass.enchanted_pickaxe": "Enchanted Pickaxe", + "item.compressed_grass.enchanted_pickaxe": "附魔草镐", "item.compressed_grass.septuple_compressed_grass_tools_pickaxe": "七级压缩草镐", - "item.compressed_grass.limit_pickaxe": "Limit Pickaxe", + "item.compressed_grass.limit_pickaxe": "极限草镐", "item.compressed_grass.quadruple_compressed_grass_tools_hoe": "四级压缩草锄", "item.compressed_grass.octuple_armor_leggings": "八级压缩草护腿", "item.compressed_grass.triple_compressed_grass_armor_armor_chestplate": "三级压缩草胸甲", @@ -108,7 +109,7 @@ "item.compressed_grass.double_compressed_grass_string": "二级压缩草", "item.compressed_grass.quadruple_armor_chestplate": "四级压缩草胸甲", "item.compressed_grass.octuple_armor_helmet": "八级压缩草头盔", - "item.compressed_grass.limit_shovel": "Limit Shovel", + "item.compressed_grass.limit_shovel": "极限草铲", "item.compressed_grass.upgrade_1": "Upgrade-1", "item.compressed_grass.sextuple_compressed_grass_armor_armor_leggings": "六级压缩草护腿", "item.compressed_grass.enchanted_armor_helmet": "附魔草头盔", @@ -120,25 +121,25 @@ "item.compressed_grass.triple_compressed_grass_tools_axe": "三级压缩草斧", "item.compressed_grass.sextuple_compressed_grass": "六级压缩草", "item.compressed_grass.octuple_grass_hoe": "八级压缩草锄", - "item.compressed_grass.enchanted_shovel": "Enchanted Shovel", + "item.compressed_grass.enchanted_shovel": "附魔草铲", "item.compressed_grass.limit_armor_helmet": "极限草头盔", "advancements.how_do_you_have_them.title": "你怎么有这么多的？", "item.compressed_grass.potato_king": "土豆之王", - "item.compressed_grass.limit_hoe": "Limit Hoe", + "item.compressed_grass.limit_hoe": "极限草锄", "item.compressed_grass.limit_compressed_grass": "极限压缩草", "item.compressed_grass.nonuple_grass_sword": "九级压缩草剑", "biome.compressed_grass.grass_biome": "草群系", "item.compressed_grass.septuple_compressed_grass": "七级压缩草", "item.compressed_grass.compressed_grass_armor_armor_leggings": "一级压缩草护腿", "item.compressed_grass.nonuple_grass_armor_chestplate": "九级压缩草胸甲", - "item.compressed_grass.limit_sword": "Limit Sword", + "item.compressed_grass.limit_sword": "极限草剑", "item.compressed_grass.quadruple_compressed_grass_tools_axe": "四级压缩草斧", "item.compressed_grass.quintuple_compressed_grass_armor_armor_chestplate": "五级压缩草胸甲", "item.compressed_grass.octuple_grass_sword": "八级压缩草剑", "item.compressed_grass.triple_compressed_grass": "三级压缩草", "item.compressed_grass.quadruple_compressed_grass_string": "四级压缩草绳", "item.compressed_grass.triple_compressed_grass_armor_armor_helmet": "三级压缩草头盔", - "advancements.enchanted.title": "It can be enchanted?", + "advancements.enchanted.title": "这也可以附魔？", "item.compressed_grass.compressed_axe": "一级压缩草斧", "item.compressed_grass.quadruple_compressed_grass_tools_shovel": "四级压缩草铲", "item.compressed_grass.sextuple_compressed_grass_armor_armor_chestplate": "六级压缩草胸甲", @@ -164,7 +165,7 @@ "item.compressed_grass.sextuple_compressed_grass_tools_hoe": "六级压缩草锄", "subtitles.technoblade_never_dies": "Technoblade Never Dies", "block.compressed_grass.grass_wood_button": "草木按钮", - "item.compressed_grass.limit_axe": "Limit Axe", + "item.compressed_grass.limit_axe": "极限草斧", "item.compressed_grass.nonuple_grass_axe": "九级压缩草斧", "advancements.how_do_you_have_them.descr": "你是不是作弊了!!!", "item.compressed_grass.septuple_compressed_grass_string": "七级压缩草绳", diff --git a/src/main/resources/assets/compressed_grass/models/block/christmas_tree.json b/src/main/resources/assets/compressed_grass/models/block/christmas_tree.json new file mode 100644 index 000000000..285f12bd0 --- /dev/null +++ b/src/main/resources/assets/compressed_grass/models/block/christmas_tree.json @@ -0,0 +1,23 @@ +{ + "parent": "compressed_grass:custom/christmastree", + "textures": { + "all": "compressed_grass:blocks/void", + "particle": "compressed_grass:blocks/void", + "11": "compressed_grass:blocks/leave3-1", + "12": "compressed_grass:blocks/leave3-2", + "13": "compressed_grass:blocks/leave3-3", + "14": "compressed_grass:blocks/leave4-1", + "15": "compressed_grass:blocks/leave4-2", + "16": "compressed_grass:blocks/5", + "1": "compressed_grass:blocks/leave1-1", + "2": "compressed_grass:blocks/leave1-2", + "3": "compressed_grass:blocks/trunk", + "4": "compressed_grass:blocks/leave1-3", + "5": "compressed_grass:blocks/leave1-4", + "6": "compressed_grass:blocks/leave1-5", + "7": "compressed_grass:blocks/leave2-1", + "8": "compressed_grass:blocks/leave2-2", + "9": "compressed_grass:blocks/leave2-3", + "10": "compressed_grass:blocks/leave2-4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressed_grass/models/custom/christmastree.json b/src/main/resources/assets/compressed_grass/models/custom/christmastree.json new file mode 100644 index 000000000..412f47aa3 --- /dev/null +++ b/src/main/resources/assets/compressed_grass/models/custom/christmastree.json @@ -0,0 +1,1191 @@ +{ + "credit": "Made with Blockbench", + "elements": [ + { + "name": "trunk", + "from": [ + 7, + 0, + 7 + ], + "to": [ + 9, + 2, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 0, + 2, + 5 + ], + "texture": "#3" + }, + "east": { + "uv": [ + 2, + 0, + 4, + 5 + ], + "texture": "#3" + }, + "south": { + "uv": [ + 4, + 0, + 6, + 5 + ], + "texture": "#3" + }, + "west": { + "uv": [ + 0, + 5, + 2, + 10 + ], + "texture": "#3" + }, + "up": { + "uv": [ + 4, + 7, + 2, + 5 + ], + "texture": "#3" + }, + "down": { + "uv": [ + 6, + 5, + 4, + 7 + ], + "texture": "#3" + } + } + }, + { + "name": "leave1-1", + "from": [ + 3, + 2, + 7 + ], + "to": [ + 13, + 3, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 10, + 5 + ], + "texture": "#1" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#1" + }, + "south": { + "uv": [ + 0, + 5, + 10, + 6 + ], + "texture": "#1" + }, + "west": { + "uv": [ + 2, + 6, + 4, + 7 + ], + "texture": "#1" + }, + "up": { + "uv": [ + 10, + 2, + 0, + 0 + ], + "texture": "#1" + }, + "down": { + "uv": [ + 10, + 2, + 0, + 4 + ], + "texture": "#1" + } + } + }, + { + "name": "leave1-2", + "from": [ + 7, + 2, + 3 + ], + "to": [ + 9, + 3, + 13 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#2" + }, + "east": { + "uv": [ + 4, + 0, + 14, + 1 + ], + "texture": "#2" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#2" + }, + "west": { + "uv": [ + 4, + 1, + 14, + 2 + ], + "texture": "#2" + }, + "up": { + "uv": [ + 2, + 10, + 0, + 0 + ], + "texture": "#2" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 10 + ], + "texture": "#2" + } + } + }, + { + "name": "leave1-3", + "from": [ + 6, + 2, + 4 + ], + "to": [ + 10, + 3, + 12 + ], + "faces": { + "north": { + "uv": [ + 8, + 1, + 12, + 2 + ], + "texture": "#4" + }, + "east": { + "uv": [ + 0, + 8, + 8, + 9 + ], + "texture": "#4" + }, + "south": { + "uv": [ + 8, + 2, + 12, + 3 + ], + "texture": "#4" + }, + "west": { + "uv": [ + 8, + 0, + 16, + 1 + ], + "texture": "#4" + }, + "up": { + "uv": [ + 4, + 8, + 0, + 0 + ], + "texture": "#4" + }, + "down": { + "uv": [ + 8, + 0, + 4, + 8 + ], + "texture": "#4" + } + } + }, + { + "name": "leave1-4", + "from": [ + 5, + 2, + 5 + ], + "to": [ + 11, + 3, + 11 + ], + "faces": { + "north": { + "uv": [ + 6, + 0, + 12, + 1 + ], + "texture": "#5" + }, + "east": { + "uv": [ + 6, + 1, + 12, + 2 + ], + "texture": "#5" + }, + "south": { + "uv": [ + 6, + 2, + 12, + 3 + ], + "texture": "#5" + }, + "west": { + "uv": [ + 6, + 3, + 12, + 4 + ], + "texture": "#5" + }, + "up": { + "uv": [ + 6, + 6, + 0, + 0 + ], + "texture": "#5" + }, + "down": { + "uv": [ + 6, + 6, + 0, + 12 + ], + "texture": "#5" + } + } + }, + { + "name": "leave1-5", + "from": [ + 4, + 2, + 6 + ], + "to": [ + 12, + 3, + 10 + ], + "faces": { + "north": { + "uv": [ + 0, + 8, + 8, + 9 + ], + "texture": "#6" + }, + "east": { + "uv": [ + 8, + 1, + 12, + 2 + ], + "texture": "#6" + }, + "south": { + "uv": [ + 8, + 0, + 16, + 1 + ], + "texture": "#6" + }, + "west": { + "uv": [ + 8, + 2, + 12, + 3 + ], + "texture": "#6" + }, + "up": { + "uv": [ + 8, + 4, + 0, + 0 + ], + "texture": "#6" + }, + "down": { + "uv": [ + 8, + 4, + 0, + 8 + ], + "texture": "#6" + } + } + }, + { + "name": "leave2-1", + "from": [ + 7, + 3, + 4 + ], + "to": [ + 9, + 4, + 12 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#7" + }, + "east": { + "uv": [ + 4, + 0, + 12, + 1 + ], + "texture": "#7" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#7" + }, + "west": { + "uv": [ + 4, + 1, + 12, + 2 + ], + "texture": "#7" + }, + "up": { + "uv": [ + 2, + 8, + 0, + 0 + ], + "texture": "#7" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 8 + ], + "texture": "#7" + } + } + }, + { + "name": "leave2-2", + "from": [ + 4, + 3, + 7 + ], + "to": [ + 12, + 4, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 8, + 5 + ], + "texture": "#8" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#8" + }, + "south": { + "uv": [ + 0, + 5, + 8, + 6 + ], + "texture": "#8" + }, + "west": { + "uv": [ + 2, + 6, + 4, + 7 + ], + "texture": "#8" + }, + "up": { + "uv": [ + 8, + 2, + 0, + 0 + ], + "texture": "#8" + }, + "down": { + "uv": [ + 8, + 2, + 0, + 4 + ], + "texture": "#8" + } + } + }, + { + "name": "leave2-3", + "from": [ + 5, + 3, + 6 + ], + "to": [ + 11, + 4, + 10 + ], + "faces": { + "north": { + "uv": [ + 6, + 0, + 12, + 1 + ], + "texture": "#9" + }, + "east": { + "uv": [ + 6, + 2, + 10, + 3 + ], + "texture": "#9" + }, + "south": { + "uv": [ + 6, + 1, + 12, + 2 + ], + "texture": "#9" + }, + "west": { + "uv": [ + 6, + 3, + 10, + 4 + ], + "texture": "#9" + }, + "up": { + "uv": [ + 6, + 4, + 0, + 0 + ], + "texture": "#9" + }, + "down": { + "uv": [ + 6, + 4, + 0, + 8 + ], + "texture": "#9" + } + } + }, + { + "name": "leave2-4", + "from": [ + 6, + 3, + 5 + ], + "to": [ + 10, + 4, + 11 + ], + "faces": { + "north": { + "uv": [ + 0, + 7, + 4, + 8 + ], + "texture": "#10" + }, + "east": { + "uv": [ + 0, + 6, + 6, + 7 + ], + "texture": "#10" + }, + "south": { + "uv": [ + 4, + 7, + 8, + 8 + ], + "texture": "#10" + }, + "west": { + "uv": [ + 6, + 6, + 12, + 7 + ], + "texture": "#10" + }, + "up": { + "uv": [ + 4, + 6, + 0, + 0 + ], + "texture": "#10" + }, + "down": { + "uv": [ + 8, + 0, + 4, + 6 + ], + "texture": "#10" + } + } + }, + { + "name": "leave3-1", + "from": [ + 7, + 4, + 5 + ], + "to": [ + 9, + 5, + 11 + ], + "faces": { + "north": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#11" + }, + "east": { + "uv": [ + 4, + 0, + 10, + 1 + ], + "texture": "#11" + }, + "south": { + "uv": [ + 4, + 3, + 6, + 4 + ], + "texture": "#11" + }, + "west": { + "uv": [ + 4, + 1, + 10, + 2 + ], + "texture": "#11" + }, + "up": { + "uv": [ + 2, + 6, + 0, + 0 + ], + "texture": "#11" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 6 + ], + "texture": "#11" + } + } + }, + { + "name": "leave3-2", + "from": [ + 5, + 4, + 7 + ], + "to": [ + 11, + 5, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 6, + 5 + ], + "texture": "#12" + }, + "east": { + "uv": [ + 0, + 6, + 2, + 7 + ], + "texture": "#12" + }, + "south": { + "uv": [ + 0, + 5, + 6, + 6 + ], + "texture": "#12" + }, + "west": { + "uv": [ + 6, + 0, + 8, + 1 + ], + "texture": "#12" + }, + "up": { + "uv": [ + 6, + 2, + 0, + 0 + ], + "texture": "#12" + }, + "down": { + "uv": [ + 6, + 2, + 0, + 4 + ], + "texture": "#12" + } + } + }, + { + "name": "leave3-3", + "from": [ + 6, + 4, + 6 + ], + "to": [ + 10, + 5, + 10 + ], + "faces": { + "north": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#13" + }, + "east": { + "uv": [ + 4, + 1, + 8, + 2 + ], + "texture": "#13" + }, + "south": { + "uv": [ + 4, + 2, + 8, + 3 + ], + "texture": "#13" + }, + "west": { + "uv": [ + 4, + 3, + 8, + 4 + ], + "texture": "#13" + }, + "up": { + "uv": [ + 4, + 4, + 0, + 0 + ], + "texture": "#13" + }, + "down": { + "uv": [ + 4, + 4, + 0, + 8 + ], + "texture": "#13" + } + } + }, + { + "name": "leave4-1", + "from": [ + 6, + 5, + 7 + ], + "to": [ + 10, + 6, + 9 + ], + "faces": { + "north": { + "uv": [ + 0, + 4, + 4, + 5 + ], + "texture": "#14" + }, + "east": { + "uv": [ + 4, + 1, + 6, + 2 + ], + "texture": "#14" + }, + "south": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#14" + }, + "west": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#14" + }, + "up": { + "uv": [ + 4, + 2, + 0, + 0 + ], + "texture": "#14" + }, + "down": { + "uv": [ + 4, + 2, + 0, + 4 + ], + "texture": "#14" + } + } + }, + { + "name": "leave4-2", + "from": [ + 7, + 5, + 6 + ], + "to": [ + 9, + 6, + 10 + ], + "faces": { + "north": { + "uv": [ + 4, + 1, + 6, + 2 + ], + "texture": "#15" + }, + "east": { + "uv": [ + 0, + 4, + 4, + 5 + ], + "texture": "#15" + }, + "south": { + "uv": [ + 4, + 2, + 6, + 3 + ], + "texture": "#15" + }, + "west": { + "uv": [ + 4, + 0, + 8, + 1 + ], + "texture": "#15" + }, + "up": { + "uv": [ + 2, + 4, + 0, + 0 + ], + "texture": "#15" + }, + "down": { + "uv": [ + 4, + 0, + 2, + 4 + ], + "texture": "#15" + } + } + }, + { + "name": "5", + "from": [ + 7, + 6, + 7 + ], + "to": [ + 9, + 7, + 9 + ], + "faces": { + "north": { + "uv": [ + 2, + 0, + 4, + 1 + ], + "texture": "#16" + }, + "east": { + "uv": [ + 2, + 1, + 4, + 2 + ], + "texture": "#16" + }, + "south": { + "uv": [ + 2, + 2, + 4, + 3 + ], + "texture": "#16" + }, + "west": { + "uv": [ + 2, + 3, + 4, + 4 + ], + "texture": "#16" + }, + "up": { + "uv": [ + 2, + 2, + 0, + 0 + ], + "texture": "#16" + }, + "down": { + "uv": [ + 2, + 2, + 0, + 4 + ], + "texture": "#16" + } + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [ + 0, + 8, + 1.25 + ] + } + }, + "groups": [ + 0, + { + "name": "leave", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + { + "name": "1", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 1, + 2, + 3, + 4, + 5 + ] + }, + { + "name": "2", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 6, + 7, + 8, + 9 + ] + }, + { + "name": "3", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 10, + 11, + 12 + ] + }, + { + "name": "4", + "origin": [ + 0, + 0, + 0 + ], + "color": 0, + "children": [ + 13, + 14 + ] + }, + 15 + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/compressed_grass/models/item/christmas_tree.json b/src/main/resources/assets/compressed_grass/models/item/christmas_tree.json new file mode 100644 index 000000000..8aabeb9e2 --- /dev/null +++ b/src/main/resources/assets/compressed_grass/models/item/christmas_tree.json @@ -0,0 +1,22 @@ +{ + "parent": "compressed_grass:block/christmas_tree", + "display": { + "thirdperson": { + "rotation": [ + 10, + -45, + 170 + ], + "translation": [ + 0, + 1.5, + -2.75 + ], + "scale": [ + 0.375, + 0.375, + 0.375 + ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/5.png b/src/main/resources/assets/compressed_grass/textures/blocks/5.png new file mode 100644 index 000000000..c19a5e86f Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/5.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/christmas_tree_icon.png b/src/main/resources/assets/compressed_grass/textures/blocks/christmas_tree_icon.png new file mode 100644 index 000000000..b6867ffa8 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/christmas_tree_icon.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave1-1.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-1.png new file mode 100644 index 000000000..34749e4ca Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-1.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave1-2.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-2.png new file mode 100644 index 000000000..76051c043 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-2.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave1-3.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-3.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-3.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave1-4.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-4.png new file mode 100644 index 000000000..416b4170e Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-4.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave1-5.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-5.png new file mode 100644 index 000000000..7591429d6 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave1-5.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave2-1.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-1.png new file mode 100644 index 000000000..955bf885e Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-1.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave2-2.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-2.png new file mode 100644 index 000000000..905a491ca Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-2.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave2-3.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-3.png new file mode 100644 index 000000000..f130d2e30 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-3.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave2-4.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-4.png new file mode 100644 index 000000000..d5589c172 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave2-4.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave3-1.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-1.png new file mode 100644 index 000000000..8ec9659ba Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-1.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave3-2.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-2.png new file mode 100644 index 000000000..ddf5b17ed Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-2.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave3-3.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-3.png new file mode 100644 index 000000000..85764c7ed Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave3-3.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave4-1.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave4-1.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave4-1.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/leave4-2.png b/src/main/resources/assets/compressed_grass/textures/blocks/leave4-2.png new file mode 100644 index 000000000..5b82e2ea3 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/leave4-2.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/trunk.png b/src/main/resources/assets/compressed_grass/textures/blocks/trunk.png new file mode 100644 index 000000000..435f6ec49 Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/trunk.png differ diff --git a/src/main/resources/assets/compressed_grass/textures/blocks/void.png b/src/main/resources/assets/compressed_grass/textures/blocks/void.png new file mode 100644 index 000000000..2f5d2892e Binary files /dev/null and b/src/main/resources/assets/compressed_grass/textures/blocks/void.png differ