diff --git a/README.md b/README.md index ddbd07b..187cceb 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,12 @@ La [vision complète](docs/vision.md) conserve les intentions ; le L’économie, les claims et les dimensions décrits dans la vision restent à implémenter. -La version **beta.117** répartit les couleurs exactes des textures de blocs -sur les sculptures, y compris les modèles unis, avec un calcul Java borné -et conservé. Elle corrige aussi les sculptures devenues invisibles après -équipement en chapeau. -Le [ticket de livraison](docs/sculpture-texture-grain-beta117.md) conserve les -contrôles et le suivi de distribution. La release est publiée et l'instance -**Sanctuary Beta** est synchronisée, sauvegardes et réglages conservés. +La version **beta.118** ajoute les seize murets en briques colorées, avec +leurs textures existantes, les raccords natifs et leurs recettes. Ils forment +une série de seize après les dalles dans l'onglet des blocs colorés. +Le [ticket de livraison](docs/colored-brick-walls-beta118.md) conserve les +contrôles et le suivi de distribution. Livraison en préparation ; l'instance +**Sanctuary Beta** publiée reste beta.117 jusqu'à sa synchronisation. La [livraison précédente](docs/clay-workshop-integration-beta110.md) réunit déjà l’atelier, les œufs et la neige saisonnière dans l’instance **Sanctuary Beta**. Les [synchronisations antérieures](docs/git-sync-beta092.md) restent documentées. @@ -37,6 +36,11 @@ La [carte native beta.005](docs/atlas-beta005.md) prend le relais après l’étude de Xaero et des alternatives libres. +## beta.118 — Murets en briques colorées + +Seize couleurs, fabrication et tailleur de pierre, eau, raccords et collisions +natifs. [Contrat et vérifications](docs/colored-brick-walls-beta118.md). + ## beta.117 — Grain des textures et sculptures en chapeau Les petits cubes d'une sculpture reprennent plusieurs nuances des textures diff --git a/docs/colored-brick-walls-beta118.md b/docs/colored-brick-walls-beta118.md new file mode 100644 index 0000000..031636c --- /dev/null +++ b/docs/colored-brick-walls-beta118.md @@ -0,0 +1,69 @@ +# beta.118 — Murets en briques de couleur + +Ticket sur `codex/colored-brick-walls-beta118`, Minecraft 26.3. + +Les seize familles de briques reçoivent un muret natif `WallBlock`, sous +l'identifiant `sanctuary:_brick_wall`. Chaque muret réutilise la texture +de briques fournie de sa couleur, sans nouvelle image ni recoloration. + +Les murets forment une série de seize dans **Blocs colorés**, après les dalles +et avant les argiles, dans l'ordre des couleurs vanilla retenu en beta.103. +Les libellés sont traduits FR/EN. + +Recettes : six briques de même couleur, en deux rangées de trois, donnent six +murets ; le tailleur de pierre donne un muret par bloc de briques. Les deux +recettes par couleur rejoignent la collection Argile et briques et leurs +déblocages. Totaux des ajouts colorés : 80 blocs, 112 objets dont ces blocs, +224 recettes. Les recettes et identifiants préexistants sont conservés. + +Piliers, raccords entre couleurs et aux murets vanilla, côtés hauts/bas, +collisions et immersion dans l'eau viennent du jeu. Tags natifs `walls` +pour blocs et objets, pioche et butin de la bonne couleur. États, modèles +multipart et butins sont repris des ressources exactes Minecraft 26.3. + +La génération reste reproductible dans `tools/generate-colored-bricks.py` ; +elle conserve les ajouts externes à ses briques, notamment la recette du +Clay Workshop et les membres Sculpture/Atelier. Le compilateur des collections +reste leur seul générateur. Aucun ajout au +terrain, changement de format ou migration de sauvegarde. Les dépendances +et le pack de textures intégré beta.090 restent inchangés. + +## Vérifications et livraison + +Le scénario natif `Bricks102ClientChecks`, complété par `Walls118Checks`, +passe en **38 secondes** sur un nouveau monde plat de graine 102 avec serveur +intégré Minecraft 26.3 : + +- Seize murets réellement posés, dont une seconde série dans l'eau. +- Recette de six murets et tailleur de pierre pour chaque couleur ; les + anciennes recettes de briques, dalles, escaliers et argiles passent aussi. +- Raccords entre couleurs et au muret vanilla, retrait des piliers intermédiaires, + côtés relevés sous un bloc plein, collisions identiques au muret vanilla. +- Eau conservée, pioche, butin de la bonne couleur, collection et recettes + découvertes, recette du Clay Workshop toujours découverte, série créative + de seize dans l'ordre natif. +- États et modèles de tous les blocs de la famille vérifiés, sans texture + manquante ; sauvegarde et reconnexion conservent les murets et leur eau. + +Log : `build/walls118-client.log`, marqueur `WALLS118_PASS`. Capture de la +galerie relue dans `build/walls118-evidence/`. Aucun essai Windows ou LAN ; +GameTest dédié exclu selon le refus antérieur de son EULA. Aucun monde personnel +ouvert. La régénération finale conserve à l'identique 2 024 fichiers de +ressources et métadonnées. + +`check build assemblePack assembleTestPack -x :sanctuary:runGameTest` réussit +en **2 min 5 s**, 125 tâches dont 101 exécutées. Sources et JAR concordants, +intégrité ZIP, versions, modèles natifs, recettes et empreintes vérifiés. +La comparaison avec beta.117 limite les changements de classes à +`ColoredBricks` et ses classes internes ; les sculptures et chapeaux restent +identiques. Les textures existantes sont toutes conservées octet pour octet. + +- `Sanctuary-beta.118.mrpack` : 10216437 octets, SHA-256 + `75bb04aad981644888690aaeda9a293a94c5d32f6439ca24613365a41aba1b6b`. +- `Sanctuary-Test-beta.118.mrpack` : 10235359 octets, SHA-256 + `f7f0a177b8472f0e8c34ad99a1ccef5d61396014017d260e934e910c4e6eb00f`. +- JAR Sanctuary : + `fc6edf4046a8ace357d561ed942213a22c7a27164fa160cdb4316f72ec302575`. + +Reçu : `build/walls118-artifact.json`. Publication et synchronisation finales +en cours. diff --git a/gradle.properties b/gradle.properties index a61cf9a..50d0f20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,8 +9,8 @@ loom_version=1.17.20 fabric_api_version=0.160.5+26.3 # Release counter: beta.001, .002, .003, ... (see docs/versioning.md). -mod_version=beta.117 -pack_version=beta.117 +mod_version=beta.118 +pack_version=beta.118 resource_pack_version=beta.090 maven_group=fr.koka.sanctuary jei_version=30.32.0-sanctuary.3 diff --git a/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Bricks102ClientChecks.java b/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Bricks102ClientChecks.java index 9f00bd3..cabf45c 100644 --- a/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Bricks102ClientChecks.java +++ b/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Bricks102ClientChecks.java @@ -37,10 +37,10 @@ public final class Bricks102ClientChecks implements FabricClientGameTest { c.waitFor(m->ProgressionClient.active()&&m.player!=null&&m.gui.screen()==null&&!IntroSpawnFlash.active(),1200); world.getServer().runOnServer(s->{ var p=s.getPlayerList().getPlayers().getFirst();var level=p.level();var pos=new BlockPos(0,3,0); - check(ColoredBricks.families().size()==16,"All colors registered");int index=0; + check(ColoredBricks.families().size()==16,"All colors registered");Walls118Checks.server(s);int index=0; for(var f:ColoredBricks.families()){ String color=f.color().getName(); - for(var block:List.of(f.bricks(),f.slab(),f.stairs(),f.clay()))check(block.asItem()!=Items.AIR,"Block item exists "+block); + for(var block:List.of(f.bricks(),f.slab(),f.stairs(),f.wall(),f.clay()))check(block.asItem()!=Items.AIR,"Block item exists "+block); check(f.bricks().defaultBlockState().is(BlockTags.MINEABLE_WITH_PICKAXE),"Pickaxe tag "+color); check(f.clay().defaultBlockState().is(BlockTags.MINEABLE_WITH_SHOVEL),"Shovel tag "+color); var shovel=new ItemStack(Items.DIAMOND_SHOVEL);var silk=shovel.copy();silk.enchant(level.registryAccess().lookupOrThrow(Registries.ENCHANTMENT).getOrThrow(Enchantments.SILK_TOUCH),1); @@ -52,7 +52,7 @@ public final class Bricks102ClientChecks implements FabricClientGameTest { drop(Block.getDrops(f.stairs().defaultBlockState(),level,pos,null),f.stairs().asItem(),1); check(f.slab().defaultBlockState().setValue(SlabBlock.WATERLOGGED,true).getFluidState().isSource(),"Slab water "+color); check(f.stairs().defaultBlockState().setValue(StairBlock.WATERLOGGED,true).getFluidState().isSource(),"Stair water "+color); - for(String suffix:List.of("clay_ball_from_dye","clay_from_dye","brick_from_dye","bricks_from_dye","clay","bricks","brick_slab","brick_stairs","brick_slab_from_stonecutting","brick_stairs_from_stonecutting","clay_ball_smelting","clay_smelting"))check(s.getRecipeManager().byKey(ResourceKey.create(Registries.RECIPE,SanctuaryMod.id(color+"_"+suffix))).isPresent(),"Recipe loaded "+color+"_"+suffix); + for(String suffix:List.of("clay_ball_from_dye","clay_from_dye","brick_from_dye","bricks_from_dye","clay","bricks","brick_slab","brick_stairs","brick_slab_from_stonecutting","brick_stairs_from_stonecutting","brick_wall","brick_wall_from_stonecutting","clay_ball_smelting","clay_smelting"))check(s.getRecipeManager().byKey(ResourceKey.create(Registries.RECIPE,SanctuaryMod.id(color+"_"+suffix))).isPresent(),"Recipe loaded "+color+"_"+suffix); craft(s,level,2,2,List.of(f.brick(),f.brick(),f.brick(),f.brick()),f.bricks().asItem(),1); craft(s,level,2,2,List.of(f.clayBall(),f.clayBall(),f.clayBall(),f.clayBall()),f.clay().asItem(),1); craft(s,level,3,1,List.of(f.bricks().asItem(),f.bricks().asItem(),f.bricks().asItem()),f.slab().asItem(),6); @@ -62,39 +62,40 @@ public final class Bricks102ClientChecks implements FabricClientGameTest { var input=new SingleRecipeInput(new ItemStack(f.clayBall()));var cooked=s.getRecipeManager().getRecipeFor(RecipeType.SMELTING,input,level).orElseThrow().value().assemble(input);check(cooked.is(f.brick()),"Smelt brick "+color); input=new SingleRecipeInput(new ItemStack(f.clay()));cooked=s.getRecipeManager().getRecipeFor(RecipeType.SMELTING,input,level).orElseThrow().value().assemble(input);check(cooked.is(BuiltInRegistries.ITEM.getValue(net.minecraft.resources.Identifier.withDefaultNamespace(color+"_terracotta"))),"Smelt terracotta "+color); var stoneInput=new SingleRecipeInput(new ItemStack(f.bricks())); - for(var variant:List.of(new Object[]{"brick_slab",f.slab().asItem(),2},new Object[]{"brick_stairs",f.stairs().asItem(),1})){ + for(var variant:List.of(new Object[]{"brick_slab",f.slab().asItem(),2},new Object[]{"brick_stairs",f.stairs().asItem(),1},new Object[]{"brick_wall",f.wall().asItem(),1})){ var recipe=(StonecutterRecipe)s.getRecipeManager().byKey(ResourceKey.create(Registries.RECIPE,SanctuaryMod.id(color+"_"+variant[0]+"_from_stonecutting"))).orElseThrow().value();check(recipe.matches(stoneInput,level),"Stonecutting accepts input");var cut=recipe.assemble(stoneInput);check(cut.is((Item)variant[1])&&cut.getCount()==(int)variant[2],"Stonecutting result"); } int x=(index%8)*3,z=(index/8)*5;level.setBlockAndUpdate(new BlockPos(x,1,z),f.bricks().defaultBlockState());level.setBlockAndUpdate(new BlockPos(x,2,z),f.slab().defaultBlockState().setValue(SlabBlock.TYPE,SlabType.TOP));level.setBlockAndUpdate(new BlockPos(x+1,1,z),f.stairs().defaultBlockState().setValue(StairBlock.FACING,Direction.SOUTH));level.setBlockAndUpdate(new BlockPos(x,1,z+1),f.clay().defaultBlockState());index++; } fr.koka.sanctuary.recipes.RecipeService.discover(p,Items.CLAY_BALL);fr.koka.sanctuary.recipes.RecipeService.refresh(p); var known=fr.koka.sanctuary.recipes.RecipeService.knowledge(p); - for(var f:ColoredBricks.families())check(known.recipes.contains("sanctuary:"+f.color().getName()+"_brick_stairs_from_stonecutting"),"Collection unlock "+f.color()); + check(known.recipes.contains("sanctuary:clay_workshop"),"Existing workshop recipe remains discoverable"); + for(var f:ColoredBricks.families())check(known.recipes.contains("sanctuary:"+f.color().getName()+"_brick_stairs_from_stonecutting")&&known.recipes.contains("sanctuary:"+f.color().getName()+"_brick_wall")&&known.recipes.contains("sanctuary:"+f.color().getName()+"_brick_wall_from_stonecutting"),"Collection unlock "+f.color()); s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"sanctuary time vanilla");s.getCommands().performPrefixedCommand(s.createCommandSourceStack(),"time set noon"); p.teleportTo(11,8,19);p.setYRot(180);p.setXRot(26);p.getAbilities().flying=true;p.onUpdateAbilities(); }); c.runOnClient(m->{ CreativeModeTabs.tryRebuildTabContents(m.level.enabledFeatures(),true,m.level.registryAccess()); var blocks=BuiltInRegistries.CREATIVE_MODE_TAB.getOrThrow(CreativeModeTabs.COLORED_BLOCKS).value().getDisplayItems(); - var ingredients=BuiltInRegistries.CREATIVE_MODE_TAB.getOrThrow(CreativeModeTabs.INGREDIENTS).value().getDisplayItems(); + var ingredients=BuiltInRegistries.CREATIVE_MODE_TAB.getOrThrow(CreativeModeTabs.INGREDIENTS).value().getDisplayItems();Walls118Checks.creative(new ArrayList<>(blocks)); for(var f:ColoredBricks.families()){ - for(var b:List.of(f.bricks(),f.slab(),f.stairs(),f.clay())){ + for(var b:List.of(f.bricks(),f.slab(),f.stairs(),f.wall(),f.clay())){ check(blocks.stream().anyMatch(i->i.is(b.asItem())),"Creative color tab "+b); for(var state:b.getStateDefinition().getPossibleStates()){ - var parts=new ArrayList();m.getModelManager().getBlockStateModelSet().get(state).collectParts(net.minecraft.util.RandomSource.create(0),parts);check(!parts.isEmpty(),"Baked model "+state); + var parts=new ArrayList();m.getModelManager().getBlockStateModelSet().get(state).collectParts(net.minecraft.util.RandomSource.create(0),parts);check(b instanceof WallBlock||!parts.isEmpty(),"Baked model "+state); for(var part:parts)for(var direction:new Direction[]{Direction.UP,Direction.DOWN,Direction.NORTH,Direction.SOUTH,Direction.EAST,Direction.WEST,null})for(var quad:part.getQuads(direction))check(!quad.materialInfo().sprite().contents().name().toString().contains("missingno"),"No missing texture "+state); } } for(var item:List.of(f.clayBall(),f.brick()))check(ingredients.stream().anyMatch(i->i.is(item)),"Creative ingredients "+item); } }); - c.waitTicks(20);c.runOnClient(m->{m.player.setYRot(180);m.player.setXRot(26);});c.waitTicks(4);c.takeScreenshot("bricks102-gallery");saved=world.getWorldSave();System.out.println("BRICKS102_NATIVE_PASS colors=16 recipes=192 blocks=64 items=96"); + c.waitTicks(20);c.runOnClient(m->{m.player.setYRot(180);m.player.setXRot(26);});c.waitTicks(4);c.takeScreenshot("bricks102-gallery");saved=world.getWorldSave();System.out.println("BRICKS102_NATIVE_PASS colors=16 recipes=224 blocks=80 items=112"); } try(var world=saved.open()){ c.waitFor(m->m.player!=null&&m.gui.screen()==null,1200); - world.getServer().runOnServer(s->{var level=s.getPlayerList().getPlayers().getFirst().level();int i=0;for(var f:ColoredBricks.families()){var pos=new BlockPos((i%8)*3,1,(i/8)*5);check(level.getBlockState(pos).is(f.bricks()),"Saved bricks "+f.color());check(level.getBlockState(pos.above()).getValue(SlabBlock.TYPE)==SlabType.TOP,"Saved slab state");i++;}}); + world.getServer().runOnServer(s->{var level=s.getPlayerList().getPlayers().getFirst().level();Walls118Checks.saved(level);int i=0;for(var f:ColoredBricks.families()){var pos=new BlockPos((i%8)*3,1,(i/8)*5);check(level.getBlockState(pos).is(f.bricks()),"Saved bricks "+f.color());check(level.getBlockState(pos.above()).getValue(SlabBlock.TYPE)==SlabType.TOP,"Saved slab state");i++;}}); } - System.out.println("BRICKS102_PASS"); + System.out.println("BRICKS102_PASS");System.out.println("WALLS118_PASS native placement, mixed connections, tall sides, waterlogging, collision, crafting, stonecutting, loot, collection, creative order, baked models and reconnect"); } private static void craft(net.minecraft.server.MinecraftServer s,net.minecraft.server.level.ServerLevel level,int w,int h,List items,Item result,int count){var input=CraftingInput.of(w,h,items.stream().map(ItemStack::new).toList());var stack=s.getRecipeManager().getRecipeFor(RecipeType.CRAFTING,input,level).orElseThrow().value().assemble(input);check(stack.is(result)&&stack.getCount()==count,"Craft "+result);} private static void drop(List drops,Item item,int count){check(drops.size()==1&&drops.getFirst().is(item)&&drops.getFirst().getCount()==count,"Loot "+item+" expected "+count+" got "+drops);} diff --git a/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Walls118Checks.java b/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Walls118Checks.java new file mode 100644 index 0000000..68015bb --- /dev/null +++ b/mods/sanctuary/src/clientGametest/java/fr/koka/sanctuary/client/Walls118Checks.java @@ -0,0 +1,73 @@ +package fr.koka.sanctuary.client; + +import fr.koka.sanctuary.building.ColoredBricks; +import java.util.*; +import net.minecraft.core.*; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.tags.*; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.item.*; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.item.crafting.*; +import net.minecraft.world.level.block.*; +import net.minecraft.world.level.block.state.properties.WallSide; +import net.minecraft.world.phys.*; + +/** Gameplay regressions using native placement, neighbor updates and recipe matching. */ +final class Walls118Checks { + static void server(MinecraftServer server){ + var player=server.getPlayerList().getPlayers().getFirst();var level=player.level(); + for(int x=-1;x<=17;x++)for(int z=9;z<=13;z++)level.setBlockAndUpdate(new BlockPos(x,0,z),Blocks.STONE.defaultBlockState()); + int index=0; + for(var family:ColoredBricks.families()){ + var wall=family.wall();var state=wall.defaultBlockState(); + check(wall instanceof WallBlock&&state.is(BlockTags.WALLS)&&state.is(BlockTags.MINEABLE_WITH_PICKAXE),"Native wall type, connection and mining tags"); + check(new ItemStack(wall).is(ItemTags.WALLS),"Native wall item tag"); + var input=CraftingInput.of(3,2,Collections.nCopies(6,new ItemStack(family.bricks()))); + var recipe=server.getRecipeManager().getRecipeFor(RecipeType.CRAFTING,input,level).orElseThrow().value();var result=recipe.assemble(input); + check(result.is(wall.asItem())&&result.getCount()==6,"Six matching bricks craft six walls"); + var drops=Block.getDrops(state,level,new BlockPos(0,2,0),null,player,new ItemStack(Items.DIAMOND_PICKAXE)); + check(drops.size()==1&&drops.getFirst().is(wall.asItem())&&drops.getFirst().getCount()==1,"Wall drops its own color"); + for(int z:new int[]{10,12}){ + var pos=new BlockPos(index,1,z); + player.teleportTo(index+.5,1,z+2.5); + if(z==12)level.setBlockAndUpdate(pos,Blocks.WATER.defaultBlockState()); + player.setItemInHand(InteractionHand.MAIN_HAND,new ItemStack(wall)); + var hit=new BlockHitResult(Vec3.atBottomCenterOf(pos),Direction.UP,pos.below(),false); + var placed=player.getMainHandItem().useOn(new UseOnContext(player,InteractionHand.MAIN_HAND,hit)); + check(placed.consumesAction(),"Native wall item placement: "+family.color()+" at "+pos+" = "+placed+", existing "+level.getBlockState(pos)); + check(level.getBlockState(pos).is(wall),"Placed wall keeps its color"); + check(level.getBlockState(pos).getValue(WallBlock.WATERLOGGED)==(z==12),"Native waterlogging on placement"); + } + index++; + } + for(int i=1;i<15;i++){ + var pos=new BlockPos(i,1,10);var state=level.getBlockState(pos); + check(state.getValue(WallBlock.EAST)==WallSide.LOW&&state.getValue(WallBlock.WEST)==WallSide.LOW&&!state.getValue(WallBlock.UP),"Mixed-color straight wall removes middle post"); + level.setBlockAndUpdate(pos.above(),Blocks.STONE.defaultBlockState()); + state=level.getBlockState(pos);check(state.getValue(WallBlock.EAST)==WallSide.TALL&&state.getValue(WallBlock.WEST)==WallSide.TALL,"Full block above raises connected sides"); + var vanilla=Blocks.BRICK_WALL.withPropertiesOf(state); + check(state.getCollisionShape(level,pos).toAabbs().equals(vanilla.getCollisionShape(level,pos).toAabbs()),"Collision equals native brick wall"); + level.removeBlock(pos.above(),false); + } + var end=new BlockPos(16,1,10);level.setBlockAndUpdate(end,Blocks.BRICK_WALL.defaultBlockState()); + check(level.getBlockState(end.west()).getValue(WallBlock.EAST)==WallSide.LOW,"Connects to vanilla brick wall"); + saved(level); + } + static void creative(List display){ + var colors=List.of(DyeColor.WHITE,DyeColor.LIGHT_GRAY,DyeColor.GRAY,DyeColor.BLACK,DyeColor.BROWN,DyeColor.RED,DyeColor.ORANGE,DyeColor.YELLOW,DyeColor.LIME,DyeColor.GREEN,DyeColor.CYAN,DyeColor.LIGHT_BLUE,DyeColor.BLUE,DyeColor.PURPLE,DyeColor.MAGENTA,DyeColor.PINK); + var families=ColoredBricks.families().stream().sorted(Comparator.comparingInt(f->colors.indexOf(f.color()))).toList(); + int start=-1;for(int i=0;i0,"Wall series is visible in Colored Blocks"); + for(int i=0;i<16;i++)check(display.get(start+i).is(families.get(i).wall().asItem()),"Contiguous series of sixteen in native color order"); + check(display.get(start-1).is(families.getLast().slab().asItem())&&display.get(start+16).is(families.getFirst().clay().asItem()),"Wall series follows slabs and precedes clay"); + } + static void saved(ServerLevel level){ + int i=0;for(var family:ColoredBricks.families()){ + check(level.getBlockState(new BlockPos(i,1,10)).is(family.wall()),"Persisted wall color"); + var wet=level.getBlockState(new BlockPos(i++,1,12));check(wet.is(family.wall())&&wet.getValue(WallBlock.WATERLOGGED)&&wet.getFluidState().isSource(),"Persisted waterlogged wall"); + } + } + private static void check(boolean ok,String message){if(!ok)throw new AssertionError(message);} +} diff --git a/mods/sanctuary/src/main/java/fr/koka/sanctuary/building/ColoredBricks.java b/mods/sanctuary/src/main/java/fr/koka/sanctuary/building/ColoredBricks.java index 0f8ed5d..575fc8e 100644 --- a/mods/sanctuary/src/main/java/fr/koka/sanctuary/building/ColoredBricks.java +++ b/mods/sanctuary/src/main/java/fr/koka/sanctuary/building/ColoredBricks.java @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour; /** Native building blocks; no world-generation, ticking entities or custom inventory. */ public final class ColoredBricks { - public record Family(DyeColor color,Block bricks,Block slab,Block stairs,Block clay,Item clayBall,Item brick){} + public record Family(DyeColor color,Block bricks,Block slab,Block stairs,Block wall,Block clay,Item clayBall,Item brick){} private static final List FAMILIES=new ArrayList<>(); // The order used by the native 26.3 Colored Blocks tab, rather than dye numeric IDs. private static final List CREATIVE_COLORS=List.of( @@ -27,15 +27,17 @@ public final class ColoredBricks { var bricks=block(name+"_bricks",new Block(properties(name+"_bricks",Blocks.BRICKS,color))); var slab=block(name+"_brick_slab",new SlabBlock(properties(name+"_brick_slab",Blocks.BRICK_SLAB,color))); var stairs=block(name+"_brick_stairs",new Stairs(bricks,properties(name+"_brick_stairs",Blocks.BRICK_STAIRS,color))); + var wall=block(name+"_brick_wall",new WallBlock(properties(name+"_brick_wall",Blocks.BRICK_WALL,color))); var clay=block(name+"_clay",new Block(properties(name+"_clay",Blocks.CLAY,color))); var clayBall=item(name+"_clay_ball");var brick=item(name+"_brick"); - FAMILIES.add(new Family(color,bricks,slab,stairs,clay,clayBall,brick)); + FAMILIES.add(new Family(color,bricks,slab,stairs,wall,clay,clayBall,brick)); } var display=FAMILIES.stream().sorted(Comparator.comparingInt(f->CREATIVE_COLORS.indexOf(f.color()))).toList(); CreativeModeTabEvents.modifyOutputEvent(CreativeModeTabs.COLORED_BLOCKS).register(out->{ for(var f:display)out.accept(f.bricks); for(var f:display)out.accept(f.stairs); for(var f:display)out.accept(f.slab); + for(var f:display)out.accept(f.wall); for(var f:display)out.accept(f.clay); }); CreativeModeTabEvents.modifyOutputEvent(CreativeModeTabs.INGREDIENTS).register(out->{ diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/black_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/black_brick_wall.json new file mode 100644 index 0000000..257f52e --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/black_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/black_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/black_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/blue_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/blue_brick_wall.json new file mode 100644 index 0000000..b161984 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/blue_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/blue_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/brown_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/brown_brick_wall.json new file mode 100644 index 0000000..732d64c --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/brown_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/brown_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/cyan_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/cyan_brick_wall.json new file mode 100644 index 0000000..39200e0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/cyan_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/cyan_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/gray_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/gray_brick_wall.json new file mode 100644 index 0000000..d35b034 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/gray_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/gray_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/green_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/green_brick_wall.json new file mode 100644 index 0000000..fba0f90 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/green_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/green_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/green_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_blue_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_blue_brick_wall.json new file mode 100644 index 0000000..4c71f27 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_blue_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_blue_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_gray_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_gray_brick_wall.json new file mode 100644 index 0000000..f37a7f9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/light_gray_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/light_gray_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/lime_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/lime_brick_wall.json new file mode 100644 index 0000000..9b6d2d0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/lime_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/lime_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/magenta_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/magenta_brick_wall.json new file mode 100644 index 0000000..6e96ae0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/magenta_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/magenta_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/orange_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/orange_brick_wall.json new file mode 100644 index 0000000..24f3061 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/orange_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/orange_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/pink_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/pink_brick_wall.json new file mode 100644 index 0000000..97fdcc7 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/pink_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/pink_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/purple_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/purple_brick_wall.json new file mode 100644 index 0000000..c9f0053 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/purple_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/purple_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/red_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/red_brick_wall.json new file mode 100644 index 0000000..83f97d3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/red_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/red_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/red_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/white_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/white_brick_wall.json new file mode 100644 index 0000000..5955266 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/white_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/white_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/white_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/yellow_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/yellow_brick_wall.json new file mode 100644 index 0000000..7ecd412 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/blockstates/yellow_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "sanctuary:block/yellow_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/black_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/black_brick_wall.json new file mode 100644 index 0000000..eb93527 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/black_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/black_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/blue_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/blue_brick_wall.json new file mode 100644 index 0000000..f014c65 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/blue_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/blue_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/brown_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/brown_brick_wall.json new file mode 100644 index 0000000..e900420 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/brown_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/brown_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/cyan_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/cyan_brick_wall.json new file mode 100644 index 0000000..ecb0008 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/cyan_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/cyan_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/gray_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/gray_brick_wall.json new file mode 100644 index 0000000..15a7827 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/gray_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/gray_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/green_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/green_brick_wall.json new file mode 100644 index 0000000..3e39073 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/green_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/green_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_blue_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_blue_brick_wall.json new file mode 100644 index 0000000..d34bf20 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_blue_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/light_blue_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_gray_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_gray_brick_wall.json new file mode 100644 index 0000000..ae7c632 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/light_gray_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/light_gray_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/lime_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/lime_brick_wall.json new file mode 100644 index 0000000..5ecca94 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/lime_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/lime_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/magenta_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/magenta_brick_wall.json new file mode 100644 index 0000000..c01ee4f --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/magenta_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/magenta_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/orange_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/orange_brick_wall.json new file mode 100644 index 0000000..5fe8de2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/orange_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/orange_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/pink_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/pink_brick_wall.json new file mode 100644 index 0000000..c86a2dd --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/pink_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/pink_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/purple_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/purple_brick_wall.json new file mode 100644 index 0000000..f616ce4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/purple_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/purple_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/red_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/red_brick_wall.json new file mode 100644 index 0000000..c7f3141 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/red_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/red_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/white_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/white_brick_wall.json new file mode 100644 index 0000000..bc67c0d --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/white_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/white_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/items/yellow_brick_wall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/items/yellow_brick_wall.json new file mode 100644 index 0000000..6c22bb8 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/items/yellow_brick_wall.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "sanctuary:block/yellow_brick_wall_inventory" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/lang/en_us.json b/mods/sanctuary/src/main/resources/assets/sanctuary/lang/en_us.json index 3afb635..c7d324a 100644 --- a/mods/sanctuary/src/main/resources/assets/sanctuary/lang/en_us.json +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/lang/en_us.json @@ -2205,5 +2205,21 @@ "sanctuary.multiblock.state.blocked": "Empty the matching slot in Results.", "sanctuary.multiblock.state.no_recipe": "This item has no furnace recipe.", "sanctuary.statuary.choose_material": "Add a block to apply its palette to the model. Containers must be empty.", - "sanctuary.statuary.material_ready": "1 block = 1 sculpture. Palette: %s." + "sanctuary.statuary.material_ready": "1 block = 1 sculpture. Palette: %s.", + "block.sanctuary.white_brick_wall": "White Brick Wall", + "block.sanctuary.orange_brick_wall": "Orange Brick Wall", + "block.sanctuary.magenta_brick_wall": "Magenta Brick Wall", + "block.sanctuary.light_blue_brick_wall": "Light Blue Brick Wall", + "block.sanctuary.yellow_brick_wall": "Yellow Brick Wall", + "block.sanctuary.lime_brick_wall": "Lime Brick Wall", + "block.sanctuary.pink_brick_wall": "Pink Brick Wall", + "block.sanctuary.gray_brick_wall": "Gray Brick Wall", + "block.sanctuary.light_gray_brick_wall": "Light Gray Brick Wall", + "block.sanctuary.cyan_brick_wall": "Cyan Brick Wall", + "block.sanctuary.purple_brick_wall": "Purple Brick Wall", + "block.sanctuary.blue_brick_wall": "Blue Brick Wall", + "block.sanctuary.brown_brick_wall": "Brown Brick Wall", + "block.sanctuary.green_brick_wall": "Green Brick Wall", + "block.sanctuary.red_brick_wall": "Red Brick Wall", + "block.sanctuary.black_brick_wall": "Black Brick Wall" } diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/lang/fr_fr.json b/mods/sanctuary/src/main/resources/assets/sanctuary/lang/fr_fr.json index 4fe0be2..a4f9c15 100644 --- a/mods/sanctuary/src/main/resources/assets/sanctuary/lang/fr_fr.json +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/lang/fr_fr.json @@ -2205,5 +2205,21 @@ "sanctuary.multiblock.state.blocked": "Vider la case correspondante dans Résultats.", "sanctuary.multiblock.state.no_recipe": "Cet objet ne possède pas de recette au four.", "sanctuary.statuary.choose_material": "Ajoutez un bloc pour appliquer sa palette au modèle. Les conteneurs doivent être vides.", - "sanctuary.statuary.material_ready": "1 bloc = 1 sculpture. Palette : %s." + "sanctuary.statuary.material_ready": "1 bloc = 1 sculpture. Palette : %s.", + "block.sanctuary.white_brick_wall": "Muret de briques blanches", + "block.sanctuary.orange_brick_wall": "Muret de briques orange", + "block.sanctuary.magenta_brick_wall": "Muret de briques magenta", + "block.sanctuary.light_blue_brick_wall": "Muret de briques bleu clair", + "block.sanctuary.yellow_brick_wall": "Muret de briques jaunes", + "block.sanctuary.lime_brick_wall": "Muret de briques vert clair", + "block.sanctuary.pink_brick_wall": "Muret de briques roses", + "block.sanctuary.gray_brick_wall": "Muret de briques grises", + "block.sanctuary.light_gray_brick_wall": "Muret de briques gris clair", + "block.sanctuary.cyan_brick_wall": "Muret de briques cyan", + "block.sanctuary.purple_brick_wall": "Muret de briques violettes", + "block.sanctuary.blue_brick_wall": "Muret de briques bleues", + "block.sanctuary.brown_brick_wall": "Muret de briques marron", + "block.sanctuary.green_brick_wall": "Muret de briques vertes", + "block.sanctuary.red_brick_wall": "Muret de briques rouges", + "block.sanctuary.black_brick_wall": "Muret de briques noires" } diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_inventory.json new file mode 100644 index 0000000..7c355ef --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/black_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_post.json new file mode 100644 index 0000000..fe0a321 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/black_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side.json new file mode 100644 index 0000000..8df8198 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/black_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side_tall.json new file mode 100644 index 0000000..9d3595f --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/black_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/black_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_inventory.json new file mode 100644 index 0000000..b49127e --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_post.json new file mode 100644 index 0000000..f77e96b --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side.json new file mode 100644 index 0000000..db366cb --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side_tall.json new file mode 100644 index 0000000..e4abb64 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/blue_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_inventory.json new file mode 100644 index 0000000..daa44b0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/brown_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_post.json new file mode 100644 index 0000000..22f0764 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/brown_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side.json new file mode 100644 index 0000000..eac0a33 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/brown_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side_tall.json new file mode 100644 index 0000000..4cdf3e9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/brown_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/brown_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_inventory.json new file mode 100644 index 0000000..7969cfb --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/cyan_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_post.json new file mode 100644 index 0000000..7f52545 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/cyan_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side.json new file mode 100644 index 0000000..f529deb --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/cyan_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side_tall.json new file mode 100644 index 0000000..2b6c50a --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/cyan_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/cyan_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_inventory.json new file mode 100644 index 0000000..9b03694 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_post.json new file mode 100644 index 0000000..45c6991 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side.json new file mode 100644 index 0000000..3354110 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side_tall.json new file mode 100644 index 0000000..ded39b0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/gray_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_inventory.json new file mode 100644 index 0000000..c68db5d --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/green_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_post.json new file mode 100644 index 0000000..75d0ec9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/green_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side.json new file mode 100644 index 0000000..908a362 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/green_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side_tall.json new file mode 100644 index 0000000..4ba168d --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/green_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/green_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_inventory.json new file mode 100644 index 0000000..4687122 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/light_blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_post.json new file mode 100644 index 0000000..9a68ef6 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/light_blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side.json new file mode 100644 index 0000000..54120f3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/light_blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side_tall.json new file mode 100644 index 0000000..557aacc --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_blue_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/light_blue_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_inventory.json new file mode 100644 index 0000000..95e461a --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/light_gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_post.json new file mode 100644 index 0000000..df4cd7c --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/light_gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side.json new file mode 100644 index 0000000..2ad90bc --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/light_gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side_tall.json new file mode 100644 index 0000000..5dab9c0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/light_gray_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/light_gray_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_inventory.json new file mode 100644 index 0000000..59bc8f4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/lime_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_post.json new file mode 100644 index 0000000..c8d40d6 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/lime_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side.json new file mode 100644 index 0000000..0af7c8a --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/lime_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side_tall.json new file mode 100644 index 0000000..b00c5dc --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/lime_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/lime_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_inventory.json new file mode 100644 index 0000000..0fd9a3c --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/magenta_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_post.json new file mode 100644 index 0000000..0d516fc --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/magenta_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side.json new file mode 100644 index 0000000..ba073e9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/magenta_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side_tall.json new file mode 100644 index 0000000..406fc89 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/magenta_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/magenta_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_inventory.json new file mode 100644 index 0000000..5bf3f21 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/orange_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_post.json new file mode 100644 index 0000000..b19848f --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/orange_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side.json new file mode 100644 index 0000000..23a3b0c --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/orange_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side_tall.json new file mode 100644 index 0000000..17a583d --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/orange_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/orange_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_inventory.json new file mode 100644 index 0000000..c53bd43 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/pink_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_post.json new file mode 100644 index 0000000..eaa5aac --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/pink_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side.json new file mode 100644 index 0000000..019182f --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/pink_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side_tall.json new file mode 100644 index 0000000..73886a9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/pink_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/pink_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_inventory.json new file mode 100644 index 0000000..89ea5ce --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/purple_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_post.json new file mode 100644 index 0000000..51b328d --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/purple_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side.json new file mode 100644 index 0000000..ef984c3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/purple_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side_tall.json new file mode 100644 index 0000000..84fa83b --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/purple_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/purple_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_inventory.json new file mode 100644 index 0000000..02aa994 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/red_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_post.json new file mode 100644 index 0000000..bf0c647 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/red_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side.json new file mode 100644 index 0000000..94aaedd --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/red_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side_tall.json new file mode 100644 index 0000000..04ba214 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/red_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/red_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_inventory.json new file mode 100644 index 0000000..9c9c532 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/white_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_post.json new file mode 100644 index 0000000..7284142 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/white_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side.json new file mode 100644 index 0000000..f118c8a --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/white_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side_tall.json new file mode 100644 index 0000000..45b9838 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/white_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/white_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_inventory.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_inventory.json new file mode 100644 index 0000000..48f7865 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "sanctuary:block/yellow_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_post.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_post.json new file mode 100644 index 0000000..b4fc6b7 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "sanctuary:block/yellow_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side.json new file mode 100644 index 0000000..467933e --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "sanctuary:block/yellow_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side_tall.json b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side_tall.json new file mode 100644 index 0000000..0ec6d58 --- /dev/null +++ b/mods/sanctuary/src/main/resources/assets/sanctuary/models/block/yellow_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "sanctuary:block/yellow_bricks" + } +} diff --git a/mods/sanctuary/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json b/mods/sanctuary/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json index 7710ef9..2688da0 100644 --- a/mods/sanctuary/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/mods/sanctuary/src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -48,6 +48,22 @@ "sanctuary:red_brick_stairs", "sanctuary:black_bricks", "sanctuary:black_brick_slab", - "sanctuary:black_brick_stairs" + "sanctuary:black_brick_stairs", + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" ] } diff --git a/mods/sanctuary/src/main/resources/data/minecraft/tags/block/walls.json b/mods/sanctuary/src/main/resources/data/minecraft/tags/block/walls.json new file mode 100644 index 0000000..0b43a46 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/minecraft/tags/block/walls.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" + ] +} diff --git a/mods/sanctuary/src/main/resources/data/minecraft/tags/item/walls.json b/mods/sanctuary/src/main/resources/data/minecraft/tags/item/walls.json new file mode 100644 index 0000000..0b43a46 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/minecraft/tags/item/walls.json @@ -0,0 +1,21 @@ +{ + "replace": false, + "values": [ + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" + ] +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall.json new file mode 100644 index 0000000..adf5497 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:black_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:black_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:black_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..29ad732 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/black_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:black_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:black_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:black_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall.json new file mode 100644 index 0000000..7a476fc --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:blue_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:blue_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:blue_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..0ac8816 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/blue_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:blue_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:blue_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:blue_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall.json new file mode 100644 index 0000000..8e7b494 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:brown_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:brown_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:brown_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..bbf24e0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/brown_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:brown_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:brown_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:brown_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall.json new file mode 100644 index 0000000..7b6dc7a --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:cyan_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:cyan_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:cyan_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..a881e39 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/cyan_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:cyan_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:cyan_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:cyan_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall.json new file mode 100644 index 0000000..df045c7 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:gray_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:gray_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:gray_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..fe0a886 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/gray_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:gray_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:gray_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:gray_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall.json new file mode 100644 index 0000000..b8b185c --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:green_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:green_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:green_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..a4c4106 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/green_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:green_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:green_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:green_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall.json new file mode 100644 index 0000000..126400a --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:light_blue_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:light_blue_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:light_blue_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..d3f0119 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_blue_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:light_blue_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:light_blue_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:light_blue_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall.json new file mode 100644 index 0000000..5ae4b83 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:light_gray_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:light_gray_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:light_gray_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..a0f0312 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/light_gray_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:light_gray_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:light_gray_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:light_gray_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall.json new file mode 100644 index 0000000..8103e65 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:lime_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:lime_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:lime_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..8ee76f4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/lime_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:lime_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:lime_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:lime_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall.json new file mode 100644 index 0000000..dfc896d --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:magenta_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:magenta_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:magenta_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..25d2ff4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/magenta_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:magenta_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:magenta_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:magenta_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall.json new file mode 100644 index 0000000..2f0eb3f --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:orange_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:orange_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:orange_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..ce2027a --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/orange_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:orange_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:orange_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:orange_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall.json new file mode 100644 index 0000000..92b2883 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:pink_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:pink_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:pink_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..dd67486 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/pink_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:pink_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:pink_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:pink_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall.json new file mode 100644 index 0000000..481540c --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:purple_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:purple_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:purple_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..14ac5c2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/purple_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:purple_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:purple_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:purple_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall.json new file mode 100644 index 0000000..1e69de1 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:red_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:red_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:red_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..03b21f3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/red_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:red_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:red_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:red_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall.json new file mode 100644 index 0000000..184fc6e --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:white_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:white_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:white_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..2690b0e --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/white_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:white_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:white_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:white_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall.json new file mode 100644 index 0000000..427b544 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:yellow_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:yellow_brick_wall" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:yellow_brick_wall" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..2fb3543 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/advancement/recipes/colored_bricks/yellow_brick_wall_from_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_material": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "items": "sanctuary:yellow_bricks" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipes": "sanctuary:yellow_brick_wall_from_stonecutting" + } + } + }, + "requirements": [ + [ + "has_material", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "sanctuary:yellow_brick_wall_from_stonecutting" + ] + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/black_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/black_brick_wall.json new file mode 100644 index 0000000..1ced867 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/black_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:black_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/black_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/blue_brick_wall.json new file mode 100644 index 0000000..fabcdc9 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/blue_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:blue_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/blue_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/brown_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/brown_brick_wall.json new file mode 100644 index 0000000..b1da6e7 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/brown_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:brown_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/brown_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/cyan_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/cyan_brick_wall.json new file mode 100644 index 0000000..769b847 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/cyan_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:cyan_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/cyan_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/gray_brick_wall.json new file mode 100644 index 0000000..6c0a1f0 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/gray_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:gray_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/gray_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/green_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/green_brick_wall.json new file mode 100644 index 0000000..adfa316 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/green_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:green_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/green_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_blue_brick_wall.json new file mode 100644 index 0000000..11ceae1 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_blue_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:light_blue_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/light_blue_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_gray_brick_wall.json new file mode 100644 index 0000000..3b1edce --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/light_gray_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:light_gray_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/light_gray_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/lime_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/lime_brick_wall.json new file mode 100644 index 0000000..4651f4e --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/lime_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:lime_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/lime_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/magenta_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/magenta_brick_wall.json new file mode 100644 index 0000000..0c1c5e2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/magenta_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:magenta_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/magenta_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/orange_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/orange_brick_wall.json new file mode 100644 index 0000000..1c1f31f --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/orange_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:orange_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/orange_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/pink_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/pink_brick_wall.json new file mode 100644 index 0000000..b78429a --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/pink_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:pink_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/pink_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/purple_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/purple_brick_wall.json new file mode 100644 index 0000000..023662d --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/purple_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:purple_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/purple_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/red_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/red_brick_wall.json new file mode 100644 index 0000000..c2011d1 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/red_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:red_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/red_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/white_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/white_brick_wall.json new file mode 100644 index 0000000..8ddaca5 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/white_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:white_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/white_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/yellow_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/yellow_brick_wall.json new file mode 100644 index 0000000..ea0a1ce --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/loot_table/blocks/yellow_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "condition": { + "type": "minecraft:survives_explosion" + }, + "entries": [ + { + "type": "minecraft:item", + "name": "sanctuary:yellow_brick_wall" + } + ], + "rolls": 1 + } + ], + "random_sequence": "sanctuary:blocks/yellow_brick_wall" +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall.json new file mode 100644 index 0000000..971b9b2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:black_bricks" + }, + "result": { + "id": "sanctuary:black_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..d15ab16 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/black_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:black_bricks", + "result": { + "id": "sanctuary:black_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall.json new file mode 100644 index 0000000..7b744c4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:blue_bricks" + }, + "result": { + "id": "sanctuary:blue_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..b9ba0d3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/blue_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:blue_bricks", + "result": { + "id": "sanctuary:blue_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall.json new file mode 100644 index 0000000..926da5e --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:brown_bricks" + }, + "result": { + "id": "sanctuary:brown_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..d9cde21 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/brown_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:brown_bricks", + "result": { + "id": "sanctuary:brown_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall.json new file mode 100644 index 0000000..b9fdca4 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:cyan_bricks" + }, + "result": { + "id": "sanctuary:cyan_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..f3ceaa2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/cyan_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:cyan_bricks", + "result": { + "id": "sanctuary:cyan_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall.json new file mode 100644 index 0000000..4aaf85f --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:gray_bricks" + }, + "result": { + "id": "sanctuary:gray_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..f4d3d07 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/gray_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:gray_bricks", + "result": { + "id": "sanctuary:gray_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall.json new file mode 100644 index 0000000..4805838 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:green_bricks" + }, + "result": { + "id": "sanctuary:green_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..f4b1069 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/green_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:green_bricks", + "result": { + "id": "sanctuary:green_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall.json new file mode 100644 index 0000000..592352d --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:light_blue_bricks" + }, + "result": { + "id": "sanctuary:light_blue_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..ec1f48b --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_blue_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:light_blue_bricks", + "result": { + "id": "sanctuary:light_blue_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall.json new file mode 100644 index 0000000..2366099 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:light_gray_bricks" + }, + "result": { + "id": "sanctuary:light_gray_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..8a48884 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/light_gray_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:light_gray_bricks", + "result": { + "id": "sanctuary:light_gray_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall.json new file mode 100644 index 0000000..4d5b9c3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:lime_bricks" + }, + "result": { + "id": "sanctuary:lime_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..5be25ae --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/lime_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:lime_bricks", + "result": { + "id": "sanctuary:lime_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall.json new file mode 100644 index 0000000..804b66a --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:magenta_bricks" + }, + "result": { + "id": "sanctuary:magenta_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..99e7c42 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/magenta_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:magenta_bricks", + "result": { + "id": "sanctuary:magenta_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall.json new file mode 100644 index 0000000..20e68c2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:orange_bricks" + }, + "result": { + "id": "sanctuary:orange_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..f3144da --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/orange_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:orange_bricks", + "result": { + "id": "sanctuary:orange_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall.json new file mode 100644 index 0000000..e49d9d7 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:pink_bricks" + }, + "result": { + "id": "sanctuary:pink_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..611795d --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/pink_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:pink_bricks", + "result": { + "id": "sanctuary:pink_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall.json new file mode 100644 index 0000000..0df4b1c --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:purple_bricks" + }, + "result": { + "id": "sanctuary:purple_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..f8cc6a3 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/purple_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:purple_bricks", + "result": { + "id": "sanctuary:purple_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall.json new file mode 100644 index 0000000..444ec01 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:red_bricks" + }, + "result": { + "id": "sanctuary:red_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..6b126c2 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/red_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:red_bricks", + "result": { + "id": "sanctuary:red_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall.json new file mode 100644 index 0000000..0d99933 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:white_bricks" + }, + "result": { + "id": "sanctuary:white_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..476efce --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/white_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:white_bricks", + "result": { + "id": "sanctuary:white_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall.json new file mode 100644 index 0000000..c9f10bc --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "pattern": [ + "###", + "###" + ], + "key": { + "#": "sanctuary:yellow_bricks" + }, + "result": { + "id": "sanctuary:yellow_brick_wall", + "count": 6 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall_from_stonecutting.json b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall_from_stonecutting.json new file mode 100644 index 0000000..ecd4b83 --- /dev/null +++ b/mods/sanctuary/src/main/resources/data/sanctuary/recipe/yellow_brick_wall_from_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "sanctuary:yellow_bricks", + "result": { + "id": "sanctuary:yellow_brick_wall", + "count": 1 + } +} diff --git a/mods/sanctuary/src/main/resources/data/sanctuary/sanctuary_recipe_collections/clay_and_bricks.json b/mods/sanctuary/src/main/resources/data/sanctuary/sanctuary_recipe_collections/clay_and_bricks.json index a1ca006..9d2419e 100644 --- a/mods/sanctuary/src/main/resources/data/sanctuary/sanctuary_recipe_collections/clay_and_bricks.json +++ b/mods/sanctuary/src/main/resources/data/sanctuary/sanctuary_recipe_collections/clay_and_bricks.json @@ -12,18 +12,21 @@ "sanctuary:black_brick", "sanctuary:black_brick_slab", "sanctuary:black_brick_stairs", + "sanctuary:black_brick_wall", "sanctuary:black_bricks", "sanctuary:black_clay", "sanctuary:black_clay_ball", "sanctuary:blue_brick", "sanctuary:blue_brick_slab", "sanctuary:blue_brick_stairs", + "sanctuary:blue_brick_wall", "sanctuary:blue_bricks", "sanctuary:blue_clay", "sanctuary:blue_clay_ball", "sanctuary:brown_brick", "sanctuary:brown_brick_slab", "sanctuary:brown_brick_stairs", + "sanctuary:brown_brick_wall", "sanctuary:brown_bricks", "sanctuary:brown_clay", "sanctuary:brown_clay_ball", @@ -31,66 +34,77 @@ "sanctuary:cyan_brick", "sanctuary:cyan_brick_slab", "sanctuary:cyan_brick_stairs", + "sanctuary:cyan_brick_wall", "sanctuary:cyan_bricks", "sanctuary:cyan_clay", "sanctuary:cyan_clay_ball", "sanctuary:gray_brick", "sanctuary:gray_brick_slab", "sanctuary:gray_brick_stairs", + "sanctuary:gray_brick_wall", "sanctuary:gray_bricks", "sanctuary:gray_clay", "sanctuary:gray_clay_ball", "sanctuary:green_brick", "sanctuary:green_brick_slab", "sanctuary:green_brick_stairs", + "sanctuary:green_brick_wall", "sanctuary:green_bricks", "sanctuary:green_clay", "sanctuary:green_clay_ball", "sanctuary:light_blue_brick", "sanctuary:light_blue_brick_slab", "sanctuary:light_blue_brick_stairs", + "sanctuary:light_blue_brick_wall", "sanctuary:light_blue_bricks", "sanctuary:light_blue_clay", "sanctuary:light_blue_clay_ball", "sanctuary:light_gray_brick", "sanctuary:light_gray_brick_slab", "sanctuary:light_gray_brick_stairs", + "sanctuary:light_gray_brick_wall", "sanctuary:light_gray_bricks", "sanctuary:light_gray_clay", "sanctuary:light_gray_clay_ball", "sanctuary:lime_brick", "sanctuary:lime_brick_slab", "sanctuary:lime_brick_stairs", + "sanctuary:lime_brick_wall", "sanctuary:lime_bricks", "sanctuary:lime_clay", "sanctuary:lime_clay_ball", "sanctuary:magenta_brick", "sanctuary:magenta_brick_slab", "sanctuary:magenta_brick_stairs", + "sanctuary:magenta_brick_wall", "sanctuary:magenta_bricks", "sanctuary:magenta_clay", "sanctuary:magenta_clay_ball", "sanctuary:orange_brick", "sanctuary:orange_brick_slab", "sanctuary:orange_brick_stairs", + "sanctuary:orange_brick_wall", "sanctuary:orange_bricks", "sanctuary:orange_clay", "sanctuary:orange_clay_ball", "sanctuary:pink_brick", "sanctuary:pink_brick_slab", "sanctuary:pink_brick_stairs", + "sanctuary:pink_brick_wall", "sanctuary:pink_bricks", "sanctuary:pink_clay", "sanctuary:pink_clay_ball", "sanctuary:purple_brick", "sanctuary:purple_brick_slab", "sanctuary:purple_brick_stairs", + "sanctuary:purple_brick_wall", "sanctuary:purple_bricks", "sanctuary:purple_clay", "sanctuary:purple_clay_ball", "sanctuary:red_brick", "sanctuary:red_brick_slab", "sanctuary:red_brick_stairs", + "sanctuary:red_brick_wall", "sanctuary:red_bricks", "sanctuary:red_clay", "sanctuary:red_clay_ball", @@ -98,12 +112,14 @@ "sanctuary:white_brick", "sanctuary:white_brick_slab", "sanctuary:white_brick_stairs", + "sanctuary:white_brick_wall", "sanctuary:white_bricks", "sanctuary:white_clay", "sanctuary:white_clay_ball", "sanctuary:yellow_brick", "sanctuary:yellow_brick_slab", "sanctuary:yellow_brick_stairs", + "sanctuary:yellow_brick_wall", "sanctuary:yellow_bricks", "sanctuary:yellow_clay", "sanctuary:yellow_clay_ball" @@ -133,68 +149,84 @@ "minecraft:flower_pot", "sanctuary:black_brick_slab", "sanctuary:black_brick_stairs", + "sanctuary:black_brick_wall", "sanctuary:black_bricks", "sanctuary:black_clay", "sanctuary:blue_brick_slab", "sanctuary:blue_brick_stairs", + "sanctuary:blue_brick_wall", "sanctuary:blue_bricks", "sanctuary:blue_clay", "sanctuary:brown_brick_slab", "sanctuary:brown_brick_stairs", + "sanctuary:brown_brick_wall", "sanctuary:brown_bricks", "sanctuary:brown_clay", "sanctuary:clay_workshop", "sanctuary:cyan_brick_slab", "sanctuary:cyan_brick_stairs", + "sanctuary:cyan_brick_wall", "sanctuary:cyan_bricks", "sanctuary:cyan_clay", "sanctuary:gray_brick_slab", "sanctuary:gray_brick_stairs", + "sanctuary:gray_brick_wall", "sanctuary:gray_bricks", "sanctuary:gray_clay", "sanctuary:green_brick_slab", "sanctuary:green_brick_stairs", + "sanctuary:green_brick_wall", "sanctuary:green_bricks", "sanctuary:green_clay", "sanctuary:light_blue_brick_slab", "sanctuary:light_blue_brick_stairs", + "sanctuary:light_blue_brick_wall", "sanctuary:light_blue_bricks", "sanctuary:light_blue_clay", "sanctuary:light_gray_brick_slab", "sanctuary:light_gray_brick_stairs", + "sanctuary:light_gray_brick_wall", "sanctuary:light_gray_bricks", "sanctuary:light_gray_clay", "sanctuary:lime_brick_slab", "sanctuary:lime_brick_stairs", + "sanctuary:lime_brick_wall", "sanctuary:lime_bricks", "sanctuary:lime_clay", "sanctuary:magenta_brick_slab", "sanctuary:magenta_brick_stairs", + "sanctuary:magenta_brick_wall", "sanctuary:magenta_bricks", "sanctuary:magenta_clay", "sanctuary:orange_brick_slab", "sanctuary:orange_brick_stairs", + "sanctuary:orange_brick_wall", "sanctuary:orange_bricks", "sanctuary:orange_clay", "sanctuary:pink_brick_slab", "sanctuary:pink_brick_stairs", + "sanctuary:pink_brick_wall", "sanctuary:pink_bricks", "sanctuary:pink_clay", "sanctuary:purple_brick_slab", "sanctuary:purple_brick_stairs", + "sanctuary:purple_brick_wall", "sanctuary:purple_bricks", "sanctuary:purple_clay", "sanctuary:red_brick_slab", "sanctuary:red_brick_stairs", + "sanctuary:red_brick_wall", "sanctuary:red_bricks", "sanctuary:red_clay", "sanctuary:statuary", "sanctuary:white_brick_slab", "sanctuary:white_brick_stairs", + "sanctuary:white_brick_wall", "sanctuary:white_bricks", "sanctuary:white_clay", "sanctuary:yellow_brick_slab", "sanctuary:yellow_brick_stairs", + "sanctuary:yellow_brick_wall", "sanctuary:yellow_bricks", "sanctuary:yellow_clay" ], @@ -210,18 +242,21 @@ "sanctuary:black_brick", "sanctuary:black_brick_slab", "sanctuary:black_brick_stairs", + "sanctuary:black_brick_wall", "sanctuary:black_bricks", "sanctuary:black_clay", "sanctuary:black_clay_ball", "sanctuary:blue_brick", "sanctuary:blue_brick_slab", "sanctuary:blue_brick_stairs", + "sanctuary:blue_brick_wall", "sanctuary:blue_bricks", "sanctuary:blue_clay", "sanctuary:blue_clay_ball", "sanctuary:brown_brick", "sanctuary:brown_brick_slab", "sanctuary:brown_brick_stairs", + "sanctuary:brown_brick_wall", "sanctuary:brown_bricks", "sanctuary:brown_clay", "sanctuary:brown_clay_ball", @@ -229,66 +264,77 @@ "sanctuary:cyan_brick", "sanctuary:cyan_brick_slab", "sanctuary:cyan_brick_stairs", + "sanctuary:cyan_brick_wall", "sanctuary:cyan_bricks", "sanctuary:cyan_clay", "sanctuary:cyan_clay_ball", "sanctuary:gray_brick", "sanctuary:gray_brick_slab", "sanctuary:gray_brick_stairs", + "sanctuary:gray_brick_wall", "sanctuary:gray_bricks", "sanctuary:gray_clay", "sanctuary:gray_clay_ball", "sanctuary:green_brick", "sanctuary:green_brick_slab", "sanctuary:green_brick_stairs", + "sanctuary:green_brick_wall", "sanctuary:green_bricks", "sanctuary:green_clay", "sanctuary:green_clay_ball", "sanctuary:light_blue_brick", "sanctuary:light_blue_brick_slab", "sanctuary:light_blue_brick_stairs", + "sanctuary:light_blue_brick_wall", "sanctuary:light_blue_bricks", "sanctuary:light_blue_clay", "sanctuary:light_blue_clay_ball", "sanctuary:light_gray_brick", "sanctuary:light_gray_brick_slab", "sanctuary:light_gray_brick_stairs", + "sanctuary:light_gray_brick_wall", "sanctuary:light_gray_bricks", "sanctuary:light_gray_clay", "sanctuary:light_gray_clay_ball", "sanctuary:lime_brick", "sanctuary:lime_brick_slab", "sanctuary:lime_brick_stairs", + "sanctuary:lime_brick_wall", "sanctuary:lime_bricks", "sanctuary:lime_clay", "sanctuary:lime_clay_ball", "sanctuary:magenta_brick", "sanctuary:magenta_brick_slab", "sanctuary:magenta_brick_stairs", + "sanctuary:magenta_brick_wall", "sanctuary:magenta_bricks", "sanctuary:magenta_clay", "sanctuary:magenta_clay_ball", "sanctuary:orange_brick", "sanctuary:orange_brick_slab", "sanctuary:orange_brick_stairs", + "sanctuary:orange_brick_wall", "sanctuary:orange_bricks", "sanctuary:orange_clay", "sanctuary:orange_clay_ball", "sanctuary:pink_brick", "sanctuary:pink_brick_slab", "sanctuary:pink_brick_stairs", + "sanctuary:pink_brick_wall", "sanctuary:pink_bricks", "sanctuary:pink_clay", "sanctuary:pink_clay_ball", "sanctuary:purple_brick", "sanctuary:purple_brick_slab", "sanctuary:purple_brick_stairs", + "sanctuary:purple_brick_wall", "sanctuary:purple_bricks", "sanctuary:purple_clay", "sanctuary:purple_clay_ball", "sanctuary:red_brick", "sanctuary:red_brick_slab", "sanctuary:red_brick_stairs", + "sanctuary:red_brick_wall", "sanctuary:red_bricks", "sanctuary:red_clay", "sanctuary:red_clay_ball", @@ -296,12 +342,14 @@ "sanctuary:white_brick", "sanctuary:white_brick_slab", "sanctuary:white_brick_stairs", + "sanctuary:white_brick_wall", "sanctuary:white_bricks", "sanctuary:white_clay", "sanctuary:white_clay_ball", "sanctuary:yellow_brick", "sanctuary:yellow_brick_slab", "sanctuary:yellow_brick_stairs", + "sanctuary:yellow_brick_wall", "sanctuary:yellow_bricks", "sanctuary:yellow_clay", "sanctuary:yellow_clay_ball" @@ -313,6 +361,8 @@ "sanctuary:black_brick_slab_from_stonecutting", "sanctuary:black_brick_stairs", "sanctuary:black_brick_stairs_from_stonecutting", + "sanctuary:black_brick_wall", + "sanctuary:black_brick_wall_from_stonecutting", "sanctuary:black_bricks", "sanctuary:black_bricks_from_dye", "sanctuary:black_clay", @@ -325,6 +375,8 @@ "sanctuary:blue_brick_slab_from_stonecutting", "sanctuary:blue_brick_stairs", "sanctuary:blue_brick_stairs_from_stonecutting", + "sanctuary:blue_brick_wall", + "sanctuary:blue_brick_wall_from_stonecutting", "sanctuary:blue_bricks", "sanctuary:blue_bricks_from_dye", "sanctuary:blue_clay", @@ -337,6 +389,8 @@ "sanctuary:brown_brick_slab_from_stonecutting", "sanctuary:brown_brick_stairs", "sanctuary:brown_brick_stairs_from_stonecutting", + "sanctuary:brown_brick_wall", + "sanctuary:brown_brick_wall_from_stonecutting", "sanctuary:brown_bricks", "sanctuary:brown_bricks_from_dye", "sanctuary:brown_clay", @@ -350,6 +404,8 @@ "sanctuary:cyan_brick_slab_from_stonecutting", "sanctuary:cyan_brick_stairs", "sanctuary:cyan_brick_stairs_from_stonecutting", + "sanctuary:cyan_brick_wall", + "sanctuary:cyan_brick_wall_from_stonecutting", "sanctuary:cyan_bricks", "sanctuary:cyan_bricks_from_dye", "sanctuary:cyan_clay", @@ -362,6 +418,8 @@ "sanctuary:gray_brick_slab_from_stonecutting", "sanctuary:gray_brick_stairs", "sanctuary:gray_brick_stairs_from_stonecutting", + "sanctuary:gray_brick_wall", + "sanctuary:gray_brick_wall_from_stonecutting", "sanctuary:gray_bricks", "sanctuary:gray_bricks_from_dye", "sanctuary:gray_clay", @@ -374,6 +432,8 @@ "sanctuary:green_brick_slab_from_stonecutting", "sanctuary:green_brick_stairs", "sanctuary:green_brick_stairs_from_stonecutting", + "sanctuary:green_brick_wall", + "sanctuary:green_brick_wall_from_stonecutting", "sanctuary:green_bricks", "sanctuary:green_bricks_from_dye", "sanctuary:green_clay", @@ -386,6 +446,8 @@ "sanctuary:light_blue_brick_slab_from_stonecutting", "sanctuary:light_blue_brick_stairs", "sanctuary:light_blue_brick_stairs_from_stonecutting", + "sanctuary:light_blue_brick_wall", + "sanctuary:light_blue_brick_wall_from_stonecutting", "sanctuary:light_blue_bricks", "sanctuary:light_blue_bricks_from_dye", "sanctuary:light_blue_clay", @@ -398,6 +460,8 @@ "sanctuary:light_gray_brick_slab_from_stonecutting", "sanctuary:light_gray_brick_stairs", "sanctuary:light_gray_brick_stairs_from_stonecutting", + "sanctuary:light_gray_brick_wall", + "sanctuary:light_gray_brick_wall_from_stonecutting", "sanctuary:light_gray_bricks", "sanctuary:light_gray_bricks_from_dye", "sanctuary:light_gray_clay", @@ -410,6 +474,8 @@ "sanctuary:lime_brick_slab_from_stonecutting", "sanctuary:lime_brick_stairs", "sanctuary:lime_brick_stairs_from_stonecutting", + "sanctuary:lime_brick_wall", + "sanctuary:lime_brick_wall_from_stonecutting", "sanctuary:lime_bricks", "sanctuary:lime_bricks_from_dye", "sanctuary:lime_clay", @@ -422,6 +488,8 @@ "sanctuary:magenta_brick_slab_from_stonecutting", "sanctuary:magenta_brick_stairs", "sanctuary:magenta_brick_stairs_from_stonecutting", + "sanctuary:magenta_brick_wall", + "sanctuary:magenta_brick_wall_from_stonecutting", "sanctuary:magenta_bricks", "sanctuary:magenta_bricks_from_dye", "sanctuary:magenta_clay", @@ -434,6 +502,8 @@ "sanctuary:orange_brick_slab_from_stonecutting", "sanctuary:orange_brick_stairs", "sanctuary:orange_brick_stairs_from_stonecutting", + "sanctuary:orange_brick_wall", + "sanctuary:orange_brick_wall_from_stonecutting", "sanctuary:orange_bricks", "sanctuary:orange_bricks_from_dye", "sanctuary:orange_clay", @@ -446,6 +516,8 @@ "sanctuary:pink_brick_slab_from_stonecutting", "sanctuary:pink_brick_stairs", "sanctuary:pink_brick_stairs_from_stonecutting", + "sanctuary:pink_brick_wall", + "sanctuary:pink_brick_wall_from_stonecutting", "sanctuary:pink_bricks", "sanctuary:pink_bricks_from_dye", "sanctuary:pink_clay", @@ -458,6 +530,8 @@ "sanctuary:purple_brick_slab_from_stonecutting", "sanctuary:purple_brick_stairs", "sanctuary:purple_brick_stairs_from_stonecutting", + "sanctuary:purple_brick_wall", + "sanctuary:purple_brick_wall_from_stonecutting", "sanctuary:purple_bricks", "sanctuary:purple_bricks_from_dye", "sanctuary:purple_clay", @@ -470,6 +544,8 @@ "sanctuary:red_brick_slab_from_stonecutting", "sanctuary:red_brick_stairs", "sanctuary:red_brick_stairs_from_stonecutting", + "sanctuary:red_brick_wall", + "sanctuary:red_brick_wall_from_stonecutting", "sanctuary:red_bricks", "sanctuary:red_bricks_from_dye", "sanctuary:red_clay", @@ -482,6 +558,8 @@ "sanctuary:white_brick_slab_from_stonecutting", "sanctuary:white_brick_stairs", "sanctuary:white_brick_stairs_from_stonecutting", + "sanctuary:white_brick_wall", + "sanctuary:white_brick_wall_from_stonecutting", "sanctuary:white_bricks", "sanctuary:white_bricks_from_dye", "sanctuary:white_clay", @@ -494,6 +572,8 @@ "sanctuary:yellow_brick_slab_from_stonecutting", "sanctuary:yellow_brick_stairs", "sanctuary:yellow_brick_stairs_from_stonecutting", + "sanctuary:yellow_brick_wall", + "sanctuary:yellow_brick_wall_from_stonecutting", "sanctuary:yellow_bricks", "sanctuary:yellow_bricks_from_dye", "sanctuary:yellow_clay", diff --git a/packwiz/pack.toml b/packwiz/pack.toml index 6730844..259fb73 100644 --- a/packwiz/pack.toml +++ b/packwiz/pack.toml @@ -1,6 +1,6 @@ name = "Sanctuary" author = "KOKA99CAB" -version = "beta.117" +version = "beta.118" pack-format = "packwiz:1.1.0" [index] diff --git a/scripts/data/collections-sanctuary.json b/scripts/data/collections-sanctuary.json index 4366a55..bf620f9 100644 --- a/scripts/data/collections-sanctuary.json +++ b/scripts/data/collections-sanctuary.json @@ -375,7 +375,39 @@ "sanctuary:black_brick_stairs_from_stonecutting", "sanctuary:black_clay_ball_smelting", "sanctuary:black_clay_smelting", - "sanctuary:clay_workshop" + "sanctuary:clay_workshop", + "sanctuary:white_brick_wall", + "sanctuary:white_brick_wall_from_stonecutting", + "sanctuary:orange_brick_wall", + "sanctuary:orange_brick_wall_from_stonecutting", + "sanctuary:magenta_brick_wall", + "sanctuary:magenta_brick_wall_from_stonecutting", + "sanctuary:light_blue_brick_wall", + "sanctuary:light_blue_brick_wall_from_stonecutting", + "sanctuary:yellow_brick_wall", + "sanctuary:yellow_brick_wall_from_stonecutting", + "sanctuary:lime_brick_wall", + "sanctuary:lime_brick_wall_from_stonecutting", + "sanctuary:pink_brick_wall", + "sanctuary:pink_brick_wall_from_stonecutting", + "sanctuary:gray_brick_wall", + "sanctuary:gray_brick_wall_from_stonecutting", + "sanctuary:light_gray_brick_wall", + "sanctuary:light_gray_brick_wall_from_stonecutting", + "sanctuary:cyan_brick_wall", + "sanctuary:cyan_brick_wall_from_stonecutting", + "sanctuary:purple_brick_wall", + "sanctuary:purple_brick_wall_from_stonecutting", + "sanctuary:blue_brick_wall", + "sanctuary:blue_brick_wall_from_stonecutting", + "sanctuary:brown_brick_wall", + "sanctuary:brown_brick_wall_from_stonecutting", + "sanctuary:green_brick_wall", + "sanctuary:green_brick_wall_from_stonecutting", + "sanctuary:red_brick_wall", + "sanctuary:red_brick_wall_from_stonecutting", + "sanctuary:black_brick_wall", + "sanctuary:black_brick_wall_from_stonecutting" ], "additional_items": [ "sanctuary:white_bricks", @@ -475,7 +507,23 @@ "sanctuary:black_clay_ball", "sanctuary:black_brick", "sanctuary:clay_workshop", - "sanctuary:statuary" + "sanctuary:statuary", + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" ], "members": { "blocks": [ @@ -544,7 +592,23 @@ "sanctuary:black_brick_stairs", "sanctuary:black_clay", "sanctuary:clay_workshop", - "sanctuary:statuary" + "sanctuary:statuary", + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" ], "items": [ "sanctuary:white_bricks", @@ -644,7 +708,23 @@ "sanctuary:black_clay_ball", "sanctuary:black_brick", "sanctuary:clay_workshop", - "sanctuary:statuary" + "sanctuary:statuary", + "sanctuary:white_brick_wall", + "sanctuary:orange_brick_wall", + "sanctuary:magenta_brick_wall", + "sanctuary:light_blue_brick_wall", + "sanctuary:yellow_brick_wall", + "sanctuary:lime_brick_wall", + "sanctuary:pink_brick_wall", + "sanctuary:gray_brick_wall", + "sanctuary:light_gray_brick_wall", + "sanctuary:cyan_brick_wall", + "sanctuary:purple_brick_wall", + "sanctuary:blue_brick_wall", + "sanctuary:brown_brick_wall", + "sanctuary:green_brick_wall", + "sanctuary:red_brick_wall", + "sanctuary:black_brick_wall" ] } } diff --git a/tools/generate-colored-bricks.py b/tools/generate-colored-bricks.py index a6e59e8..379ab93 100644 --- a/tools/generate-colored-bricks.py +++ b/tools/generate-colored-bricks.py @@ -50,6 +50,7 @@ version=dict(line.split('=',1) for line in (root/'gradle.properties').read_text( preview=Image.new('RGB',(840,16*68+50),(30,31,34));draw=ImageDraw.Draw(preview);draw.text((12,12),version.upper()+' bricks / clay block / clay ball / brick item - native 16 x 16',fill='white') for index,color in enumerate(colors): names=[color+'_'+suffix for suffix in ['bricks','brick_slab','brick_stairs','clay','clay_ball','brick']];bricks,slab,stairs,clay,ball,brick=names + wall=color+'_brick_wall' source=assets/'textures/block'/f'{bricks}.png';image=Image.open(source);assert image.size==(16,16),source target=sample(image) # Dark neutrals need less white to stay distinct from light gray; retain the source hue. @@ -68,6 +69,7 @@ for index,color in enumerate(colors): mapping.update({f'minecraft:block/{s}':f'sanctuary:block/{n}' for s,n in zip(['bricks','brick_slab','brick_stairs','clay'],names)}) mapping.update({f'minecraft:blocks/{s}':f'sanctuary:blocks/{n}' for s,n in zip(['bricks','brick_slab','brick_stairs','clay'],names)}) mapping.update({f'minecraft:item/{s}':f'sanctuary:item/{n}' for s,n in [('clay_ball',ball),('brick',brick)]}) + mapping.update({'minecraft:brick_wall':id(wall),'minecraft:block/brick_wall':'sanctuary:block/'+wall,'minecraft:blocks/brick_wall':'sanctuary:blocks/'+wall}) for vanilla,name in zip(['bricks','brick_slab','brick_stairs','clay'],names): for category in ['blockstates','models/block','items']: copy_native('assets/minecraft/'+category+'/'+vanilla+'.json',assets/category/(name+'.json'),mapping) @@ -76,24 +78,39 @@ for index,color in enumerate(colors): copy_native('assets/minecraft/models/block/'+vanilla+'.json',assets/'models/block'/(name+'.json'),mapping) for vanilla,name in [('clay_ball',ball),('brick',brick)]: for category in ['models/item','items']:copy_native('assets/minecraft/'+category+'/'+vanilla+'.json',assets/category/(name+'.json'),mapping) + for category in ['blockstates','items']: + copy_native('assets/minecraft/'+category+'/brick_wall.json',assets/category/(wall+'.json'),mapping) + for part in ['post','side','side_tall','inventory']: + copy_native('assets/minecraft/models/block/brick_wall_'+part+'.json',assets/'models/block'/(wall+'_'+part+'.json'),mapping) + copy_native('data/minecraft/loot_table/blocks/brick_wall.json',data/'sanctuary/loot_table/blocks'/(wall+'.json'),mapping) block_ids.extend(map(id,names[:4]));item_ids.extend(map(id,names)); + block_ids.append(id(wall));item_ids.append(id(wall)) singular,plural=fr[index];en=color.replace('_',' ').title() for key,eng,french,isblock in zip(names,[f'{en} Bricks',f'{en} Brick Slab',f'{en} Brick Stairs',f'{en} Clay',f'{en} Clay Ball',f'{en} Brick'],[f'Briques {plural}',f'Dalle de briques {plural}',f'Escalier de briques {plural}',f'Argile {singular}',f"Boule d’argile {singular}",f'Brique {singular}'],[True]*4+[False]*2): translation=('block.' if isblock else 'item.')+'sanctuary.'+key;labels['en_us'][translation]=eng;labels['fr_fr'][translation]=french + labels['en_us']['block.sanctuary.'+wall]=f'{en} Brick Wall';labels['fr_fr']['block.sanctuary.'+wall]=f'Muret de briques {plural}' dye='minecraft:'+color+'_dye' for output,ingredient in [(ball,'#sanctuary:clay_balls'),(clay,'#sanctuary:clay_blocks'),(brick,'#sanctuary:brick_items'),(bricks,'#sanctuary:brick_blocks')]: shaped(output+'_from_dye',['###','#X#','###'],{'#':ingredient,'X':dye},id(output),8) shaped(clay,['##','##'],{'#':id(ball)},id(clay));shaped(bricks,['##','##'],{'#':id(brick)},id(bricks)) shaped(slab,['###'],{'#':id(bricks)},id(slab),6);shaped(stairs,['# ','## ','###'],{'#':id(bricks)},id(stairs),4) - for output,amount in [(slab,2),(stairs,1)]:recipe(output+'_from_stonecutting',{'type':'minecraft:stonecutting','ingredient':id(bricks),'result':{'id':id(output),'count':amount}},id(bricks)) + shaped(wall,['###','###'],{'#':id(bricks)},id(wall),6) + for output,amount in [(slab,2),(stairs,1),(wall,1)]:recipe(output+'_from_stonecutting',{'type':'minecraft:stonecutting','ingredient':id(bricks),'result':{'id':id(output),'count':amount}},id(bricks)) for output,ingredient,exp in [(id(brick),ball,.3),('minecraft:'+color+'_terracotta',clay,.35)]: recipe(ingredient+'_smelting',{'type':'minecraft:smelting','cookingtime':200,'experience':exp,'ingredient':id(ingredient),'result':{'id':output}},id(ingredient)) - tag('minecraft','block','mineable/pickaxe',list(map(id,names[:3])));tag('minecraft','block','mineable/shovel',[id(clay)]) + tag('minecraft','block','mineable/pickaxe',list(map(id,names[:3]))+[id(wall)]);tag('minecraft','block','mineable/shovel',[id(clay)]) for kind in ['block','item']: tag('minecraft',kind,'slabs',[id(slab)]);tag('minecraft',kind,'stairs',[id(stairs)]) + tag('minecraft',kind,'walls',[id(wall)]) for name,values in [('clay_balls',['minecraft:clay_ball',id(ball)]),('clay_blocks',['minecraft:clay',id(clay)]),('brick_items',['minecraft:brick',id(brick)]),('brick_blocks',['minecraft:bricks',id(bricks)])]:tag('sanctuary','item',name,values) for lang,obj in labels.items():write(assets/'lang'/f'{lang}.json',obj) -p=root/'scripts/data/collections-sanctuary.json';obj=json.loads(p.read_text());obj['clay_and_bricks']={'additional_recipes':recipes,'additional_items':item_ids,'members':{'blocks':block_ids,'items':item_ids}};write(p,obj) +p=root/'scripts/data/collections-sanctuary.json';obj=json.loads(p.read_text());extra=obj.setdefault('clay_and_bricks',{}) +# Other features (notably the workshop and sculptures) extend this collection too. +# Append our generated IDs without dropping additions owned by those features. +for key,values in [('additional_recipes',recipes),('additional_items',item_ids)]:extra[key]=list(dict.fromkeys(extra.get(key,[])+values)) +members=extra.setdefault('members',{}) +for kind,values in [('blocks',block_ids),('items',item_ids)]:members[kind]=list(dict.fromkeys(members.get(kind,[])+values)) +write(p,obj) # The reviewed collection compiler remains the sole writer of runtime taxonomy. import subprocess,sys subprocess.run([sys.executable,str(root/'scripts/compile_collections.py'),'--write'],check=True)