diff --git a/gradle.properties b/gradle.properties index f36631c1..300affd5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,5 @@ org.gradle.parallel = true # Mod Properties mod_name = Jineric Mod mod_id = jineric - version = b4.3.0+1.19.4 + version = b5.0.0+1.19.4 maven_group = jingy.jineric diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..cec0753f --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..ab25188e --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..3a4b3d4e --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..6d98167f --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_tiles": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..5fd410e7 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_tiles": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..479061b9 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_deepslate_tiles": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_deepslate_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_deepslate_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..59d46e13 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_polished_blackstone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_polished_blackstone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_polished_blackstone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..ac1531a6 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_polished_blackstone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_polished_blackstone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_polished_blackstone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..49a55d18 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cracked_polished_blackstone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:cracked_polished_blackstone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cracked_polished_blackstone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_slab_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_slab_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..529e7740 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_slab_from_smooth_basalt_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_smooth_basalt": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:smooth_basalt" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:smooth_basalt_slab_from_smooth_basalt_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_smooth_basalt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:smooth_basalt_slab_from_smooth_basalt_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..8370f8ac --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_smooth_basalt": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:smooth_basalt" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:smooth_basalt_stairs_from_smooth_basalt_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_smooth_basalt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:smooth_basalt_stairs_from_smooth_basalt_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_wall_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_wall_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..92bfb364 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/building_blocks/smooth_basalt_wall_from_smooth_basalt_stonecutting.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_smooth_basalt": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:smooth_basalt" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:smooth_basalt_wall_from_smooth_basalt_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_smooth_basalt", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:smooth_basalt_wall_from_smooth_basalt_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_acacia_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_acacia_chest.json new file mode 100644 index 00000000..38613833 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_acacia_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_acacia_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_acacia_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_birch_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_birch_chest.json new file mode 100644 index 00000000..3ade8300 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_birch_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_birch_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_birch_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_crimson_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_crimson_chest.json new file mode 100644 index 00000000..1d7ba950 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_crimson_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_crimson_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_crimson_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_dark_oak_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_dark_oak_chest.json new file mode 100644 index 00000000..e0c6b2e9 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_dark_oak_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_dark_oak_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_dark_oak_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_jungle_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_jungle_chest.json new file mode 100644 index 00000000..d762964c --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_jungle_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_jungle_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_jungle_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_mangrove_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_mangrove_chest.json new file mode 100644 index 00000000..e0a231c4 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_mangrove_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_mangrove_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_mangrove_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_spruce_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_spruce_chest.json new file mode 100644 index 00000000..3c099d09 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_spruce_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_spruce_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_spruce_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_warped_chest.json b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_warped_chest.json new file mode 100644 index 00000000..3c1803b3 --- /dev/null +++ b/src/main/generated/data/jineric/advancements/recipes/redstone/trapped_warped_chest.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_chest": { + "conditions": { + "items": [ + { + "tag": "jineric:wooden_chests" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "jineric:trapped_warped_chest" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_chest", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "jineric:trapped_warped_chest" + ] + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..da32b8db --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_slab_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_bricks" + }, + "result": "jineric:cracked_deepslate_brick_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..f2b51b5e --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_stairs_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_bricks" + }, + "result": "jineric:cracked_deepslate_brick_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json new file mode 100644 index 00000000..e4f369fd --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_brick_wall_from_cracked_deepslate_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_bricks" + }, + "result": "jineric:cracked_deepslate_brick_wall" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..cbb45485 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_slab_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_tiles" + }, + "result": "jineric:cracked_deepslate_tile_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..1db47152 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_stairs_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_tiles" + }, + "result": "jineric:cracked_deepslate_tile_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json new file mode 100644 index 00000000..c6f81dcb --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_deepslate_tile_wall_from_cracked_deepslate_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_deepslate_tiles" + }, + "result": "jineric:cracked_deepslate_tile_wall" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..52ca0b08 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_slab_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_polished_blackstone_bricks" + }, + "result": "jineric:cracked_polished_blackstone_brick_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..606d3d02 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_stairs_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_polished_blackstone_bricks" + }, + "result": "jineric:cracked_polished_blackstone_brick_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json new file mode 100644 index 00000000..1cc5f147 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/cracked_polished_blackstone_brick_wall_from_cracked_polished_blackstone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:cracked_polished_blackstone_bricks" + }, + "result": "jineric:cracked_polished_blackstone_brick_wall" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/smooth_basalt_slab_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/recipes/smooth_basalt_slab_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..0e4ce820 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/smooth_basalt_slab_from_smooth_basalt_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:smooth_basalt" + }, + "result": "jineric:smooth_basalt_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/recipes/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..2174a16b --- /dev/null +++ b/src/main/generated/data/jineric/recipes/smooth_basalt_stairs_from_smooth_basalt_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:smooth_basalt" + }, + "result": "jineric:smooth_basalt_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/smooth_basalt_wall_from_smooth_basalt_stonecutting.json b/src/main/generated/data/jineric/recipes/smooth_basalt_wall_from_smooth_basalt_stonecutting.json new file mode 100644 index 00000000..2833b2b2 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/smooth_basalt_wall_from_smooth_basalt_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:smooth_basalt" + }, + "result": "jineric:smooth_basalt_wall" +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_acacia_chest.json b/src/main/generated/data/jineric/recipes/trapped_acacia_chest.json new file mode 100644 index 00000000..1db6f291 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_acacia_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:acacia_chest" + } + ], + "result": { + "item": "jineric:trapped_acacia_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_birch_chest.json b/src/main/generated/data/jineric/recipes/trapped_birch_chest.json new file mode 100644 index 00000000..74105b6d --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_birch_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:birch_chest" + } + ], + "result": { + "item": "jineric:trapped_birch_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_crimson_chest.json b/src/main/generated/data/jineric/recipes/trapped_crimson_chest.json new file mode 100644 index 00000000..b57d5fc6 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_crimson_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:crimson_chest" + } + ], + "result": { + "item": "jineric:trapped_crimson_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_dark_oak_chest.json b/src/main/generated/data/jineric/recipes/trapped_dark_oak_chest.json new file mode 100644 index 00000000..b59c632b --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_dark_oak_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:dark_oak_chest" + } + ], + "result": { + "item": "jineric:trapped_dark_oak_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_jungle_chest.json b/src/main/generated/data/jineric/recipes/trapped_jungle_chest.json new file mode 100644 index 00000000..175876cf --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_jungle_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:jungle_chest" + } + ], + "result": { + "item": "jineric:trapped_jungle_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_mangrove_chest.json b/src/main/generated/data/jineric/recipes/trapped_mangrove_chest.json new file mode 100644 index 00000000..39365582 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_mangrove_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:mangrove_chest" + } + ], + "result": { + "item": "jineric:trapped_mangrove_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_spruce_chest.json b/src/main/generated/data/jineric/recipes/trapped_spruce_chest.json new file mode 100644 index 00000000..83461525 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_spruce_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:spruce_chest" + } + ], + "result": { + "item": "jineric:trapped_spruce_chest" + } +} \ No newline at end of file diff --git a/src/main/generated/data/jineric/recipes/trapped_warped_chest.json b/src/main/generated/data/jineric/recipes/trapped_warped_chest.json new file mode 100644 index 00000000..50afa952 --- /dev/null +++ b/src/main/generated/data/jineric/recipes/trapped_warped_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "redstone", + "group": "trapped_chest", + "ingredients": [ + { + "item": "minecraft:tripwire_hook" + }, + { + "item": "jineric:warped_chest" + } + ], + "result": { + "item": "jineric:trapped_warped_chest" + } +} \ No newline at end of file diff --git a/src/main/java/jingy/jineric/block/JinericBlocks.java b/src/main/java/jingy/jineric/block/JinericBlocks.java index fe816162..dd30a0e1 100644 --- a/src/main/java/jingy/jineric/block/JinericBlocks.java +++ b/src/main/java/jingy/jineric/block/JinericBlocks.java @@ -80,7 +80,7 @@ public class JinericBlocks { public static final Block STONE_TILE_SLAB = register("stone_tile_slab", new SlabBlock(FabricBlockSettings.copy(STONE_TILES))); public static final Block STONE_TILE_WALL = register("stone_tile_wall", new WallBlock(FabricBlockSettings.copy(STONE_TILES))); - //DEEPSLATE +//DEEPSLATE public static final Block CRACKED_DEEPSLATE_BRICK_STAIRS = register("cracked_deepslate_brick_stairs", new StairsBlock(CRACKED_DEEPSLATE_BRICKS.getDefaultState(), FabricBlockSettings.copy(CRACKED_DEEPSLATE_BRICKS))); public static final Block CRACKED_DEEPSLATE_BRICK_SLAB = register("cracked_deepslate_brick_slab", new SlabBlock(FabricBlockSettings.copy(CRACKED_DEEPSLATE_BRICKS))); public static final Block CRACKED_DEEPSLATE_BRICK_WALL = register("cracked_deepslate_brick_wall", new WallBlock(FabricBlockSettings.copy(CRACKED_DEEPSLATE_BRICKS))); @@ -92,7 +92,7 @@ public class JinericBlocks { public static final Block SMOOTH_DEEPSLATE_SLAB = register("smooth_deepslate_slab", new SlabBlock(FabricBlockSettings.copy(SMOOTH_DEEPSLATE))); public static final Block SMOOTH_DEEPSLATE_WALL = register("smooth_deepslate_wall", new WallBlock(FabricBlockSettings.copy(SMOOTH_DEEPSLATE))); - //DIORITE, GRANITE, ANDESITE BLOCKS +//DIORITE, GRANITE, ANDESITE public static final Block POLISHED_GRANITE_WALL = register("polished_granite_wall", new WallBlock(FabricBlockSettings.copy(POLISHED_GRANITE))); public static final Block POLISHED_DIORITE_WALL = register("polished_diorite_wall", new WallBlock(FabricBlockSettings.copy(POLISHED_DIORITE))); public static final Block POLISHED_ANDESITE_WALL = register("polished_andesite_wall", new WallBlock(FabricBlockSettings.copy(POLISHED_ANDESITE))); @@ -177,12 +177,12 @@ public class JinericBlocks { public static final Block CHISELED_DRIPSTONE = register("chiseled_dripstone", new Block(FabricBlockSettings.copy(DRIPSTONE_BRICKS))); public static final Block DRIPSTONE_PILLAR = register("dripstone_pillar", new PillarBlock(FabricBlockSettings.copy(DRIPSTONE_BLOCK))); - //OBSIDIAN +//OBSIDIAN public static final Block OBSIDIAN_STAIRS = register("obsidian_stairs", new StairsBlock(OBSIDIAN.getDefaultState(), JinericBlockSettings.obsidianSettings().nonOpaque())); public static final Block OBSIDIAN_SLAB = register("obsidian_slab", new SlabBlock(JinericBlockSettings.obsidianSettings().nonOpaque())); public static final Block OBSIDIAN_WALL = register("obsidian_wall", new WallBlock(JinericBlockSettings.obsidianSettings().nonOpaque())); - //NETHER +//NETHER public static final Block QUARTZ_WALL = register("quartz_wall", new WallBlock(FabricBlockSettings.copy(QUARTZ_BLOCK))); public static final Block SMOOTH_QUARTZ_WALL = register("smooth_quartz_wall", new WallBlock(FabricBlockSettings.copy(SMOOTH_QUARTZ))); public static final Block QUARTZ_BRICK_SLAB = register("quartz_brick_slab", new SlabBlock(FabricBlockSettings.copy(QUARTZ_BRICKS))); @@ -199,7 +199,7 @@ public class JinericBlocks { public static final Block CRACKED_NETHER_BRICK_STAIRS = register("cracked_nether_brick_stairs", new StairsBlock(CRACKED_NETHER_BRICKS.getDefaultState(), Block.Settings.copy(CRACKED_NETHER_BRICKS))); public static final Block CRACKED_NETHER_BRICK_WALL = register("cracked_nether_brick_wall", new WallBlock(Block.Settings.copy(CRACKED_NETHER_BRICKS))); - //END +//END public static final Block PURPUR_WALL = register("purpur_wall", new WallBlock(FabricBlockSettings.copy(PURPUR_BLOCK))); //RHYOLITE @@ -209,18 +209,10 @@ public class JinericBlocks { // public static final Block RHYOLITE_WALL = register("rhyolite_wall", new WallBlock(FabricBlockSettings.copy(RHYOLITE))); //COBBLED -// public static final Block COBBLED_RHYOLITE = register( -// "cobbled_rhyolite", new Block(FabricBlockSettings.copy(RHYOLITE)) -// ); -// public static final Block COBBLED_RHYOLITE_STAIRS = register( -// "cobbled_rhyolite_stairs", new StairsBlock(RHYOLITE.getDefaultState(), FabricBlockSettings.copy(RHYOLITE)) -// ); -// public static final Block COBBLED_RHYOLITE_SLAB = register( -// "cobbled_rhyolite_slab", new SlabBlock(FabricBlockSettings.copy(RHYOLITE)) -// ); -// public static final Block COBBLED_RHYOLITE_WALL = register( -// "cobbled_rhyolite_wall", new WallBlock(FabricBlockSettings.copy(RHYOLITE)) -// ); +// public static final Block COBBLED_RHYOLITE = register("cobbled_rhyolite", new Block(FabricBlockSettings.copy(RHYOLITE))); +// public static final Block COBBLED_RHYOLITE_STAIRS = register("cobbled_rhyolite_stairs", new StairsBlock(RHYOLITE.getDefaultState(), FabricBlockSettings.copy(RHYOLITE))); +// public static final Block COBBLED_RHYOLITE_SLAB = register("cobbled_rhyolite_slab", new SlabBlock(FabricBlockSettings.copy(RHYOLITE))); +// public static final Block COBBLED_RHYOLITE_WALL = register("cobbled_rhyolite_wall", new WallBlock(FabricBlockSettings.copy(RHYOLITE))); // public static final Block SMOOTH_RHYOLITE = register("smooth_rhyolite", new Block(FabricBlockSettings.copy(RHYOLITE))); // public static final Block SMOOTH_RHYOLITE_STAIRS = register("smooth_rhyolite_stairs", new StairsBlock(SMOOTH_RHYOLITE.getDefaultState(), FabricBlockSettings.copy(SMOOTH_RHYOLITE))); // public static final Block SMOOTH_RHYOLITE_SLAB = register("smooth_rhyolite_slab", new SlabBlock(FabricBlockSettings.copy(SMOOTH_RHYOLITE))); @@ -252,7 +244,7 @@ public class JinericBlocks { public static final Block PRISMARINE_CRYSTAL_BLOCK = register("prismarine_crystal_block", new Block(FabricBlockSettings.copy(SEA_LANTERN).luminance(state -> 4).requiresTool())); // public static final Block GUNPOWDER_BLOCK = register("gunpowder_block", new Block(FabricBlockSettings.copy(SAND))); public static final Block BLAZE_ROD_BLOCK = register("blaze_rod_block", new Block(FabricBlockSettings.copy(CHARCOAL_BLOCK))); - public static final Block EGG_BLOCK = register("egg_block", new Block(FabricBlockSettings.copy(GLOWSTONE).sounds(BlockSoundGroup.CALCITE).strength(0.50F))); + public static final Block EGG_BLOCK = register("egg_block", new Block(FabricBlockSettings.copy(CALCITE).sounds(BlockSoundGroup.CALCITE).strength(0.50F))); public static final Block STICK_BLOCK = register("stick_block", new PillarBlock(FabricBlockSettings.copy(OAK_PLANKS))); public static final Block PAPER_BLOCK = register("paper_block", new Block(FabricBlockSettings.copy(AZALEA_LEAVES).sounds(BlockSoundGroup.AZALEA_LEAVES))); @@ -282,14 +274,22 @@ public class JinericBlocks { //CHESTS public static final Block ACACIA_CHEST = register("acacia_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.ACACIA)); public static final Block BIRCH_CHEST = register("birch_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.BIRCH)); -//// public static final Block BOREAL_CHEST = register("boreal_chest", new FabricBlockSettingsBase(FabricBlockSettings.copy(CHEST), JinericChestType.BOREAL)); - public static final Block CRIMSON_CHEST = register("crimson_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.CRIMSON) ); + public static final Block CRIMSON_CHEST = register("crimson_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.CRIMSON)); public static final Block DARK_OAK_CHEST = register("dark_oak_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.DARK_OAK)); public static final Block JUNGLE_CHEST = register("jungle_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.JUNGLE)); // public static final Block SHULKER_CHEST = register("shulker_chest", new ShulkerChestBlock(FabricBlockSettings.of(Material.STONE), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.SHULKER)); public static final Block SPRUCE_CHEST = register("spruce_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.SPRUCE)); public static final Block WARPED_CHEST = register("warped_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.WARPED)); public static final Block MANGROVE_CHEST = register("mangrove_chest", new JinericChestBlock(FabricBlockSettings.copy(CHEST), () -> JinericBlockEntityType.JINERIC_CHEST, WoodType.MANGROVE)); + public static final Block TRAPPED_ACACIA_CHEST = register("trapped_acacia_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.ACACIA)); + public static final Block TRAPPED_BIRCH_CHEST = register("trapped_birch_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.BIRCH)); + public static final Block TRAPPED_CRIMSON_CHEST = register("trapped_crimson_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.CRIMSON)); + public static final Block TRAPPED_DARK_OAK_CHEST = register("trapped_dark_oak_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.DARK_OAK)); + public static final Block TRAPPED_JUNGLE_CHEST = register("trapped_jungle_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.JUNGLE)); + public static final Block TRAPPED_SPRUCE_CHEST = register("trapped_spruce_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.SPRUCE)); + public static final Block TRAPPED_WARPED_CHEST = register("trapped_warped_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.WARPED)); + public static final Block TRAPPED_MANGROVE_CHEST = register("trapped_mangrove_chest", new JinericTrappedChestBlock(FabricBlockSettings.copy(CHEST), WoodType.MANGROVE)); + public static final Block REFINERY = register("refinery", new RefineryBlock(FabricBlockSettings.copy(FURNACE).luminance(state -> 13))); @@ -336,27 +336,6 @@ public class JinericBlocks { public static final Block WARPED_LADDER = register("warped_ladder", new LadderBlock(FabricBlockSettings.copy(LADDER))); public static final Block CRIMSON_LADDER = register("crimson_ladder", new LadderBlock(FabricBlockSettings.copy(LADDER))); - /* - //DRIED BAMBOO - public static final Block DRIED_BAMBOO_WOOD = register("dried_bamboo_wood", new PillarBlock(FabricBlockSettings.copy(OAK_WOOD))); - public static final Block DRIED_BAMBOO_LOG = register("dried_bamboo_log", new PillarBlock(FabricBlockSettings.copy(OAK_LOG))); - public static final Block STRIPPED_DRIED_BAMBOO_WOOD = register("stripped_dried_bamboo_wood", new PillarBlock(FabricBlockSettings.copy(OAK_WOOD))); - public static final Block STRIPPED_DRIED_BAMBOO_LOG = register("stripped_dried_bamboo_log", new PillarBlock(FabricBlockSettings.copy(OAK_LOG))); - public static final Block DRIED_BAMBOO_PLANKS = register("dried_bamboo_planks", new Block(FabricBlockSettings.copy(OAK_PLANKS))); - public static final Block DRIED_BAMBOO_STAIRS = register("dried_bamboo_stairs", new StairsBlock(OAK_STAIRS.getDefaultState(), FabricBlockSettings.copy(OAK_STAIRS))); - public static final Block DRIED_BAMBOO_SLAB = register("dried_bamboo_slab", new SlabBlock(FabricBlockSettings.copy(OAK_SLAB))); - public static final Block DRIED_BAMBOO_FENCE = register("dried_bamboo_fence", new FenceBlock(FabricBlockSettings.copy(OAK_FENCE))); - //public static final Block DRIED_BAMBOO_SIGN = register("dried_bamboo_sign", new SignBlock(FabricBlockSettings.copy(OAK_SIGN), JinericSignType.BOREAL)); - //public static final Block DRIED_BAMBOO_WALL_SIGN = register("dried_bamboo_wall_sign", new JinericWallSignBlock(FabricBlockSettings.copy(OAK_SIGN), JinericSignType.BOREAL)); - public static final Block DRIED_BAMBOO_BUTTON = register("dried_bamboo_button", new JinericWoodenButtonBlock(Boolean.getBoolean(String.valueOf(POWERED)), FabricBlockSettings.copy((OAK_BUTTON)))); - public static final Block DRIED_BAMBOO_PRESSURE_PLATE = register("dried_bamboo_pressure_plate", new JinericWoodenPressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING, AbstractFabricBlockSettings.copy(OAK_PRESSURE_PLATE))); - public static final Block DRIED_BAMBOO_DOOR = register("dried_bamboo_door", new DoorBlock(FabricBlockSettings.copy(OAK_DOOR))); - public static final Block DRIED_BAMBOO_TRAPDOOR = register("dried_bamboo_trapdoor", new JinericWoodenTrapdoorBlock(OAK_TRAPDOOR.getDefaultState(), FabricBlockSettings.copy(OAK_TRAPDOOR).sounds(BlockSoundGroup.WOOD))); - public static final Block DRIED_BAMBOO_FENCE_GATE = register("dried_bamboo_fence_gate", new FenceGateBlock(FabricBlockSettings.copy(OAK_FENCE_GATE))); - public static final Block DRIED_BAMBOO_SAPLING = register("dried_bamboo_sapling", new JinericSaplingBlock(new BorealSaplingGenerator(), FabricBlockSettings.copy(OAK_SAPLING))); - public static final Block DRIED_BAMBOO_LEAVES = register("dried_bamboo_leaves", new LeavesBlock(JinericBlockSettings.JinericLeavesBlock(BlockSoundGroup.GRASS))); -*/ - //ICE SLIPPERINESS public static boolean isSlipperyBlock(BlockState state) { return state.isOf(PACKED_ICE_STAIRS) || state.isOf(PACKED_ICE_SLAB) || state.isOf(PACKED_ICE_WALL); diff --git a/src/main/java/jingy/jineric/block/JinericTrappedChestBlock.java b/src/main/java/jingy/jineric/block/JinericTrappedChestBlock.java new file mode 100644 index 00000000..d07eaa3c --- /dev/null +++ b/src/main/java/jingy/jineric/block/JinericTrappedChestBlock.java @@ -0,0 +1,46 @@ +package jingy.jineric.block; + +import jingy.jineric.block.entity.JinericTrappedChestBlockEntity; +import jingy.jineric.registry.JinericBlockEntityType; +import net.minecraft.block.BlockState; +import net.minecraft.block.WoodType; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.ChestBlockEntity; +import net.minecraft.stat.Stat; +import net.minecraft.stat.Stats; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.BlockView; + +public class JinericTrappedChestBlock extends JinericChestBlock { + public JinericTrappedChestBlock(Settings settings, WoodType type) { + super(settings, () -> JinericBlockEntityType.JINERIC_TRAPPED_CHEST, type); + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new JinericTrappedChestBlockEntity(pos, state); + } + + @Override + protected Stat getOpenStat() { + return Stats.CUSTOM.getOrCreateStat(Stats.TRIGGER_TRAPPED_CHEST); + } + + @Override + public boolean emitsRedstonePower(BlockState state) { + return true; + } + + @Override + public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return MathHelper.clamp(ChestBlockEntity.getPlayersLookingInChestCount(world, pos), 0, 15); + } + + @Override + public int getStrongRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return direction == Direction.UP ? state.getWeakRedstonePower(world, pos, direction) : 0; + } +} diff --git a/src/main/java/jingy/jineric/block/entity/JinericTrappedChestBlockEntity.java b/src/main/java/jingy/jineric/block/entity/JinericTrappedChestBlockEntity.java new file mode 100644 index 00000000..d92637c0 --- /dev/null +++ b/src/main/java/jingy/jineric/block/entity/JinericTrappedChestBlockEntity.java @@ -0,0 +1,23 @@ +package jingy.jineric.block.entity; + +import jingy.jineric.registry.JinericBlockEntityType; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; + +public class JinericTrappedChestBlockEntity extends JinericChestBlockEntity { + public JinericTrappedChestBlockEntity(BlockPos blockPos, BlockState blockState) { + super(JinericBlockEntityType.JINERIC_TRAPPED_CHEST, blockPos, blockState); + } + + @Override + protected void onViewerCountUpdate(World world, BlockPos pos, BlockState state, int oldViewerCount, int newViewerCount) { + super.onViewerCountUpdate(world, pos, state, oldViewerCount, newViewerCount); + if (oldViewerCount != newViewerCount) { + Block block = state.getBlock(); + world.updateNeighborsAlways(pos, block); + world.updateNeighborsAlways(pos.down(), block); + } + } +} diff --git a/src/main/java/jingy/jineric/block/enums/JinericChestType.java b/src/main/java/jingy/jineric/block/enums/JinericChestType.java deleted file mode 100644 index 65d5816d..00000000 --- a/src/main/java/jingy/jineric/block/enums/JinericChestType.java +++ /dev/null @@ -1,104 +0,0 @@ -package jingy.jineric.block.enums; - -import jingy.jineric.base.JinericMain; -import net.minecraft.util.Identifier; - -public enum JinericChestType { - - ACACIA(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/acacia_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/acacia_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/acacia_right") - ), - - BIRCH(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/birch_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/birch_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/birch_right")), - - CRIMSON(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/crimson_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/crimson_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/crimson_right")), - - DARK_OAK(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/dark_oak_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/dark_oak_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/dark_oak_right")), - - JUNGLE(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/jungle_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/jungle_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/jungle_right")), - - SPRUCE(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/spruce_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/spruce_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/spruce_right")), - - WARPED(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/warped_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/warped_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/warped_right")), - - MANGROVE(27, 9, - new Identifier(JinericMain.MOD_ID, "entity/chest/mangrove_chest"), - new Identifier(JinericMain.MOD_ID, "entity/chest/mangrove_left"), - new Identifier(JinericMain.MOD_ID, "entity/chest/mangrove_right")), - - SHULKER(81, 9, new Identifier(JinericMain.MOD_ID, "entity/chest/shulker_chest")); - - public final int size; - public final int rowLength; - public final Identifier texture; - public final Identifier textureRight; - public final Identifier textureLeft; - - JinericChestType(int size, int rowLength, Identifier texture, Identifier textureRight, Identifier textureLeft) { - this.size = size; - this.rowLength = rowLength; - this.texture = texture; - this.textureRight = textureRight; - this.textureLeft = textureLeft; - } - - JinericChestType(int size, int rowLength, Identifier texture) { - this.size = size; - this.rowLength = rowLength; - this.texture = texture; - this.textureLeft = null; - this.textureRight = null; - } - -// public int getRowCount() { -// return this.size / this.rowLength; -// } - -// public ChestBlockEntity getEntity(BlockPos pos, BlockState state) { -// return switch (this) { -// case ACACIA -> JinericBlockEntityType.ACACIA_CHEST.instantiate(pos, state); -// case BIRCH -> JinericBlockEntityType.BIRCH_CHEST.instantiate(pos, state); -// case CRIMSON -> JinericBlockEntityType.CRIMSON_CHEST.instantiate(pos, state); -// case DARK_OAK -> JinericBlockEntityType.DARK_OAK_CHEST.instantiate(pos, state); -// case JUNGLE -> JinericBlockEntityType.JUNGLE_CHEST.instantiate(pos, state); -// case SPRUCE -> JinericBlockEntityType.SPRUCE_CHEST.instantiate(pos, state); -// case WARPED -> JinericBlockEntityType.WARPED_CHEST.instantiate(pos, state); -// case MANGROVE -> JinericBlockEntityType.MANGROVE_CHEST.instantiate(pos, state); -// case SHULKER -> JinericBlockEntityType.SHULKER_CHEST.instantiate(pos, state); -// }; -// } - -// public BlockEntityType getBlockEntityType() { -// return switch (this) { -// case ACACIA -> JinericBlockEntityType.ACACIA_CHEST; -// case BIRCH -> JinericBlockEntityType.BIRCH_CHEST; -// case CRIMSON -> JinericBlockEntityType.CRIMSON_CHEST; -// case DARK_OAK -> JinericBlockEntityType.DARK_OAK_CHEST; -// case JUNGLE -> JinericBlockEntityType.JUNGLE_CHEST; -// case SPRUCE -> JinericBlockEntityType.SPRUCE_CHEST; -// case WARPED -> JinericBlockEntityType.WARPED_CHEST; -// case MANGROVE -> JinericBlockEntityType.MANGROVE_CHEST; -// case SHULKER -> JinericBlockEntityType.SHULKER_CHEST; -// }; -// } -} diff --git a/src/main/java/jingy/jineric/client/render/JinericTextureRenderLayers.java b/src/main/java/jingy/jineric/client/render/JinericTextureRenderLayers.java index 9c925833..a8b706de 100644 --- a/src/main/java/jingy/jineric/client/render/JinericTextureRenderLayers.java +++ b/src/main/java/jingy/jineric/client/render/JinericTextureRenderLayers.java @@ -2,6 +2,7 @@ import jingy.jineric.base.JinericMain; import jingy.jineric.block.entity.JinericChestBlockEntity; +import jingy.jineric.block.entity.JinericTrappedChestBlockEntity; import jingy.jineric.block.entity.ShulkerChestBlockEntity; import net.minecraft.block.WoodType; import net.minecraft.block.entity.BlockEntity; @@ -15,9 +16,12 @@ public class JinericTextureRenderLayers extends TexturedRenderLayers { public static final SpriteIdentifier ACACIA_CHEST = createChestTextureId("acacia_chest"); public static final SpriteIdentifier ACACIA_CHEST_LEFT = createChestTextureId("acacia_left"); public static final SpriteIdentifier ACACIA_CHEST_RIGHT = createChestTextureId("acacia_right"); - public static final SpriteIdentifier BOREAL_CHEST = createChestTextureId("boreal_chest"); - public static final SpriteIdentifier BOREAL_CHEST_LEFT = createChestTextureId("boreal_left"); - public static final SpriteIdentifier BOREAL_CHEST_RIGHT = createChestTextureId("boreal_right"); + public static final SpriteIdentifier TRAPPED_ACACIA_CHEST = createChestTextureId("trapped_acacia_chest"); + public static final SpriteIdentifier TRAPPED_ACACIA_CHEST_LEFT = createChestTextureId("trapped_acacia_left"); + public static final SpriteIdentifier TRAPPED_ACACIA_CHEST_RIGHT = createChestTextureId("trapped_acacia_right"); +// public static final SpriteIdentifier BOREAL_CHEST = createChestTextureId("boreal_chest"); +// public static final SpriteIdentifier BOREAL_CHEST_LEFT = createChestTextureId("boreal_left"); +// public static final SpriteIdentifier BOREAL_CHEST_RIGHT = createChestTextureId("boreal_right"); public static final SpriteIdentifier BIRCH_CHEST = createChestTextureId("birch_chest"); public static final SpriteIdentifier BIRCH_CHEST_LEFT = createChestTextureId("birch_left"); public static final SpriteIdentifier BIRCH_CHEST_RIGHT = createChestTextureId("birch_right"); @@ -40,6 +44,28 @@ public class JinericTextureRenderLayers extends TexturedRenderLayers { public static final SpriteIdentifier MANGROVE_CHEST = createChestTextureId("mangrove_chest"); public static final SpriteIdentifier MANGROVE_CHEST_LEFT = createChestTextureId("mangrove_left"); public static final SpriteIdentifier MANGROVE_CHEST_RIGHT = createChestTextureId("mangrove_right"); + public static final SpriteIdentifier TRAPPED_BIRCH_CHEST = createChestTextureId("trapped_birch_chest"); + public static final SpriteIdentifier TRAPPED_BIRCH_CHEST_LEFT = createChestTextureId("trapped_birch_left"); + public static final SpriteIdentifier TRAPPED_BIRCH_CHEST_RIGHT = createChestTextureId("trapped_birch_right"); + public static final SpriteIdentifier TRAPPED_CRIMSON_CHEST = createChestTextureId("trapped_crimson_chest"); + public static final SpriteIdentifier TRAPPED_CRIMSON_CHEST_LEFT = createChestTextureId("trapped_crimson_left"); + public static final SpriteIdentifier TRAPPED_CRIMSON_CHEST_RIGHT = createChestTextureId("trapped_crimson_right"); + public static final SpriteIdentifier TRAPPED_DARK_OAK_CHEST = createChestTextureId("trapped_dark_oak_chest"); + public static final SpriteIdentifier TRAPPED_DARK_OAK_CHEST_LEFT = createChestTextureId("trapped_dark_oak_left"); + public static final SpriteIdentifier TRAPPED_DARK_OAK_CHEST_RIGHT = createChestTextureId("trapped_dark_oak_right"); + public static final SpriteIdentifier TRAPPED_JUNGLE_CHEST = createChestTextureId("trapped_jungle_chest"); + public static final SpriteIdentifier TRAPPED_JUNGLE_CHEST_LEFT = createChestTextureId("trapped_jungle_left"); + public static final SpriteIdentifier TRAPPED_JUNGLE_CHEST_RIGHT = createChestTextureId("trapped_jungle_right"); + public static final SpriteIdentifier TRAPPED_SHULKER = createChestTextureId("trapped_shulker_chest"); + public static final SpriteIdentifier TRAPPED_SPRUCE_CHEST = createChestTextureId("trapped_spruce_chest"); + public static final SpriteIdentifier TRAPPED_SPRUCE_CHEST_LEFT = createChestTextureId("trapped_spruce_left"); + public static final SpriteIdentifier TRAPPED_SPRUCE_CHEST_RIGHT = createChestTextureId("trapped_spruce_right"); + public static final SpriteIdentifier TRAPPED_WARPED_CHEST = createChestTextureId("trapped_warped_chest"); + public static final SpriteIdentifier TRAPPED_WARPED_CHEST_LEFT = createChestTextureId("trapped_warped_left"); + public static final SpriteIdentifier TRAPPED_WARPED_CHEST_RIGHT = createChestTextureId("trapped_warped_right"); + public static final SpriteIdentifier TRAPPED_MANGROVE_CHEST = createChestTextureId("trapped_mangrove_chest"); + public static final SpriteIdentifier TRAPPED_MANGROVE_CHEST_LEFT = createChestTextureId("trapped_mangrove_left"); + public static final SpriteIdentifier TRAPPED_MANGROVE_CHEST_RIGHT = createChestTextureId("trapped_mangrove_right"); private static SpriteIdentifier createChestTextureId(String variant) { return new SpriteIdentifier(CHEST_ATLAS_TEXTURE, new Identifier(JinericMain.MOD_ID, "entity/chest/" + variant)); @@ -52,6 +78,32 @@ public static SpriteIdentifier getChestTexture(BlockEntity blockEntity, ChestTyp else if (blockEntity instanceof ShulkerChestBlockEntity) { return SHULKER; } + else if (blockEntity instanceof JinericTrappedChestBlockEntity) { + if (woodType == WoodType.ACACIA) { + return getChestTexture(chestType, TRAPPED_ACACIA_CHEST, TRAPPED_ACACIA_CHEST_LEFT, TRAPPED_ACACIA_CHEST_RIGHT); + } + else if (woodType == WoodType.BIRCH) { + return getChestTexture(chestType, TRAPPED_BIRCH_CHEST, TRAPPED_BIRCH_CHEST_LEFT, TRAPPED_BIRCH_CHEST_RIGHT); + } + else if (woodType == WoodType.CRIMSON) { + return getChestTexture(chestType, TRAPPED_CRIMSON_CHEST, TRAPPED_CRIMSON_CHEST_LEFT, TRAPPED_CRIMSON_CHEST_RIGHT); + } + else if (woodType == WoodType.DARK_OAK) { + return getChestTexture(chestType, TRAPPED_DARK_OAK_CHEST, TRAPPED_DARK_OAK_CHEST_LEFT, TRAPPED_DARK_OAK_CHEST_RIGHT); + } + else if (woodType == WoodType.JUNGLE) { + return getChestTexture(chestType, TRAPPED_JUNGLE_CHEST, TRAPPED_JUNGLE_CHEST_LEFT, TRAPPED_JUNGLE_CHEST_RIGHT); + } + else if (woodType == WoodType.SPRUCE) { + return getChestTexture(chestType, TRAPPED_SPRUCE_CHEST, TRAPPED_SPRUCE_CHEST_LEFT, TRAPPED_SPRUCE_CHEST_RIGHT); + } + else if (woodType == WoodType.WARPED) { + return getChestTexture(chestType, TRAPPED_WARPED_CHEST, TRAPPED_WARPED_CHEST_LEFT, TRAPPED_WARPED_CHEST_RIGHT); + } + else if (woodType == WoodType.MANGROVE) { + return getChestTexture(chestType, TRAPPED_MANGROVE_CHEST, TRAPPED_MANGROVE_CHEST_LEFT, TRAPPED_MANGROVE_CHEST_RIGHT); + } + } else if (blockEntity instanceof JinericChestBlockEntity) { if (woodType == WoodType.ACACIA) { return getChestTexture(chestType, ACACIA_CHEST, ACACIA_CHEST_LEFT, ACACIA_CHEST_RIGHT); diff --git a/src/main/java/jingy/jineric/data/generators/JinericModelGenerator.java b/src/main/java/jingy/jineric/data/generators/JinericModelGenerator.java index 5905a88f..db7605e8 100644 --- a/src/main/java/jingy/jineric/data/generators/JinericModelGenerator.java +++ b/src/main/java/jingy/jineric/data/generators/JinericModelGenerator.java @@ -19,10 +19,8 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen @Override public void generateItemModels(ItemModelGenerator itemModelGenerator) { - } - public void registerBlockSet(Block block, Block stairBlock, Block slabBlock, Block wallBlock, BlockStateModelGenerator blockStateModelGenerator) { blockStateModelGenerator.registerSimpleCubeAll(block); registerStairs(stairBlock, blockStateModelGenerator); @@ -34,30 +32,37 @@ private static TextureMap getBlock(Block block) { return TextureMap.all(block); } - public void registerStairs(Block stairBlock, BlockStateModelGenerator blockStateModelGenerator) { - TextureMap stairTextureMap = TextureMap.all(TextureMap.getId(stairBlock)); - Identifier regularModelId = Models.STAIRS.upload(stairBlock, stairTextureMap, blockStateModelGenerator.modelCollector); - Identifier innerModelId = Models.INNER_STAIRS.upload(stairBlock, stairTextureMap, blockStateModelGenerator.modelCollector); - Identifier outerModelId = Models.OUTER_STAIRS.upload(stairBlock, stairTextureMap, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(stairBlock, innerModelId, regularModelId, outerModelId)); - } - public void registerSlab(Block slabBlock, BlockStateModelGenerator blockStateModelGenerator) { - TextureMap slabTextureMap = TextureMap.all(TextureMap.getId(slabBlock)); - TextureMap slabTextureMapSide = TextureMap.sideEnd(TextureMap.getSubId(slabBlock, "_side"), slabTextureMap.getTexture(TextureKey.TOP)); - - Identifier bottomModelId = Models.SLAB.upload(slabBlock, slabTextureMapSide, blockStateModelGenerator.modelCollector); - Identifier topModelId = Models.SLAB_TOP.upload(slabBlock, slabTextureMapSide, blockStateModelGenerator.modelCollector); - Identifier doubleModelId = Models.CUBE_COLUMN.uploadWithoutVariant(slabBlock, "_double", slabTextureMapSide, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSlabBlockState(slabBlock, bottomModelId, topModelId, doubleModelId)); -// blockStateModelGenerator.registerParentedItemModel(slabBlock, ); - } - public void registerWall(Block wallBlock, BlockStateModelGenerator blockStateModelGenerator) { - TextureMap wallTextureMap = TextureMap.all(TextureMap.getId(wallBlock)); - Identifier postModelId = Models.TEMPLATE_WALL_POST.upload(wallBlock, wallTextureMap, blockStateModelGenerator.modelCollector); - Identifier sideModelId = Models.TEMPLATE_WALL_SIDE.upload(wallBlock, wallTextureMap, blockStateModelGenerator.modelCollector); - Identifier sideTallModelId = Models.TEMPLATE_WALL_SIDE_TALL.upload(wallBlock, wallTextureMap, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createWallBlockState(wallBlock, postModelId, sideModelId, sideTallModelId)); - Identifier wallInventory = Models.WALL_INVENTORY.upload(wallBlock, wallTextureMap, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.registerParentedItemModel(wallBlock, wallInventory); + public void registerStairs(Block stairBlockTexture, BlockStateModelGenerator blockStateModelGenerator) { + TextureMap stairTextureMap = TextureMap.all(TextureMap.getId(stairBlockTexture)); + Identifier regularModelId = Models.STAIRS.upload(stairBlockTexture, stairTextureMap, blockStateModelGenerator.modelCollector); + Identifier innerModelId = Models.INNER_STAIRS.upload(stairBlockTexture, stairTextureMap, blockStateModelGenerator.modelCollector); + Identifier outerModelId = Models.OUTER_STAIRS.upload(stairBlockTexture, stairTextureMap, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(stairBlockTexture, innerModelId, regularModelId, outerModelId)); + } + public void registerSlab(Block slabBlockTexture, BlockStateModelGenerator blockStateModelGenerator) { + TextureMap slabTextureMap = TextureMap.all(TextureMap.getId(slabBlockTexture)); + TextureMap slabTextureMapSide = TextureMap.sideEnd(TextureMap.getSubId(slabBlockTexture, "_side"), slabTextureMap.getTexture(TextureKey.TOP)); + Identifier bottomModelId = Models.SLAB.upload(slabBlockTexture, slabTextureMapSide, blockStateModelGenerator.modelCollector); + Identifier topModelId = Models.SLAB_TOP.upload(slabBlockTexture, slabTextureMapSide, blockStateModelGenerator.modelCollector); + Identifier doubleModelId = Models.CUBE_COLUMN.uploadWithoutVariant(slabBlockTexture, "_double", slabTextureMapSide, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSlabBlockState(slabBlockTexture, bottomModelId, topModelId, doubleModelId)); + } + public void registerWall(Block wallBlockTexture, BlockStateModelGenerator blockStateModelGenerator) { + TextureMap wallTextureMap = TextureMap.all(TextureMap.getId(wallBlockTexture)); + Identifier postModelId = Models.TEMPLATE_WALL_POST.upload(wallBlockTexture, wallTextureMap, blockStateModelGenerator.modelCollector); + Identifier sideModelId = Models.TEMPLATE_WALL_SIDE.upload(wallBlockTexture, wallTextureMap, blockStateModelGenerator.modelCollector); + Identifier sideTallModelId = Models.TEMPLATE_WALL_SIDE_TALL.upload(wallBlockTexture, wallTextureMap, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createWallBlockState(wallBlockTexture, postModelId, sideModelId, sideTallModelId)); + Identifier wallInventory = Models.WALL_INVENTORY.upload(wallBlockTexture, wallTextureMap, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.registerParentedItemModel(wallBlockTexture, wallInventory); + } + + public void registerFence(Block fenceBlock, Block fenceBlockTexture, BlockStateModelGenerator blockStateModelGenerator) { + TextureMap fenceTextureMap = TextureMap.all(TextureMap.getId(fenceBlockTexture)); + Identifier postModelId = Models.FENCE_POST.upload(fenceBlock, fenceTextureMap, blockStateModelGenerator.modelCollector); + Identifier sideModelId = Models.FENCE_SIDE.upload(fenceBlock, fenceTextureMap, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createFenceBlockState(fenceBlock, postModelId, sideModelId)); + Identifier fenceInventory = Models.FENCE_INVENTORY.upload(fenceBlock, fenceTextureMap, blockStateModelGenerator.modelCollector); + blockStateModelGenerator.registerParentedItemModel(fenceBlock, fenceInventory); } } \ No newline at end of file diff --git a/src/main/java/jingy/jineric/data/generators/JinericRecipeGenerator.java b/src/main/java/jingy/jineric/data/generators/JinericRecipeGenerator.java index fb48fcc5..ed5755f3 100644 --- a/src/main/java/jingy/jineric/data/generators/JinericRecipeGenerator.java +++ b/src/main/java/jingy/jineric/data/generators/JinericRecipeGenerator.java @@ -1,8 +1,18 @@ package jingy.jineric.data.generators; +import jingy.jineric.block.JinericBlocks; +import jingy.jineric.item.JinericItems; +import jingy.jineric.tag.JinericItemTags; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.minecraft.block.Blocks; +import net.minecraft.data.server.recipe.CraftingRecipeJsonBuilder; import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import java.util.function.Consumer; @@ -23,5 +33,45 @@ public void generate(Consumer exporter) { // offerStonecuttingRecipe(exporter, building, JinericBlocks._SLAB, JinericBlocks.); // offerStonecuttingRecipe(exporter, building, JinericBlocks._STAIRS, JinericBlocks.); // offerStonecuttingRecipe(exporter, building, JinericBlocks._WALL, JinericBlocks.); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_SPRUCE_CHEST, JinericItems.SPRUCE_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_BIRCH_CHEST, JinericItems.BIRCH_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_JUNGLE_CHEST, JinericItems.JUNGLE_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_ACACIA_CHEST, JinericItems.ACACIA_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_DARK_OAK_CHEST, JinericItems.DARK_OAK_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_MANGROVE_CHEST, JinericItems.MANGROVE_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_CRIMSON_CHEST, JinericItems.CRIMSON_CHEST); + offerTrappedChestReipce(exporter, JinericItems.TRAPPED_WARPED_CHEST, JinericItems.WARPED_CHEST); + + + offerStonecuttingRecipe(exporter, building, JinericBlocks.SMOOTH_BASALT_SLAB, Blocks.SMOOTH_BASALT); + offerStonecuttingRecipe(exporter, building, JinericBlocks.SMOOTH_BASALT_STAIRS, Blocks.SMOOTH_BASALT); + offerStonecuttingRecipe(exporter, building, JinericBlocks.SMOOTH_BASALT_WALL, Blocks.SMOOTH_BASALT); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_TILE_SLAB, Blocks.CRACKED_DEEPSLATE_TILES); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_TILE_STAIRS, Blocks.CRACKED_DEEPSLATE_TILES); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_TILE_WALL, Blocks.CRACKED_DEEPSLATE_TILES); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_BRICK_SLAB, Blocks.CRACKED_DEEPSLATE_BRICKS); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_BRICK_STAIRS, Blocks.CRACKED_DEEPSLATE_BRICKS); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_DEEPSLATE_BRICK_WALL, Blocks.CRACKED_DEEPSLATE_BRICKS); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_SLAB, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_STAIRS, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS); + offerStonecuttingRecipe(exporter, building, JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_WALL, Blocks.CRACKED_POLISHED_BLACKSTONE_BRICKS); + createCustomFenceRecipe(JinericBlocks.RED_NETHER_BRICK_FENCE, Ingredient.ofItems(Blocks.RED_NETHER_BRICKS)); + } + + public static void offerTrappedChestReipce(Consumer exporter, ItemConvertible output, ItemConvertible input) { + ShapelessRecipeJsonBuilder.create(RecipeCategory.REDSTONE, output) + .input(Blocks.TRIPWIRE_HOOK) + .input(input) + .group("trapped_chest") + .criterion("has_chest", conditionsFromTag(JinericItemTags.WOODEN_CHESTS)) + .offerTo(exporter); + } + + public static CraftingRecipeJsonBuilder createCustomFenceRecipe(ItemConvertible output, Ingredient input) { + return ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output) + .input('#', input) + .input('X', (ItemConvertible) Items.NETHER_BRICK) + .pattern("#X#") + .pattern("#X#"); } } diff --git a/src/main/java/jingy/jineric/item/JinericItemGroups.java b/src/main/java/jingy/jineric/item/JinericItemGroups.java index 9b13c663..102d8f64 100644 --- a/src/main/java/jingy/jineric/item/JinericItemGroups.java +++ b/src/main/java/jingy/jineric/item/JinericItemGroups.java @@ -188,6 +188,14 @@ public class JinericItemGroups { entries.add(JinericItems.MANGROVE_CHEST); entries.add(JinericItems.CRIMSON_CHEST); entries.add(JinericItems.WARPED_CHEST); + entries.add(JinericItems.TRAPPED_SPRUCE_CHEST); + entries.add(JinericItems.TRAPPED_BIRCH_CHEST); + entries.add(JinericItems.TRAPPED_JUNGLE_CHEST); + entries.add(JinericItems.TRAPPED_ACACIA_CHEST); + entries.add(JinericItems.TRAPPED_DARK_OAK_CHEST); + entries.add(JinericItems.TRAPPED_MANGROVE_CHEST); + entries.add(JinericItems.TRAPPED_CRIMSON_CHEST); + entries.add(JinericItems.TRAPPED_WARPED_CHEST); entries.add(JinericItems.SPRUCE_LADDER); entries.add(JinericItems.BIRCH_LADDER); entries.add(JinericItems.JUNGLE_LADDER); diff --git a/src/main/java/jingy/jineric/item/JinericItems.java b/src/main/java/jingy/jineric/item/JinericItems.java index 9976a373..d5728cde 100644 --- a/src/main/java/jingy/jineric/item/JinericItems.java +++ b/src/main/java/jingy/jineric/item/JinericItems.java @@ -54,6 +54,34 @@ public class JinericItems { public static final Item DRIPSTONE_PILLAR = register("dripstone_pillar", new BlockItem(JinericBlocks.DRIPSTONE_PILLAR, new FabricItemSettings())); public static final Item FULL_GRASS_BLOCK = register("full_grass_block", new BlockItem(JinericBlocks.FULL_GRASS_BLOCK, new FabricItemSettings())); +//TUFF + public static final Item COBBLED_TUFF = register("cobbled_tuff", new BlockItem(JinericBlocks.COBBLED_TUFF, new FabricItemSettings())); + public static final Item COBBLED_TUFF_SLAB = register("cobbled_tuff_slab", new BlockItem(JinericBlocks.COBBLED_TUFF_SLAB, new FabricItemSettings())); + public static final Item COBBLED_TUFF_STAIRS = register("cobbled_tuff_stairs", new BlockItem(JinericBlocks.COBBLED_TUFF_STAIRS, new FabricItemSettings())); + public static final Item COBBLED_TUFF_WALL = register("cobbled_tuff_wall", new BlockItem(JinericBlocks.COBBLED_TUFF_WALL, new FabricItemSettings())); + public static final Item SMOOTH_TUFF = register("smooth_tuff", new BlockItem(JinericBlocks.SMOOTH_TUFF, new FabricItemSettings())); + public static final Item SMOOTH_TUFF_STAIRS = register("smooth_tuff_stairs", new BlockItem(JinericBlocks.SMOOTH_TUFF_STAIRS, new FabricItemSettings())); + public static final Item SMOOTH_TUFF_SLAB = register("smooth_tuff_slab", new BlockItem(JinericBlocks.SMOOTH_TUFF_SLAB, new FabricItemSettings())); + public static final Item SMOOTH_TUFF_WALL = register("smooth_tuff_wall", new BlockItem(JinericBlocks.SMOOTH_TUFF_WALL, new FabricItemSettings())); + public static final Item POLISHED_TUFF = register("polished_tuff", new BlockItem(JinericBlocks.POLISHED_TUFF, new FabricItemSettings())); + public static final Item POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new BlockItem(JinericBlocks.POLISHED_TUFF_STAIRS, new FabricItemSettings())); + public static final Item POLISHED_TUFF_SLAB = register("polished_tuff_slab", new BlockItem(JinericBlocks.POLISHED_TUFF_SLAB, new FabricItemSettings())); + public static final Item POLISHED_TUFF_WALL = register("polished_tuff_wall", new BlockItem(JinericBlocks.POLISHED_TUFF_WALL, new FabricItemSettings())); + public static final Item TUFF_BRICKS = register("tuff_bricks", new BlockItem(JinericBlocks.TUFF_BRICKS, new FabricItemSettings())); + public static final Item TUFF_BRICK_STAIRS = register("tuff_brick_stairs", new BlockItem(JinericBlocks.TUFF_BRICK_STAIRS, new FabricItemSettings())); + public static final Item TUFF_BRICK_SLAB = register("tuff_brick_slab", new BlockItem(JinericBlocks.TUFF_BRICK_SLAB, new FabricItemSettings())); + public static final Item TUFF_BRICK_WALL = register("tuff_brick_wall", new BlockItem(JinericBlocks.TUFF_BRICK_WALL, new FabricItemSettings())); + public static final Item CRACKED_TUFF_BRICKS = register("cracked_tuff_bricks", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICKS, new FabricItemSettings())); + public static final Item CRACKED_TUFF_BRICK_STAIRS = register("cracked_tuff_brick_stairs", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_STAIRS, new FabricItemSettings())); + public static final Item CRACKED_TUFF_BRICK_SLAB = register("cracked_tuff_brick_slab", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_SLAB, new FabricItemSettings())); + public static final Item CRACKED_TUFF_BRICK_WALL = register("cracked_tuff_brick_wall", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_WALL, new FabricItemSettings())); + public static final Item CHISELED_TUFF = register("chiseled_tuff", new BlockItem(JinericBlocks.CHISELED_TUFF, new FabricItemSettings())); + public static final Item TUFF_PILLAR = register("tuff_pillar", new BlockItem(JinericBlocks.TUFF_PILLAR, new FabricItemSettings())); + public static final Item TUFF_TILES = register("tuff_tiles", new BlockItem(JinericBlocks.TUFF_TILES, new FabricItemSettings())); + public static final Item TUFF_TILE_SLAB = register("tuff_tile_slab", new BlockItem(JinericBlocks.TUFF_TILE_SLAB, new FabricItemSettings())); + public static final Item TUFF_TILE_STAIRS = register("tuff_tile_stairs", new BlockItem(JinericBlocks.TUFF_TILE_STAIRS, new FabricItemSettings())); + public static final Item TUFF_TILE_WALL = register("tuff_tile_wall", new BlockItem(JinericBlocks.TUFF_TILE_WALL, new FabricItemSettings())); + //SANDSTONE public static final Item SMOOTH_SANDSTONE_WALL = register("smooth_sandstone_wall", new BlockItem(JinericBlocks.SMOOTH_SANDSTONE_WALL, new FabricItemSettings())); public static final Item CUT_SANDSTONE_STAIRS = register("cut_sandstone_stairs", new BlockItem(JinericBlocks.CUT_SANDSTONE_STAIRS, new FabricItemSettings())); @@ -104,6 +132,7 @@ public class JinericItems { public static final Item WAVY_SOUL_SANDSTONE_WALL = register("wavy_soul_sandstone_wall", new BlockItem(JinericBlocks.WAVY_SOUL_SANDSTONE_WALL, new FabricItemSettings())); //MISC VANILLA + //OVERWORLD public static final Item STONE_WALL = register("stone_wall", new BlockItem(JinericBlocks.STONE_WALL, new FabricItemSettings())); public static final Item CRACKED_STONE_BRICK_STAIRS = register("cracked_stone_brick_stairs", new BlockItem(JinericBlocks.CRACKED_STONE_BRICK_STAIRS, new FabricItemSettings())); public static final Item CRACKED_STONE_BRICK_SLAB = register("cracked_stone_brick_slab", new BlockItem(JinericBlocks.CRACKED_STONE_BRICK_SLAB, new FabricItemSettings())); @@ -139,6 +168,7 @@ public class JinericItems { public static final Item OBSIDIAN_STAIRS = register("obsidian_stairs", new BlockItem(JinericBlocks.OBSIDIAN_STAIRS, new FabricItemSettings())); public static final Item OBSIDIAN_SLAB = register("obsidian_slab", new BlockItem(JinericBlocks.OBSIDIAN_SLAB, new FabricItemSettings())); public static final Item OBSIDIAN_WALL = register("obsidian_wall", new BlockItem(JinericBlocks.OBSIDIAN_WALL, new FabricItemSettings())); + //NETHER public static final Item QUARTZ_WALL = register("quartz_wall", new BlockItem(JinericBlocks.QUARTZ_WALL, new FabricItemSettings())); public static final Item SMOOTH_QUARTZ_WALL = register("smooth_quartz_wall", new BlockItem(JinericBlocks.SMOOTH_QUARTZ_WALL, new FabricItemSettings())); public static final Item QUARTZ_BRICK_STAIRS = register("quartz_brick_stairs", new BlockItem(JinericBlocks.QUARTZ_BRICK_STAIRS, new FabricItemSettings())); @@ -147,16 +177,17 @@ public class JinericItems { public static final Item CRACKED_NETHER_BRICK_STAIRS = register("cracked_nether_brick_stairs", new BlockItem(JinericBlocks.CRACKED_NETHER_BRICK_STAIRS, new FabricItemSettings())); public static final Item CRACKED_NETHER_BRICK_SLAB = register("cracked_nether_brick_slab", new BlockItem(JinericBlocks.CRACKED_NETHER_BRICK_SLAB, new FabricItemSettings())); public static final Item CRACKED_NETHER_BRICK_WALL = register("cracked_nether_brick_wall", new BlockItem(JinericBlocks.CRACKED_NETHER_BRICK_WALL, new FabricItemSettings())); + public static final Item RED_NETHER_BRICK_FENCE = register("red_nether_brick_fence", new BlockItem(JinericBlocks.RED_NETHER_BRICK_FENCE, new FabricItemSettings())); public static final Item CRACKED_POLISHED_BLACKSTONE_BRICK_STAIRS = register("cracked_polished_blackstone_brick_stairs", new BlockItem(JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_STAIRS, new FabricItemSettings())); public static final Item CRACKED_POLISHED_BLACKSTONE_BRICK_SLAB = register("cracked_polished_blackstone_brick_slab", new BlockItem(JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_SLAB, new FabricItemSettings())); public static final Item CRACKED_POLISHED_BLACKSTONE_BRICK_WALL = register("cracked_polished_blackstone_brick_wall", new BlockItem(JinericBlocks.CRACKED_POLISHED_BLACKSTONE_BRICK_WALL, new FabricItemSettings())); public static final Item SMOOTH_BASALT_STAIRS = register("smooth_basalt_stairs", new BlockItem(JinericBlocks.SMOOTH_BASALT_STAIRS, new FabricItemSettings())); public static final Item SMOOTH_BASALT_SLAB = register("smooth_basalt_slab", new BlockItem(JinericBlocks.SMOOTH_BASALT_SLAB, new FabricItemSettings())); public static final Item SMOOTH_BASALT_WALL = register("smooth_basalt_wall", new BlockItem(JinericBlocks.SMOOTH_BASALT_WALL, new FabricItemSettings())); + //END public static final Item PURPUR_WALL = register("purpur_wall", new BlockItem(JinericBlocks.PURPUR_WALL, new FabricItemSettings())); -//COPPER - //REGULAR +//COPPER //CUT public static final Item CUT_COPPER_WALL = register("cut_copper_wall", new BlockItem(JinericBlocks.CUT_COPPER_WALL, new FabricItemSettings())); public static final Item EXPOSED_CUT_COPPER_WALL = register("exposed_cut_copper_wall", new BlockItem(JinericBlocks.EXPOSED_CUT_COPPER_WALL, new FabricItemSettings())); @@ -166,7 +197,7 @@ public class JinericItems { public static final Item WAXED_EXPOSED_CUT_COPPER_WALL = register("waxed_exposed_cut_copper_wall", new BlockItem(JinericBlocks.WAXED_EXPOSED_CUT_COPPER_WALL, new FabricItemSettings())); public static final Item WAXED_WEATHERED_CUT_COPPER_WALL = register("waxed_weathered_cut_copper_wall", new BlockItem(JinericBlocks.WAXED_WEATHERED_CUT_COPPER_WALL, new FabricItemSettings())); public static final Item WAXED_OXIDIZED_CUT_COPPER_WALL = register("waxed_oxidized_cut_copper_wall", new BlockItem(JinericBlocks.WAXED_OXIDIZED_CUT_COPPER_WALL, new FabricItemSettings())); -//STORAGE +//ITEM STORAGE public static final Item CHARCOAL_BLOCK = register("charcoal_block", new BlockItem(JinericBlocks.CHARCOAL_BLOCK, new FabricItemSettings())); public static final Item FLINT_BLOCK = register("flint_block", new BlockItem(JinericBlocks.FLINT_BLOCK, new FabricItemSettings())); public static final Item BONE_MEAL_BLOCK = register("bone_meal_block", new BlockItem(JinericBlocks.BONE_MEAL_BLOCK, new FabricItemSettings())); @@ -196,7 +227,15 @@ public class JinericItems { public static final Item MANGROVE_CHEST = register("mangrove_chest", new BlockItem(JinericBlocks.MANGROVE_CHEST, new FabricItemSettings())); public static final Item CRIMSON_CHEST = register("crimson_chest", new BlockItem(JinericBlocks.CRIMSON_CHEST, new FabricItemSettings())); public static final Item WARPED_CHEST = register("warped_chest", new BlockItem(JinericBlocks.WARPED_CHEST, new FabricItemSettings())); -//LADDER + public static final Item TRAPPED_ACACIA_CHEST = register("trapped_acacia_chest", new BlockItem(JinericBlocks.TRAPPED_ACACIA_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_BIRCH_CHEST = register("trapped_birch_chest", new BlockItem(JinericBlocks.TRAPPED_BIRCH_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_SPRUCE_CHEST = register("trapped_spruce_chest", new BlockItem(JinericBlocks.TRAPPED_SPRUCE_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_JUNGLE_CHEST = register("trapped_jungle_chest", new BlockItem(JinericBlocks.TRAPPED_JUNGLE_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_DARK_OAK_CHEST = register("trapped_dark_oak_chest", new BlockItem(JinericBlocks.TRAPPED_DARK_OAK_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_MANGROVE_CHEST = register("trapped_mangrove_chest", new BlockItem(JinericBlocks.TRAPPED_MANGROVE_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_CRIMSON_CHEST = register("trapped_crimson_chest", new BlockItem(JinericBlocks.TRAPPED_CRIMSON_CHEST, new FabricItemSettings())); + public static final Item TRAPPED_WARPED_CHEST = register("trapped_warped_chest", new BlockItem(JinericBlocks.TRAPPED_WARPED_CHEST, new FabricItemSettings())); +//LADDERS public static final Item SPRUCE_LADDER = register("spruce_ladder", new BlockItem(JinericBlocks.SPRUCE_LADDER, new FabricItemSettings())); public static final Item BIRCH_LADDER = register("birch_ladder", new BlockItem(JinericBlocks.BIRCH_LADDER, new FabricItemSettings())); public static final Item JUNGLE_LADDER = register("jungle_ladder", new BlockItem(JinericBlocks.JUNGLE_LADDER, new FabricItemSettings())); @@ -205,17 +244,27 @@ public class JinericItems { public static final Item MANGROVE_LADDER = register("mangrove_ladder", new BlockItem(JinericBlocks.MANGROVE_LADDER, new FabricItemSettings())); public static final Item WARPED_LADDER = register("warped_ladder", new BlockItem(JinericBlocks.WARPED_LADDER, new FabricItemSettings())); public static final Item CRIMSON_LADDER = register("crimson_ladder", new BlockItem(JinericBlocks.CRIMSON_LADDER, new FabricItemSettings())); +//REDSTONE + public static final Item REDSTONE_LANTERN = register("redstone_lantern", new BlockItem(JinericBlocks.REDSTONE_LANTERN, new FabricItemSettings())); +//FOOD + public static final Item GOLDEN_POTATO = register("golden_potato", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(6).saturationModifier(14.4f).build()))); + public static final Item GOLDEN_SWEET_BERRIES = register("golden_sweet_berries", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(5).saturationModifier(8f).build()))); + public static final Item GOLDEN_BEETROOT = register("golden_beetroot", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(4).saturationModifier(5f).build()))); //MISC JINERIC public static final Item SOUL_JACK_O_LANTERN = register("soul_jack_o_lantern", new BlockItem(JinericBlocks.SOUL_JACK_O_LANTERN, new FabricItemSettings())); public static final Item NETHERITE_HORSE_ARMOR = register("netherite_horse_armor", new JinericHorseArmorItem(15, "netherite", new FabricItemSettings().fireproof().maxCount(1))); -//WIP ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - - public static final Item RED_NETHER_BRICK_FENCE = register("red_nether_brick_fence", new BlockItem(JinericBlocks.RED_NETHER_BRICK_FENCE, new FabricItemSettings())); +//WIP OR UNKNOWN ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ + public static final Item REFINERY = register("refinery", new BlockItem(JinericBlocks.REFINERY, new FabricItemSettings())); + public static final Item FIREWEED = register("fireweed", new BlockItem(JinericBlocks.FIREWEED, new FabricItemSettings())); public static final Item TUMBLEWEED = register("tumbleweed", new BlockItem(JinericBlocks.TUMBLEWEED, new FabricItemSettings())); + public static final Item REDSTONE_CAMPFIRE = register("redstone_campfire", new BlockItem(JinericBlocks.REDSTONE_CAMPFIRE, new FabricItemSettings())); +// public static final Item SHULKER_CHEST = register("shulker_chest", new BlockItem(JinericBlocks.SHULKER_CHEST, new FabricItemSettings())); +// public static final Item MANX_LOAGHTAN_SPAWN_EGG = register("manx_loaghtan_spawn_egg", new SpawnEggItem(JinericEntities.MANX_LOAGHTAN, 0x3f4052, 0x12101d, new FabricItemSettings())); +// public static final Item SALT = register("salt", new Item(new FabricItemSettings())); +// public static final Item SALT_BLOCK = register("salt_block", new BlockItem(JinericBlocks.SALT_BLOCK, new FabricItemSettings())); +// public static final Item FROZEN_ELYTRA = register("frozen_elytra", new JinericElytraItem(new FabricItemSettings().maxDamage(432).equipmentSlot(item -> CHEST).rarity(RARE))); -//UNKNOWN ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ - public static final Item REFINERY = register("refinery", new BlockItem(JinericBlocks.REFINERY, new FabricItemSettings())); //BOREAL // public static final Item BOREAL_WOOD = register("boreal_wood", new BlockItem(JinericBlocks.BOREAL_WOOD, new FabricItemSettings())); // public static final Item BOREAL_LOG = register("boreal_log", new BlockItem(JinericBlocks.BOREAL_LOG, new FabricItemSettings())); @@ -236,8 +285,7 @@ public class JinericItems { // public static final Item BOREAL_TRAPDOOR = register("boreal_trapdoor", new BlockItem(JinericBlocks.BOREAL_TRAPDOOR, new FabricItemSettings())); // public static final Item BOREAL_SAPLING = register("boreal_sapling", new BlockItem(JinericBlocks.BOREAL_SAPLING, new FabricItemSettings())); // public static final Item BOREAL_LEAVES = register("boreal_leaves", new BlockItem(JinericBlocks.BOREAL_LEAVES, new FabricItemSettings())); - public static final Item FIREWEED = register("fireweed", new BlockItem(JinericBlocks.FIREWEED, new FabricItemSettings())); -//RHYOLITE + //RHYOLITE // public static final Item RHYOLITE = register("rhyolite", new BlockItem(JinericBlocks.RHYOLITE, new FabricItemSettings())); // public static final Item RHYOLITE_STAIRS = register("rhyolite_stairs", new BlockItem(JinericBlocks.RHYOLITE_STAIRS, new FabricItemSettings())); // public static final Item RHYOLITE_SLAB = register("rhyolite_slab", new BlockItem(JinericBlocks.RHYOLITE_SLAB, new FabricItemSettings())); @@ -259,35 +307,7 @@ public class JinericItems { // public static final Item RHYOLITE_BRICK_WALL = register("rhyolite_brick_wall", new BlockItem(JinericBlocks.RHYOLITE_BRICK_WALL, new FabricItemSettings())); // public static final Item POLISHED_RHYOLITE_WALL = register("polished_rhyolite_wall", new BlockItem(JinericBlocks.POLISHED_RHYOLITE_WALL, new FabricItemSettings())); // public static final Item RHYOLITE_TILE_WALL = register("rhyolite_tile_wall", new BlockItem(JinericBlocks.RHYOLITE_TILE_WALL, new FabricItemSettings())); -//TUFF - public static final Item COBBLED_TUFF = register("cobbled_tuff", new BlockItem(JinericBlocks.COBBLED_TUFF, new FabricItemSettings())); - public static final Item COBBLED_TUFF_SLAB = register("cobbled_tuff_slab", new BlockItem(JinericBlocks.COBBLED_TUFF_SLAB, new FabricItemSettings())); - public static final Item COBBLED_TUFF_STAIRS = register("cobbled_tuff_stairs", new BlockItem(JinericBlocks.COBBLED_TUFF_STAIRS, new FabricItemSettings())); - public static final Item COBBLED_TUFF_WALL = register("cobbled_tuff_wall", new BlockItem(JinericBlocks.COBBLED_TUFF_WALL, new FabricItemSettings())); - public static final Item SMOOTH_TUFF = register("smooth_tuff", new BlockItem(JinericBlocks.SMOOTH_TUFF, new FabricItemSettings())); - public static final Item SMOOTH_TUFF_STAIRS = register("smooth_tuff_stairs", new BlockItem(JinericBlocks.SMOOTH_TUFF_STAIRS, new FabricItemSettings())); - public static final Item SMOOTH_TUFF_SLAB = register("smooth_tuff_slab", new BlockItem(JinericBlocks.SMOOTH_TUFF_SLAB, new FabricItemSettings())); - public static final Item SMOOTH_TUFF_WALL = register("smooth_tuff_wall", new BlockItem(JinericBlocks.SMOOTH_TUFF_WALL, new FabricItemSettings())); - public static final Item POLISHED_TUFF = register("polished_tuff", new BlockItem(JinericBlocks.POLISHED_TUFF, new FabricItemSettings())); - public static final Item POLISHED_TUFF_STAIRS = register("polished_tuff_stairs", new BlockItem(JinericBlocks.POLISHED_TUFF_STAIRS, new FabricItemSettings())); - public static final Item POLISHED_TUFF_SLAB = register("polished_tuff_slab", new BlockItem(JinericBlocks.POLISHED_TUFF_SLAB, new FabricItemSettings())); - public static final Item POLISHED_TUFF_WALL = register("polished_tuff_wall", new BlockItem(JinericBlocks.POLISHED_TUFF_WALL, new FabricItemSettings())); - public static final Item TUFF_BRICKS = register("tuff_bricks", new BlockItem(JinericBlocks.TUFF_BRICKS, new FabricItemSettings())); - public static final Item TUFF_BRICK_STAIRS = register("tuff_brick_stairs", new BlockItem(JinericBlocks.TUFF_BRICK_STAIRS, new FabricItemSettings())); - public static final Item TUFF_BRICK_SLAB = register("tuff_brick_slab", new BlockItem(JinericBlocks.TUFF_BRICK_SLAB, new FabricItemSettings())); - public static final Item TUFF_BRICK_WALL = register("tuff_brick_wall", new BlockItem(JinericBlocks.TUFF_BRICK_WALL, new FabricItemSettings())); - public static final Item CRACKED_TUFF_BRICKS = register("cracked_tuff_bricks", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICKS, new FabricItemSettings())); - public static final Item CRACKED_TUFF_BRICK_STAIRS = register("cracked_tuff_brick_stairs", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_STAIRS, new FabricItemSettings())); - public static final Item CRACKED_TUFF_BRICK_SLAB = register("cracked_tuff_brick_slab", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_SLAB, new FabricItemSettings())); - public static final Item CRACKED_TUFF_BRICK_WALL = register("cracked_tuff_brick_wall", new BlockItem(JinericBlocks.CRACKED_TUFF_BRICK_WALL, new FabricItemSettings())); - public static final Item CHISELED_TUFF = register("chiseled_tuff", new BlockItem(JinericBlocks.CHISELED_TUFF, new FabricItemSettings())); - public static final Item TUFF_PILLAR = register("tuff_pillar", new BlockItem(JinericBlocks.TUFF_PILLAR, new FabricItemSettings())); - public static final Item TUFF_TILES = register("tuff_tiles", new BlockItem(JinericBlocks.TUFF_TILES, new FabricItemSettings())); - public static final Item TUFF_TILE_SLAB = register("tuff_tile_slab", new BlockItem(JinericBlocks.TUFF_TILE_SLAB, new FabricItemSettings())); - public static final Item TUFF_TILE_STAIRS = register("tuff_tile_stairs", new BlockItem(JinericBlocks.TUFF_TILE_STAIRS, new FabricItemSettings())); - public static final Item TUFF_TILE_WALL = register("tuff_tile_wall", new BlockItem(JinericBlocks.TUFF_TILE_WALL, new FabricItemSettings())); - -//CALCITE + //CALCITE // public static final Item POLISHED_CALCITE = register("polished_calcite", new BlockItem(JinericBlocks.POLISHED_CALCITE, new FabricItemSettings())); // public static final Item POLISHED_CALCITE_STAIRS = register("polished_calcite_stairs", new BlockItem(JinericBlocks.POLISHED_CALCITE_STAIRS, new FabricItemSettings())); // public static final Item POLISHED_CALCITE_SLAB = register("polished_calcite_slab", new BlockItem(JinericBlocks.POLISHED_CALCITE_SLAB, new FabricItemSettings())); @@ -301,23 +321,11 @@ public class JinericItems { // public static final Item SMOOTH_CALCITE_SLAB = register("smooth_calcite_slab", new BlockItem(JinericBlocks.SMOOTH_CALCITE_SLAB, new FabricItemSettings())); // public static final Item SMOOTH_CALCITE_WALL = register("smooth_calcite_wall", new BlockItem(JinericBlocks.SMOOTH_CALCITE_WALL, new FabricItemSettings())); -//MISC -// public static final Item SHULKER_CHEST = register("shulker_chest", new BlockItem(JinericBlocks.SHULKER_CHEST, new FabricItemSettings())); - public static final Item GOLDEN_POTATO = register("golden_potato", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(6).saturationModifier(14.4f).build()))); - public static final Item GOLDEN_SWEET_BERRIES = register("golden_sweet_berries", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(5).saturationModifier(8f).build()))); - public static final Item GOLDEN_BEETROOT = register("golden_beetroot", new Item(new FabricItemSettings().food(new FoodComponent.Builder().hunger(4).saturationModifier(5f).build()))); -// public static final Item MANX_LOAGHTAN_SPAWN_EGG = register("manx_loaghtan_spawn_egg", new SpawnEggItem(JinericEntities.MANX_LOAGHTAN, 0x3f4052, 0x12101d, new FabricItemSettings())); -// public static final Item SALT = register("salt", new Item(new FabricItemSettings())); -// public static final Item SALT_BLOCK = register("salt_block", new BlockItem(JinericBlocks.SALT_BLOCK, new FabricItemSettings())); -// public static final Item FROZEN_ELYTRA = register("frozen_elytra", new JinericElytraItem(new FabricItemSettings().maxDamage(432).equipmentSlot(item -> CHEST).rarity(RARE))); - public static final Item REDSTONE_LANTERN = register("redstone_lantern", new BlockItem(JinericBlocks.REDSTONE_LANTERN, new FabricItemSettings())); - public static final Item REDSTONE_CAMPFIRE = register("redstone_campfire", new BlockItem(JinericBlocks.REDSTONE_CAMPFIRE, new FabricItemSettings())); - - private static Item register(String name, Item item) { return Registry.register(Registries.ITEM, new Identifier("jineric", name), item); } + //TODO: Check if necessary public static void itemRegistry() { } diff --git a/src/main/java/jingy/jineric/registry/JinericBlockEntityRenderer.java b/src/main/java/jingy/jineric/registry/JinericBlockEntityRenderer.java index c199b943..85d49b79 100644 --- a/src/main/java/jingy/jineric/registry/JinericBlockEntityRenderer.java +++ b/src/main/java/jingy/jineric/registry/JinericBlockEntityRenderer.java @@ -9,7 +9,7 @@ public class JinericBlockEntityRenderer { public static void register() { BlockEntityRendererFactories.register(JinericBlockEntityType.REDSTONE_CAMPFIRE, RedstoneCampfireBlockEntityRenderer::new); BlockEntityRendererFactories.register(JinericBlockEntityType.JINERIC_CHEST, ChestBlockEntityRenderer::new); -// BlockEntityRendererRegistry.register(JinericBlockEntityType.BOREAL_CHEST, GenericChestBlockEntityRenderer::new); + BlockEntityRendererFactories.register(JinericBlockEntityType.JINERIC_TRAPPED_CHEST, ChestBlockEntityRenderer::new); BlockEntityRendererFactories.register(JinericBlockEntityType.REDSTONE_CAMPFIRE, RedstoneCampfireBlockEntityRenderer::new); } } diff --git a/src/main/java/jingy/jineric/registry/JinericBlockEntityType.java b/src/main/java/jingy/jineric/registry/JinericBlockEntityType.java index 27e296ed..7058cb2d 100644 --- a/src/main/java/jingy/jineric/registry/JinericBlockEntityType.java +++ b/src/main/java/jingy/jineric/registry/JinericBlockEntityType.java @@ -27,6 +27,19 @@ public class JinericBlockEntityType { JinericBlocks.WARPED_CHEST, JinericBlocks.MANGROVE_CHEST ).build(); + public static final BlockEntityType JINERIC_TRAPPED_CHEST = + FabricBlockEntityTypeBuilder.create( + JinericChestBlockEntity::new, + JinericBlocks.TRAPPED_ACACIA_CHEST, + JinericBlocks.TRAPPED_BIRCH_CHEST, + JinericBlocks.TRAPPED_BIRCH_CHEST, + JinericBlocks.TRAPPED_CRIMSON_CHEST, + JinericBlocks.TRAPPED_DARK_OAK_CHEST, + JinericBlocks.TRAPPED_JUNGLE_CHEST, + JinericBlocks.TRAPPED_SPRUCE_CHEST, + JinericBlocks.TRAPPED_WARPED_CHEST, + JinericBlocks.TRAPPED_MANGROVE_CHEST + ).build(); public static final BlockEntityType REFINERY = FabricBlockEntityTypeBuilder.create(RefineryBlockEntity::new, JinericBlocks.REFINERY).build(); @@ -36,7 +49,7 @@ public class JinericBlockEntityType { public static void registerBlockEntities() { Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "jineric_chest"), JINERIC_CHEST); -// Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "boreal_chest"), BOREAL_CHEST); + Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "jineric_trapped_chest"), JINERIC_TRAPPED_CHEST); // Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "shulker_chest"), SHULKER_CHEST); Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "refinery"), REFINERY); Registry.register(Registries.BLOCK_ENTITY_TYPE, new Identifier(JinericMain.MOD_ID, "campfire"), REDSTONE_CAMPFIRE); diff --git a/src/main/java/jingy/jineric/registry/JinericBlockMaterials.java b/src/main/java/jingy/jineric/registry/JinericBlockMaterials.java index 3f417697..30fcce75 100644 --- a/src/main/java/jingy/jineric/registry/JinericBlockMaterials.java +++ b/src/main/java/jingy/jineric/registry/JinericBlockMaterials.java @@ -6,9 +6,11 @@ public class JinericBlockMaterials { public static final Material OBSIDIAN = new Material( - MapColor.BLACK, false, true, true, true, false, false, PistonBehavior.BLOCK); + MapColor.BLACK, false, true, true, true, false, false, PistonBehavior.BLOCK + ); public static final Material SHULKER_CHEST_MATERIAL = new Material( - MapColor.PURPLE, false, true, true, true, false, false, PistonBehavior.BLOCK); + MapColor.PURPLE, false, true, true, true, false, false, PistonBehavior.BLOCK + ); } diff --git a/src/main/java/jingy/jineric/registry/JinericEntityModelLayers.java b/src/main/java/jingy/jineric/registry/JinericEntityModelLayers.java index 5d9caf5c..20e2c027 100644 --- a/src/main/java/jingy/jineric/registry/JinericEntityModelLayers.java +++ b/src/main/java/jingy/jineric/registry/JinericEntityModelLayers.java @@ -4,6 +4,7 @@ import jingy.jineric.base.JinericMain; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; +import net.minecraft.block.WoodType; import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.render.entity.model.EntityModelLayers; import net.minecraft.util.Identifier; @@ -12,40 +13,49 @@ @Environment(EnvType.CLIENT) public class JinericEntityModelLayers extends EntityModelLayers { - private static final Set LAYERS = Sets.newHashSet(); - public static final EntityModelLayer ACACIA_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "acacia_chest"), "main"); - public static final EntityModelLayer DOUBLE_ACACIA_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_acacia_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_ACACIA_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_acacia_chest_right"), "main"); - public static final EntityModelLayer BIRCH_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "birch_chest"), "main"); - public static final EntityModelLayer DOUBLE_BIRCH_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_birch_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_BIRCH_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_birch_chest_right"), "main"); - public static final EntityModelLayer BOREAL_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "boreal_chest"), "main"); - public static final EntityModelLayer DOUBLE_BOREAL_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_boreal_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_BOREAL_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_boreal_chest_right"), "main"); - public static final EntityModelLayer CRIMSON_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "crimson_chest"), "main"); - public static final EntityModelLayer DOUBLE_CRIMSON_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_crimson_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_CRIMSON_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_crimson_chest_right"), "main"); - public static final EntityModelLayer DARK_OAK_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "dark_oak_chest"), "main"); - public static final EntityModelLayer DOUBLE_DARK_OAK_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_dark_oak_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_DARK_OAK_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_dark_oak_chest_right"), "main"); - public static final EntityModelLayer JUNGLE_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "jungle_chest"), "main"); - public static final EntityModelLayer DOUBLE_JUNGLE_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_jungle_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_JUNGLE_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_jungle_chest_right"), "main"); - public static final EntityModelLayer SPRUCE_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "spruce_chest"), "main"); - public static final EntityModelLayer DOUBLE_SPRUCE_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_spruce_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_SPRUCE_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_spruce_chest_right"), "main"); - public static final EntityModelLayer WARPED_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "warped_chest"), "main"); - public static final EntityModelLayer DOUBLE_WARPED_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_warped_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_WARPED_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_warped_chest_right"), "main"); - public static final EntityModelLayer MANGROVE_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "mangrove_chest"), "main"); - public static final EntityModelLayer DOUBLE_MANGROVE_CHEST_LEFT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_mangrove_chest_left"), "main"); - public static final EntityModelLayer DOUBLE_MANGROVE_CHEST_RIGHT = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "double_mangrove_chest_right"), "main"); - public static final EntityModelLayer SHULKER_CHEST = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "shulker_chest"), "main"); - - public static final EntityModelLayer FROZEN_ELYTRA = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "frozen_elytra"), "main"); - public static final EntityModelLayer TURTLE_SADDLE = new EntityModelLayer(new Identifier(JinericMain.MOD_ID, "turtle"), "saddle"); + + private static EntityModelLayer registerMain(String id) { + return register(id, "main"); + } + + private static EntityModelLayer register(String id, String layer) { + EntityModelLayer entityModelLayer = create(id, layer); + if (!LAYERS.add(entityModelLayer)) { + throw new IllegalStateException("Duplicate registration for " + entityModelLayer); + } else { + return entityModelLayer; + } + } + + private static EntityModelLayer create(String id, String layer) { + return new EntityModelLayer(new Identifier(JinericMain.MOD_ID, id), layer); + } + + public static EntityModelLayer createChest(WoodType woodType) { + return create(woodType.name() + "_chest", "main"); + } + + public static EntityModelLayer createRightDoubleChest(WoodType woodType) { + return create("double_" + woodType.name() + "_chest_right","main"); + } + + public static EntityModelLayer createLeftDoubleChest(WoodType woodType) { + return create("double_" + woodType.name() + "_chest_left", "main"); + } + + public static EntityModelLayer createTrappedChest(WoodType woodType) { + return create("trapped_" + woodType.name() + "_chest", "main"); + } + + public static EntityModelLayer createRightDoubleTrappedChest(WoodType woodType) { + return create("trapped_double_" + woodType.name() + "_chest_right","main"); + } + + public static EntityModelLayer createLeftDoubleTrappedChest(WoodType woodType) { + return create("trapped_double_" + woodType.name() + "_chest_left","main"); + } } diff --git a/src/main/java/jingy/jineric/registry/JinericEntityModels.java b/src/main/java/jingy/jineric/registry/JinericEntityModels.java index 2b68c8d5..5e159004 100644 --- a/src/main/java/jingy/jineric/registry/JinericEntityModels.java +++ b/src/main/java/jingy/jineric/registry/JinericEntityModels.java @@ -1,49 +1,34 @@ package jingy.jineric.registry; +import com.google.common.collect.ImmutableMap; +import jingy.jineric.client.render.entity.model.JinericEntityModelLayer; import jingy.jineric.entity.passive.manxloaghtan.ManxLoaghtanModel; import jingy.jineric.entity.passive.manxloaghtan.ManxLoaghtanWoolModel; import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry; +import net.minecraft.block.WoodType; import net.minecraft.client.model.Dilation; import net.minecraft.client.model.TexturedModelData; import net.minecraft.client.render.block.entity.ChestBlockEntityRenderer; +import net.minecraft.client.render.entity.model.EntityModelLayer; import net.minecraft.client.render.entity.model.TurtleEntityModel; public class JinericEntityModels { public static void register() { - //TexturedModelData.of(TurtleEntityModel.getModelData(0, new Dilation(0.5F)), 128, 64) + ImmutableMap.Builder builder = ImmutableMap.builder(); EntityModelLayerRegistry.TexturedModelDataProvider turtleSaddle = () -> TexturedModelData.of(TurtleEntityModel.getModelData(0, new Dilation(0.5F)), 128, 64); - EntityModelLayerRegistry.registerModelLayer(jingy.jineric.client.render.entity.model.JinericEntityModelLayer.TURTLE_SADDLE, turtleSaddle); -// EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.TURTLE_SADDLE, TurtleEntityModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(jingy.jineric.client.render.entity.model.JinericEntityModelLayer.MANX_LOAGHTAN, ManxLoaghtanModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(jingy.jineric.client.render.entity.model.JinericEntityModelLayer.MANX_LOAGHTAN_WOOL, ManxLoaghtanWoolModel::getTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.ACACIA_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_ACACIA_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_ACACIA_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.BIRCH_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BIRCH_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BIRCH_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.BOREAL_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BOREAL_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BOREAL_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.CRIMSON_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_CRIMSON_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_CRIMSON_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DARK_OAK_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_DARK_OAK_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_DARK_OAK_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.JUNGLE_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_JUNGLE_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_JUNGLE_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.SPRUCE_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_SPRUCE_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_SPRUCE_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.WARPED_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_WARPED_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_WARPED_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.MANGROVE_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_MANGROVE_CHEST_LEFT, ChestBlockEntityRenderer::getLeftDoubleTexturedModelData); - EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_MANGROVE_CHEST_RIGHT, ChestBlockEntityRenderer::getRightDoubleTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.TURTLE_SADDLE, turtleSaddle); + EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.MANX_LOAGHTAN, ManxLoaghtanModel::getTexturedModelData); + EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.MANX_LOAGHTAN_WOOL, ManxLoaghtanWoolModel::getTexturedModelData); + TexturedModelData jinericChestBlock = ChestBlockEntityRenderer.getSingleTexturedModelData(); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createChest(chestType), jinericChestBlock)); + TexturedModelData jinericDoubleRightChestBlock = ChestBlockEntityRenderer.getRightDoubleTexturedModelData(); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createRightDoubleChest(chestType), jinericDoubleRightChestBlock)); + TexturedModelData jinericDoubleLeftChestBlock = ChestBlockEntityRenderer.getLeftDoubleTexturedModelData(); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createLeftDoubleChest(chestType), jinericDoubleLeftChestBlock)); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createTrappedChest(chestType), jinericChestBlock)); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createRightDoubleTrappedChest(chestType), jinericDoubleRightChestBlock)); + WoodType.stream().forEach(chestType -> builder.put(JinericEntityModelLayers.createLeftDoubleTrappedChest(chestType), jinericDoubleLeftChestBlock)); EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.SHULKER_CHEST, ChestBlockEntityRenderer::getSingleTexturedModelData); } } diff --git a/src/main/java/jingy/jineric/registry/JinericEntityRenderers.java b/src/main/java/jingy/jineric/registry/JinericEntityRenderers.java index 8883df74..2cc424ec 100644 --- a/src/main/java/jingy/jineric/registry/JinericEntityRenderers.java +++ b/src/main/java/jingy/jineric/registry/JinericEntityRenderers.java @@ -4,7 +4,6 @@ import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; public class JinericEntityRenderers { - public static void register() { EntityRendererRegistry.register(JinericEntities.MANX_LOAGHTAN, ManxLoaghtanRenderer::new); } diff --git a/src/main/java/jingy/jineric/registry/JinericRegistries.java b/src/main/java/jingy/jineric/registry/JinericRegistries.java index ba5a8f30..eb52c273 100644 --- a/src/main/java/jingy/jineric/registry/JinericRegistries.java +++ b/src/main/java/jingy/jineric/registry/JinericRegistries.java @@ -56,6 +56,14 @@ private static void registerIsFuel() { registry.add(JinericItems.MANGROVE_CHEST, 300); registry.add(JinericItems.CRIMSON_CHEST, 300); registry.add(JinericItems.WARPED_CHEST, 300); + registry.add(JinericItems.TRAPPED_SPRUCE_CHEST, 300); + registry.add(JinericItems.TRAPPED_BIRCH_CHEST, 300); + registry.add(JinericItems.TRAPPED_JUNGLE_CHEST, 300); + registry.add(JinericItems.TRAPPED_ACACIA_CHEST, 300); + registry.add(JinericItems.TRAPPED_DARK_OAK_CHEST, 300); + registry.add(JinericItems.TRAPPED_MANGROVE_CHEST, 300); + registry.add(JinericItems.TRAPPED_CRIMSON_CHEST, 300); + registry.add(JinericItems.TRAPPED_WARPED_CHEST, 300); } private static void registerCompostable() { diff --git a/src/main/java/jingy/jineric/registry/JinericScreenHandlerTypes.java b/src/main/java/jingy/jineric/registry/JinericScreenHandlerTypes.java index d3cdcbbb..c0de1e75 100644 --- a/src/main/java/jingy/jineric/registry/JinericScreenHandlerTypes.java +++ b/src/main/java/jingy/jineric/registry/JinericScreenHandlerTypes.java @@ -6,7 +6,6 @@ import net.minecraft.client.gui.screen.ingame.HandledScreens; public class JinericScreenHandlerTypes { - public static void register() { HandledScreens.register(JinericScreenHandlerType.SHULKER_CHEST, ShulkerChestScreen::new); HandledScreens.register(JinericScreenHandlerType.REFINERY, RefineryScreen::new); diff --git a/src/main/java/jingy/jineric/screen/JinericScreenHandlerType.java b/src/main/java/jingy/jineric/screen/JinericScreenHandlerType.java index 7aa8d681..44916ea4 100644 --- a/src/main/java/jingy/jineric/screen/JinericScreenHandlerType.java +++ b/src/main/java/jingy/jineric/screen/JinericScreenHandlerType.java @@ -8,15 +8,12 @@ import net.minecraft.util.Identifier; public class JinericScreenHandlerType { - public static final Identifier SHULKER_CHEST_SCREEN_ID = new Identifier(JinericMain.MOD_ID, "shulker_chest"); public static final Identifier REFINERY_SCREEN_ID = new Identifier(JinericMain.MOD_ID, "refinery"); - public static ScreenHandlerType SHULKER_CHEST; public static ScreenHandlerType REFINERY; public static void registerScreenHandlers() { -// SHULKER_CHEST = Registry.register(Registries.SCREEN_HANDLER, SHULKER_CHEST_SCREEN_ID, new ScreenHandlerType<>(ShulkerChestScreenHandler::new, null)); SHULKER_CHEST = Registry.register(Registries.SCREEN_HANDLER, SHULKER_CHEST_SCREEN_ID, new ScreenHandlerType<>(ShulkerChestScreenHandler::new, null)); REFINERY = Registry.register(Registries.SCREEN_HANDLER, REFINERY_SCREEN_ID, new ScreenHandlerType<>(RefineryScreenHandler::new, null)); } diff --git a/src/main/java/jingy/jineric/screen/RefineryScreenHandler.java b/src/main/java/jingy/jineric/screen/RefineryScreenHandler.java index 12b2a49a..c1011020 100644 --- a/src/main/java/jingy/jineric/screen/RefineryScreenHandler.java +++ b/src/main/java/jingy/jineric/screen/RefineryScreenHandler.java @@ -8,7 +8,6 @@ import net.minecraft.screen.PropertyDelegate; public class RefineryScreenHandler extends AbstractFurnaceScreenHandler { - public RefineryScreenHandler(int syncId, PlayerInventory playerInventory) { super(JinericScreenHandlerType.REFINERY, JinericRecipeType.REFINING_RECIPE_TYPE, RecipeBookCategory.FURNACE, syncId, playerInventory); } diff --git a/src/main/java/jingy/jineric/world/biome/JinericBiomes.java b/src/main/java/jingy/jineric/world/biome/JinericBiomes.java index a8b25be7..0630a71e 100644 --- a/src/main/java/jingy/jineric/world/biome/JinericBiomes.java +++ b/src/main/java/jingy/jineric/world/biome/JinericBiomes.java @@ -1,11 +1,8 @@ package jingy.jineric.world.biome; public class JinericBiomes { - - //TODO: FIX // // public static final List> BIOMES = new ArrayList<>(); -// // public static RegistryKey BOREAL_FOREST = createBiome("boreal_forest", JinericOverworldBiomes.createBorealForest(false)); // // diff --git a/src/main/resources/assets/jineric/blockstates/trapped_acacia_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_acacia_chest.json new file mode 100644 index 00000000..4e03d9b8 --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_acacia_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_acacia_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_birch_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_birch_chest.json new file mode 100644 index 00000000..b3e82e35 --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_birch_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_birch_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_crimson_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_crimson_chest.json new file mode 100644 index 00000000..7d4f0abc --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_crimson_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_crimson_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_dark_oak_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_dark_oak_chest.json new file mode 100644 index 00000000..5cc4ef83 --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_dark_oak_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_dark_oak_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_jungle_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_jungle_chest.json new file mode 100644 index 00000000..f47e4e77 --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_jungle_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_jungle_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_mangrove_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_mangrove_chest.json new file mode 100644 index 00000000..725dd93f --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_mangrove_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_mangrove_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_spruce_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_spruce_chest.json new file mode 100644 index 00000000..ca47964b --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_spruce_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_spruce_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/blockstates/trapped_warped_chest.json b/src/main/resources/assets/jineric/blockstates/trapped_warped_chest.json new file mode 100644 index 00000000..802cfe6a --- /dev/null +++ b/src/main/resources/assets/jineric/blockstates/trapped_warped_chest.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "jineric:block/trapped_warped_chest" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/lang/en_us.json b/src/main/resources/assets/jineric/lang/en_us.json index c54bd03e..d3ba725a 100644 --- a/src/main/resources/assets/jineric/lang/en_us.json +++ b/src/main/resources/assets/jineric/lang/en_us.json @@ -238,6 +238,14 @@ "block.jineric.mangrove_chest": "Mangrove Chest", "block.jineric.crimson_chest": "Crimson Chest", "block.jineric.warped_chest": "Warped Chest", + "block.jineric.trapped_spruce_chest": "Trapped Spruce Chest", + "block.jineric.trapped_birch_chest": "Trapped Birch Chest", + "block.jineric.trapped_jungle_chest": "Trapped Jungle Chest", + "block.jineric.trapped_acacia_chest": "Trapped Acacia Chest", + "block.jineric.trapped_dark_oak_chest": "Trapped Dark Oak Chest", + "block.jineric.trapped_mangrove_chest": "Trapped Mangrove Chest", + "block.jineric.trapped_crimson_chest": "Trapped Crimson Chest", + "block.jineric.trapped_warped_chest": "Trapped Warped Chest", "container.chestAcaciaDouble": "Double Acacia Chest", "container.chestBirchDouble": "Double Birch Chest", diff --git a/src/main/resources/assets/jineric/models/block/chest_template.json b/src/main/resources/assets/jineric/models/block/chest_template.json index 3cb2e3b8..c1c5d15f 100644 --- a/src/main/resources/assets/jineric/models/block/chest_template.json +++ b/src/main/resources/assets/jineric/models/block/chest_template.json @@ -1,5 +1,4 @@ { - "credit": "Made using Blockbench", "parent": "block/block", "elements": [ { diff --git a/src/main/resources/assets/jineric/models/block/trapped_acacia_chest.json b/src/main/resources/assets/jineric/models/block/trapped_acacia_chest.json new file mode 100644 index 00000000..703e7b75 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_acacia_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_acacia_chest", + "particle": "jineric:entity/chest/acacia_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_birch_chest.json b/src/main/resources/assets/jineric/models/block/trapped_birch_chest.json new file mode 100644 index 00000000..efc17825 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_birch_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_birch_chest", + "particle": "jineric:entity/chest/birch_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_crimson_chest.json b/src/main/resources/assets/jineric/models/block/trapped_crimson_chest.json new file mode 100644 index 00000000..af284756 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_crimson_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_crimson_chest", + "particle": "jineric:entity/chest/crimson_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_dark_oak_chest.json b/src/main/resources/assets/jineric/models/block/trapped_dark_oak_chest.json new file mode 100644 index 00000000..9669df15 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_dark_oak_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_dark_oak_chest", + "particle": "jineric:entity/chest/dark_oak_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_jungle_chest.json b/src/main/resources/assets/jineric/models/block/trapped_jungle_chest.json new file mode 100644 index 00000000..e1899d8f --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_jungle_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_jungle_chest", + "particle": "jineric:entity/chest/jungle_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_mangrove_chest.json b/src/main/resources/assets/jineric/models/block/trapped_mangrove_chest.json new file mode 100644 index 00000000..35c1a9a0 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_mangrove_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_mangrove_chest", + "particle": "jineric:entity/chest/mangrove_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_spruce_chest.json b/src/main/resources/assets/jineric/models/block/trapped_spruce_chest.json new file mode 100644 index 00000000..280bf66a --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_spruce_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_spruce_chest", + "particle": "jineric:entity/chest/spruce_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/block/trapped_warped_chest.json b/src/main/resources/assets/jineric/models/block/trapped_warped_chest.json new file mode 100644 index 00000000..531784e7 --- /dev/null +++ b/src/main/resources/assets/jineric/models/block/trapped_warped_chest.json @@ -0,0 +1,7 @@ +{ + "parent": "jineric:block/chest_template", + "textures": { + "0": "jineric:entity/chest/trapped_warped_chest", + "particle": "jineric:entity/chest/warped_chest_particle" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/jineric/models/item/trapped_acacia_chest.json b/src/main/resources/assets/jineric/models/item/trapped_acacia_chest.json new file mode 100644 index 00000000..627dabe2 --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_acacia_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_acacia_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_birch_chest.json b/src/main/resources/assets/jineric/models/item/trapped_birch_chest.json new file mode 100644 index 00000000..6c8119d7 --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_birch_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_birch_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_crimson_chest.json b/src/main/resources/assets/jineric/models/item/trapped_crimson_chest.json new file mode 100644 index 00000000..64482367 --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_crimson_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_crimson_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_dark_oak_chest.json b/src/main/resources/assets/jineric/models/item/trapped_dark_oak_chest.json new file mode 100644 index 00000000..5e647067 --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_dark_oak_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_dark_oak_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_jungle_chest.json b/src/main/resources/assets/jineric/models/item/trapped_jungle_chest.json new file mode 100644 index 00000000..d6edaddd --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_jungle_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_jungle_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_mangrove_chest.json b/src/main/resources/assets/jineric/models/item/trapped_mangrove_chest.json new file mode 100644 index 00000000..0a3963b5 --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_mangrove_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_mangrove_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_spruce_chest.json b/src/main/resources/assets/jineric/models/item/trapped_spruce_chest.json new file mode 100644 index 00000000..d6e9d59c --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_spruce_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_spruce_chest" +} diff --git a/src/main/resources/assets/jineric/models/item/trapped_warped_chest.json b/src/main/resources/assets/jineric/models/item/trapped_warped_chest.json new file mode 100644 index 00000000..ae2d518b --- /dev/null +++ b/src/main/resources/assets/jineric/models/item/trapped_warped_chest.json @@ -0,0 +1,3 @@ +{ + "parent": "jineric:block/trapped_warped_chest" +} diff --git a/src/main/resources/assets/jineric/textures/entity/chest/spruce_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/spruce_chest.png index fb5444b8..0ba66fa2 100644 Binary files a/src/main/resources/assets/jineric/textures/entity/chest/spruce_chest.png and b/src/main/resources/assets/jineric/textures/entity/chest/spruce_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_chest.png new file mode 100644 index 00000000..a09605d6 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_left.png new file mode 100644 index 00000000..423ba2b1 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_right.png new file mode 100644 index 00000000..17bb40e4 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_acacia_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_chest.png new file mode 100644 index 00000000..296d4ef7 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_left.png new file mode 100644 index 00000000..a1b192c7 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_right.png new file mode 100644 index 00000000..0677d66f Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_birch_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_chest.png new file mode 100644 index 00000000..6a518bf3 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_left.png new file mode 100644 index 00000000..316875ea Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_right.png new file mode 100644 index 00000000..f346202c Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_crimson_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_chest.png new file mode 100644 index 00000000..1d0b2e41 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_left.png new file mode 100644 index 00000000..125ffa55 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_right.png new file mode 100644 index 00000000..cd628d27 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_dark_oak_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_chest.png new file mode 100644 index 00000000..10ba045e Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_left.png new file mode 100644 index 00000000..ef3213ec Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_right.png new file mode 100644 index 00000000..c30b0f2a Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_jungle_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_chest.png new file mode 100644 index 00000000..20b1cca4 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_left.png new file mode 100644 index 00000000..7ab6710d Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_right.png new file mode 100644 index 00000000..77204b07 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_mangrove_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_chest.png new file mode 100644 index 00000000..41303945 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_left.png new file mode 100644 index 00000000..2a177dd1 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_right.png new file mode 100644 index 00000000..84aa91d7 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_spruce_right.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_chest.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_chest.png new file mode 100644 index 00000000..e63d6f53 Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_chest.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_left.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_left.png new file mode 100644 index 00000000..3dafbb3a Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_left.png differ diff --git a/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_right.png b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_right.png new file mode 100644 index 00000000..2482cdde Binary files /dev/null and b/src/main/resources/assets/jineric/textures/entity/chest/trapped_warped_right.png differ diff --git a/src/main/resources/assets/minecraft/atlases/blocks.json b/src/main/resources/assets/minecraft/atlases/blocks.json index 9977c70c..bbe9ccd7 100644 --- a/src/main/resources/assets/minecraft/atlases/blocks.json +++ b/src/main/resources/assets/minecraft/atlases/blocks.json @@ -8,6 +8,14 @@ {"type": "single", "resource": "jineric:entity/chest/mangrove_chest"}, {"type": "single", "resource": "jineric:entity/chest/crimson_chest"}, {"type": "single", "resource": "jineric:entity/chest/warped_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_spruce_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_birch_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_jungle_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_acacia_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_dark_oak_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_mangrove_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_crimson_chest"}, + {"type": "single", "resource": "jineric:entity/chest/trapped_warped_chest"}, {"type": "single", "resource": "jineric:entity/chest/spruce_chest_particle"}, {"type": "single", "resource": "jineric:entity/chest/birch_chest_particle"}, diff --git a/src/main/resources/assets/minecraft/atlases/chests.json b/src/main/resources/assets/minecraft/atlases/chests.json deleted file mode 100644 index 9a6435c4..00000000 --- a/src/main/resources/assets/minecraft/atlases/chests.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "sources": [ - { - "type": "directory", - "source": "entity/chest", - "prefix": "entity/chest/" - } - ], - "values": [ - {"resource": "jineric:spruce_chest"}, - {"resource": "jineric:birch_chest"}, - {"resource": "jineric:jungle_chest"}, - {"resource": "jineric:acacia_chest"}, - {"resource": "jineric:dark_oak_chest"}, - {"resource": "jineric:mangrove_chest"}, - {"resource": "jineric:crimson_chest"}, - {"resource": "jineric:warped_chest"}, - {"resource": "shulker_chest"} - ] -} \ No newline at end of file diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest.png deleted file mode 100644 index 87cb5c7f..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest_particle.png deleted file mode 100644 index d19c90c8..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/acacia_left.png deleted file mode 100644 index 71c8a7d0..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/acacia_right.png deleted file mode 100644 index 1b667379..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/acacia_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest.png deleted file mode 100644 index 2c911d32..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest_particle.png deleted file mode 100644 index 5faf2f3a..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/birch_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/birch_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/birch_left.png deleted file mode 100644 index 5839fe8f..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/birch_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/birch_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/birch_right.png deleted file mode 100644 index 7f689beb..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/birch_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest.png deleted file mode 100644 index 443b4e6f..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest_particle.png deleted file mode 100644 index 9d1f8151..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/crimson_left.png deleted file mode 100644 index edc77d11..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/crimson_right.png deleted file mode 100644 index b327d723..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/crimson_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest.png deleted file mode 100644 index 098d4197..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest_particle.png deleted file mode 100644 index a57d654a..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_left.png deleted file mode 100644 index cccc7bca..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_right.png deleted file mode 100644 index c92f4eb4..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/dark_oak_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest.png deleted file mode 100644 index 14092fdf..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest_particle.png deleted file mode 100644 index c841f3e7..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/jungle_left.png deleted file mode 100644 index 5f87cb6b..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/jungle_right.png deleted file mode 100644 index 8cd9c282..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/jungle_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest.png deleted file mode 100644 index b7e6ce02..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest_particle.png deleted file mode 100644 index 03c82593..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_left.png deleted file mode 100644 index dfa4d602..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_right.png deleted file mode 100644 index f7f330be..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/mangrove_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/shulker_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/shulker_chest.png deleted file mode 100644 index 870e312c..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/shulker_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest.png deleted file mode 100644 index fb5444b8..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest_particle.png deleted file mode 100644 index 8c206dff..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/spruce_left.png deleted file mode 100644 index 53db213c..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/spruce_right.png deleted file mode 100644 index 7996bf59..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/spruce_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest.png b/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest.png deleted file mode 100644 index 9f7fbb18..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest_particle.png b/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest_particle.png deleted file mode 100644 index 68fb6dd6..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/warped_chest_particle.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/warped_left.png b/src/main/resources/assets/minecraft/textures/entity/chest/warped_left.png deleted file mode 100644 index 5618bec7..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/warped_left.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/entity/chest/warped_right.png b/src/main/resources/assets/minecraft/textures/entity/chest/warped_right.png deleted file mode 100644 index 28727f8b..00000000 Binary files a/src/main/resources/assets/minecraft/textures/entity/chest/warped_right.png and /dev/null differ diff --git a/src/main/resources/assets/minecraft/textures/item/bone_meal.png b/src/main/resources/assets/minecraft/textures/item/bone_meal.png index c47fa9a7..c10fd618 100644 Binary files a/src/main/resources/assets/minecraft/textures/item/bone_meal.png and b/src/main/resources/assets/minecraft/textures/item/bone_meal.png differ diff --git a/src/main/resources/data/jineric/recipes/bone_block_from_bone_meal_block.json b/src/main/resources/data/jineric/recipes/bone_block_from_bone_meal_block.json new file mode 100644 index 00000000..fbf5bddb --- /dev/null +++ b/src/main/resources/data/jineric/recipes/bone_block_from_bone_meal_block.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "bone_block", + "category": "misc", + "key": { + "#": { + "item": "jineric:bone_meal_block" + } + }, + "pattern": [ + " # ", + " # ", + " # " + ], + "result": { + "item": "minecraft:bone_block" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/resources/data/jineric/recipes/bone_from_bone_block.json b/src/main/resources/data/jineric/recipes/bone_from_bone_block.json deleted file mode 100644 index 5852a5e2..00000000 --- a/src/main/resources/data/jineric/recipes/bone_from_bone_block.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "pattern": [ - "#" - ], - "key": { - "#": { - "item": "minecraft:bone_block" - } - }, - "result": { - "item": "minecraft:bone", - "count": 9 - } -} \ No newline at end of file diff --git a/src/main/resources/data/jineric/recipes/bone_meal_block.json b/src/main/resources/data/jineric/recipes/bone_meal_block.json index b2e01fe5..2fa6706d 100644 --- a/src/main/resources/data/jineric/recipes/bone_meal_block.json +++ b/src/main/resources/data/jineric/recipes/bone_meal_block.json @@ -1,6 +1,6 @@ { "type": "minecraft:crafting_shaped", - "category": "building", + "category": "misc", "key": { "#": { "item": "minecraft:bone_meal" diff --git a/src/main/resources/data/jineric/recipes/bone_meal_from_bone_meal_block.json b/src/main/resources/data/jineric/recipes/bone_meal_from_bone_meal_block.json new file mode 100644 index 00000000..31825aa8 --- /dev/null +++ b/src/main/resources/data/jineric/recipes/bone_meal_from_bone_meal_block.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "bonemeal", + "category": "misc", + "ingredients": [ + { + "item": "jineric:bone_meal_block" + } + ], + "result": { + "count": 9, + "item": "minecraft:bone_meal" + } +} \ No newline at end of file diff --git a/src/main/resources/data/jineric/recipes/wavy_red_sandstone.json b/src/main/resources/data/jineric/recipes/wavy_red_sandstone.json new file mode 100644 index 00000000..adb7355d --- /dev/null +++ b/src/main/resources/data/jineric/recipes/wavy_red_sandstone.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " # ", + "# #", + " # " + ], + "key": { + "#": { + "item": "minecraft:red_sandstone" + } + }, + "result": { + "item": "jineric:wavy_red_sandstone", + "count": 4 + } +} diff --git a/src/main/resources/data/jineric/tags/blocks/wooden_chests.json b/src/main/resources/data/jineric/tags/blocks/wooden_chests.json index 3d8fb45c..1d827c49 100644 --- a/src/main/resources/data/jineric/tags/blocks/wooden_chests.json +++ b/src/main/resources/data/jineric/tags/blocks/wooden_chests.json @@ -8,6 +8,14 @@ "jineric:dark_oak_chest", "jineric:crimson_chest", "jineric:warped_chest", - "jineric:mangrove_chest" + "jineric:mangrove_chest", + "jineric:trapped_warped_chest", + "jineric:trapped_crimson_chest", + "jineric:trapped_mangrove_chest", + "jineric:trapped_dark_oak_chest", + "jineric:trapped_acacia_chest", + "jineric:trapped_jungle_chest", + "jineric:trapped_birch_chest", + "jineric:trapped_spruce_chest" ] } \ No newline at end of file diff --git a/src/main/resources/data/jineric/tags/items/chests.json b/src/main/resources/data/jineric/tags/items/chests.json index 6858b33f..b763c771 100644 --- a/src/main/resources/data/jineric/tags/items/chests.json +++ b/src/main/resources/data/jineric/tags/items/chests.json @@ -9,6 +9,14 @@ "jineric:acacia_chest", "jineric:jungle_chest", "jineric:birch_chest", - "jineric:spruce_chest" + "jineric:spruce_chest", + "jineric:trapped_warped_chest", + "jineric:trapped_crimson_chest", + "jineric:trapped_mangrove_chest", + "jineric:trapped_dark_oak_chest", + "jineric:trapped_acacia_chest", + "jineric:trapped_jungle_chest", + "jineric:trapped_birch_chest", + "jineric:trapped_spruce_chest" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/acacia_chest_boat.json b/src/main/resources/data/minecraft/recipes/acacia_chest_boat.json new file mode 100644 index 00000000..1ebf79bd --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/acacia_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:acacia_boat" + } + ], + "result": { + "item": "minecraft:acacia_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/birch_chest_boat.json b/src/main/resources/data/minecraft/recipes/birch_chest_boat.json new file mode 100644 index 00000000..1c024e33 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/birch_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:birch_boat" + } + ], + "result": { + "item": "minecraft:birch_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/bone_block.json b/src/main/resources/data/minecraft/recipes/bone_block.json index c229f6df..d70a5218 100644 --- a/src/main/resources/data/minecraft/recipes/bone_block.json +++ b/src/main/resources/data/minecraft/recipes/bone_block.json @@ -1,17 +1,19 @@ { "type": "minecraft:crafting_shaped", - "pattern": [ - "###", - "###", - "###" - ], + "group": "bone_block", + "category": "misc", "key": { "#": { "item": "minecraft:bone" } }, + "pattern": [ + "###", + "###", + "###" + ], "result": { - "item": "minecraft:bone_block", - "count": 1 - } + "item": "minecraft:bone_block" + }, + "show_notification": true } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/bone_meal_from_bone_block.json b/src/main/resources/data/minecraft/recipes/bone_meal_from_bone_block.json index dc6d61d1..6cb8f05e 100644 --- a/src/main/resources/data/minecraft/recipes/bone_meal_from_bone_block.json +++ b/src/main/resources/data/minecraft/recipes/bone_meal_from_bone_block.json @@ -1,14 +1,13 @@ { - "type": "minecraft:crafting_shapeless", - "category": "misc", - "group": "bonemeal", - "ingredients": [ - { - "item": "jineric:bone_meal_block" - } - ], - "result": { - "count": 9, - "item": "minecraft:bone_meal" - } + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "minecraft:bone_block" + } + ], + "result": { + "count": 9, + "item": "minecraft:bone" + } } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/dark_oak_chest_boat.json b/src/main/resources/data/minecraft/recipes/dark_oak_chest_boat.json new file mode 100644 index 00000000..59fe2a39 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/dark_oak_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:dark_oak_boat" + } + ], + "result": { + "item": "minecraft:dark_oak_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/jungle_chest_boat.json b/src/main/resources/data/minecraft/recipes/jungle_chest_boat.json new file mode 100644 index 00000000..f10ee759 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/jungle_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:jungle_boat" + } + ], + "result": { + "item": "minecraft:jungle_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/mangrove_chest_boat.json b/src/main/resources/data/minecraft/recipes/mangrove_chest_boat.json new file mode 100644 index 00000000..b99cb805 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/mangrove_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:mangrove_boat" + } + ], + "result": { + "item": "minecraft:mangrove_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/oak_chest_boat.json b/src/main/resources/data/minecraft/recipes/oak_chest_boat.json new file mode 100644 index 00000000..29e587f1 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/oak_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:oak_boat" + } + ], + "result": { + "item": "minecraft:oak_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/spruce_chest_boat.json b/src/main/resources/data/minecraft/recipes/spruce_chest_boat.json new file mode 100644 index 00000000..44d25261 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/spruce_chest_boat.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "group": "chest_boat", + "ingredients": [ + { + "tag": "jineric:chests" + }, + { + "item": "minecraft:spruce_boat" + } + ], + "result": { + "item": "minecraft:spruce_chest_boat" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/recipes/trapped_chest.json b/src/main/resources/data/minecraft/recipes/trapped_chest.json new file mode 100644 index 00000000..6cea98e4 --- /dev/null +++ b/src/main/resources/data/minecraft/recipes/trapped_chest.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "group": "trapped_chest", + "category": "redstone", + "ingredients": [ + { + "item": "minecraft:chest" + }, + { + "item": "minecraft:tripwire_hook" + } + ], + "result": { + "item": "minecraft:trapped_chest" + } +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/guarded_by_piglins.json b/src/main/resources/data/minecraft/tags/blocks/guarded_by_piglins.json index 513c4b39..af6d4efb 100644 --- a/src/main/resources/data/minecraft/tags/blocks/guarded_by_piglins.json +++ b/src/main/resources/data/minecraft/tags/blocks/guarded_by_piglins.json @@ -7,6 +7,14 @@ "jineric:dark_oak_chest", "jineric:mangrove_chest", "jineric:crimson_chest", - "jineric:warped_chest" + "jineric:warped_chest", + "jineric:trapped_spruce_chest", + "jineric:trapped_birch_chest", + "jineric:trapped_jungle_chest", + "jineric:trapped_acacia_chest", + "jineric:trapped_dark_oak_chest", + "jineric:trapped_mangrove_chest", + "jineric:trapped_crimson_chest", + "jineric:trapped_warped_chest" ] } \ No newline at end of file