diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/AbstractSinkBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/AbstractSinkBlock.java index 742cd6438..7564fc408 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/AbstractSinkBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/AbstractSinkBlock.java @@ -145,24 +145,24 @@ public static void spawnParticles(Direction facing, World world, BlockPos pos) { if (world.isClient) { int x = pos.getX(), y = pos.getY(), z = pos.getZ(); if (facing == Direction.EAST) { - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); } else if (facing == Direction.SOUTH){ - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.76, 0.0, 0.0, 0.0); } else if (facing == Direction.NORTH){ - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 1.19, z + 0.24, 0.0, 0.0, 0.0); } else { - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 1.19, z + 0.5, 0.0, 0.0, 0.0); } } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicBathtubBlock.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicBathtubBlock.java index b8c43d8bd..46952706a 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicBathtubBlock.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/BasicBathtubBlock.java @@ -325,24 +325,24 @@ public static void spawnParticles(Direction facing, World world, BlockPos pos) { if (world.isClient) { int x = pos.getX(), y = pos.getY(), z = pos.getZ(); if (facing == Direction.EAST) { - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.76, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); } else if (facing == Direction.SOUTH){ - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.76, 0.0, 0.0, 0.0); } else if (facing == Direction.NORTH){ - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.5, y + 0.8, z + 0.24, 0.0, 0.0, 0.0); } else { - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + 0.24, y + 0.8, z + 0.5, 0.0, 0.0, 0.0); } } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java index 4a422e950..023e7b4c2 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/blockentities/ShowerHeadBlockEntity.java @@ -76,24 +76,24 @@ public static void addShowerParticles(World world, BlockPos pos, float[] offset, int x = pos.getX(), y = pos.getY(), z = pos.getZ(); Random rand = world.random; if (rand.nextBoolean()) { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); } else { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); } if (rand.nextBoolean()) { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] - difference[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); } else { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); } if (rand.nextBoolean()) { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2]), 0.0, 0.0, 0.0); } else { - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); - world.addParticle(ParticleIDs.WATER_DROP, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2] - difference[2]), 0.0, 0.0, 0.0); + world.addParticle(ParticleIDs.WATER_DROP, true, x + (offset[0] + difference[0]), y + (offset[1] - difference[1]), z + (offset[2] + difference[2]), 0.0, 0.0, 0.0); } } diff --git a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java index eb1bcee9a..c7ced5b67 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java +++ b/common/src/main/java/com/unlikepaladin/pfm/blocks/models/ModelHelper.java @@ -188,7 +188,7 @@ public static Identifier getTextureId(Block block, String postfix) { } } } - } else if (postfix.equals("top") && !PFMDataGenerator.areAssetsRunning()) { + } else if (postfix.equals("_top") && !PFMDataGenerator.areAssetsRunning()) { BakedModel model = MinecraftClient.getInstance().getBakedModelManager().getBlockModels().getModel(block.getDefaultState()); if (model != null) { List quadList = model.getQuads(block.getDefaultState(), Direction.UP, Random.create(42L)); diff --git a/common/src/main/java/com/unlikepaladin/pfm/data/materials/ExtraCounterVariant.java b/common/src/main/java/com/unlikepaladin/pfm/data/materials/ExtraCounterVariant.java index 935ecfc2e..755e1efc1 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/data/materials/ExtraCounterVariant.java +++ b/common/src/main/java/com/unlikepaladin/pfm/data/materials/ExtraCounterVariant.java @@ -21,6 +21,11 @@ public class ExtraCounterVariant extends VariantBase { public static ExtraCounterVariant CONCRETE = new ExtraCounterVariant(Blocks.WHITE_CONCRETE, null, "concrete"); public static ExtraCounterVariant SMOOTH_STONE = new ExtraCounterVariant(Blocks.WHITE_CONCRETE, Blocks.SMOOTH_STONE,"smooth_stone"); public static ExtraCounterVariant DEEPSLATE_TILE = new ExtraCounterVariant(Blocks.QUARTZ_BLOCK, Blocks.DEEPSLATE_TILES,"deepslate_tile"); + public static ExtraCounterVariant GRANITE_TERRACOTTA = new ExtraCounterVariant(Blocks.WHITE_TERRACOTTA, Blocks.POLISHED_GRANITE,"granite_terracotta"); + public static ExtraCounterVariant ANDESITE_OAK = new ExtraCounterVariant(Blocks.STRIPPED_OAK_LOG, Blocks.POLISHED_ANDESITE,"andesite_oak"); + public static ExtraCounterVariant DEEPSLATE_DARK_OAK = new ExtraCounterVariant(Blocks.DARK_OAK_PLANKS, Blocks.POLISHED_DEEPSLATE,"deepslate_dark_oak"); + public static ExtraCounterVariant BLACKSTONE_CRIMSON = new ExtraCounterVariant(Blocks.CRIMSON_PLANKS, Blocks.POLISHED_BLACKSTONE,"blackstone_crimson"); + private final String name; private final Block baseBlock; static final List DEFAULT_VARIANTS = new ArrayList<>(); @@ -33,6 +38,10 @@ public static List values() { DEFAULT_VARIANTS.add(CONCRETE); DEFAULT_VARIANTS.add(SMOOTH_STONE); DEFAULT_VARIANTS.add(DEEPSLATE_TILE); + DEFAULT_VARIANTS.add(GRANITE_TERRACOTTA); + DEFAULT_VARIANTS.add(ANDESITE_OAK); + DEFAULT_VARIANTS.add(DEEPSLATE_DARK_OAK); + DEFAULT_VARIANTS.add(BLACKSTONE_CRIMSON); } return DEFAULT_VARIANTS; } @@ -99,7 +108,7 @@ public List getFeatureList() { @Override public Block mainChild() { - return baseBlock; + return this.baseBlock; } @Environment(EnvType.CLIENT) diff --git a/common/src/main/java/com/unlikepaladin/pfm/items/LightSwitchItem.java b/common/src/main/java/com/unlikepaladin/pfm/items/LightSwitchItem.java index 2ff71050f..a6a8cb433 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/items/LightSwitchItem.java +++ b/common/src/main/java/com/unlikepaladin/pfm/items/LightSwitchItem.java @@ -82,6 +82,11 @@ protected boolean canPlace(ItemPlacementContext context, BlockState state) { WorldView world = context.getWorld(); Direction side = context.getSide(); NbtList lights = getLights(context.getStack()); + boolean canPlace = state.getBlock().canPlaceAt(state, world, pos) && side.getAxis().isHorizontal(); + + if (!canPlace) { + return false; + } if (lights != null) { ArrayList removedLights = new ArrayList<>(); ArrayList lightOffsets = new ArrayList<>(); @@ -105,7 +110,7 @@ protected boolean canPlace(ItemPlacementContext context, BlockState state) { context.getPlayer().sendMessage(Text.translatable("message.pfm.light_switch_far", removedLights.toString()), false); } } - return state.getBlock().canPlaceAt(state, world, pos) && side.getAxis().isHorizontal(); + return true; } private void addLight(ItemStack stack, BlockPos pos) diff --git a/common/src/main/java/com/unlikepaladin/pfm/items/ShowerHandleItem.java b/common/src/main/java/com/unlikepaladin/pfm/items/ShowerHandleItem.java index 35bba8bbb..6d3e42f90 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/items/ShowerHandleItem.java +++ b/common/src/main/java/com/unlikepaladin/pfm/items/ShowerHandleItem.java @@ -66,6 +66,10 @@ protected boolean canPlace(ItemPlacementContext context, BlockState state) { Direction playerFacing = context.getHorizontalPlayerFacing(); Direction placeDirection = context.getSide(); + boolean canPlace = state.getBlock().canPlaceAt(state, world, pos) && placeDirection.getAxis().isHorizontal(); + if (!canPlace) { + return false; + } if (showerHeadLong != null) { BlockPos headPos = BlockPos.fromLong(showerHeadLong.longValue()); BlockPos placedPos = pos.offset(playerFacing); @@ -81,7 +85,7 @@ protected boolean canPlace(ItemPlacementContext context, BlockState state) { } return state.getBlock().canPlaceAt(state, world, pos) && placeDirection.getAxis().isHorizontal(); } - return state.getBlock().canPlaceAt(state, world, pos) && placeDirection.getAxis().isHorizontal(); + return true; } private void setShowerHeadPosNBT(ItemStack stack, BlockPos pos) diff --git a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java index 0fc76be2a..32e570c11 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java +++ b/common/src/main/java/com/unlikepaladin/pfm/registry/dynamic/LateBlockRegistry.java @@ -55,30 +55,36 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat PaladinFurnitureMod.pfmModCompatibilities.forEach(PFMModCompatibility::createBlocks); PaladinFurnitureMod.furnitureEntryMap.put(BasicChairBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair", () -> new BasicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(DinnerChairBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_dinner", () -> new DinnerChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicChairBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_classic", () -> new ClassicChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicChairDyeableBlock.class, new FurnitureEntry<>() {{ int i = 0; @@ -92,12 +98,14 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat PaladinFurnitureMod.furnitureEntryMap.put(ModernChairBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_chair_modern", () -> new ModernChairBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(FroggyChairBlock.class, new FurnitureEntry<>() {{ this.addBlock(registerLateBlock("froggy_chair", () -> new FroggyChairBlock(AbstractBlock.Settings.create().strength(9.0f).resistance(8.0f).nonOpaque().requiresTool().mapColor(MapColor.GREEN)), true, PaladinFurnitureMod.FURNITURE_GROUP)); @@ -131,95 +139,114 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat PaladinFurnitureMod.furnitureEntryMap.put(BasicTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_basic", () -> new BasicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_classic", () -> new ClassicTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(LogTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + MapColor color = variant.getBaseBlock().getDefaultMapColor(); String postfix = variant.isNetherWood() ? "stem" : "log"; - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_" + postfix, () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_" + postfix, () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_" + postfix, () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_" + postfix, () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_natural", () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_natural", () -> new LogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(RawLogTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + MapColor color = variant.getBaseBlock().getDefaultMapColor(); String postfix = variant.isNetherWood() ? "stem" : "log"; - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_raw_table_" + postfix, () -> new RawLogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_raw_table_" + postfix, () -> new RawLogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" +variant.asString()+"_raw_table_" + postfix, () -> new RawLogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" +variant.asString()+"_raw_table_" + postfix, () -> new RawLogTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } }}); PaladinFurnitureMod.furnitureEntryMap.put(DinnerTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_dinner", () -> new DinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ModernDinnerTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_table_modern_dinner", () -> new ModernDinnerTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(BasicCoffeeTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_basic", () -> new BasicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ModernCoffeeTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_modern", () -> new ModernCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicCoffeeTableBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_coffee_table_classic", () -> new ClassicCoffeeTableBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicNightstandBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_nightstand", () -> new ClassicNightstandBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(SimpleBedBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { @@ -246,43 +273,52 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat }}); PaladinFurnitureMod.furnitureEntryMap.put(SimpleBunkLadderBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_simple_bunk_ladder", () -> new SimpleBunkLadderBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_simple_bunk_ladder", () -> new SimpleBunkLadderBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(LogStoolBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { + MapColor color = variant.getBaseBlock().getDefaultMapColor(); String postfix = variant.isNetherWood() ? "stem" : "log"; - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString() + "_" + postfix + "_stool", () -> new LogStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString() + "_" + postfix + "_stool", () -> new LogStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(SimpleStoolBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_simple_stool", () -> new SimpleStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ClassicStoolBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_classic_stool", () -> new ClassicStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(ModernStoolBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } for (StoneVariant variant : StoneVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); } for (ExtraStoolVariant variant : ExtraStoolVariant.values()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_modern_stool", () -> new ModernStoolBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); } }}); @@ -295,45 +331,48 @@ public static void registerBlocks() throws InvocationTargetException, Instantiat PaladinFurnitureMod.furnitureEntryMap.put(KitchenWallDrawerSmallBlock.class, new FurnitureEntry()); PaladinFurnitureMod.furnitureEntryMap.put(KitchenCounterBlock.class, new FurnitureEntry<>() {{ for (WoodVariant variant : WoodVariantRegistry.getVariants()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); if (variant.hasStripped()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + this.addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock("stripped_" + variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), false); } } for (StoneVariant variant : StoneVariantRegistry.getVariants()) {if (variant.identifier.getPath().equals("quartz")) continue; - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); } for (ExtraCounterVariant variant : ExtraCounterVariant.values()) { - this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); - PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + MapColor color = variant.getBaseBlock().getDefaultMapColor(); + this.addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_counter", () -> new KitchenCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_drawer", () -> new KitchenDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock( variant.asString()+"_kitchen_cabinet", () -> new KitchenCabinetBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_sink", () -> new KitchenSinkBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque(), Biome.Precipitation.RAIN, SinkBehavior.WATER_SINK_BEHAVIOR), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterOvenBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_counter_oven", () -> new KitchenCounterOvenBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallCounterBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_counter", () -> new KitchenWallCounterBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_drawer", () -> new KitchenWallDrawerBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); + PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).addBlock(variant, LateBlockRegistry.registerLateBlock(variant.asString()+"_kitchen_wall_small_drawer", () -> new KitchenWallDrawerSmallBlock(AbstractBlock.Settings.copy(variant.getBaseBlock()).mapColor(color).nonOpaque()), true, PaladinFurnitureMod.FURNITURE_GROUP), true); }}}); PaladinFurnitureMod.furnitureEntryMap.put(FreezerBlock.class, new FurnitureEntry() {{ this.addBlock(LateBlockRegistry.registerLateBlock( "white_freezer", () -> PaladinFurnitureModBlocksItems.WHITE_FREEZER, true, PaladinFurnitureMod.FURNITURE_GROUP)); diff --git a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java index cdc316607..91cc8731f 100644 --- a/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java +++ b/common/src/main/java/com/unlikepaladin/pfm/runtime/data/PFMRecipeProvider.java @@ -376,7 +376,7 @@ protected void generateRecipes(RecipeExporter exporter) { PaladinFurnitureMod.furnitureEntryMap.get(KitchenCounterBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { Pair materials = getCounterMaterials(variantBase); - offerCounterRecipe(block.asItem(), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(materials.getRight()), exporter); + offerCounterRecipe(block.asItem(), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(materials.getLeft()), exporter); generatedRecipes.add(getId(block)); } }); @@ -389,7 +389,7 @@ protected void generateRecipes(RecipeExporter exporter) { PaladinFurnitureMod.furnitureEntryMap.get(KitchenSinkBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { Pair materials = getCounterMaterials(variantBase); - offerKitchenSinkRecipe(block.asItem(), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(Items.BUCKET), Ingredient.ofItems(Items.IRON_INGOT), exporter); + offerKitchenSinkRecipe(block.asItem(), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(Items.BUCKET), Ingredient.ofItems(Items.IRON_INGOT), exporter); generatedRecipes.add(getId(block)); } }); @@ -402,7 +402,7 @@ protected void generateRecipes(RecipeExporter exporter) { PaladinFurnitureMod.furnitureEntryMap.get(KitchenDrawerBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { Pair materials = getCounterMaterials(variantBase); - offerCounterApplianceRecipe(block.asItem(), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(Items.CHEST), exporter); + offerCounterApplianceRecipe(block.asItem(), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(Items.CHEST), exporter); generatedRecipes.add(getId(block)); } }); @@ -447,7 +447,7 @@ protected void generateRecipes(RecipeExporter exporter) { }); PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { - offerWallDrawerRecipe(block.asItem(), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(variantBase.getBaseBlock()), Ingredient.ofItems(Items.CHEST), exporter); + offerWallDrawerRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(Items.CHEST), exporter); generatedRecipes.add(getId(block)); } }); @@ -460,20 +460,20 @@ protected void generateRecipes(RecipeExporter exporter) { }); PaladinFurnitureMod.furnitureEntryMap.get(KitchenWallDrawerSmallBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { - offerWallDrawerSmallRecipe(block.asItem(), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(Items.CHEST), exporter); + offerWallDrawerSmallRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock().asItem()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(Items.CHEST), exporter); generatedRecipes.add(getId(block)); } }); PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).getVariantToBlockMap().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { Pair materials = getCounterMaterials(variantBase); - offerCabinetRecipe(block.asItem(), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(Items.CHEST), exporter); + offerCabinetRecipe(block.asItem(), Ingredient.ofItems(materials.getRight()), Ingredient.ofItems(materials.getLeft()), Ingredient.ofItems(Items.CHEST), exporter); generatedRecipes.add(getId(block)); } }); PaladinFurnitureMod.furnitureEntryMap.get(KitchenCabinetBlock.class).getVariantToBlockMapNonBase().forEach((variantBase, block) -> { if (!generatedRecipes.contains(getId(block))) { - offerCabinetRecipe(block.asItem(), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(Items.CHEST), exporter); + offerCabinetRecipe(block.asItem(), Ingredient.ofItems(variantBase.getBaseBlock().asItem()), Ingredient.ofItems((Block)variantBase.getChild("stripped_log")), Ingredient.ofItems(Items.CHEST), exporter); generatedRecipes.add(getId(block)); } }); @@ -682,22 +682,10 @@ public static Pair getCounterMaterials(VariantBase variantBase) Block counterTop = variantBase.getSecondaryBlock(); Block counterBase = variantBase.getBaseBlock(); - if (variantBase.identifier.getPath().equals("granite")) { - counterTop = Blocks.POLISHED_GRANITE; - counterBase = Blocks.WHITE_TERRACOTTA; - } else if (variantBase.identifier.getPath().equals("calcite") || variantBase.identifier.getPath().equals("netherite")) { + if (variantBase.identifier.getPath().equals("calcite") || variantBase.identifier.getPath().equals("netherite")) { Block temp = counterBase; counterBase = counterTop; counterTop = temp; - } else if (variantBase.identifier.getPath().equals("andesite")) { - counterTop = Blocks.POLISHED_ANDESITE; - counterBase = Blocks.STRIPPED_OAK_LOG; - } else if (variantBase.identifier.getPath().equals("deepslate")) { - counterTop = Blocks.POLISHED_DEEPSLATE; - counterBase = Blocks.DARK_OAK_PLANKS; - } else if (variantBase.identifier.getPath().equals("blackstone")) { - counterTop = Blocks.POLISHED_BLACKSTONE; - counterBase = Blocks.CRIMSON_PLANKS; } return new Pair<>(counterBase,counterTop); } @@ -854,7 +842,7 @@ public static void offerFreezerRecipe(ItemConvertible output, Ingredient legMate } public static void offerMicrowaveRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient storage, RecipeExporter exporter) { - FurnitureRecipeJsonFactory.create(output, 1).group("kitchen").criterion("has_" + getItemPath(legMaterial), conditionsFromIngredient(legMaterial)).input(legMaterial ,3).input(storage).input(Ingredient.ofItems(Items.REDSTONE)).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); + FurnitureRecipeJsonFactory.create(output, 1).group("kitchen").criterion("has_" + getItemPath(legMaterial), conditionsFromIngredient(legMaterial)).input(legMaterial ,5).input(storage).input(Ingredient.ofItems(Items.REDSTONE)).offerTo(exporter, new Identifier("pfm", output.asItem().getTranslationKey().replace("block.pfm.", ""))); } public static void offerRangeHoodRecipe(ItemConvertible output, Ingredient legMaterial, Ingredient secondMaterial, RecipeExporter exporter) { diff --git a/common/src/main/resources/assets/pfm/lang/en_us.json b/common/src/main/resources/assets/pfm/lang/en_us.json index a6cfe447d..aa1dade50 100644 --- a/common/src/main/resources/assets/pfm/lang/en_us.json +++ b/common/src/main/resources/assets/pfm/lang/en_us.json @@ -314,6 +314,10 @@ "block.pfm.variant.gray_dark_oak": "Gray Dark Oak", "block.pfm.variant.white": "White", "block.pfm.variant.gray": "Gray", + "block.pfm.variant.granite_terracotta": "Granite Terracotta", + "block.pfm.variant.andesite_oak": "Andesite Stripped Oak", + "block.pfm.variant.deepslate_dark_oak": "Deepslate Dark Oak", + "block.pfm.variant.blackstone_crimson": "Blackstone Crimson", "block.pfm.variant.light_gray_dark_oak": "Light Gray Dark Oak" } diff --git a/common/src/main/resources/assets/pfm/lang/ru_ru.json b/common/src/main/resources/assets/pfm/lang/ru_ru.json new file mode 100644 index 000000000..644195dc2 --- /dev/null +++ b/common/src/main/resources/assets/pfm/lang/ru_ru.json @@ -0,0 +1,324 @@ +{ + "block.pfm.working_table": "Мебельный верстак", + + "block.pfm.froggy_chair": "Стул-лягушка", + "block.pfm.froggy_chair_pink": "Розовый стул-лягушка", + "block.pfm.froggy_chair_orange": "Оранжевый стул-лягушка", + "block.pfm.froggy_chair_blue": "Синий стул-лягушка", + "block.pfm.froggy_chair_light_blue": "Голубой стул-лягушка", + "block.pfm.froggy_chair_yellow": "Жёлтый стул-лягушка", + + "itemGroup.pfm.furniture": "Мебель Паладина", + "itemGroup.pfm.dye_kits": "Наборы красителей", + + "block.pfm.white_arm_chair": "Белое кресло", + "block.pfm.orange_arm_chair": "Оранжевое кресло", + "block.pfm.magenta_arm_chair": "Пурпурное кресло", + "block.pfm.light_blue_arm_chair": "Голубое кресло", + "block.pfm.yellow_arm_chair": "Жёлтое кресло", + "block.pfm.lime_arm_chair": "Лаймовое кресло", + "block.pfm.pink_arm_chair": "Розовое кресло", + "block.pfm.gray_arm_chair": "Серое кресло", + "block.pfm.light_gray_arm_chair": "Светло-серое кресло", + "block.pfm.cyan_arm_chair": "Бирюзовое кресло", + "block.pfm.purple_arm_chair": "Фиолетовое кресло", + "block.pfm.blue_arm_chair": "Синее кресло", + "block.pfm.brown_arm_chair": "Коричневое кресло", + "block.pfm.green_arm_chair": "Зелёное кресло", + "block.pfm.red_arm_chair": "Красное кресло", + "block.pfm.black_arm_chair": "Чёрное кресло", + "block.pfm.arm_chair_leather": "Кожаное кресло", + "block.pfm.white_simple_sofa": "Простой белый диван", + "block.pfm.orange_simple_sofa": "Простой оранжевый диван", + "block.pfm.magenta_simple_sofa": "Простой пурпурный диван", + "block.pfm.light_blue_simple_sofa": "Простой голубой диван", + "block.pfm.yellow_simple_sofa": "Простой жёлтый диван", + "block.pfm.lime_simple_sofa": "Простой лаймовый диван", + "block.pfm.pink_simple_sofa": "Простой розовый диван", + "block.pfm.gray_simple_sofa": "Простой серый диван", + "block.pfm.light_gray_simple_sofa": "Простой светло-серый диван", + "block.pfm.cyan_simple_sofa": "Простой бирюзовый диван", + "block.pfm.purple_simple_sofa": "Простой фиолетовый диван", + "block.pfm.blue_simple_sofa": "Простой синий диван", + "block.pfm.brown_simple_sofa": "Простой коричневый диван", + "block.pfm.green_simple_sofa": "Простой зелёный диван", + "block.pfm.red_simple_sofa": "Простой красный диван", + "block.pfm.black_simple_sofa": "Простой чёрный диван", + + "block.pfm.oak_chair_classic_white": "Классический белый дубовый стул", + "block.pfm.oak_chair_classic_orange": "Классический оранжевый дубовый стул", + "block.pfm.oak_chair_classic_magenta": "Классический пурпурный дубовый стул", + "block.pfm.oak_chair_classic_light_blue": "Классический голубой дубовый стул", + "block.pfm.oak_chair_classic_yellow": "Классический жёлтый дубовый стул", + "block.pfm.oak_chair_classic_lime": "Классический лаймовый дубовый стул", + "block.pfm.oak_chair_classic_pink": "Классический розовый дубовый стул", + "block.pfm.oak_chair_classic_gray": "Классический серый дубовый стул", + "block.pfm.oak_chair_classic_light_gray": "Классический светло-серый дубовый стул", + "block.pfm.oak_chair_classic_cyan": "Классический бирюзовый дубовый стул", + "block.pfm.oak_chair_classic_purple": "Классический фиолетовый дубовый стул", + "block.pfm.oak_chair_classic_blue": "Классический синий дубовый стул", + "block.pfm.oak_chair_classic_brown": "Классический коричневый дубовый стул", + "block.pfm.oak_chair_classic_green": "Классический зелёный дубовый стул", + "block.pfm.oak_chair_classic_red": "Классический красный дубовый стул", + "block.pfm.oak_chair_classic_black": "Классический чёрный дубовый стул", + + "item.pfm.dye_kit_red": "Набор красного красителя", + "item.pfm.dye_kit_orange": "Набор оранжевого красителя", + "item.pfm.dye_kit_yellow": "Набор жёлтого красителя", + "item.pfm.dye_kit_lime": "Набор лаймового красителя", + "item.pfm.dye_kit_green": "Набор зелёного красителя", + "item.pfm.dye_kit_cyan": "Набор бирюзового красителя", + "item.pfm.dye_kit_light_blue": "Набор голубого красителя", + "item.pfm.dye_kit_blue": "Набор синего красителя", + "item.pfm.dye_kit_purple": "Набор фиолетового красителя", + "item.pfm.dye_kit_magenta": "Набор пурпурного красителя", + "item.pfm.dye_kit_pink": "Набор розового красителя", + "item.pfm.dye_kit_brown": "Набор коричневого красителя", + "item.pfm.dye_kit_black": "Набор чёрного красителя", + "item.pfm.dye_kit_gray": "Набор серого красителя", + "item.pfm.dye_kit_light_gray": "Набор светло-серого красителя", + "item.pfm.dye_kit_white": "Набор белого красителя", + + "block.pfm.light_switch": "Выключатель света", + "block.pfm.basic_shower_handle": "Простая ручка душа", + "block.pfm.basic_shower_head": "Простая лейка душа", + "block.pfm.basic_sink": "Простой умывальник", + + "message.pfm.light_switch_not_canopy": "Вам нужно выбрать только плафон светильника", + "message.pfm.light_switch_far": "Этот выключатель света находится слишком далеко от ламп, поэтому они были отключены: %s", + "tooltip.pfm.light_switch_connected": "Этот выключатель подключён к %d светильникам", + "message.pfm.shower_handle_far": "Эта ручка слишком далеко от лейки душа, соединение было разорвано: %s", + "tooltip.pfm.shower_handle_connected": "Эта ручка подключена к %d лейкам душа", + "message.pfm.patchouli_not_installed": "Для использования этой книги необходимо установить мод Patchouli", + "item.pfm.furniture_book": "Мебель Паладина", + + "block.pfm.white_shower_towel": "Белое полотенце для душа", + "block.pfm.orange_shower_towel": "Оранжевое полотенце для душа", + "block.pfm.magenta_shower_towel": "Пурпурное полотенце для душа", + "block.pfm.light_blue_shower_towel": "Голубое полотенце для душа", + "block.pfm.yellow_shower_towel": "Жёлтое полотенце для душа", + "block.pfm.lime_shower_towel": "Лаймовое полотенце для душа", + "block.pfm.pink_shower_towel": "Розовое полотенце для душа", + "block.pfm.gray_shower_towel": "Серое полотенце для душа", + "block.pfm.light_gray_shower_towel": "Светло-серое полотенце для душа", + "block.pfm.cyan_shower_towel": "Бирюзовое полотенце для душа", + "block.pfm.purple_shower_towel": "Фиолетовое полотенце для душа", + "block.pfm.blue_shower_towel": "Синее полотенце для душа", + "block.pfm.brown_shower_towel": "Коричневое полотенце для душа", + "block.pfm.green_shower_towel": "Зелёное полотенце для душа", + "block.pfm.red_shower_towel": "Красное полотенце для душа", + "block.pfm.black_shower_towel": "Чёрное полотенце для душа", + + "container.pfm.nightstand": "Тумбочка", + "container.pfm.drawer": "Кухонный ящик", + "container.pfm.drawer_small": "Малый кухонный ящик", + "container.pfm.small_storage": "Малый контейнер", + "container.pfm.working_table": "Мебельный верстак", + "container.pfm.cabinet": "Навесной шкаф", + "container.pfm.kitchen_cabinet": "Кухонный шкаф", + "container.pfm.white_fridge": "Белый холодильник", + "container.pfm.white_freeezer": "Белая морозильная камера", + "container.pfm.gray_fridge": "Серый холодильник", + "container.pfm.gray_freezer": "Серая морозильная камера", + "container.pfm.iron_fridge": "Железный холодильник", + "container.pfm.iron_freezer": "Железная морозильная камера", + "container.pfm.xbox_fridge": "Холодильник Xbox Series X", + "container.pfm.freezer": "Морозильная камера", + "container.pfm.white_stove": "Белая плита", + "container.pfm.gray_stove": "Серая плита", + "container.pfm.iron_stove": "Железная плита", + "container.pfm.kitchen_counter_oven": "Встроенный духовой шкаф", + "container.pfm.working_table.ingredient_required": "Требуемые ингредиенты:", + + "block.pfm.kitchen_stovetop": "Кухонная варочная поверхность", + "block.pfm.white_stove": "Белая плита", + "block.pfm.white_oven_range_hood": "Белая вытяжка", + "block.pfm.gray_oven_range_hood": "Серая вытяжка", + "block.pfm.iron_stove": "Железная плита", + "block.pfm.gray_stove": "Серая плита", + "block.pfm.iron_oven_range_hood": "Железная вытяжка", + "block.pfm.iron_toaster": "Железный тостер", + "container.pfm.microwave": "Микроволновка", + "container.pfm.trashcan": "Мусорное ведро", + "block.pfm.iron_microwave": "Железная микроволновка", + "block.pfm.trashcan": "Металлическое мусорное ведро", + "block.pfm.mesh_trashcan": "Мусорное ведро с сеткой", + "gui.pfm.trashcan.clear_button": "Очистить", + "gui.pfm.microwave.start_button": "Запустить", + "block.pfm.white_fridge": "Белый холодильник", + "block.pfm.gray_fridge": "Серый холодильник", + "block.pfm.iron_fridge": "Железный холодильник", + "block.pfm.white_freezer": "Белая морозильная камера", + "block.pfm.gray_freezer": "Серая морозильная камера", + "block.pfm.iron_freezer": "Железная морозильная камера", + "block.pfm.xbox_fridge": "Холодильник Xbox Series X", + + "block.pfm.oak_herringbone_planks": "Дубовые доски с рисунком «ёлочка»", + "block.pfm.dark_oak_herringbone_planks": "Тёмные дубовые доски с рисунком «ёлочка»", + "block.pfm.jungle_herringbone_planks": "Тропические доски с рисунком «ёлочка»", + "block.pfm.acacia_herringbone_planks": "Акациевые доски с рисунком «ёлочка»", + "block.pfm.birch_herringbone_planks": "Берёзовые доски с рисунком «ёлочка»", + "block.pfm.spruce_herringbone_planks": "Еловые доски с рисунком «ёлочка»", + "block.pfm.warped_herringbone_planks": "Искажённые доски с рисунком «ёлочка»", + "block.pfm.crimson_herringbone_planks": "Багровые доски с рисунком «ёлочка»", + "block.pfm.mangrove_herringbone_planks": "Мангровые доски с рисунком «ёлочка»", + "block.pfm.cherry_herringbone_planks": "Вишнёвые доски с рисунком «ёлочка»", + "block.pfm.bamboo_herringbone_planks": "Бамбуковые доски с рисунком «ёлочка»", + + "block.pfm.raw_concrete": "Сырой бетон", + "block.pfm.raw_concrete_powder": "Сырой порошок бетона", + "block.pfm.leather_block": "Кожаный блок", + "block.pfm.iron_chain": "Железная цепь", + "block.pfm.gray_modern_pendant": "Серый современный подвесной светильник", + "block.pfm.white_modern_pendant": "Белый современный подвесной светильник", + "block.pfm.glass_modern_pendant": "Стеклянный современный подвесной светильник", + "block.pfm.simple_light": "Простой потолочный светильник", + + "block.pfm.white_mirror": "Белое зеркало", + "block.pfm.gray_mirror": "Серое зеркало", + + "stat.pfm.fridge_opened": "Взаимодействий с холодильником", + "stat.pfm.freezer_opened": "Взаимодействий с морозильной камерой", + "stat.pfm.drawer_searched": "Ящиков открыто", + "stat.pfm.cabinet_searched": "Навесных шкафов открыто", + "stat.pfm.stove_opened": "Взаимодействий с плитой", + "stat.pfm.stove_used": "Взаимодействий с варочной поверхностью", + "stat.pfm.sink_filled": "Заполнено раковин", + "stat.pfm.use_sink": "Взятие воды из раковины", + "stat.pfm.plate_used": "Взаимодействий с тарелкой", + "stat.pfm.microwave_used": "Взаимодействий с микроволновкой", + "stat.pfm.chair_used": "Сидений на стуле", + "stat.pfm.toilet_used": "Взаимодействий с унитазом", + "stat.pfm.use_bathtub": "Взаимодействий с ванной", + "stat.pfm.bathtub_filled": "Заполнено ванн", + + "subtitles.pfm.microwave_running": "Шум микроволновки", + "subtitles.pfm.microwave_beep": "Писк микроволновки", + "subtitles.pfm.toilet_flushing": "Смыв унитаза", + "subtitles.pfm.toilet_used": "Использование туалета", + + "tags.pfm.tuckable_blocks": "Прячущиеся блоки", + + "block.pfm.basic_plate": "Простая тарелка", + "block.pfm.basic_cutlery": "Простые столовые приборы", + "block.pfm.basic_toilet": "Простой унитаз", + "block.pfm.wall_toilet_paper": "Туалетная бумага", + "block.pfm.basic_bathtub": "Простая ванна", + + "block.pfm.cooking_table": "Кухонный стол", + + "keybindings.category.pfm": "Мебель Паладина", + "key.pfm.toiletUse": "Использовать унитаз", + + "pfm.compat.failure.reason.indiumNotFound": "Для использования мода 'Мебель Паладина' с Sodium требуется Indium. Загрузите последнюю версию, поместите её в папку mods и перезапустите игру.", + "pfm.compat.failure.indiumDownload": "Скачать Indium", + "pfm.compat.failure.title": "Не удалось загрузить мод 'Мебель Паладина'!", + + "emi.category.pfm.freezer": "Заморозка", + "emi.category.pfm.furniture": "Верстак", + "rei.pfm.freezer": "Заморозка", + "rei.pfm.furniture": "Мебельный верстак", + "pfm.patchouli.guide_book.name": "Мебель Паладина", + "pfm.patchouli.guide_book.landing_text": "Это руководство по всему, что связано с мебелью в этом моде. Оно покажет вам, как использовать и создавать мебель и приборы.", + "pfm.patchouli.guide_book.subtitle": "Ваш гид по моду", + "pfm.option.tablesOfDifferentMaterialsConnect": "Соединять столы из разных материалов", + "pfm.option.tablesOfDifferentMaterialsConnect.tooltip": "Столы из разных материалов соединяются, если стоят рядом.", + "pfm.option.chairsFacePlayer": "Стулья смотрят на игрока", + "pfm.option.chairsFacePlayer.tooltip": "Стулья будут поворачиваться к игроку при установке, если включено.", + "pfm.option.countersOfDifferentMaterialsConnect": "Соединять столешницы из разных материалов", + "pfm.option.countersOfDifferentMaterialsConnect.tooltip": "Столешницы из разных материалов соединяются, если стоят рядом.", + "pfm.option.foodPopsOffStove": "Еда выскакивает с плиты", + "pfm.option.foodPopsOffStove.tooltip": "Если включено, готовая еда будет выскакивать с плиты, как с костра.", + "pfm.option.checkForUpdates": "Проверка обновлений", + "pfm.option.checkForUpdates.tooltip": "Если включено, мод будет проверять обновления и уведомлять вас о новых версиях.", + "pfm.option.enableBook": "Включить руководство", + "pfm.option.enableBook.tooltip": "Новые игроки автоматически получат руководство.", + "pfm.option.differentMirrorsConnect": "Соединять зеркала из разных материалов", + "pfm.option.differentMirrorsConnect.tooltip": "Зеркала из разных материалов соединяются, если стоят рядом.", + "pfm.option.mobsSitOnChairs": "Мобы садятся на стулья", + "pfm.option.mobsSitOnChairs.tooltip": "Если включено, мобы будут садиться на стулья при контакте.", + "pfm.option.shaderSolidFix": "Исправление шейдеров для прозрачных элементов", + "pfm.option.shaderSolidFix.tooltip": "Делает мебель с прозрачными частями непрозрачной для предотвращения проблем с рендерингом в шейдерах, таких как Seus.", + "pfm.option.spawnImmersivePortalsMirror": "Зеркала Immersive Portals", + "pfm.option.spawnImmersivePortalsMirror.tooltip": "Если включено, зеркала мода будут работать с Immersive Portals.", + "pfm.option.renderImmersivePortalsMirrors": "Отображение зеркал Immersive Portals", + "pfm.option.renderImmersivePortalsMirrors.tooltip": "Если включено, зеркала будут отображаться, если установлен Immersive Portals.", + + "pfm.config.title": "Конфигурация мода 'Мебель Паладина'", + "pfm.option.resetAll": "Сбросить все настройки", + "pfm.option.client": "Управляется клиентом", + "pfm.option.server": "Управляется сервером", + "pfm.config.categories.mod_options": "Настройки мода", + "pfm.config.categories.gameplay_options": "Настройки геймплея", + "pfm.option.regenAssets": "Пересоздать ресурсы", + "pfm.option.regenData": "Пересоздать данные", + "pfm.config.regen": "Пересоздать", + "pfm.option.regenAssets.tooltip": "Пересоздаёт визуальные ресурсы мода и вызывает перезагрузку ресурсов. Только для клиента.", + "pfm.option.regenData.tooltip": "Пересоздаёт данные мода, требуется выйти из мира. Только для хоста сервера.", + "gui.pfm.saveChanges": "Вы хотите сохранить изменения?", + "gui.pfm.changesMightNotBeSaved": "Закрытие без сохранения изменений!", + + "block.type.stripped": "Очищенный", + "block.type.raw": "Необработанный", + "block.type.natural": "Естественный", + "block.type.log": "Бревно", + "block.type.stem": "Ствол", + + "block.pfm.basic_chair": "Простой %s %s стул", + "block.pfm.dinner_chair": "Обеденный %s %s стул", + "block.pfm.classic_chair": "Классический %s %s стул", + "block.pfm.modern_chair": "Современный %s %s стул", + + "block.pfm.table_basic": "Простой %s %s стол", + "block.pfm.table_classic": "Классический %s %s стол", + "block.pfm.table_log": "%s %s %s стол", + "block.pfm.table_dinner": "%s %s обеденный стол", + "block.pfm.table_modern_dinner": "%s %s современный обеденный стол", + + "block.pfm.log_stool": "%s %s %s табурет", + "block.pfm.simple_stool": "%s %s простой табурет", + "block.pfm.classic_stool": "%s %s классический табурет", + "block.pfm.modern_stool": "%s %s современный табурет", + + "block.pfm.classic_nightstand": "%s %s классическая тумбочка", + + "block.pfm.simple_bed": "%s %s простая кровать", + "block.pfm.classic_bed": "%s %s классическая кровать", + "block.pfm.simple_bunk_ladder": "%s простая лестница двухъярусной кровати", + + "block.pfm.kitchen_counter": "%s %s кухонный стол", + "block.pfm.kitchen_drawer": "%s %s кухонный ящик", + "block.pfm.kitchen_cabinet": "%s %s навесной шкаф", + "block.pfm.kitchen_sink": "%s %s кухонная раковина", + "block.pfm.kitchen_counter_oven": "%s %s встроенный духовой шкаф", + "block.pfm.kitchen_wall_counter": "%s %s кухонный шкаф-заполнитель", + "block.pfm.kitchen_wall_drawer": "%s %s кухонный шкаф", + "block.pfm.kitchen_wall_small_drawer": "%s %s маленький кухонный шкаф", + "block.pfm.coffee_table_basic": "Простой %s %s кофейный столик", + "block.pfm.coffee_table_modern": "Современный %s %s кофейный столик", + "block.pfm.coffee_table_classic": "Классический %s %s кофейный столик", + "block.pfm.basic_lamp": "Простая %s %s лампа", + + "message.pfm.toilet_use": "Чтобы использовать унитаз, вы должны сначала наполнить его водой. Используйте ведро или бутылку с водой. Для автоматического наполнения разместите источник воды под полом.", + + "block.pfm.variant.quartz": "Кварц", + "block.pfm.variant.netherite": "Незерит", + "block.pfm.variant.light_wood": "Светлое дерево", + "block.pfm.variant.dark_wood": "Тёмное дерево", + "block.pfm.variant.calcite": "Кальцит", + "block.pfm.variant.stone": "Камень", + "block.pfm.variant.dark_concrete": "Тёмный бетон", + "block.pfm.variant.concrete": "Бетон", + "block.pfm.variant.smooth_stone": "Гладкий камень", + "block.pfm.variant.deepslate_tile": "Плитка из глубинного сланца", + "block.pfm.variant.gray_dark_oak": "Серый тёмный дуб", + "block.pfm.variant.white": "Белый", + "block.pfm.variant.gray": "Серый", + "block.pfm.variant.light_gray_dark_oak": "Светло-серый тёмный дуб", + + "block.pfm.variant.granite_terracotta": "Гранит Терракота", + "block.pfm.variant.andesite_oak": "Дуб андезитовый полосатый", + "block.pfm.variant.deepslate_dark_oak": "Дуб темный", + "block.pfm.variant.blackstone_crimson": "Блэкстоун Кримсон" + +} diff --git a/common/src/main/resources/data/pfm/recipes/white_modern_pendant.json b/common/src/main/resources/data/pfm/recipes/white_modern_pendant.json index d31dc4d37..8c7e510d5 100644 --- a/common/src/main/resources/data/pfm/recipes/white_modern_pendant.json +++ b/common/src/main/resources/data/pfm/recipes/white_modern_pendant.json @@ -19,7 +19,7 @@ } ], "result": { - "item": "pfm:glass_modern_pendant", + "item": "pfm:white_modern_pendant", "count": 1 } } \ No newline at end of file diff --git a/docs/bathtub_crafting_wiki.png b/docs/bathtub_crafting_wiki.png new file mode 100644 index 000000000..190c80c54 Binary files /dev/null and b/docs/bathtub_crafting_wiki.png differ diff --git a/docs/bathtub_wiki.png b/docs/bathtub_wiki.png new file mode 100644 index 000000000..5e2cd85c7 Binary files /dev/null and b/docs/bathtub_wiki.png differ diff --git a/docs/bed_craft_wiki.png b/docs/bed_craft_wiki.png new file mode 100644 index 000000000..23064ee36 Binary files /dev/null and b/docs/bed_craft_wiki.png differ diff --git a/docs/beds_dyekit_wiki.png b/docs/beds_dyekit_wiki.png new file mode 100644 index 000000000..cda09c286 Binary files /dev/null and b/docs/beds_dyekit_wiki.png differ diff --git a/docs/beds_stacked_wiki.png b/docs/beds_stacked_wiki.png new file mode 100644 index 000000000..0f41641b1 Binary files /dev/null and b/docs/beds_stacked_wiki.png differ diff --git a/docs/beds_wiki.png b/docs/beds_wiki.png new file mode 100644 index 000000000..c50fc71aa Binary files /dev/null and b/docs/beds_wiki.png differ diff --git a/docs/chairs_craft_wiki.png b/docs/chairs_craft_wiki.png new file mode 100644 index 000000000..b5a11e557 Binary files /dev/null and b/docs/chairs_craft_wiki.png differ diff --git a/docs/chairs_stone_craft_wiki.png b/docs/chairs_stone_craft_wiki.png new file mode 100644 index 000000000..7d1e74c9a Binary files /dev/null and b/docs/chairs_stone_craft_wiki.png differ diff --git a/docs/chairs_stone_wiki.png b/docs/chairs_stone_wiki.png new file mode 100644 index 000000000..11ddcaaf8 Binary files /dev/null and b/docs/chairs_stone_wiki.png differ diff --git a/docs/chairs_stripped_wiki.png b/docs/chairs_stripped_wiki.png new file mode 100644 index 000000000..7a1e56b5d Binary files /dev/null and b/docs/chairs_stripped_wiki.png differ diff --git a/docs/chairs_tucked_wiki.png b/docs/chairs_tucked_wiki.png new file mode 100644 index 000000000..11b593f94 Binary files /dev/null and b/docs/chairs_tucked_wiki.png differ diff --git a/docs/chairs_wiki.png b/docs/chairs_wiki.png new file mode 100644 index 000000000..1323fe311 Binary files /dev/null and b/docs/chairs_wiki.png differ diff --git a/docs/coffee_tables_craft_wiki.png b/docs/coffee_tables_craft_wiki.png new file mode 100644 index 000000000..f95d6f483 Binary files /dev/null and b/docs/coffee_tables_craft_wiki.png differ diff --git a/docs/coffee_tables_wiki.png b/docs/coffee_tables_wiki.png new file mode 100644 index 000000000..6c3f8114b Binary files /dev/null and b/docs/coffee_tables_wiki.png differ diff --git a/docs/fridge_craft_wiki.png b/docs/fridge_craft_wiki.png new file mode 100644 index 000000000..1e0e63f13 Binary files /dev/null and b/docs/fridge_craft_wiki.png differ diff --git a/docs/fridge_iron_wiki.png b/docs/fridge_iron_wiki.png new file mode 100644 index 000000000..39e48d9e4 Binary files /dev/null and b/docs/fridge_iron_wiki.png differ diff --git a/docs/fridge_tall_wiki.png b/docs/fridge_tall_wiki.png new file mode 100644 index 000000000..560073381 Binary files /dev/null and b/docs/fridge_tall_wiki.png differ diff --git a/docs/fridge_wiki.png b/docs/fridge_wiki.png new file mode 100644 index 000000000..3c097e97b Binary files /dev/null and b/docs/fridge_wiki.png differ diff --git a/docs/kitchen_cabinets_crafting_wiki.png b/docs/kitchen_cabinets_crafting_wiki.png new file mode 100644 index 000000000..0162e2853 Binary files /dev/null and b/docs/kitchen_cabinets_crafting_wiki.png differ diff --git a/docs/kitchen_counters_crafting_filler_wiki.png b/docs/kitchen_counters_crafting_filler_wiki.png new file mode 100644 index 000000000..2250c43cb Binary files /dev/null and b/docs/kitchen_counters_crafting_filler_wiki.png differ diff --git a/docs/kitchen_counters_crafting_wiki.png b/docs/kitchen_counters_crafting_wiki.png new file mode 100644 index 000000000..3777b9fd5 Binary files /dev/null and b/docs/kitchen_counters_crafting_wiki.png differ diff --git a/docs/kitchen_counters_example_2_wiki.png b/docs/kitchen_counters_example_2_wiki.png new file mode 100644 index 000000000..59822b2b7 Binary files /dev/null and b/docs/kitchen_counters_example_2_wiki.png differ diff --git a/docs/kitchen_counters_example_wiki.png b/docs/kitchen_counters_example_wiki.png new file mode 100644 index 000000000..a8fab9619 Binary files /dev/null and b/docs/kitchen_counters_example_wiki.png differ diff --git a/docs/kitchen_counters_wiki.png b/docs/kitchen_counters_wiki.png new file mode 100644 index 000000000..52f3685b3 Binary files /dev/null and b/docs/kitchen_counters_wiki.png differ diff --git a/docs/kitchen_drawers_crafting_wiki.png b/docs/kitchen_drawers_crafting_wiki.png new file mode 100644 index 000000000..0040c8db3 Binary files /dev/null and b/docs/kitchen_drawers_crafting_wiki.png differ diff --git a/docs/kitchen_drawers_wiki.png b/docs/kitchen_drawers_wiki.png new file mode 100644 index 000000000..c7c3b477e Binary files /dev/null and b/docs/kitchen_drawers_wiki.png differ diff --git a/docs/ladder_craft_wiki.png b/docs/ladder_craft_wiki.png new file mode 100644 index 000000000..b14e73ae0 Binary files /dev/null and b/docs/ladder_craft_wiki.png differ diff --git a/docs/lights_lamp_craft_wiki.png b/docs/lights_lamp_craft_wiki.png new file mode 100644 index 000000000..f38abac64 Binary files /dev/null and b/docs/lights_lamp_craft_wiki.png differ diff --git a/docs/lights_pendant_craft_wiki.png b/docs/lights_pendant_craft_wiki.png new file mode 100644 index 000000000..9813ff9a1 Binary files /dev/null and b/docs/lights_pendant_craft_wiki.png differ diff --git a/docs/lights_switch_craft_wiki.png b/docs/lights_switch_craft_wiki.png new file mode 100644 index 000000000..478e4072e Binary files /dev/null and b/docs/lights_switch_craft_wiki.png differ diff --git a/docs/lights_wiki.png b/docs/lights_wiki.png new file mode 100644 index 000000000..d68d588ee Binary files /dev/null and b/docs/lights_wiki.png differ diff --git a/docs/microwave_crafting_wiki.png b/docs/microwave_crafting_wiki.png new file mode 100644 index 000000000..642983fd5 Binary files /dev/null and b/docs/microwave_crafting_wiki.png differ diff --git a/docs/microwave_wiki.png b/docs/microwave_wiki.png new file mode 100644 index 000000000..64aad5617 Binary files /dev/null and b/docs/microwave_wiki.png differ diff --git a/docs/nightstand_craft_wiki.png b/docs/nightstand_craft_wiki.png new file mode 100644 index 000000000..45cba1523 Binary files /dev/null and b/docs/nightstand_craft_wiki.png differ diff --git a/docs/nightstand_wiki.png b/docs/nightstand_wiki.png new file mode 100644 index 000000000..e065264f9 Binary files /dev/null and b/docs/nightstand_wiki.png differ diff --git a/docs/plate_crafting_wiki.png b/docs/plate_crafting_wiki.png new file mode 100644 index 000000000..5a025b8d2 Binary files /dev/null and b/docs/plate_crafting_wiki.png differ diff --git a/docs/plate_wiki.png b/docs/plate_wiki.png new file mode 100644 index 000000000..ad68a734e Binary files /dev/null and b/docs/plate_wiki.png differ diff --git a/docs/shower_crafting_wiki.png b/docs/shower_crafting_wiki.png new file mode 100644 index 000000000..ad077ea4c Binary files /dev/null and b/docs/shower_crafting_wiki.png differ diff --git a/docs/shower_wiki.png b/docs/shower_wiki.png new file mode 100644 index 000000000..8844f271a Binary files /dev/null and b/docs/shower_wiki.png differ diff --git a/docs/sink_crafting_wiki.png b/docs/sink_crafting_wiki.png new file mode 100644 index 000000000..6b5b2911b Binary files /dev/null and b/docs/sink_crafting_wiki.png differ diff --git a/docs/sink_wiki.png b/docs/sink_wiki.png new file mode 100644 index 000000000..43f517993 Binary files /dev/null and b/docs/sink_wiki.png differ diff --git a/docs/stove_crafting_wiki.png b/docs/stove_crafting_wiki.png new file mode 100644 index 000000000..fa3861e56 Binary files /dev/null and b/docs/stove_crafting_wiki.png differ diff --git a/docs/stove_separate_crafting_wiki.png b/docs/stove_separate_crafting_wiki.png new file mode 100644 index 000000000..8c10118da Binary files /dev/null and b/docs/stove_separate_crafting_wiki.png differ diff --git a/docs/stove_separate_wiki.png b/docs/stove_separate_wiki.png new file mode 100644 index 000000000..72a6d7f2f Binary files /dev/null and b/docs/stove_separate_wiki.png differ diff --git a/docs/stove_wiki.png b/docs/stove_wiki.png new file mode 100644 index 000000000..9222745ac Binary files /dev/null and b/docs/stove_wiki.png differ diff --git a/docs/tables_craft_wiki.png b/docs/tables_craft_wiki.png new file mode 100644 index 000000000..02c394d0e Binary files /dev/null and b/docs/tables_craft_wiki.png differ diff --git a/docs/tables_shape_wiki.png b/docs/tables_shape_wiki.png new file mode 100644 index 000000000..8be0aca22 Binary files /dev/null and b/docs/tables_shape_wiki.png differ diff --git a/docs/tables_wiki.png b/docs/tables_wiki.png new file mode 100644 index 000000000..8e351114c Binary files /dev/null and b/docs/tables_wiki.png differ diff --git a/docs/toaster_crafting_wiki.png b/docs/toaster_crafting_wiki.png new file mode 100644 index 000000000..9fdba327f Binary files /dev/null and b/docs/toaster_crafting_wiki.png differ diff --git a/docs/toaster_wiki.png b/docs/toaster_wiki.png new file mode 100644 index 000000000..0eef4fc2a Binary files /dev/null and b/docs/toaster_wiki.png differ diff --git a/docs/toilet_crafting_wiki.png b/docs/toilet_crafting_wiki.png new file mode 100644 index 000000000..64c8c4b2f Binary files /dev/null and b/docs/toilet_crafting_wiki.png differ diff --git a/docs/toilet_paper_wiki.png b/docs/toilet_paper_wiki.png new file mode 100644 index 000000000..c9cd3303e Binary files /dev/null and b/docs/toilet_paper_wiki.png differ diff --git a/docs/toilet_wiki.png b/docs/toilet_wiki.png new file mode 100644 index 000000000..b7a34262e Binary files /dev/null and b/docs/toilet_wiki.png differ diff --git a/docs/workbench_craft_wiki.png b/docs/workbench_craft_wiki.png new file mode 100644 index 000000000..81c920480 Binary files /dev/null and b/docs/workbench_craft_wiki.png differ diff --git a/docs/workbench_gui_wiki.png b/docs/workbench_gui_wiki.png new file mode 100644 index 000000000..b5b041048 Binary files /dev/null and b/docs/workbench_gui_wiki.png differ diff --git a/docs/workbench_wiki.png b/docs/workbench_wiki.png new file mode 100644 index 000000000..e4c9b1520 Binary files /dev/null and b/docs/workbench_wiki.png differ diff --git a/fabric/build.gradle b/fabric/build.gradle index aed4aa92c..91ce59406 100755 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -96,7 +96,9 @@ if (rootProject.rei_compatibility == "true"){ modRuntimeOnly("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } - modRuntimeOnly( "dev.architectury:architectury-fabric:${rootProject.architectury_version}") + modRuntimeOnly("dev.architectury:architectury-fabric:${rootProject.architectury_version}") { + exclude(group: "net.fabricmc.fabric-api") + } } } else { dependencies { diff --git a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java index bb2bdf513..0f176b21c 100644 --- a/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java +++ b/fabric/src/main/java/com/unlikepaladin/pfm/mixin/fabric/PFMTitleScreenMixin.java @@ -1,6 +1,9 @@ package com.unlikepaladin.pfm.mixin.fabric; import net.fabricmc.loader.api.FabricLoader; +import net.fabricmc.loader.api.Version; +import net.fabricmc.loader.api.VersionParsingException; +import net.minecraft.SharedConstants; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.ConfirmScreen; import net.minecraft.client.gui.screen.TitleScreen; @@ -33,6 +36,13 @@ public class PFMTitleScreenMixin { if (FabricLoader.getInstance().isModLoaded("sodium") && !FabricLoader.getInstance().isModLoaded("indium")) { reason = "pfm.compat.failure.reason.indiumNotFound"; + try { + if (FabricLoader.getInstance().getModContainer("sodium").get().getMetadata().getVersion().compareTo(Version.parse("0.6")) > 0) { + return; + } + } catch (VersionParsingException e) { + + } } else { return; @@ -42,7 +52,7 @@ public class PFMTitleScreenMixin { (boolean accepted) -> { if (accepted) { try { - Util.getOperatingSystem().open(new URI("https://modrinth.com/mod/indium/versions?g=1.17.1")); + Util.getOperatingSystem().open(new URI("https://modrinth.com/mod/indium/versions?g="+ SharedConstants.VERSION_NAME)); } catch (URISyntaxException e) { throw new IllegalStateException(e); } @@ -52,7 +62,7 @@ public class PFMTitleScreenMixin { }, Text.translatable("pfm.compat.failure.title").formatted(Formatting.RED), Text.translatable(reason), - Text.translatable("pfm.compat.failure.indiumNotFound"), + Text.translatable("pfm.compat.failure.indiumDownload"), Text.translatable("menu.quit"))); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 3f8e2996c..93f999797 100755 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -15,7 +15,8 @@ "contributors": [ "lzyzl6", "MIHONO", - "WrenXing" + "WrenXing", + "j-tap" ], "license": "LGPL-3.0-only", "icon": "assets/pfm/icon.png", diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 785ac73f3..437700f9e 100755 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -13,7 +13,7 @@ A Brand-New Furniture mod for Modern Minecraft where things are functional! ''' itemIcon = "pfm:oak_chair" logoFile = "icon.png" -credits = "Translators: lzyzl6, MIHONO, WrenXing" +credits = "Translators: lzyzl6, MIHONO, WrenXing, j-tap" [[dependencies.pfm]] modId = "forge" diff --git a/gradle.properties b/gradle.properties index 43b912950..d11aafd2a 100755 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ minecraft_version=1.20.4 enabled_platforms=fabric,forge,neoforge archives_base_name=paladin-furniture-mod -mod_version=1.3-rc.2 +mod_version=1.3 maven_group=com.unlikepaladin architectury_version=11.0.12