diff --git a/gradle.properties b/gradle.properties index 158afde..56dd9af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ org.gradle.daemon=false org.gradle.jvmargs=-Xmx8G version_minecraft=1.16.2 -version_forge_minecraft=1.16.2-33.0.22 +version_forge_minecraft=1.16.2-33.0.37 version_fml_mappings=20200723-1.16.1 version_jei=1.16.2:7.1.3.19 version_engineersdecor=1.1.2-b5 diff --git a/meta/update.json b/meta/update.json index a2df99b..93b1a79 100644 --- a/meta/update.json +++ b/meta/update.json @@ -1,13 +1,14 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.16.2": { + "1.1.2-b5": "[A] Sandstone Ornamented Clinker Brick added.\n[A] Old Industrial Wood Planks/Stairs/Slabs/Slab Slices added.\n[A] Old Industrial Wood Door added.\n[M] Wood textures made slightly darker.\n[F] Milking Machine fluid transfer re-added (thx gebcrafter).\n[F] Fluid Barrel status overlay message format fixed.\n[F] Fixed missing Dense Grit Dirt loot table (issue #124, thx vaelzan).", "1.1.2-b4": "[F] Mapping adaption to Forge 1.16.2-33.0.22/20200723-1.16.1.\n[F] Fixed conditional recipe tag dependency (thx Blu, Cyborgmas).", "1.1.2-b3": "[F] Mapping adaption to Forge 1.16.2-33.0.20.", "1.1.2-b2": "[A] Dark Shingle Roof added.", "1.1.2-b1": "[U] Ported to MC1.16.2." }, "promos": { - "1.16.2-recommended": "1.1.2-b4", - "1.16.2-latest": "1.1.2-b4" + "1.16.2-recommended": "1.1.2-b5", + "1.16.2-latest": "1.1.2-b5" } } \ No newline at end of file diff --git a/readme.md b/readme.md index a119249..495c2da 100644 --- a/readme.md +++ b/readme.md @@ -11,8 +11,13 @@ Mod sources for Minecraft version 1.16.2. ## Version history - ~ v1.1.2-b5 [A] Sandstone Ornamented Clinker Brick added. + - v1.1.2-b5 [A] Sandstone Ornamented Clinker Brick added. + [A] Old Industrial Wood Planks/Stairs/Slabs/Slab Slices added. + [A] Old Industrial Wood Door added. + [M] Wood textures made slightly darker. [F] Milking Machine fluid transfer re-added (thx gebcrafter). + [F] Fluid Barrel status overlay message format fixed. + [F] Fixed missing Dense Grit Dirt loot table (issue #124, thx vaelzan). - v1.1.2-b4 [F] Mapping adaption to Forge 1.16.2-33.0.22/20200723-1.16.1. [F] Fixed conditional recipe tag dependency (thx Blu, Cyborgmas). diff --git a/src/main/java/wile/engineersdecor/ModConfig.java b/src/main/java/wile/engineersdecor/ModConfig.java index 2d522f1..8d8ba67 100644 --- a/src/main/java/wile/engineersdecor/ModConfig.java +++ b/src/main/java/wile/engineersdecor/ModConfig.java @@ -97,7 +97,6 @@ public class ModConfig public final ForgeConfigSpec.BooleanValue without_gas_concrete; public final ForgeConfigSpec.BooleanValue without_walls; public final ForgeConfigSpec.BooleanValue without_stairs; - public final ForgeConfigSpec.BooleanValue without_ie_concrete_wall; public final ForgeConfigSpec.BooleanValue without_panzer_glass; public final ForgeConfigSpec.BooleanValue without_ladders; public final ForgeConfigSpec.BooleanValue without_treated_wood_furniture; @@ -206,10 +205,6 @@ public class ModConfig .translation(MODID + ".config.without_stairs") .comment("Disable all mod stairs blocks.") .define("without_stairs", false); - without_ie_concrete_wall = builder - .translation(MODID + ".config.without_ie_concrete_wall") - .comment("Disable IE concrete wall.") - .define("without_ie_concrete_wall", false); without_panzer_glass = builder .translation(MODID + ".config.without_panzer_glass") .comment("Disable panzer glass and derived blocks.") @@ -629,7 +624,6 @@ public class ModConfig if(SERVER.without_slag_bricks.get()&&rn.startsWith("slag_brick_")) return true; if(SERVER.without_rebar_concrete.get()&&rn.startsWith("rebar_concrete")) return true; if(SERVER.without_gas_concrete.get()&&rn.startsWith("gas_concrete")) return true; - if(SERVER.without_ie_concrete_wall.get()&&rn.startsWith("ie_concrete_wall")) return true; if(SERVER.without_panzer_glass.get()&&rn.startsWith("panzerglass_")) return true; if(SERVER.without_light_sources.get()&&rn.endsWith("_light")) return true; if(SERVER.without_sign_plates.get()&&rn.startsWith("sign_")) return true; diff --git a/src/main/java/wile/engineersdecor/ModContent.java b/src/main/java/wile/engineersdecor/ModContent.java index cd57b4e..15cbcf2 100644 --- a/src/main/java/wile/engineersdecor/ModContent.java +++ b/src/main/java/wile/engineersdecor/ModContent.java @@ -288,6 +288,34 @@ public class ModContent // ------------------------------------------------------------------------------------------------------------------- + public static final DecorBlock.Normal OLD_INDUSTRIAL_PLANKS = (DecorBlock.Normal)(new DecorBlock.Normal( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.5f, 8f).sound(SoundType.WOOD) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "old_industrial_wood_planks")); + + public static final EdSlabBlock OLD_INDUSTRIAL_SLAB = (EdSlabBlock)(new EdSlabBlock( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.5f, 8f).sound(SoundType.WOOD) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "old_industrial_wood_slab")); + + public static final EdStairsBlock OLD_INDUSTRIAL_STAIRS = (EdStairsBlock)(new EdStairsBlock( + DecorBlock.CFG_DEFAULT, + OLD_INDUSTRIAL_PLANKS.getDefaultState(), + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.5f, 8f).sound(SoundType.WOOD) + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "old_industrial_wood_stairs")); + + public static final EdSlabSliceBlock OLD_INDUSTRIAL_SLABSLICE = (EdSlabSliceBlock)(new EdSlabSliceBlock( + DecorBlock.CFG_CUTOUT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.5f, 8f).sound(SoundType.WOOD).notSolid() + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "old_industrial_wood_slabslice")); + + public static final EdDoorBlock OLD_INDUSTRIAL_WOOD_DOOR = (EdDoorBlock)(new EdDoorBlock( + DecorBlock.CFG_DEFAULT, + Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(1.5f, 12f).sound(SoundType.WOOD).notSolid() + )).setRegistryName(new ResourceLocation(ModEngineersDecor.MODID, "old_industrial_wood_door")); + + // ------------------------------------------------------------------------------------------------------------------- + public static final DecorBlock.WaterLoggable TREATED_WOOD_TABLE = (DecorBlock.WaterLoggable)(new DecorBlock.WaterLoggable( DecorBlock.CFG_CUTOUT, Block.Properties.create(Material.WOOD, MaterialColor.WOOD).hardnessAndResistance(2f, 15f).sound(SoundType.WOOD).notSolid(), @@ -828,6 +856,11 @@ public class ModContent METAL_RUNG_STEPS, TREATED_WOOD_LADDER, IRON_HATCH, + OLD_INDUSTRIAL_PLANKS, + OLD_INDUSTRIAL_SLAB, + OLD_INDUSTRIAL_STAIRS, + OLD_INDUSTRIAL_SLABSLICE, + OLD_INDUSTRIAL_WOOD_DOOR, TREATED_WOOD_TABLE, TREATED_WOOD_STOOL, TREATED_WOOD_SIDE_TABLE, diff --git a/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java b/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java index 75e45c6..9816d74 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java +++ b/src/main/java/wile/engineersdecor/blocks/EdCraftingTable.java @@ -8,14 +8,6 @@ */ package wile.engineersdecor.blocks; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.renderer.ItemRenderer; -import wile.engineersdecor.ModContent; -import wile.engineersdecor.ModEngineersDecor; -import wile.engineersdecor.libmc.detail.Auxiliaries; -import wile.engineersdecor.libmc.detail.Inventories; -import wile.engineersdecor.libmc.detail.Inventories.SlotRange; -import wile.engineersdecor.libmc.detail.Networking; import net.minecraft.inventory.container.*; import net.minecraft.network.play.server.SSetSlotPacket; import net.minecraft.network.NetworkManager; @@ -45,6 +37,7 @@ import net.minecraft.util.text.StringTextComponent; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.client.gui.widget.button.ImageButton; import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.client.renderer.ItemRenderer; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.registries.ForgeRegistries; @@ -52,6 +45,13 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import com.mojang.blaze3d.systems.RenderSystem; import com.google.common.collect.ImmutableList; +import com.mojang.blaze3d.matrix.MatrixStack; +import wile.engineersdecor.ModContent; +import wile.engineersdecor.ModEngineersDecor; +import wile.engineersdecor.libmc.detail.Auxiliaries; +import wile.engineersdecor.libmc.detail.Inventories; +import wile.engineersdecor.libmc.detail.Inventories.SlotRange; +import wile.engineersdecor.libmc.detail.Networking; import wile.engineersdecor.libmc.detail.TooltipDisplay; import wile.engineersdecor.libmc.detail.TooltipDisplay.TipRange; @@ -456,8 +456,8 @@ public class EdCraftingTable if(!this.mergeItemStack(slotstack, 10, 46, true)) return ItemStack.EMPTY; slot.onSlotChange(slotstack, stack); } else if(index >= 10 && (index < 46)) { - if(!this.mergeItemStack(slotstack, 46, 54, false)) return ItemStack.EMPTY; - } else if((index >= 46) && (index < 54)) { + if(!this.mergeItemStack(slotstack, 46, 46+NUM_OF_STORAGE_SLOTS, false)) return ItemStack.EMPTY; + } else if((index >= 46) && (index < 46+NUM_OF_STORAGE_SLOTS)) { if(!this.mergeItemStack(slotstack, 10, 46, false)) return ItemStack.EMPTY; } else if(!this.mergeItemStack(slotstack, 10, 46, false)) { return ItemStack.EMPTY; diff --git a/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java b/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java new file mode 100644 index 0000000..cf2f7db --- /dev/null +++ b/src/main/java/wile/engineersdecor/blocks/EdDoorBlock.java @@ -0,0 +1,22 @@ +/* + * @file EdDoorBlock.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Door blocks. + */ +package wile.engineersdecor.blocks; + +import wile.engineersdecor.libmc.blocks.StandardDoorBlock; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IWorldReader; +import net.minecraft.block.*; + + +public class EdDoorBlock extends StandardDoorBlock implements IDecorBlock +{ + public EdDoorBlock(long config, Block.Properties properties) + { super(config, properties); } +} diff --git a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java index 439420e..62c5db4 100644 --- a/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java +++ b/src/main/java/wile/engineersdecor/blocks/EdFluidBarrel.java @@ -239,7 +239,7 @@ public class EdFluidBarrel { int vol = tank_.getFluidAmount(); int cap = tank_.getCapacity(); - String name = Auxiliaries.localizable(tank_.getFluid().getTranslationKey()).getString(); + String name = (new TranslationTextComponent(tank_.getFluid().getTranslationKey())).getString(); if((vol>0) && (cap>0)) { Overlay.show(player, Auxiliaries.localizable("block.engineersdecor.fluid_barrel.status", new Object[]{ Integer.toString(vol), Integer.toString(cap), name diff --git a/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java b/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java new file mode 100644 index 0000000..d9b7606 --- /dev/null +++ b/src/main/java/wile/engineersdecor/libmc/blocks/StandardDoorBlock.java @@ -0,0 +1,47 @@ +/* + * @file StandardDoorBlock.java + * @author Stefan Wilhelm (wile) + * @copyright (C) 2019 Stefan Wilhelm + * @license MIT (see https://opensource.org/licenses/MIT) + * + * Door blocks, almost entirely based on vanilla. + */ +package wile.engineersdecor.libmc.blocks; + +import net.minecraft.entity.EntitySpawnPlacementRegistry; +import net.minecraft.entity.EntityType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.block.*; +import net.minecraft.block.BlockState; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.world.IBlockReader; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import wile.engineersdecor.libmc.detail.Auxiliaries; + +import javax.annotation.Nullable; +import java.util.List; + + +public class StandardDoorBlock extends DoorBlock implements StandardBlocks.IStandardBlock +{ + private final long config; + + public StandardDoorBlock(long config, Block.Properties properties) + { super(properties); this.config = config; } + + @Override + @OnlyIn(Dist.CLIENT) + public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) + { Auxiliaries.Tooltip.addInformation(stack, world, tooltip, flag, true); } + + @Override + public boolean canSpawnInBlock() + { return false; } + + @Override + public boolean canCreatureSpawn(BlockState state, IBlockReader world, BlockPos pos, EntitySpawnPlacementRegistry.PlacementType type, @Nullable EntityType entityType) + { return false; } +} diff --git a/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java b/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java index b20f6bb..0f1070a 100644 --- a/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java +++ b/src/main/java/wile/engineersdecor/libmc/datagen/AssetsDataGen.java @@ -11,7 +11,7 @@ package wile.engineersdecor.libmc.datagen; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ItemModelProvider; import wile.engineersdecor.libmc.detail.Auxiliaries; -import net.minecraftforge.client.model.generators.*; +import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraft.data.*; public class AssetsDataGen diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 99541a8..29fa11a 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -19,7 +19,7 @@ logoFile="logo.png" [[dependencies.engineersdecor]] modId="forge" mandatory=true - versionRange="[33.0.19,)" + versionRange="[33.0.37,)" ordering="NONE" side="BOTH" diff --git a/src/main/resources/assets/engineersdecor/blockstates/fluid_barrel.json b/src/main/resources/assets/engineersdecor/blockstates/fluid_barrel.json index cc75dca..e3c1470 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/fluid_barrel.json +++ b/src/main/resources/assets/engineersdecor/blockstates/fluid_barrel.json @@ -1,34 +1,34 @@ { "variants": { - "facing=north,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0" }, - "facing=south,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0", "y":180 }, - "facing=west,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0", "y":270 }, - "facing=east,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0", "y":90 }, - "facing=up,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0", "x":270 }, - "facing=down,level=0": { "model": "engineersdecor:block/pipe/fluid_barrel_model0", "x":90 }, - "facing=north,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1" }, - "facing=south,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1", "y":180 }, - "facing=west,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1", "y":270 }, - "facing=east,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1", "y":90 }, - "facing=up,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1", "x":270 }, - "facing=down,level=1": { "model": "engineersdecor:block/pipe/fluid_barrel_model1", "x":90 }, - "facing=north,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2" }, - "facing=south,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2", "y":180 }, - "facing=west,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2", "y":270 }, - "facing=east,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2", "y":90 }, - "facing=up,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2", "x":270 }, - "facing=down,level=2": { "model": "engineersdecor:block/pipe/fluid_barrel_model2", "x":90 }, - "facing=north,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3" }, - "facing=south,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3", "y":180 }, - "facing=west,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3", "y":270 }, - "facing=east,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3", "y":90 }, - "facing=up,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3", "x":270 }, - "facing=down,level=3": { "model": "engineersdecor:block/pipe/fluid_barrel_model3", "x":90 }, - "facing=north,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4" }, - "facing=south,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4", "y":180 }, - "facing=west,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4", "y":270 }, - "facing=east,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4", "y":90 }, - "facing=up,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4", "x":270 }, - "facing=down,level=4": { "model": "engineersdecor:block/pipe/fluid_barrel_model4", "x":90 } + "facing=north,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0" }, + "facing=south,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0", "y":180 }, + "facing=west,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0", "y":270 }, + "facing=east,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0", "y":90 }, + "facing=up,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0", "x":270 }, + "facing=down,level=0": { "model": "engineersdecor:block/device/fluid_barrel_model0", "x":90 }, + "facing=north,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1" }, + "facing=south,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1", "y":180 }, + "facing=west,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1", "y":270 }, + "facing=east,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1", "y":90 }, + "facing=up,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1", "x":270 }, + "facing=down,level=1": { "model": "engineersdecor:block/device/fluid_barrel_model1", "x":90 }, + "facing=north,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2" }, + "facing=south,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2", "y":180 }, + "facing=west,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2", "y":270 }, + "facing=east,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2", "y":90 }, + "facing=up,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2", "x":270 }, + "facing=down,level=2": { "model": "engineersdecor:block/device/fluid_barrel_model2", "x":90 }, + "facing=north,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3" }, + "facing=south,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3", "y":180 }, + "facing=west,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3", "y":270 }, + "facing=east,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3", "y":90 }, + "facing=up,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3", "x":270 }, + "facing=down,level=3": { "model": "engineersdecor:block/device/fluid_barrel_model3", "x":90 }, + "facing=north,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4" }, + "facing=south,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4", "y":180 }, + "facing=west,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4", "y":270 }, + "facing=east,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4", "y":90 }, + "facing=up,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4", "x":270 }, + "facing=down,level=4": { "model": "engineersdecor:block/device/fluid_barrel_model4", "x":90 } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/labeled_crate.json b/src/main/resources/assets/engineersdecor/blockstates/labeled_crate.json index b0b5a3f..7c96778 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/labeled_crate.json +++ b/src/main/resources/assets/engineersdecor/blockstates/labeled_crate.json @@ -1,8 +1,8 @@ { "variants": { - "facing=north": { "model": "engineersdecor:block/misc/labeled_crate_model" }, - "facing=south": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/misc/labeled_crate_model", "y":90 } + "facing=north": { "model": "engineersdecor:block/device/labeled_crate_model" }, + "facing=south": { "model": "engineersdecor:block/device/labeled_crate_model", "y":180 }, + "facing=west": { "model": "engineersdecor:block/device/labeled_crate_model", "y":270 }, + "facing=east": { "model": "engineersdecor:block/device/labeled_crate_model", "y":90 } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/metal_crafting_table.json b/src/main/resources/assets/engineersdecor/blockstates/metal_crafting_table.json index cc5de16..333a245 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/metal_crafting_table.json +++ b/src/main/resources/assets/engineersdecor/blockstates/metal_crafting_table.json @@ -1,8 +1,8 @@ { "variants": { - "facing=north": { "model": "engineersdecor:block/crafting_table/metal_crafting_table_model" }, - "facing=south": { "model": "engineersdecor:block/crafting_table/metal_crafting_table_model", "y":180 }, - "facing=west": { "model": "engineersdecor:block/crafting_table/metal_crafting_table_model", "y":270 }, - "facing=east": { "model": "engineersdecor:block/crafting_table/metal_crafting_table_model", "y":90 } + "facing=north": { "model": "engineersdecor:block/device/metal_crafting_table_model" }, + "facing=south": { "model": "engineersdecor:block/device/metal_crafting_table_model", "y":180 }, + "facing=west": { "model": "engineersdecor:block/device/metal_crafting_table_model", "y":270 }, + "facing=east": { "model": "engineersdecor:block/device/metal_crafting_table_model", "y":90 } } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_door.json b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_door.json new file mode 100644 index 0000000..4e39244 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_door.json @@ -0,0 +1,34 @@ +{"variants":{ + "facing=east,half=lower,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh" }, + "facing=east,half=lower,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 90 }, + "facing=east,half=lower,hinge=right,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh" }, + "facing=east,half=lower,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 270 }, + "facing=east,half=upper,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh" }, + "facing=east,half=upper,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 90 }, + "facing=east,half=upper,hinge=right,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh" }, + "facing=east,half=upper,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 270 }, + "facing=north,half=lower,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh" }, + "facing=north,half=lower,hinge=right,open=false":{ "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 270 }, + "facing=north,half=lower,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 180 }, + "facing=north,half=upper,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 270 }, + "facing=north,half=upper,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh" }, + "facing=north,half=upper,hinge=right,open=false":{ "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 270 }, + "facing=north,half=upper,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 180 }, + "facing=south,half=lower,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 90 }, + "facing=south,half=lower,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 180 }, + "facing=south,half=lower,hinge=right,open=false":{ "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 90 }, + "facing=south,half=lower,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh" }, + "facing=south,half=upper,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 90 }, + "facing=south,half=upper,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 180 }, + "facing=south,half=upper,hinge=right,open=false":{ "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 90 }, + "facing=south,half=upper,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh" }, + "facing=west,half=lower,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 180 }, + "facing=west,half=lower,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 270 }, + "facing=west,half=lower,hinge=right,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_rh", "y": 180 }, + "facing=west,half=lower,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_bottom_lh", "y": 90 }, + "facing=west,half=upper,hinge=left,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 180 }, + "facing=west,half=upper,hinge=left,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 270 }, + "facing=west,half=upper,hinge=right,open=false": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_rh", "y": 180 }, + "facing=west,half=upper,hinge=right,open=true": { "model": "engineersdecor:block/door/old_industrial_wood_door_model_top_lh", "y": 90 } +}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_planks.json b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_planks.json new file mode 100644 index 0000000..8e16e3a --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_planks.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "engineersdecor:block/wood/old_industrial_planks_model0" }, + { "model": "engineersdecor:block/wood/old_industrial_planks_model1" }, + { "model": "engineersdecor:block/wood/old_industrial_planks_model2" }, + { "model": "engineersdecor:block/wood/old_industrial_planks_model3" } + ] + } +} diff --git a/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slab.json b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slab.json new file mode 100644 index 0000000..548de94 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slab.json @@ -0,0 +1,16 @@ +{ + "variants": { + "tvariant=0,type=bottom": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s0v0_model" }, + "tvariant=1,type=bottom": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s0v1_model" }, + "tvariant=2,type=bottom": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s0v2_model" }, + "tvariant=3,type=bottom": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s0v3_model" }, + "tvariant=0,type=top": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s1v0_model" }, + "tvariant=1,type=top": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s1v1_model" }, + "tvariant=2,type=top": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s1v2_model" }, + "tvariant=3,type=top": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s1v3_model" }, + "tvariant=0,type=double": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s2v0_model" }, + "tvariant=1,type=double": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s2v1_model" }, + "tvariant=2,type=double": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s2v2_model" }, + "tvariant=3,type=double": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slab_s2v3_model" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slabslice.json b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slabslice.json new file mode 100644 index 0000000..a7eeea0 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_slabslice.json @@ -0,0 +1,19 @@ +{ + "variants": { + "parts=0": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s0_model" }, + "parts=1": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s1_model" }, + "parts=2": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s2_model" }, + "parts=3": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s3_model" }, + "parts=4": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s4_model" }, + "parts=5": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s5_model" }, + "parts=6": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s6_model" }, + "parts=7": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s7_model" }, + "parts=8": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s8_model" }, + "parts=9": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_s9_model" }, + "parts=10": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_sa_model" }, + "parts=11": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_sb_model" }, + "parts=12": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_sc_model" }, + "parts=13": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_sd_model" }, + "parts=14": { "model": "engineersdecor:block/slab/specific/old_industrial_wood_slabslice_se_model" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_stairs.json b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_stairs.json new file mode 100644 index 0000000..470f6e2 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/blockstates/old_industrial_wood_stairs.json @@ -0,0 +1,44 @@ +{ + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer" }, + "facing=west,half=bottom,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer" }, + "facing=north,half=bottom,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner" }, + "facing=west,half=bottom,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner" }, + "facing=north,half=bottom,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_outer", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "engineersdecor:block/wood/old_industrial_wood_stairs_inner", "x": 180, "y": 270, "uvlock": true } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json b/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json index 8286de3..fa74e39 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json +++ b/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json @@ -1,12 +1,12 @@ { "variants": { - "facing=north,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 0 }, - "facing=south,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 180 }, - "facing=west,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 270 }, - "facing=east,lit=false": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model", "y": 90 }, - "facing=north,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 0 }, - "facing=south,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 180 }, - "facing=west,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 270 }, - "facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_electrical_furnace_model_lit", "y": 90 } + "facing=north,lit=false": { "model": "engineersdecor:block/device/small_electrical_furnace_model", "y": 0 }, + "facing=south,lit=false": { "model": "engineersdecor:block/device/small_electrical_furnace_model", "y": 180 }, + "facing=west,lit=false": { "model": "engineersdecor:block/device/small_electrical_furnace_model", "y": 270 }, + "facing=east,lit=false": { "model": "engineersdecor:block/device/small_electrical_furnace_model", "y": 90 }, + "facing=north,lit=true": { "model": "engineersdecor:block/device/small_electrical_furnace_model_lit", "y": 0 }, + "facing=south,lit=true": { "model": "engineersdecor:block/device/small_electrical_furnace_model_lit", "y": 180 }, + "facing=west,lit=true": { "model": "engineersdecor:block/device/small_electrical_furnace_model_lit", "y": 270 }, + "facing=east,lit=true": { "model": "engineersdecor:block/device/small_electrical_furnace_model_lit", "y": 90 } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/small_lab_furnace.json b/src/main/resources/assets/engineersdecor/blockstates/small_lab_furnace.json index 9eaa12d..55bc2cf 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/small_lab_furnace.json +++ b/src/main/resources/assets/engineersdecor/blockstates/small_lab_furnace.json @@ -1,12 +1,12 @@ { "variants": { - "facing=north,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 0 }, - "facing=south,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 180 }, - "facing=west,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 270 }, - "facing=east,lit=false": { "model": "engineersdecor:block/furnace/small_lab_furnace_model", "y": 90 }, - "facing=north,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 0 }, - "facing=south,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 180 }, - "facing=west,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 270 }, - "facing=east,lit=true": { "model": "engineersdecor:block/furnace/small_lab_furnace_model_lit", "y": 90 } + "facing=north,lit=false": { "model": "engineersdecor:block/device/small_lab_furnace_model", "y": 0 }, + "facing=south,lit=false": { "model": "engineersdecor:block/device/small_lab_furnace_model", "y": 180 }, + "facing=west,lit=false": { "model": "engineersdecor:block/device/small_lab_furnace_model", "y": 270 }, + "facing=east,lit=false": { "model": "engineersdecor:block/device/small_lab_furnace_model", "y": 90 }, + "facing=north,lit=true": { "model": "engineersdecor:block/device/small_lab_furnace_model_lit", "y": 0 }, + "facing=south,lit=true": { "model": "engineersdecor:block/device/small_lab_furnace_model_lit", "y": 180 }, + "facing=west,lit=true": { "model": "engineersdecor:block/device/small_lab_furnace_model_lit", "y": 270 }, + "facing=east,lit=true": { "model": "engineersdecor:block/device/small_lab_furnace_model_lit", "y": 90 } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/small_mineral_smelter.json b/src/main/resources/assets/engineersdecor/blockstates/small_mineral_smelter.json index 6160408..a34b257 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/small_mineral_smelter.json +++ b/src/main/resources/assets/engineersdecor/blockstates/small_mineral_smelter.json @@ -1,20 +1,20 @@ { "variants": { - "facing=north,phase=0": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model", "y": 0 }, - "facing=south,phase=0": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model", "y": 180 }, - "facing=west,phase=0": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model", "y": 270 }, - "facing=east,phase=0": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model", "y": 90 }, - "facing=north,phase=1": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s1", "y": 0 }, - "facing=south,phase=1": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s1", "y": 180 }, - "facing=west,phase=1": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s1", "y": 270 }, - "facing=east,phase=1": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s1", "y": 90 }, - "facing=north,phase=2": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s2", "y": 0 }, - "facing=south,phase=2": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s2", "y": 180 }, - "facing=west,phase=2": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s2", "y": 270 }, - "facing=east,phase=2": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s2", "y": 90 }, - "facing=north,phase=3": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s3", "y": 0 }, - "facing=south,phase=3": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s3", "y": 180 }, - "facing=west,phase=3": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s3", "y": 270 }, - "facing=east,phase=3": { "model": "engineersdecor:block/furnace/small_mineral_smelter_model_s3", "y": 90 } + "facing=north,phase=0": { "model": "engineersdecor:block/device/small_mineral_smelter_model", "y": 0 }, + "facing=south,phase=0": { "model": "engineersdecor:block/device/small_mineral_smelter_model", "y": 180 }, + "facing=west,phase=0": { "model": "engineersdecor:block/device/small_mineral_smelter_model", "y": 270 }, + "facing=east,phase=0": { "model": "engineersdecor:block/device/small_mineral_smelter_model", "y": 90 }, + "facing=north,phase=1": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s1", "y": 0 }, + "facing=south,phase=1": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s1", "y": 180 }, + "facing=west,phase=1": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s1", "y": 270 }, + "facing=east,phase=1": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s1", "y": 90 }, + "facing=north,phase=2": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s2", "y": 0 }, + "facing=south,phase=2": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s2", "y": 180 }, + "facing=west,phase=2": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s2", "y": 270 }, + "facing=east,phase=2": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s2", "y": 90 }, + "facing=north,phase=3": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s3", "y": 0 }, + "facing=south,phase=3": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s3", "y": 180 }, + "facing=west,phase=3": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s3", "y": 270 }, + "facing=east,phase=3": { "model": "engineersdecor:block/device/small_mineral_smelter_model_s3", "y": 90 } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/small_waste_incinerator.json b/src/main/resources/assets/engineersdecor/blockstates/small_waste_incinerator.json index d51e81b..0025d71 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/small_waste_incinerator.json +++ b/src/main/resources/assets/engineersdecor/blockstates/small_waste_incinerator.json @@ -1,6 +1,6 @@ { "variants": { - "lit=false": { "model": "engineersdecor:block/furnace/small_waste_incinerator_model" }, - "lit=true" : { "model": "engineersdecor:block/furnace/small_waste_incinerator_model_lit" } + "lit=false": { "model": "engineersdecor:block/device/small_waste_incinerator_model" }, + "lit=true" : { "model": "engineersdecor:block/device/small_waste_incinerator_model_lit" } } } diff --git a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve.json b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve.json index a80f871..d451af4 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve.json +++ b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve.json @@ -1,8 +1,8 @@ { "multipart": [ - { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "y": 0 } }, - { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "y": 180 } }, - { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "y": 270 } }, - { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "y": 90 } }, - { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "x": -90 } }, - { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_model", "x": 90 } } + { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "y": 0 } }, + { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "y": 180 } }, + { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "y": 270 } }, + { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "y": 90 } }, + { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "x": -90 } }, + { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_model", "x": 90 } } ]} diff --git a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone.json b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone.json index b688cad..1e32419 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone.json +++ b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone.json @@ -1,14 +1,14 @@ { "multipart": [ - { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "y": 0 } }, - { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "y": 180 } }, - { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "y": 270 } }, - { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "y": 90 } }, - { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "x": -90 } }, - { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model", "x": 90 } }, - { "when": { "rs_n":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 0 } }, - { "when": { "rs_s":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 180 } }, - { "when": { "rs_w":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 270 } }, - { "when": { "rs_e":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 90 } }, - { "when": { "rs_u":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "x": -90 } }, - { "when": { "rs_d":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "x": 90 } } + { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "y": 0 } }, + { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "y": 180 } }, + { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "y": 270 } }, + { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "y": 90 } }, + { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "x": -90 } }, + { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_model", "x": 90 } }, + { "when": { "rs_n":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 0 } }, + { "when": { "rs_s":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 180 } }, + { "when": { "rs_w":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 270 } }, + { "when": { "rs_e":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 90 } }, + { "when": { "rs_u":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "x": -90 } }, + { "when": { "rs_d":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "x": 90 } } ]} diff --git a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone_analog.json b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone_analog.json index c11826f..f6190b4 100644 --- a/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone_analog.json +++ b/src/main/resources/assets/engineersdecor/blockstates/straight_pipe_valve_redstone_analog.json @@ -1,14 +1,14 @@ { "multipart": [ - { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "y": 0 } }, - { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "y": 180 } }, - { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "y": 270 } }, - { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "y": 90 } }, - { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "x": -90 } }, - { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model", "x": 90 } }, - { "when": { "rs_n":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 0 } }, - { "when": { "rs_s":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 180 } }, - { "when": { "rs_w":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 270 } }, - { "when": { "rs_e":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "y": 90 } }, - { "when": { "rs_u":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "x": -90 } }, - { "when": { "rs_d":"true" }, "apply": { "model": "engineersdecor:block/pipe/straight_pipe_valve_rs_connector_submodel", "x": 90 } } + { "when": { "facing":"north" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "y": 0 } }, + { "when": { "facing":"south" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "y": 180 } }, + { "when": { "facing":"west" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "y": 270 } }, + { "when": { "facing":"east" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "y": 90 } }, + { "when": { "facing":"up" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "x": -90 } }, + { "when": { "facing":"down" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model", "x": 90 } }, + { "when": { "rs_n":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 0 } }, + { "when": { "rs_s":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 180 } }, + { "when": { "rs_w":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 270 } }, + { "when": { "rs_e":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "y": 90 } }, + { "when": { "rs_u":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "x": -90 } }, + { "when": { "rs_d":"true" }, "apply": { "model": "engineersdecor:block/device/straight_pipe_valve_rs_connector_submodel", "x": 90 } } ]} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/lang/en_us.json b/src/main/resources/assets/engineersdecor/lang/en_us.json index 4ed6719..d1e79b6 100644 --- a/src/main/resources/assets/engineersdecor/lang/en_us.json +++ b/src/main/resources/assets/engineersdecor/lang/en_us.json @@ -25,7 +25,6 @@ "engineersdecor.config.without_factory_dropper": "Without factory dropper", "engineersdecor.config.without_halfslabs": "Without slab slices", "engineersdecor.config.without_hsupports": "Without h. supports", - "engineersdecor.config.without_ie_concrete_wall": "Without concrete wall", "engineersdecor.config.without_lab_furnace": "Without lab furnace", "engineersdecor.config.without_ladder_speed_boost": "Without ladder speed boost", "engineersdecor.config.without_ladders": "Without ladders", @@ -52,6 +51,8 @@ "engineersdecor.tooltip.slabpickup.help": "§rFast pickup by left-clicking while looking up/down and holding this slab.", "block.engineersdecor.clinker_brick_block": "Clinker Brick Block", "block.engineersdecor.clinker_brick_block.help": "§6A brick block with position dependent texture variations.§r\nLooks slightly darker and more color intensive than the vanilla brick block.", + "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornated Clinker Brick", + "block.engineersdecor.clinker_brick_sastor_corner_block.help": "§6Quoin decoration for clinker wall accentuation.§r\nPlace looking horizontally to generate a building corner ornamentation. Place while looking almost straight up/down for window ornamentation. The style of adjacent Sandstone Ornated Blocks are copied (preferred) to facilitate placements for higher buildings.", "block.engineersdecor.clinker_brick_slab": "Clinker Brick Slab", "block.engineersdecor.clinker_brick_slab.help": "§6Slab made from a Clinker Block.§r\nLooks slightly darker and more color intensive than the vanilla brick.", "block.engineersdecor.clinker_brick_stained_block": "Stained Clinker Brick Block", @@ -156,6 +157,11 @@ "block.engineersdecor.metal_rung_ladder.help": "§6Typical industrial wall ladder, consisting of horizontal metal rod rungs.§r Look up/down to climb faster.", "block.engineersdecor.metal_rung_steps": "Staggered Metal Steps", "block.engineersdecor.metal_rung_steps.help": "§6Staggered rod rungs affixed to a wall, allowing to climb up, fall down, and so on.§r Look up/down to climb faster.", + "block.engineersdecor.old_industrial_wood_door": "Old Industrial Wood Door", + "block.engineersdecor.old_industrial_wood_planks": "Old Industrial Wood Planks", + "block.engineersdecor.old_industrial_wood_slab": "Old Industrial Wood Slab", + "block.engineersdecor.old_industrial_wood_slabslice": "Old Industrial Wood Slab Slice", + "block.engineersdecor.old_industrial_wood_stairs": "Old Industrial Wood Stairs", "block.engineersdecor.panzerglass_block": "Panzer Glass Block", "block.engineersdecor.panzerglass_block.help": "§6Reinforced glass block.§r Expensive, explosion-proof. Dark gray tint, faint structural lines visible, multi texture for seemless look.", "block.engineersdecor.panzerglass_slab": "Panzer Glass Slab", @@ -196,8 +202,6 @@ "block.engineersdecor.slag_brick_stairs.help": "§6Gray-brown brick stairs.", "block.engineersdecor.slag_brick_wall": "Slag Brick Wall", "block.engineersdecor.slag_brick_wall.help": "§6Simplistic Slag Brick Wall.", - "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornamented Clinker Brick Corner", - "block.engineersdecor.clinker_brick_sastor_corner_block.help": "§6Quoin decoration for clinker wall accentuation.", "block.engineersdecor.small_block_breaker": "Small Block Breaker", "block.engineersdecor.small_block_breaker.help": "§6Breaks blocks in front of it.§r\nCan be disabled by applying a redstone signal. The time needed to destroy a block depends on the hardness of that block. ${!block_breaker_requires_power?engineersdecor.tooltip.massive_speed_boost_with_rf_power} ${block_breaker_requires_power?engineersdecor.tooltip.requires_rf_power}", "block.engineersdecor.small_block_breaker.status": "SOC: %1$s%% of %2$sRF§r | progress: %3$s%%", diff --git a/src/main/resources/assets/engineersdecor/lang/ru_ru.json b/src/main/resources/assets/engineersdecor/lang/ru_ru.json index 5bd2bbe..75b4519 100644 --- a/src/main/resources/assets/engineersdecor/lang/ru_ru.json +++ b/src/main/resources/assets/engineersdecor/lang/ru_ru.json @@ -25,7 +25,6 @@ "engineersdecor.config.without_factory_dropper": "Без фабричного выбрасывателя", "engineersdecor.config.without_halfslabs": "Без частей плит", "engineersdecor.config.without_hsupports": "Без опор", - "engineersdecor.config.without_ie_concrete_wall": "Без бетонных стен", "engineersdecor.config.without_lab_furnace": "Без лабораторной печи", "engineersdecor.config.without_ladder_speed_boost": "Без ускорения на лестницах", "engineersdecor.config.without_ladders": "Без лестниц", @@ -52,6 +51,8 @@ "engineersdecor.tooltip.slabpickup.help": "§rБыстрое поднятие щелчком ЛКМ, смотря вверх/вниз с этой плитой в руках.", "block.engineersdecor.clinker_brick_block": "Клинкерный кирпич", "block.engineersdecor.clinker_brick_block.help": "§6Кирпичный блок с вариациями текстуры, зависящими от положения.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок.", + "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornated Clinker Brick", + "block.engineersdecor.clinker_brick_sastor_corner_block.help": "§6Quoin decoration for clinker wall accentuation.§r\nPlace looking horizontally to generate a building corner ornamentation. Place while looking almost straight up/down for window ornamentation. The style of adjacent Sandstone Ornated Blocks are copied (preferred) to facilitate placements for higher buildings.", "block.engineersdecor.clinker_brick_slab": "Клинкерная плита", "block.engineersdecor.clinker_brick_slab.help": "§6Плита из клинкерного блока.§r\nВыглядит темнее и интенсивнее, чем Кирпичный блок.", "block.engineersdecor.clinker_brick_stained_block": "Грязный клинкерный кирпич", @@ -156,6 +157,11 @@ "block.engineersdecor.metal_rung_ladder.help": "§6Типичная промышленная настенная лестница, состоящая из горизонтальных металлических стержней.§r Смотри вверх/вниз, чтобы подняться быстрее.", "block.engineersdecor.metal_rung_steps": "Настенные металлические ступеньки", "block.engineersdecor.metal_rung_steps.help": "§6Металлические ступеньки, крепятся к стене. Позволяют подниматься/спускаться.§r Смотри вверх/вниз, чтобы подняться быстрее.", + "block.engineersdecor.old_industrial_wood_door": "Old Industrial Wood Door", + "block.engineersdecor.old_industrial_wood_planks": "Old Industrial Wood Planks", + "block.engineersdecor.old_industrial_wood_slab": "Old Industrial Wood Slab", + "block.engineersdecor.old_industrial_wood_slabslice": "Old Industrial Wood Slab Slice", + "block.engineersdecor.old_industrial_wood_stairs": "Old Industrial Wood Stairs", "block.engineersdecor.panzerglass_block": "Бронированное стекло", "block.engineersdecor.panzerglass_block.help": "§6Усиленный стеклоблок.§r Дорогой, взрывоустойчивый. Имеет тёмно-серый оттенок, слегка видны структурные линии, мультитекстура для бесшовного отображения.", "block.engineersdecor.panzerglass_slab": "Плита из бронированного стекла", diff --git a/src/main/resources/assets/engineersdecor/lang/zh_cn.json b/src/main/resources/assets/engineersdecor/lang/zh_cn.json index 3a33f93..8becae0 100644 --- a/src/main/resources/assets/engineersdecor/lang/zh_cn.json +++ b/src/main/resources/assets/engineersdecor/lang/zh_cn.json @@ -25,7 +25,6 @@ "engineersdecor.config.without_factory_dropper": "不要工厂掉落器", "engineersdecor.config.without_halfslabs": "不要台阶切片", "engineersdecor.config.without_hsupports": "不要支撑", - "engineersdecor.config.without_ie_concrete_wall": "不要混凝土墙", "engineersdecor.config.without_lab_furnace": "不要实验室炉", "engineersdecor.config.without_ladder_speed_boost": "不要爬梯加速", "engineersdecor.config.without_ladders": "不要梯子", @@ -52,6 +51,8 @@ "engineersdecor.tooltip.slabpickup.help": "§r手持同类台阶往上/下看时单击该台阶可无需破坏快速拾起。", "block.engineersdecor.clinker_brick_block": "过烧砖块", "block.engineersdecor.clinker_brick_block.help": "§6一种放在不同位置贴图有不同变化的砖块。§r\n比原版砖看起来颜色更深，色度也更高。", + "block.engineersdecor.clinker_brick_sastor_corner_block": "Sandstone Ornated Clinker Brick", + "block.engineersdecor.clinker_brick_sastor_corner_block.help": "§6Quoin decoration for clinker wall accentuation.§r\nPlace looking horizontally to generate a building corner ornamentation. Place while looking almost straight up/down for window ornamentation. The style of adjacent Sandstone Ornated Blocks are copied (preferred) to facilitate placements for higher buildings.", "block.engineersdecor.clinker_brick_slab": "过烧砖台阶", "block.engineersdecor.clinker_brick_slab.help": "§6过烧砖块制造的台阶。§r\n比原版砖看起来颜色更深，色度也更高。", "block.engineersdecor.clinker_brick_stained_block": "污渍过烧砖块", @@ -156,6 +157,11 @@ "block.engineersdecor.metal_rung_ladder.help": "§6典型的工业墙梯，由水平的金属杆蹬组成。§r往上/下看会爬得更快。", "block.engineersdecor.metal_rung_steps": "交错金属台阶", "block.engineersdecor.metal_rung_steps.help": "§6贴在墙上的交错金属杆蹬，能够爬上或爬下。§r往上/下看会爬得更快。", + "block.engineersdecor.old_industrial_wood_door": "Old Industrial Wood Door", + "block.engineersdecor.old_industrial_wood_planks": "Old Industrial Wood Planks", + "block.engineersdecor.old_industrial_wood_slab": "Old Industrial Wood Slab", + "block.engineersdecor.old_industrial_wood_slabslice": "Old Industrial Wood Slab Slice", + "block.engineersdecor.old_industrial_wood_stairs": "Old Industrial Wood Stairs", "block.engineersdecor.panzerglass_block": "装甲玻璃块", "block.engineersdecor.panzerglass_block.help": "§6强化的玻璃方块。§r昂贵，防爆。深灰色调，有隐约可见的结构线和多种纹理，外观无光泽。", "block.engineersdecor.panzerglass_slab": "装甲玻璃台阶", diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model0.json b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model0.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model0.json rename to src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model0.json diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model1.json b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model1.json similarity index 54% rename from src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model1.json rename to src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model1.json index 28ee56e..2296ff8 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model1.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model1.json @@ -1,4 +1,4 @@ { - "parent": "engineersdecor:block/pipe/fluid_barrel_model0", + "parent": "engineersdecor:block/device/fluid_barrel_model0", "textures": { "s" : "engineersdecor:block/pipe/fluid_barrel_side1" } } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model2.json b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model2.json similarity index 54% rename from src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model2.json rename to src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model2.json index 9024c1a..bd4e93e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model2.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model2.json @@ -1,4 +1,4 @@ { - "parent": "engineersdecor:block/pipe/fluid_barrel_model0", + "parent": "engineersdecor:block/device/fluid_barrel_model0", "textures": { "s" : "engineersdecor:block/pipe/fluid_barrel_side2" } } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model3.json b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model3.json similarity index 56% rename from src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model3.json rename to src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model3.json index 5e7d2a0..5a3a062 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model3.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model3.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/pipe/fluid_barrel_model0", + "parent": "engineersdecor:block/device/fluid_barrel_model0", "textures": { "s" : "engineersdecor:block/pipe/fluid_barrel_side3" } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model4.json b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model4.json similarity index 54% rename from src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model4.json rename to src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model4.json index 846acb7..6d2a0fa 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/fluid_barrel_model4.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/fluid_barrel_model4.json @@ -1,4 +1,4 @@ { - "parent": "engineersdecor:block/pipe/fluid_barrel_model0", + "parent": "engineersdecor:block/device/fluid_barrel_model0", "textures": { "s" : "engineersdecor:block/pipe/fluid_barrel_side4" } } diff --git a/src/main/resources/assets/engineersdecor/models/block/misc/labeled_crate_model.json b/src/main/resources/assets/engineersdecor/models/block/device/labeled_crate_model.json similarity index 98% rename from src/main/resources/assets/engineersdecor/models/block/misc/labeled_crate_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/labeled_crate_model.json index c78b273..3d52fbf 100644 --- a/src/main/resources/assets/engineersdecor/models/block/misc/labeled_crate_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/labeled_crate_model.json @@ -1,6 +1,5 @@ { "parent": "block/block", - "gui_light": "front", "textures": { "f": "engineersdecor:block/misc/labeled_crate_front_texture", "particle": "engineersdecor:block/misc/labeled_crate_side_texture", diff --git a/src/main/resources/assets/engineersdecor/models/block/crafting_table/metal_crafting_table_model.json b/src/main/resources/assets/engineersdecor/models/block/device/metal_crafting_table_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/crafting_table/metal_crafting_table_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/metal_crafting_table_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json b/src/main/resources/assets/engineersdecor/models/block/device/small_electrical_furnace_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_electrical_furnace_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model_lit.json b/src/main/resources/assets/engineersdecor/models/block/device/small_electrical_furnace_model_lit.json similarity index 70% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model_lit.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_electrical_furnace_model_lit.json index bee45b0..7d07f67 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model_lit.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_electrical_furnace_model_lit.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/furnace/small_electrical_furnace_model", + "parent": "engineersdecor:block/device/small_electrical_furnace_model", "textures": { "front": "engineersdecor:block/furnace/small_electrical_furnace_front_lit", "back": "engineersdecor:block/furnace/small_electrical_furnace_back_lit" diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_lab_furnace_model.json b/src/main/resources/assets/engineersdecor/models/block/device/small_lab_furnace_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_lab_furnace_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_lab_furnace_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_lab_furnace_model_lit.json b/src/main/resources/assets/engineersdecor/models/block/device/small_lab_furnace_model_lit.json similarity index 58% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_lab_furnace_model_lit.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_lab_furnace_model_lit.json index 98e0c54..33432e6 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_lab_furnace_model_lit.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_lab_furnace_model_lit.json @@ -1,4 +1,4 @@ { - "parent": "engineersdecor:block/furnace/small_lab_furnace_model", + "parent": "engineersdecor:block/device/small_lab_furnace_model", "textures": { "gloom": "engineersdecor:block/furnace/small_lab_furnace_front_gloom_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model.json b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s1.json b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s1.json similarity index 57% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s1.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s1.json index 4312c83..0fbf40e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s1.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s1.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/furnace/small_mineral_smelter_model", + "parent": "engineersdecor:block/device/small_mineral_smelter_model", "textures": { "front": "engineersdecor:block/furnace/small_mineral_smelter_front_s1" } diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s2.json b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s2.json similarity index 57% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s2.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s2.json index 706233e..2705e92 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s2.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s2.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/furnace/small_mineral_smelter_model", + "parent": "engineersdecor:block/device/small_mineral_smelter_model", "textures": { "front": "engineersdecor:block/furnace/small_mineral_smelter_front_s2" } diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s3.json b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s3.json similarity index 57% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s3.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s3.json index 0919785..bf82971 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_mineral_smelter_model_s3.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_mineral_smelter_model_s3.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/furnace/small_mineral_smelter_model", + "parent": "engineersdecor:block/device/small_mineral_smelter_model", "textures": { "front": "engineersdecor:block/furnace/small_mineral_smelter_front_s3" } diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_waste_incinerator_model.json b/src/main/resources/assets/engineersdecor/models/block/device/small_waste_incinerator_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_waste_incinerator_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_waste_incinerator_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/furnace/small_waste_incinerator_model_lit.json b/src/main/resources/assets/engineersdecor/models/block/device/small_waste_incinerator_model_lit.json similarity index 55% rename from src/main/resources/assets/engineersdecor/models/block/furnace/small_waste_incinerator_model_lit.json rename to src/main/resources/assets/engineersdecor/models/block/device/small_waste_incinerator_model_lit.json index 7399cff..a78deb1 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furnace/small_waste_incinerator_model_lit.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/small_waste_incinerator_model_lit.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/furnace/small_waste_incinerator_model", + "parent": "engineersdecor:block/device/small_waste_incinerator_model", "textures": { "side": "engineersdecor:block/furnace/small_waste_incinerator_side" } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_model.json b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_model.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_model.json diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_analog_model.json b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_analog_model.json similarity index 62% rename from src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_analog_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_analog_model.json index 479722b..1e80729 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_analog_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_analog_model.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/pipe/straight_pipe_valve_model", + "parent": "engineersdecor:block/device/straight_pipe_valve_model", "textures": { "side" : "engineersdecor:block/pipe/straight_pipe_valve_side_redstone_analog_texture" } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_model.json b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_model.json similarity index 60% rename from src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_model.json rename to src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_model.json index 33d7ae5..ab76258 100644 --- a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_redstone_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_redstone_model.json @@ -1,5 +1,5 @@ { - "parent": "engineersdecor:block/pipe/straight_pipe_valve_model", + "parent": "engineersdecor:block/device/straight_pipe_valve_model", "textures": { "side" : "engineersdecor:block/pipe/straight_pipe_valve_side_redstone_texture" } diff --git a/src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_rs_connector_submodel.json b/src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_rs_connector_submodel.json similarity index 100% rename from src/main/resources/assets/engineersdecor/models/block/pipe/straight_pipe_valve_rs_connector_submodel.json rename to src/main/resources/assets/engineersdecor/models/block/device/straight_pipe_valve_rs_connector_submodel.json diff --git a/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_lh.json b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_lh.json new file mode 100644 index 0000000..d821440 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_lh.json @@ -0,0 +1,170 @@ +{ + "ambientocclusion": false, + "textures": { + "bottom": "engineersdecor:block/door/old_industrial_door_texture_bottom", + "particle": "engineersdecor:block/door/old_industrial_door_texture_side" + }, + "elements": [ + { + "from": [0.5, 0, 0], + "to": [2.5, 16, 16], + "faces": { + "north": {"uv": [13.5, 0, 15.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "south": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"} + } + }, + { + "from": [0, 2, 15], + "to": [0.5, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 14], "texture": "#bottom"}, + "south": {"uv": [0, 0, 0.5, 14], "texture": "#particle"}, + "west": {"uv": [15, 0, 16, 14], "texture": "#bottom"} + } + }, + { + "from": [2.5, 2, 15], + "to": [3, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, 8]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [0, 0, 1, 14], "texture": "#bottom"}, + "south": {"uv": [2.5, 0, 3, 14], "texture": "#particle"} + } + }, + { + "from": [0, 2, 0], + "to": [0.5, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, -7]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 14], "texture": "#particle"}, + "south": {"uv": [0, 0, 0.5, 14], "texture": "#bottom"}, + "west": {"uv": [0, 0, 1, 14], "texture": "#bottom"} + } + }, + { + "from": [2.5, 2, 0], + "to": [3, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, -7]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [15, 0, 16, 14], "texture": "#bottom"}, + "south": {"uv": [2.5, 0, 3, 14], "texture": "#particle"} + } + }, + { + "from": [0, 0, 0], + "to": [0.5, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, -6]}, + "faces": { + "north": {"uv": [15.5, 14, 16, 16], "texture": "#particle"}, + "south": {"uv": [0, 14, 0.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#bottom"}, + "up": {"uv": [0, 0, 0.5, 16], "texture": "#particle"}, + "down": {"uv": [0, 0, 0.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 0], + "to": [3, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, -6]}, + "faces": { + "north": {"uv": [13, 14, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#bottom"}, + "south": {"uv": [2.5, 14, 3, 16], "texture": "#particle"}, + "up": {"uv": [2.5, 0, 3, 16], "texture": "#particle"}, + "down": {"uv": [2.5, 0, 3, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 14, 12], + "to": [3, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 21, 5]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 2], "texture": "#particle"}, + "east": {"uv": [1, 0, 4, 1], "texture": "#particle"}, + "up": {"uv": [2.5, 12, 3, 15], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 4], "texture": "#particle"} + } + }, + { + "from": [0, 14, 12], + "to": [0.5, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 21, 5]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 2], "texture": "#particle"}, + "west": {"uv": [12, 0, 15, 1], "texture": "#particle"}, + "up": {"uv": [0, 12, 0.5, 15], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 4], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 14], + "to": [3, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 9, 7]}, + "faces": { + "north": {"uv": [13, 13, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [1, 13, 2, 14], "texture": "#particle"}, + "up": {"uv": [2.5, 14, 3, 15], "texture": "#particle"} + } + }, + { + "from": [2.5, 13.5, 11], + "to": [3, 14.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, 4]}, + "faces": { + "north": {"uv": [13, 1.5, 13.5, 2.5], "texture": "#particle"}, + "east": {"uv": [4, 1.5, 5, 2.5], "texture": "#particle"}, + "south": {"uv": [2.5, 1.5, 3, 2.5], "texture": "#particle"}, + "up": {"uv": [2.5, 11, 3, 12], "texture": "#particle"}, + "down": {"uv": [2.5, 4, 3, 5], "texture": "#particle"} + } + }, + { + "from": [0, 13.5, 11], + "to": [0.5, 14.5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 20.5, 4]}, + "faces": { + "north": {"uv": [15.5, 1.5, 16, 2.5], "texture": "#particle"}, + "south": {"uv": [0, 1.5, 0.5, 2.5], "texture": "#particle"}, + "west": {"uv": [11, 1.5, 12, 2.5], "texture": "#particle"}, + "up": {"uv": [0, 11, 0.5, 12], "texture": "#particle"}, + "down": {"uv": [0, 4, 0.5, 5], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 1], + "to": [3, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 9, -6]}, + "faces": { + "east": {"uv": [14, 13, 15, 14], "texture": "#particle"}, + "south": {"uv": [2.5, 13, 3, 14], "texture": "#particle"}, + "up": {"uv": [2.5, 1, 3, 2], "texture": "#particle"} + } + }, + { + "from": [0, 2, 14], + "to": [0.5, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 9, 7]}, + "faces": { + "north": {"uv": [15.5, 13, 16, 14], "texture": "#particle"}, + "west": {"uv": [14, 13, 15, 14], "texture": "#particle"}, + "up": {"uv": [0, 14, 0.5, 15], "texture": "#particle"} + } + }, + { + "from": [0, 2, 1], + "to": [0.5, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 9, -6]}, + "faces": { + "south": {"uv": [0, 13, 0.5, 14], "texture": "#particle"}, + "west": {"uv": [1, 13, 2, 14], "texture": "#particle"}, + "up": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_rh.json b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_rh.json new file mode 100644 index 0000000..331a8ab --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_bottom_rh.json @@ -0,0 +1,205 @@ +{ + "ambientocclusion": false, + "textures": { + "bottom": "engineersdecor:block/door/old_industrial_door_texture_bottom", + "particle": "engineersdecor:block/door/old_industrial_door_texture_side" + }, + "elements": [ + { + "from": [0.5, 0, 0], + "to": [2.5, 16, 16], + "faces": { + "north": {"uv": [13.5, 0, 15.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "south": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"} + } + }, + { + "from": [0, 2, 15], + "to": [0.5, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, 8]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 14], "texture": "#bottom"}, + "south": {"uv": [0, 0, 0.5, 14], "texture": "#particle"}, + "west": {"uv": [15, 0, 16, 14], "texture": "#bottom"}, + "down": {"uv": [0, 0, 0.5, 1], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 15], + "to": [3, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, 8]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [0, 0, 1, 14], "texture": "#bottom"}, + "south": {"uv": [2.5, 0, 3, 14], "texture": "#particle"}, + "down": {"uv": [2.5, 0, 3, 1], "texture": "#particle"} + } + }, + { + "from": [0, 2, 0], + "to": [0.5, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, -7]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 14], "texture": "#particle"}, + "south": {"uv": [0, 0, 0.5, 14], "texture": "#bottom"}, + "west": {"uv": [0, 0, 1, 14], "texture": "#bottom"}, + "down": {"uv": [0, 15, 0.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 0], + "to": [3, 16, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, -7]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [15, 0, 16, 14], "texture": "#bottom"}, + "south": {"uv": [2.5, 0, 3, 14], "texture": "#particle"}, + "down": {"uv": [2.5, 15, 3, 16], "texture": "#particle"} + } + }, + { + "from": [0, 0, 0], + "to": [0.5, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 8, -6]}, + "faces": { + "north": {"uv": [15.5, 14, 16, 16], "texture": "#particle"}, + "south": {"uv": [0, 14, 0.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 14, 16, 16], "texture": "#bottom"}, + "up": {"uv": [0, 0, 0.5, 16], "texture": "#particle"}, + "down": {"uv": [0, 0, 0.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 0], + "to": [3, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 8, -6]}, + "faces": { + "north": {"uv": [13, 14, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 14, 16, 16], "texture": "#bottom"}, + "south": {"uv": [2.5, 14, 3, 16], "texture": "#particle"}, + "up": {"uv": [2.5, 0, 3, 16], "texture": "#particle"}, + "down": {"uv": [2.5, 0, 3, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 14, 1], + "to": [3, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 21, -17]}, + "faces": { + "east": {"uv": [12, 0, 15, 1], "texture": "#particle"}, + "south": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "up": {"uv": [2.5, 1, 3, 4], "texture": "#particle"}, + "down": {"uv": [2.5, 12, 3, 15], "texture": "#particle"} + } + }, + { + "from": [2.5, 13.5, 4], + "to": [3, 14.5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 20.5, -14]}, + "faces": { + "north": {"uv": [13, 1.5, 13.5, 2.5], "texture": "#particle"}, + "east": {"uv": [11, 1.5, 12, 2.5], "texture": "#particle"}, + "south": {"uv": [2.5, 1.5, 3, 2.5], "texture": "#particle"}, + "up": {"uv": [2.5, 4, 3, 5], "texture": "#particle"}, + "down": {"uv": [2.5, 11, 3, 12], "texture": "#particle"} + } + }, + { + "from": [0, 13.5, 4], + "to": [0.5, 14.5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 20.5, -14]}, + "faces": { + "north": {"uv": [13, 1.5, 13.5, 2.5], "texture": "#particle"}, + "south": {"uv": [2.5, 1.5, 3, 2.5], "texture": "#particle"}, + "west": {"uv": [4, 1.5, 5, 2.5], "texture": "#particle"}, + "up": {"uv": [2.5, 4, 3, 5], "texture": "#particle"}, + "down": {"uv": [2.5, 11, 3, 12], "texture": "#particle"} + } + }, + { + "from": [0, 15, 14], + "to": [0.5, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 22, -4]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 1], "texture": "#particle"}, + "west": {"uv": [14, 0, 15, 1], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + }, + { + "from": [0, 15, 14], + "to": [0.5, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 22, -4]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 1], "texture": "#particle"}, + "west": {"uv": [14, 0, 15, 1], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + }, + { + "from": [0, 2, 14], + "to": [0.5, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 9, -4]}, + "faces": { + "north": {"uv": [15.5, 13, 16, 14], "texture": "#particle"}, + "west": {"uv": [14, 13, 15, 14], "texture": "#particle"}, + "up": {"uv": [0, 14, 0.5, 15], "texture": "#particle"} + } + }, + { + "from": [0, 2, 1], + "to": [0.5, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 9, -17]}, + "faces": { + "south": {"uv": [0, 13, 0.5, 14], "texture": "#particle"}, + "west": {"uv": [1, 13, 2, 14], "texture": "#particle"}, + "up": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + }, + { + "from": [2.5, 15, 14], + "to": [3, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 22, -4]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 1], "texture": "#particle"}, + "east": {"uv": [1, 0, 2, 1], "texture": "#particle"}, + "south": {"uv": [2.5, 0, 3, 1], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 2], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 14], + "to": [3, 3, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 9, -4]}, + "faces": { + "north": {"uv": [13, 13, 13.5, 14], "texture": "#particle"}, + "east": {"uv": [1, 13, 2, 14], "texture": "#particle"}, + "up": {"uv": [2.5, 14, 3, 15], "texture": "#particle"} + } + }, + { + "from": [2.5, 2, 1], + "to": [3, 3, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8.5, 9, -17]}, + "faces": { + "east": {"uv": [14, 13, 15, 14], "texture": "#particle"}, + "south": {"uv": [2.5, 13, 3, 14], "texture": "#particle"}, + "up": {"uv": [2.5, 1, 3, 2], "texture": "#particle"} + } + }, + { + "from": [0, 14, 1], + "to": [0.5, 15, 4], + "rotation": {"angle": 0, "axis": "y", "origin": [6, 21, -17]}, + "faces": { + "south": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "west": {"uv": [1, 2, 4, 3], "texture": "#particle"}, + "up": {"uv": [0, 1, 0.5, 4], "texture": "#particle"}, + "down": {"uv": [0, 12, 0.5, 15], "texture": "#particle"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_inventory.json b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_inventory.json new file mode 100644 index 0000000..8b653aa --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_inventory.json @@ -0,0 +1,59 @@ +{ + "parent": "block/block", + "ambientocclusion": false, + "textures": { + "bottom": "engineersdecor:block/door/old_industrial_door_texture_bottom", + "top": "engineersdecor:block/door/old_industrial_door_texture_top", + "particle": "engineersdecor:block/door/old_industrial_door_texture_side" + }, + "elements": [ + { + "from": [7.25, 8, 3.5], + "to": [8.75, 16, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#particle"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#top"}, + "south": {"uv": [13, 0, 16, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "up": {"uv": [0, 0, 16, 3], "rotation": 270, "texture": "#particle"} + } + }, + { + "from": [7.25, 0, 3.5], + "to": [8.75, 8, 11.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 7.5]}, + "faces": { + "north": {"uv": [0, 0, 3, 16], "texture": "#particle"}, + "east": {"uv": [16, 0, 0, 16], "texture": "#bottom"}, + "south": {"uv": [13, 0, 16, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#bottom"}, + "down": {"uv": [0, 13, 16, 16], "rotation": 90, "texture": "#particle"} + } + } + ], + "gui_light": "front", + "display": { + "thirdperson_righthand": { + "rotation": [6, 88, 39], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_righthand": { + "rotation": [-4, 27, 0], + "translation": [2.25, 0, 0], + "scale": [0.5, 0.5, 0.5] + }, + "ground": { + "translation": [0, 1.75, 0], + "scale": [0.4, 0.4, 0.4] + }, + "gui": { + "rotation": [0, 90, 0], + "translation": [0, 0.25, 0], + "scale": [0.9, 0.9, 0.9] + }, + "fixed": { + "rotation": [0, 90, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_lh.json b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_lh.json new file mode 100644 index 0000000..de9c4c1 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_lh.json @@ -0,0 +1,160 @@ +{ + "ambientocclusion": false, + "textures": { + "top": "engineersdecor:block/door/old_industrial_door_texture_top", + "particle": "engineersdecor:block/door/old_industrial_door_texture_side" + }, + "elements": [ + { + "from": [0.5, 0, 0], + "to": [2.5, 16, 16], + "faces": { + "north": {"uv": [13.5, 0, 15.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "south": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "up": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 1], + "to": [3, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 8]}, + "faces": { + "east": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "west": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "up": {"uv": [2.5, 1, 3, 15], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 15], "texture": "#particle"} + } + }, + { + "from": [0, 0, 1], + "to": [0.5, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 7, 8]}, + "faces": { + "west": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "up": {"uv": [0, 1, 0.5, 15], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 15], "texture": "#particle"} + } + }, + { + "from": [2.5, 15, 0], + "to": [3, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 22, 8]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 1], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "south": {"uv": [2.5, 0, 3, 1], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "up": {"uv": [2.5, 0, 3, 16], "texture": "#particle"}, + "down": {"uv": [2.5, 0, 3, 16], "texture": "#particle"} + } + }, + { + "from": [0, 15, 0], + "to": [0.5, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 22, 8]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 1], "texture": "#particle"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "up": {"uv": [0, 0, 0.5, 16], "texture": "#particle"}, + "down": {"uv": [0, 0, 0.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 15], + "to": [3, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 10, 8]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 1, 1, 16], "texture": "#top"}, + "south": {"uv": [2.5, 1, 3, 16], "texture": "#particle"}, + "west": {"uv": [15, 1, 16, 16], "texture": "#top"} + } + }, + { + "from": [0, 0, 15], + "to": [0.5, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 10, 8]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 16], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 16], "texture": "#particle"}, + "west": {"uv": [15, 1, 16, 16], "texture": "#top"} + } + }, + { + "from": [2.5, 0, 0], + "to": [3, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 10, -7]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [15, 1, 16, 16], "texture": "#top"}, + "south": {"uv": [2.5, 1, 3, 16], "texture": "#particle"}, + "west": {"uv": [0, 1, 1, 16], "texture": "#top"} + } + }, + { + "from": [0, 0, 0], + "to": [0.5, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 10, -7]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 16], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 1, 1, 16], "texture": "#top"} + } + }, + { + "from": [2.5, 14, 14], + "to": [3, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 22, 22]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 2], "texture": "#particle"}, + "east": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "west": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "up": {"uv": [2.5, 14, 3, 15], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 2], "texture": "#particle"} + } + }, + { + "from": [0, 14, 14], + "to": [0.5, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 22]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 2], "texture": "#particle"}, + "east": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "west": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "up": {"uv": [0, 14, 0.5, 15], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + }, + { + "from": [2.5, 14, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 22, 9]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 2], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "south": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "up": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "down": {"uv": [2.5, 14, 3, 15], "texture": "#particle"} + } + }, + { + "from": [0, 14, 1], + "to": [0.5, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 9]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 2], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "up": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "down": {"uv": [0, 14, 0.5, 15], "texture": "#particle"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_rh.json b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_rh.json new file mode 100644 index 0000000..a8b411c --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/door/old_industrial_wood_door_model_top_rh.json @@ -0,0 +1,161 @@ +{ + "ambientocclusion": false, + "textures": { + "bottom": "engineersdecor:block/door/old_industrial_door_texture_bottom", + "top": "engineersdecor:block/door/old_industrial_door_texture_top", + "particle": "engineersdecor:block/door/old_industrial_door_texture_side" + }, + "elements": [ + { + "from": [0.5, 0, 0], + "to": [2.5, 16, 16], + "faces": { + "north": {"uv": [13.5, 0, 15.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "south": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "up": {"uv": [0.5, 0, 2.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 1], + "to": [3, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 7, 8]}, + "faces": { + "east": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "west": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "up": {"uv": [2.5, 1, 3, 15], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 15], "texture": "#particle"} + } + }, + { + "from": [0, 0, 1], + "to": [0.5, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 7, 8]}, + "faces": { + "west": {"uv": [1, 15, 15, 16], "texture": "#top"}, + "up": {"uv": [0, 1, 0.5, 15], "texture": "#bottom"}, + "down": {"uv": [0, 1, 0.5, 15], "texture": "#particle"} + } + }, + { + "from": [2.5, 15, 0], + "to": [3, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 22, 8]}, + "faces": { + "north": {"uv": [13, 0, 13.5, 1], "texture": "#particle"}, + "east": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "south": {"uv": [2.5, 0, 3, 1], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "up": {"uv": [2.5, 0, 3, 16], "texture": "#particle"}, + "down": {"uv": [2.5, 0, 3, 16], "texture": "#particle"} + } + }, + { + "from": [0, 15, 0], + "to": [0.5, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 22, 8]}, + "faces": { + "north": {"uv": [15.5, 0, 16, 1], "texture": "#particle"}, + "south": {"uv": [0, 0, 0.5, 1], "texture": "#particle"}, + "west": {"uv": [0, 0, 16, 1], "texture": "#top"}, + "up": {"uv": [0, 0, 0.5, 16], "texture": "#particle"}, + "down": {"uv": [0, 0, 0.5, 16], "texture": "#particle"} + } + }, + { + "from": [2.5, 0, 15], + "to": [3, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 10, 8]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [0, 1, 1, 16], "texture": "#top"}, + "south": {"uv": [2.5, 1, 3, 16], "texture": "#particle"}, + "west": {"uv": [15, 1, 16, 16], "texture": "#top"} + } + }, + { + "from": [0, 0, 15], + "to": [0.5, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 10, 8]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 16], "texture": "#top"}, + "south": {"uv": [0, 1, 0.5, 16], "texture": "#particle"}, + "west": {"uv": [15, 1, 16, 16], "texture": "#top"} + } + }, + { + "from": [2.5, 0, 0], + "to": [3, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [9, 10, -7]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 16], "texture": "#particle"}, + "east": {"uv": [15, 1, 16, 16], "texture": "#top"}, + "south": {"uv": [2.5, 1, 3, 16], "texture": "#particle"}, + "west": {"uv": [0, 1, 1, 16], "texture": "#top"} + } + }, + { + "from": [0, 0, 0], + "to": [0.5, 15, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [6.5, 10, -7]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 16], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 16], "texture": "#top"}, + "west": {"uv": [0, 1, 1, 16], "texture": "#top"} + } + }, + { + "from": [2.5, 14, 14], + "to": [3, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 22, 22]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 2], "texture": "#particle"}, + "east": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "west": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "up": {"uv": [2.5, 14, 3, 15], "texture": "#particle"}, + "down": {"uv": [2.5, 1, 3, 2], "texture": "#particle"} + } + }, + { + "from": [2.5, 14, 1], + "to": [3, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [10.5, 22, 9]}, + "faces": { + "north": {"uv": [13, 1, 13.5, 2], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "south": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "up": {"uv": [2.5, 1, 3, 2], "texture": "#particle"}, + "down": {"uv": [2.5, 14, 3, 15], "texture": "#particle"} + } + }, + { + "from": [0, 14, 14], + "to": [0.5, 15, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 22]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 2], "texture": "#particle"}, + "east": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "west": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "up": {"uv": [0, 14, 0.5, 15], "texture": "#particle"}, + "down": {"uv": [0, 1, 0.5, 2], "texture": "#particle"} + } + }, + { + "from": [0, 14, 1], + "to": [0.5, 15, 2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 22, 9]}, + "faces": { + "north": {"uv": [15.5, 1, 16, 2], "texture": "#particle"}, + "east": {"uv": [14, 1, 15, 2], "texture": "#particle"}, + "south": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "west": {"uv": [1, 1, 2, 2], "texture": "#particle"}, + "up": {"uv": [0, 1, 0.5, 2], "texture": "#particle"}, + "down": {"uv": [0, 14, 0.5, 15], "texture": "#particle"} + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json index e73f255..04ee287 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_side_table_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "particle": "engineersdecor:block/material/treated_wood_framed_texture", - "o": "engineersdecor:block/material/treated_wood_framed_texture" + "particle": "engineersdecor:block/material/wood_framed_texture", + "o": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_stool_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_stool_model.json index 1cf3b92..a06743f 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_stool_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_stool_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "o": "engineersdecor:block/material/treated_wood_framed_texture", - "particle": "engineersdecor:block/material/treated_wood_framed_texture" + "o": "engineersdecor:block/material/wood_framed_texture", + "particle": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json index 603de4b..6981965 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_table_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "o": "engineersdecor:block/material/treated_wood_framed_texture", - "particle": "engineersdecor:block/material/treated_wood_framed_texture" + "o": "engineersdecor:block/material/wood_framed_texture", + "particle": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json index 7b64054..2d43e4d 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_model.json @@ -3,8 +3,8 @@ "ambientocclusion": false, "textures": { "glass": "engineersdecor:block/glass/window_glass_texture", - "frame": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "frame": "engineersdecor:block/material/wood_sanded_texture", + "particle": "engineersdecor:block/material/wood_sanded_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json index e9a41f0..0a39788 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_window_submodel.json @@ -2,8 +2,8 @@ "parent": "block/block", "ambientocclusion": false, "textures": { - "frame": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "frame": "engineersdecor:block/material/wood_sanded_texture", + "particle": "engineersdecor:block/material/wood_sanded_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json index 2f0ea7a..c9295b2 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_broad_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "o": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "o": "engineersdecor:block/material/wood_sanded_texture", + "particle": "engineersdecor:block/material/wood_sanded_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_model.json b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_model.json index e3851bb..77d3bf4 100644 --- a/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/furniture/treated_wood_windowsill_model.json @@ -1,8 +1,8 @@ { "parent": "block/block", "textures": { - "o": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "o": "engineersdecor:block/material/wood_sanded_texture", + "particle": "engineersdecor:block/material/wood_sanded_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json b/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json index 61a5a03..d638540 100644 --- a/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/ladder/treated_wood_ladder_model.json @@ -2,8 +2,8 @@ "parent": "block/block", "gui_light": "front", "textures": { - "o": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "o": "engineersdecor:block/material/wood_sanded_texture", + "particle": "engineersdecor:block/material/wood_sanded_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json index 0d5d8ec..68d704c 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_chimneytrunk_model.json @@ -1,5 +1,6 @@ { "parent": "block/block", + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json index 65487cf..09f79a6 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model.json @@ -1,5 +1,6 @@ { "parent": "block/block", + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json index 8b2e2d3..3cd072e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_inner.json @@ -1,4 +1,5 @@ { + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json index cb19490..e59b900 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_metallized_model_outer.json @@ -1,4 +1,5 @@ { + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof", diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json index 3f41f75..e70e864 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model.json @@ -1,5 +1,6 @@ { "parent": "block/block", + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json index 7b3a71a..f5ea24c 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_inner.json @@ -1,4 +1,5 @@ { + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json index 101621c..d15e77e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_model_outer.json @@ -1,4 +1,5 @@ { + "ambientocclusion": false, "textures": { "particle": "engineersdecor:block/roof/dark_shingle_roof", "s": "engineersdecor:block/roof/dark_shingle_roof" diff --git a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json index 23ab523..bf9cd44 100644 --- a/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/roof/dark_shingle_roof_skylight_model.json @@ -1,4 +1,5 @@ { + "ambientocclusion": false, "parent": "block/block", "textures": { "2": "engineersdecor:block/material/steel_texture", diff --git a/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json b/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json index 7d305fc..68aa586 100644 --- a/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/sign/sign_decor_model.json @@ -2,9 +2,9 @@ "parent": "block/block", "gui_light": "front", "textures": { - "s": "engineersdecor:block/material/treated_wood_rough_texture", + "s": "engineersdecor:block/material/wood_rough_texture", "f": "engineersdecor:block/sign/engineersdecor-logo", - "particle": "engineersdecor:block/material/treated_wood_rough_texture" + "particle": "engineersdecor:block/material/wood_rough_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json b/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json index c80b917..e46b8d1 100644 --- a/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/sign/sign_exit_model.json @@ -2,8 +2,8 @@ "parent": "block/block", "gui_light": "front", "textures": { - "s": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture", + "s": "engineersdecor:block/material/wood_rough_texture", + "particle": "engineersdecor:block/material/wood_rough_texture", "f": "engineersdecor:block/sign/sign_exit_texture" }, "elements": [ diff --git a/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json b/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json index 68f0cf1..f025d4c 100644 --- a/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/sign/sign_rect14x14_model.json @@ -2,8 +2,8 @@ "parent": "block/block", "gui_light": "front", "textures": { - "s": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture", + "s": "engineersdecor:block/material/wood_rough_texture", + "particle": "engineersdecor:block/material/wood_rough_texture", "f": "engineersdecor:block/sign/sign_factoryarea_texture" }, "elements": [ diff --git a/src/main/resources/assets/engineersdecor/models/block/sign/sign_triangular_model.json b/src/main/resources/assets/engineersdecor/models/block/sign/sign_triangular_model.json index f9ffa25..ea8e78f 100644 --- a/src/main/resources/assets/engineersdecor/models/block/sign/sign_triangular_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/sign/sign_triangular_model.json @@ -2,8 +2,8 @@ "parent": "block/block", "gui_light": "front", "textures": { - "s": "engineersdecor:block/material/treated_wood_rough_texture", - "particle": "engineersdecor:block/material/treated_wood_rough_texture", + "s": "engineersdecor:block/material/wood_rough_texture", + "particle": "engineersdecor:block/material/wood_rough_texture", "f": "engineersdecor:block/sign/sign_hotwire_texture" }, "elements": [ diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s0_model.json index 41f171f..cfcd17c 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s0_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s0_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s1_model.json index 057e3c8..fd7246b 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s1_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s1_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s2_model.json index 776149a..2cba2ad 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s2_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s2_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s3_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s3_model.json index 0575a5d..4efd8a1 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s3_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s3_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s4_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s4_model.json index 972e42c..eca88ed 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s4_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s4_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s5_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s5_model.json index 7acf56a..a03b065 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s5_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s5_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s6_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s6_model.json index 6cb6c14..c2f3c61 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s6_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s6_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s7_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s7_model.json index 4df3fc7..a47cdbc 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s7_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s7_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s8_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s8_model.json index 91eb82f..7f569ae 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s8_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s8_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s9_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s9_model.json index c989499..8e14b8c 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s9_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_s9_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sa_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sa_model.json index e95616f..3fbd927 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sa_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sa_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sb_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sb_model.json index 6ab4524..7175c1e 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sb_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sb_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sc_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sc_model.json index a58d00d..ecaee19 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sc_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sc_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sd_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sd_model.json index 5d08bbb..1e6e566 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sd_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_sd_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_se_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_se_model.json index 5ddda23..67b3df7 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_se_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/halfslab_se_model.json @@ -3,7 +3,7 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" }, "elements": [ { diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_inventory_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_inventory_model.json index 13fc6d5..086a674 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_inventory_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_inventory_model.json @@ -3,6 +3,6 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s0_model.json index 11df6dd..96e5f95 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s0_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s0_model.json @@ -3,6 +3,6 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s1_model.json index 6ac23aa..c20fd44 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s1_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s1_model.json @@ -3,6 +3,6 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s2_model.json index b45a6ed..6d24c59 100644 --- a/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s2_model.json +++ b/src/main/resources/assets/engineersdecor/models/block/slab/generic/slab_s2_model.json @@ -3,6 +3,6 @@ "textures": { "particle": "#all", "side": "#all", - "all": "engineersdecor:block/material/treated_wood_framed_texture" + "all": "engineersdecor:block/material/wood_framed_texture" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v0_model.json new file mode 100644 index 0000000..47ecf58 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v0_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s0_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v1_model.json new file mode 100644 index 0000000..e719cbd --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v1_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s0_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture1"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v2_model.json new file mode 100644 index 0000000..43c8004 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v2_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s0_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture2"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v3_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v3_model.json new file mode 100644 index 0000000..4e7f811 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s0v3_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s0_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture3"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v0_model.json new file mode 100644 index 0000000..2fa267c --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v0_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s1_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v1_model.json new file mode 100644 index 0000000..eb8b9a2 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v1_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s1_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture1"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v2_model.json new file mode 100644 index 0000000..de8e29f --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v2_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s1_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture2"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v3_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v3_model.json new file mode 100644 index 0000000..f6a5756 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s1v3_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s1_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture3"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v0_model.json new file mode 100644 index 0000000..110dcbd --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v0_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s2_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v1_model.json new file mode 100644 index 0000000..25c89c5 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v1_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s2_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture1"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v2_model.json new file mode 100644 index 0000000..ca74983 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v2_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s2_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture2"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v3_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v3_model.json new file mode 100644 index 0000000..7660d6d --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slab_s2v3_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_s2_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture3"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s0_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s0_model.json new file mode 100644 index 0000000..e2aa485 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s0_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s0_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s1_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s1_model.json new file mode 100644 index 0000000..aae5201 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s1_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s1_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s2_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s2_model.json new file mode 100644 index 0000000..eaef502 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s2_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s2_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s3_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s3_model.json new file mode 100644 index 0000000..a7937b4 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s3_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s3_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s4_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s4_model.json new file mode 100644 index 0000000..96537df --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s4_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s4_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s5_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s5_model.json new file mode 100644 index 0000000..48dd173 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s5_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s5_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s6_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s6_model.json new file mode 100644 index 0000000..02631ce --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s6_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s6_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s7_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s7_model.json new file mode 100644 index 0000000..ea644e5 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s7_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s7_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s8_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s8_model.json new file mode 100644 index 0000000..7c94749 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s8_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s8_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s9_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s9_model.json new file mode 100644 index 0000000..5ef9cb4 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_s9_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_s9_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sa_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sa_model.json new file mode 100644 index 0000000..b461959 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sa_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_sa_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sb_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sb_model.json new file mode 100644 index 0000000..a7898b9 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sb_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_sb_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sc_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sc_model.json new file mode 100644 index 0000000..15cae19 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sc_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_sc_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sd_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sd_model.json new file mode 100644 index 0000000..2b9f74b --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_sd_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_sd_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_se_model.json b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_se_model.json new file mode 100644 index 0000000..0419cf2 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/slab/specific/old_industrial_wood_slabslice_se_model.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_se_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model0.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model0.json new file mode 100644 index 0000000..4c243d0 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model0.json @@ -0,0 +1 @@ +{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/material/industrial_planks_texture0" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model1.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model1.json new file mode 100644 index 0000000..9df6117 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model1.json @@ -0,0 +1 @@ +{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/material/industrial_planks_texture1" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model2.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model2.json new file mode 100644 index 0000000..9fad441 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model2.json @@ -0,0 +1 @@ +{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/material/industrial_planks_texture2" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model3.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model3.json new file mode 100644 index 0000000..260d668 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_planks_model3.json @@ -0,0 +1 @@ +{ "parent": "block/cube_all", "textures": { "all": "engineersdecor:block/material/industrial_planks_texture3" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs.json new file mode 100644 index 0000000..285cecd --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "engineersdecor:block/material/industrial_planks_texture0", + "top": "engineersdecor:block/material/industrial_planks_texture0", + "side": "engineersdecor:block/material/industrial_planks_texture0" + } +} diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_inner.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_inner.json new file mode 100644 index 0000000..7231759 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "engineersdecor:block/material/industrial_planks_texture0", + "top": "engineersdecor:block/material/industrial_planks_texture1", + "side": "engineersdecor:block/material/industrial_planks_texture2" + } +} diff --git a/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_outer.json b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_outer.json new file mode 100644 index 0000000..e82b984 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/block/wood/old_industrial_wood_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "engineersdecor:block/material/industrial_planks_texture0", + "top": "engineersdecor:block/material/industrial_planks_texture0", + "side": "engineersdecor:block/material/industrial_planks_texture0" + } +} diff --git a/src/main/resources/assets/engineersdecor/models/item/fluid_barrel.json b/src/main/resources/assets/engineersdecor/models/item/fluid_barrel.json index 5d5babe..dd5c464 100644 --- a/src/main/resources/assets/engineersdecor/models/item/fluid_barrel.json +++ b/src/main/resources/assets/engineersdecor/models/item/fluid_barrel.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/pipe/fluid_barrel_model0" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/fluid_barrel_model0" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/labeled_crate.json b/src/main/resources/assets/engineersdecor/models/item/labeled_crate.json index 1d2c898..756b0b3 100644 --- a/src/main/resources/assets/engineersdecor/models/item/labeled_crate.json +++ b/src/main/resources/assets/engineersdecor/models/item/labeled_crate.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/misc/labeled_crate_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/labeled_crate_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json b/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json index 31c0717..95ef5c5 100644 --- a/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json +++ b/src/main/resources/assets/engineersdecor/models/item/metal_crafting_table.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/crafting_table/metal_crafting_table_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/metal_crafting_table_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_door.json b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_door.json new file mode 100644 index 0000000..bd54c8f --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_door.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/door/old_industrial_wood_door_model_inventory" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_planks.json b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_planks.json new file mode 100644 index 0000000..a336d81 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_planks.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/wood/old_industrial_planks_model0" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slab.json b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slab.json new file mode 100644 index 0000000..645fd69 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slab.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/slab_inventory_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slabslice.json b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slabslice.json new file mode 100644 index 0000000..380391d --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_slabslice.json @@ -0,0 +1 @@ +{"parent":"engineersdecor:block/slab/generic/halfslab_inventory_model","textures":{"all":"engineersdecor:block/material/industrial_planks_texture0"}} \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_stairs.json b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_stairs.json new file mode 100644 index 0000000..933e780 --- /dev/null +++ b/src/main/resources/assets/engineersdecor/models/item/old_industrial_wood_stairs.json @@ -0,0 +1 @@ +{ "parent": "engineersdecor:block/wood/old_industrial_wood_stairs" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/small_electrical_furnace.json b/src/main/resources/assets/engineersdecor/models/item/small_electrical_furnace.json index b35b87c..00ee9f8 100644 --- a/src/main/resources/assets/engineersdecor/models/item/small_electrical_furnace.json +++ b/src/main/resources/assets/engineersdecor/models/item/small_electrical_furnace.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/furnace/small_electrical_furnace_model_lit" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/small_electrical_furnace_model_lit" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/small_lab_furnace.json b/src/main/resources/assets/engineersdecor/models/item/small_lab_furnace.json index 1d702ab..3060925 100644 --- a/src/main/resources/assets/engineersdecor/models/item/small_lab_furnace.json +++ b/src/main/resources/assets/engineersdecor/models/item/small_lab_furnace.json @@ -1,4 +1,4 @@ { - "parent": "engineersdecor:block/furnace/small_lab_furnace_model", + "parent": "engineersdecor:block/device/small_lab_furnace_model", "textures": { "gloom": "engineersdecor:block/furnace/small_lab_furnace_front_gloom_on" } } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/small_mineral_smelter.json b/src/main/resources/assets/engineersdecor/models/item/small_mineral_smelter.json index 662cf72..840b498 100644 --- a/src/main/resources/assets/engineersdecor/models/item/small_mineral_smelter.json +++ b/src/main/resources/assets/engineersdecor/models/item/small_mineral_smelter.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/furnace/small_mineral_smelter_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/small_mineral_smelter_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/small_waste_incinerator.json b/src/main/resources/assets/engineersdecor/models/item/small_waste_incinerator.json index 4ee2107..650ef3a 100644 --- a/src/main/resources/assets/engineersdecor/models/item/small_waste_incinerator.json +++ b/src/main/resources/assets/engineersdecor/models/item/small_waste_incinerator.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/furnace/small_waste_incinerator_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/small_waste_incinerator_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve.json b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve.json index 0601142..7da7475 100644 --- a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve.json +++ b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/pipe/straight_pipe_valve_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/straight_pipe_valve_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone.json b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone.json index 41bd392..33ed7fd 100644 --- a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone.json +++ b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/pipe/straight_pipe_valve_redstone_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/straight_pipe_valve_redstone_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone_analog.json b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone_analog.json index 12f19ec..0222433 100644 --- a/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone_analog.json +++ b/src/main/resources/assets/engineersdecor/models/item/straight_pipe_valve_redstone_analog.json @@ -1 +1 @@ -{ "parent": "engineersdecor:block/pipe/straight_pipe_valve_redstone_analog_model" } \ No newline at end of file +{ "parent": "engineersdecor:block/device/straight_pipe_valve_redstone_analog_model" } \ No newline at end of file diff --git a/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_bottom.png b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_bottom.png new file mode 100644 index 0000000..02efe6b Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_bottom.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_side.png b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_side.png new file mode 100644 index 0000000..5d8cc83 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_side.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_top.png b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_top.png new file mode 100644 index 0000000..ca31842 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/door/old_industrial_door_texture_top.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture0.png b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture0.png new file mode 100644 index 0000000..8ef8172 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture0.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture1.png b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture1.png new file mode 100644 index 0000000..26fe686 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture1.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture2.png b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture2.png new file mode 100644 index 0000000..2f9c6aa Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture2.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture3.png b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture3.png new file mode 100644 index 0000000..8ea63af Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/industrial_planks_texture3.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood.png b/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood.png deleted file mode 100644 index 0320af5..0000000 Binary files a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood.png and /dev/null differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_framed_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_framed_texture.png deleted file mode 100644 index 22a5e5a..0000000 Binary files a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_framed_texture.png and /dev/null differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_pole_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_pole_texture.png deleted file mode 100644 index 8c50fc8..0000000 Binary files a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_pole_texture.png and /dev/null differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_rough_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_rough_texture.png deleted file mode 100644 index 5d3729a..0000000 Binary files a/src/main/resources/assets/engineersdecor/textures/block/material/treated_wood_rough_texture.png and /dev/null differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/wood_framed_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/wood_framed_texture.png new file mode 100644 index 0000000..63d0ac6 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/wood_framed_texture.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/wood_rough_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/wood_rough_texture.png new file mode 100644 index 0000000..207dc7d Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/wood_rough_texture.png differ diff --git a/src/main/resources/assets/engineersdecor/textures/block/material/wood_sanded_texture.png b/src/main/resources/assets/engineersdecor/textures/block/material/wood_sanded_texture.png new file mode 100644 index 0000000..d3f2b87 Binary files /dev/null and b/src/main/resources/assets/engineersdecor/textures/block/material/wood_sanded_texture.png differ diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/dense_grit_dirt_block.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/dense_grit_dirt_block.json new file mode 100644 index 0000000..26dfc80 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/dense_grit_dirt_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "dense_grit_dirt_block_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:dense_grit_dirt_block" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_door.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_door.json new file mode 100644 index 0000000..5856805 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [{ + "name": "old_industrial_wood_door_dlt", + "rolls": 1, + "conditions": [ + { "condition": "minecraft:survives_explosion" } + ], + "entries": [{ + "name": "engineersdecor:old_industrial_wood_door", + "type": "minecraft:item", + "conditions": [{ + "block": "engineersdecor:old_industrial_wood_door", + "condition": "minecraft:block_state_property", + "properties": { "half": "lower" } + } + ] + }] + }] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_planks.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_planks.json new file mode 100644 index 0000000..c9c8437 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_planks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "old_industrial_wood_planks_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:old_industrial_wood_planks" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slab.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slab.json new file mode 100644 index 0000000..2c13710 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "old_industrial_wood_slab_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:old_industrial_wood_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slabslice.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slabslice.json new file mode 100644 index 0000000..6c4f2d9 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_slabslice.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "old_industrial_wood_slabslice_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:old_industrial_wood_slabslice" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_stairs.json b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_stairs.json new file mode 100644 index 0000000..07879e7 --- /dev/null +++ b/src/main/resources/data/engineersdecor/loot_tables/blocks/old_industrial_wood_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "old_industrial_wood_stairs_dlt", + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:copy_name", + "source": "block_entity" + } + ], + "name": "engineersdecor:old_industrial_wood_stairs" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/factory_dropper_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/factory_dropper_recipe.json index 1bf0fc3..3cc800e 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/factory_dropper_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/factory_dropper_recipe.json @@ -31,7 +31,8 @@ "conditions": [ { "type": "engineersdecor:optional", - "result": "engineersdecor:factory_dropper" + "result": "engineersdecor:factory_dropper", + "required": ["engineersdecor:old_industrial_wood_planks"] } ], "recipe": { @@ -44,7 +45,7 @@ "key": { "D": { "item": "minecraft:dropper" }, "P": { "item": "minecraft:iron_ingot" }, - "W": { "tag": "minecraft:planks" } + "W": { "item": "engineersdecor:old_industrial_wood_planks" } }, "result": { "item": "engineersdecor:factory_dropper", diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/factory_hopper_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/factory_hopper_recipe.json index 92d43ba..9114953 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/factory_hopper_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/factory_hopper_recipe.json @@ -31,7 +31,8 @@ "conditions": [ { "type": "engineersdecor:optional", - "result": "engineersdecor:factory_hopper" + "result": "engineersdecor:factory_hopper", + "required": ["engineersdecor:old_industrial_wood_planks"] } ], "recipe": { @@ -44,7 +45,7 @@ "key": { "H": { "item": "minecraft:hopper" }, "P": { "item": "minecraft:iron_ingot" }, - "W": { "tag": "minecraft:planks" } + "W": { "item": "engineersdecor:old_industrial_wood_planks" } }, "result": { "item": "engineersdecor:factory_hopper", diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/factory_placer_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/factory_placer_recipe.json index 8d3a9e4..f17e7ce 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/factory_placer_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/factory_placer_recipe.json @@ -31,7 +31,8 @@ "conditions": [ { "type": "engineersdecor:optional", - "result": "engineersdecor:factory_placer" + "result": "engineersdecor:factory_placer", + "required": ["engineersdecor:old_industrial_wood_planks"] } ], "recipe": { @@ -44,7 +45,7 @@ "key": { "D": { "item": "minecraft:dispenser" }, "P": { "item": "minecraft:iron_ingot" }, - "W": { "tag": "minecraft:planks" } + "W": { "item": "engineersdecor:old_industrial_wood_planks" } }, "result": { "item": "engineersdecor:factory_placer", diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_ladder_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_ladder_recipe.json index 9930d47..a0c178d 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_ladder_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_ladder_recipe.json @@ -6,29 +6,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:metal_rung_ladder", - "required": ["#forge:rods/iron"] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "S S", - "SSS" - ], - "key": { - "S": { "tag": "forge:rods/iron" } - }, - "result": { - "item": "engineersdecor:metal_rung_ladder", - "count": 4 - } - } - }, - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:metal_rung_ladder" + "required": ["engineersdecor:thin_steel_pole"] } ], "recipe": { @@ -39,11 +17,11 @@ " " ], "key": { - "S": { "item": "minecraft:iron_nugget" } + "S": { "item": "engineersdecor:thin_steel_pole" } }, "result": { "item": "engineersdecor:metal_rung_ladder", - "count": 1 + "count": 4 } } } diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_steps_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_steps_recipe.json index b6f5296..02d7a1a 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_steps_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/metal_rung_steps_recipe.json @@ -6,7 +6,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:metal_rung_steps", - "required": ["#forge:rods/iron"] + "required": ["engineersdecor:thin_steel_pole"] } ], "recipe": { @@ -17,30 +17,7 @@ " SS" ], "key": { - "S": { "tag": "forge:rods/iron" } - }, - "result": { - "item": "engineersdecor:metal_rung_steps", - "count": 4 - } - } - }, - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:metal_rung_steps" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - " SS", - "SS ", - " SS" - ], - "key": { - "S": { "item": "minecraft:iron_ingot" } + "S": { "item": "engineersdecor:thin_steel_pole" } }, "result": { "item": "engineersdecor:metal_rung_steps", diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/old_industrial_planks_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/old_industrial_planks_recipe.json new file mode 100644 index 0000000..27617b5 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/dependent/old_industrial_planks_recipe.json @@ -0,0 +1,52 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_planks", + "required": ["#forge:treated_wood"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "WC", + "WW" + ], + "key": { + "C": { "item": "minecraft:charcoal" }, + "W": { "tag" : "forge:treated_wood" } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_planks", + "count": 4 + } + } + }, + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_planks" + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "WW", + "WC" + ], + "key": { + "C": { "item": "minecraft:charcoal" }, + "W": { "tag": "minecraft:planks" } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_planks", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/steel_framed_window_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/steel_framed_window_recipe.json deleted file mode 100644 index b4525b8..0000000 --- a/src/main/resources/data/engineersdecor/recipes/dependent/steel_framed_window_recipe.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "type": "forge:conditional", - "recipes": [ - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:steel_framed_window", - "required": ["#forge:glass_panes", "#forge:sheetmetal/iron"] - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "WGW", - "GGG", - "WGW" - ], - "key": { - "W": { "tag": "forge:sheetmetal/iron" }, - "G": { "tag": "forge:glass_panes" } - }, - "result": { - "item": "engineersdecor:steel_framed_window", - "count": 9 - } - } - }, - { - "conditions": [ - { - "type": "engineersdecor:optional", - "result": "engineersdecor:steel_framed_window" - } - ], - "recipe": { - "type": "minecraft:crafting_shaped", - "pattern": [ - "WGW", - "GGG", - "WGW" - ], - "key": { - "W": { "item": "minecraft:iron_ingot" }, - "G": { "tag": "engineersdecor:plain_glass_panes" } - }, - "result": { - "item": "engineersdecor:steel_framed_window", - "count": 9 - } - } - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json index c287d29..445f3b4 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_ladder_recipe.json @@ -30,22 +30,22 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_ladder", - "missing": ["#forge:rods/treated_wood"] + "required": ["engineersdecor:old_industrial_wood_planks"] } ], "recipe": { "type": "minecraft:crafting_shaped", "pattern": [ - "LL", - "LL", - "LL" + "S S", + "SSS", + "S S" ], "key": { - "L": { "item": "minecraft:ladder" } + "S": { "item": "engineersdecor:old_industrial_wood_planks" } }, "result": { "item": "engineersdecor:treated_wood_ladder", - "count": 4 + "count": 6 } } } diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_pole_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_pole_recipe.json index b871b13..6cbd900 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_pole_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_pole_recipe.json @@ -31,7 +31,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_pole", - "missing": ["#forge:treated_wood", "#forge:treated_wood_slab"] + "required": ["engineersdecor:old_industrial_wood_planks", "engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -42,8 +42,8 @@ " W " ], "key": { - "W": { "tag": "minecraft:planks" }, - "S": { "tag": "minecraft:wooden_slabs" } + "W": { "item": "engineersdecor:old_industrial_wood_planks" }, + "S": { "item": "engineersdecor:old_industrial_wood_slab" } }, "result": { "item": "engineersdecor:treated_wood_pole", diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_side_table_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_side_table_recipe.json index a0d7b53..d410d0b 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_side_table_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_side_table_recipe.json @@ -31,8 +31,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_side_table", - "missing": ["#forge:treated_wood_slab"], - "required": ["engineersdecor:treated_wood_pole"] + "required": ["engineersdecor:treated_wood_pole", "engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -43,7 +42,7 @@ "PPP" ], "key": { - "S": { "tag": "minecraft:wooden_slabs" }, + "S": { "item": "engineersdecor:old_industrial_wood_slab" }, "P": { "item": "engineersdecor:treated_wood_pole" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_stool_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_stool_recipe.json index c4941e5..c3fec93 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_stool_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_stool_recipe.json @@ -30,8 +30,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_stool", - "missing": ["#forge:treated_wood_slab"], - "required": ["engineersdecor:treated_wood_pole"] + "required": ["engineersdecor:treated_wood_pole", "engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -42,7 +41,7 @@ " S " ], "key": { - "W": { "tag": "minecraft:wooden_slabs" }, + "W": { "item": "engineersdecor:old_industrial_wood_slab" }, "S": { "item": "engineersdecor:treated_wood_pole" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_table_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_table_recipe.json index 7f5cd91..ccebd35 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_table_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_table_recipe.json @@ -31,8 +31,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_table", - "missing": ["#forge:treated_wood_slab"], - "required": ["engineersdecor:treated_wood_pole"] + "required": ["engineersdecor:treated_wood_pole", "engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -43,7 +42,7 @@ "S S" ], "key": { - "W": { "tag": "minecraft:wooden_slabs" }, + "W": { "item": "engineersdecor:old_industrial_wood_slab" }, "S": { "item": "engineersdecor:treated_wood_pole" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_window_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_window_recipe.json index ce373f6..0b940b9 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_window_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_window_recipe.json @@ -31,7 +31,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_window", - "missing": ["#forge:treated_wood_slab", "#forge:glass_panes"] + "required": ["engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -42,7 +42,7 @@ "WGW" ], "key": { - "W": { "tag": "minecraft:wooden_slabs" }, + "W": { "item": "engineersdecor:old_industrial_wood_slab" }, "G": { "tag": "engineersdecor:plain_glass_panes" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_windowsill_recipe.json b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_windowsill_recipe.json index 4401561..1ec221b 100644 --- a/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_windowsill_recipe.json +++ b/src/main/resources/data/engineersdecor/recipes/dependent/treated_wood_windowsill_recipe.json @@ -30,8 +30,7 @@ { "type": "engineersdecor:optional", "result": "engineersdecor:treated_wood_windowsill", - "missing": ["#forge:rods/treated_wood", "#forge:treated_wood_slab"], - "required": ["engineersdecor:treated_wood_pole"] + "required": ["engineersdecor:treated_wood_pole", "engineersdecor:old_industrial_wood_slab"] } ], "recipe": { @@ -42,7 +41,7 @@ " " ], "key": { - "W": { "tag": "minecraft:wooden_slabs" }, + "W": { "item": "engineersdecor:old_industrial_wood_slab" }, "S": { "item": "engineersdecor:treated_wood_pole" } }, "result": { diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_door_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_door_recipe.json new file mode 100644 index 0000000..0fa8ecd --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_door_recipe.json @@ -0,0 +1,31 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_door", + "required": ["engineersdecor:old_industrial_wood_planks"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "PP", + "PP", + "PP" + ], + "key": { + "P": { + "item": "engineersdecor:old_industrial_wood_planks" + } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_door", + "count": 2 + } + } + } + ] +} diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe.json new file mode 100644 index 0000000..53f88e4 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe.json @@ -0,0 +1,29 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_slab", + "required": ["engineersdecor:old_industrial_wood_planks"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC" + ], + "key": { + "C": { + "item": "engineersdecor:old_industrial_wood_planks" + } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_slab", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe_decompose.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe_decompose.json new file mode 100644 index 0000000..dcdda21 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slab_recipe_decompose.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_planks", + "required": ["engineersdecor:old_industrial_wood_slab"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "B", + "B" + ], + "key": { + "B": { "item": "engineersdecor:old_industrial_wood_slab" } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_planks", + "count": 1 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe.json new file mode 100644 index 0000000..dc0974d --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_slabslice", + "required": ["engineersdecor:old_industrial_wood_slab"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:old_industrial_wood_slab" } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_slabslice", + "count": 16 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe_decompose.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe_decompose.json new file mode 100644 index 0000000..aaf572b --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_slabslice_recipe_decompose.json @@ -0,0 +1,28 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_slab", + "required": ["engineersdecor:old_industrial_wood_slabslice"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { "item": "engineersdecor:old_industrial_wood_slabslice" } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_slab", + "count": 1 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe.json new file mode 100644 index 0000000..ea01c91 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe.json @@ -0,0 +1,31 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_stairs", + "required": ["engineersdecor:old_industrial_wood_planks"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "C ", + "CC ", + "CCC" + ], + "key": { + "C": { + "item": "engineersdecor:old_industrial_wood_planks" + } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_stairs", + "count": 6 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe_decompose.json b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe_decompose.json new file mode 100644 index 0000000..e459758 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/old_industrial_wood_stairs_recipe_decompose.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:old_industrial_wood_planks", + "required": ["engineersdecor:old_industrial_wood_stairs"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "SS", + "SS" + ], + "key": { + "S": { + "item": "engineersdecor:old_industrial_wood_stairs" + } + }, + "result": { + "item": "engineersdecor:old_industrial_wood_planks", + "count": 4 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/engineersdecor/recipes/independent/steel_framed_window_recipe.json b/src/main/resources/data/engineersdecor/recipes/independent/steel_framed_window_recipe.json new file mode 100644 index 0000000..8e77b51 --- /dev/null +++ b/src/main/resources/data/engineersdecor/recipes/independent/steel_framed_window_recipe.json @@ -0,0 +1,30 @@ +{ + "type": "forge:conditional", + "recipes": [ + { + "conditions": [ + { + "type": "engineersdecor:optional", + "result": "engineersdecor:steel_framed_window", + "required": ["#engineersdecor:plain_glass_panes", "engineersdecor:thin_steel_pole"] + } + ], + "recipe": { + "type": "minecraft:crafting_shaped", + "pattern": [ + "WGW", + "GGG", + "WGW" + ], + "key": { + "W": { "item": "engineersdecor:thin_steel_pole" }, + "G": { "tag": "engineersdecor:plain_glass_panes" } + }, + "result": { + "item": "engineersdecor:steel_framed_window", + "count": 9 + } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/main/resources/data/minecraft/tags/blocks/planks.json new file mode 100644 index 0000000..daa1358 --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/planks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "engineersdecor:old_industrial_wood_planks" + ] +} \ No newline at end of file