From 86d71c693192d2d9c1c222a5e5247ab01bb8b24f Mon Sep 17 00:00:00 2001 From: stfwi Date: Wed, 8 May 2019 21:19:08 +0200 Subject: [PATCH] Passive fluid accumulator non-experimental. Electrical furnace non-experimental. Fixed version-check URL. Opt-out configs added. --- 1.12/gradle.properties | 2 +- 1.12/meta/update.json | 5 +- 1.12/readme.md | 12 +++-- .../engineersdecor/ModEngineersDecor.java | 2 +- .../blocks/BlockDecorFurnace.java | 8 ++-- .../blocks/BlockDecorFurnaceElectrical.java | 43 +++++++++++++----- .../BlockDecorPassiveFluidAccumulator.java | 16 +++---- .../wile/engineersdecor/blocks/ModBlocks.java | 6 +-- .../wile/engineersdecor/detail/ModConfig.java | 18 +++++++- .../blockstates/small_electrical_furnace.json | 5 +- .../small_electrical_furnace_model.json | 15 +++--- .../small_electrical_furnace_back_lit.png | Bin 0 -> 893 bytes ...all_electrical_furnace_back_lit.png.mcmeta | 1 + .../small_electrical_furnace_front_lit.png | Bin 0 -> 876 bytes ...ll_electrical_furnace_front_lit.png.mcmeta | 1 + .../small_electrical_furnace_gloom_off.png | Bin 184 -> 0 bytes .../small_electrical_furnace_gloom_on.png | Bin 693 -> 0 bytes ...all_electrical_furnace_gloom_on.png.mcmeta | 1 - .../small_electrical_furnace_radiator.png | Bin 0 -> 448 bytes meta/update.json | 5 +- 20 files changed, 93 insertions(+), 47 deletions(-) create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png.mcmeta create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_front_lit.png create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_front_lit.png.mcmeta delete mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_off.png delete mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png delete mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png.mcmeta create mode 100644 1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_radiator.png diff --git a/1.12/gradle.properties b/1.12/gradle.properties index 4b6c77f..87dd61a 100644 --- a/1.12/gradle.properties +++ b/1.12/gradle.properties @@ -4,4 +4,4 @@ org.gradle.jvmargs=-Xmx8G version_minecraft=1.12.2 version_forge=14.23.5.2768 version_jei=4.10.0.198 -version_engineersdecor=1.0.4 +version_engineersdecor=1.0.5-b1 diff --git a/1.12/meta/update.json b/1.12/meta/update.json index 15eb6a0..ac6a737 100644 --- a/1.12/meta/update.json +++ b/1.12/meta/update.json @@ -1,7 +1,8 @@ { "homepage": "https://www.curseforge.com/minecraft/mc-mods/engineers-decor/", "1.12.2": { - "1.0.4": "[R] Release based on v1.0.3-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). * Walls with texture variations. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, analog redstone controlled valve. Support pressuzized transfer. * Tooltip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned.\n[E] Added pass-through electrical furnace (experimental, see config).", + "1.0.5-b1": "[A] Added passive fluid accumulator.\n[A] Added small electrical passthrough-furnace.\n[F] Fixed version check URL.\n[M] Opt-out config options for valves, passive fluid accumulator, and furni.", + "1.0.4": "[R] Release based on v1.0.4-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). * Walls with texture variations. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, analog redstone controlled valve. Support pressurized transfer. * Tool tip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned.\n[E] Added pass-through electrical furnace (experimental, see config).", "1.0.4-b9": "[F] Inserting fluids with pressurized tag only into IE piping.\n[F] Valve redstone connector rendering does not check for \"can connect redstone\" but only for \"can provide power\".\n[M] Valves are adapted to be detected as pipe by IE.", "1.0.4-b8": "[F] Fixed stairs rendering without smooth light (thanks rastot9).\n[E] Added passive fluid accumulator (experimental feature, see config).", "1.0.4-b7": "[F] Fixed recipe loading issue if IE is not installed.\n[M] Valves support IE pressurized fluid transfer.", @@ -34,6 +35,6 @@ }, "promos": { "1.12.2-recommended": "1.0.4", - "1.12.2-latest": "1.0.4" + "1.12.2-latest": "1.0.5-b1" } } \ No newline at end of file diff --git a/1.12/readme.md b/1.12/readme.md index 6549ddd..bb8a036 100644 --- a/1.12/readme.md +++ b/1.12/readme.md @@ -10,8 +10,14 @@ Mod sources for Minecraft version 1.12.2. ---- ## Revision history + - v1.0.5-b1 [A] Added passive fluid accumulator. + [A] Added small electrical passthrough-furnace. + [F] Fixed version check URL. + [M] Opt-out config options for valves, passive fluid accumulator, + and furni. + ------------------------------------------------------------------- - - v1.0.4 [R] Release based on v1.0.3-b9. Release-to-release changes: + - v1.0.4 [R] Release based on v1.0.4-b9. Release-to-release changes: * Crafting table: Quick crafting history re-fab, JEI integration. * Rendering improvements and issue fixes (stairs, ambient occlusion, optifine, etc). @@ -19,8 +25,8 @@ Mod sources for Minecraft version 1.12.2. * Thin/thick steel poles with support feet/heads. * Horizontal steel double-T support beams added. * Fluid pipe valves added: Check valve, redstone controlled valve, - analog redstone controlled valve. Support pressuzized transfer. - * Tooltip documentation (CTRL-SHIFT) for stairs added. + analog redstone controlled valve. Support pressurized transfer. + * Tool tip documentation (CTRL-SHIFT) for stairs added. * Internal code cleanups. * Recipes tuned. ------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java index aad5da8..95b24f5 100644 --- a/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java +++ b/1.12/src/main/java/wile/engineersdecor/ModEngineersDecor.java @@ -48,7 +48,7 @@ import javax.annotation.Nonnull; version = ModEngineersDecor.MODVERSION, dependencies = "required-after:forge@[14.23.5.2768,);before:immersiveengineering", useMetadata = true, - updateJSON = "https://raw.githubusercontent.com/stfwi/engineersdecor/develop/meta/update.json", + updateJSON = "https://raw.githubusercontent.com/stfwi/engineers-decor/develop/meta/update.json", certificateFingerprint = ((ModEngineersDecor.MODFINGERPRINT==("@"+"MOD_SIGNSHA1"+"@")) ? "" : ModEngineersDecor.MODFINGERPRINT) ) @SuppressWarnings({"unused", "ConstantConditions"}) diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java index c5317ca..6bb7c42 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnace.java @@ -11,7 +11,6 @@ package wile.engineersdecor.blocks; import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.detail.ExtItems; -import net.minecraft.stats.StatList; import net.minecraft.block.properties.PropertyBool; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.Block; @@ -41,6 +40,7 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.math.MathHelper; import net.minecraft.util.*; +import net.minecraft.stats.StatList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -109,9 +109,9 @@ public class BlockDecorFurnace extends BlockDecorDirected NBTTagCompound inventory_nbt = stack.getTagCompound().getCompoundTag("inventory"); if(inventory_nbt.isEmpty()) return; final TileEntity te = world.getTileEntity(pos); - if(!(te instanceof BTileEntity)) return; - ((BTileEntity)te).readnbt(inventory_nbt); - ((BTileEntity)te).markDirty(); + if(!(te instanceof BlockDecorFurnace.BTileEntity)) return; + ((BlockDecorFurnace.BTileEntity)te).readnbt(inventory_nbt); + ((BlockDecorFurnace.BTileEntity)te).markDirty(); } @Override diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java index 92c9694..65a73cf 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorFurnaceElectrical.java @@ -4,20 +4,20 @@ * @copyright (C) 2019 Stefan Wilhelm * @license MIT (see https://opensource.org/licenses/MIT) * - * ED electrical furnace. + * ED small electrical pass-through furnace. */ package wile.engineersdecor.blocks; import wile.engineersdecor.ModEngineersDecor; -import net.minecraft.stats.StatList; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.world.World; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.tileentity.TileEntity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.init.Items; @@ -29,6 +29,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.*; +import net.minecraft.stats.StatList; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; @@ -62,6 +63,20 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace return true; } + @Override + public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) + { + world.setBlockState(pos, state.withProperty(LIT, false)); + if(world.isRemote) return; + if((!stack.hasTagCompound()) || (!stack.getTagCompound().hasKey("inventory"))) return; + NBTTagCompound inventory_nbt = stack.getTagCompound().getCompoundTag("inventory"); + if(inventory_nbt.isEmpty()) return; + final TileEntity te = world.getTileEntity(pos); + if(!(te instanceof BlockDecorFurnaceElectrical.BTileEntity)) return; + ((BlockDecorFurnaceElectrical.BTileEntity)te).readnbt(inventory_nbt); + ((BlockDecorFurnaceElectrical.BTileEntity)te).markDirty(); + } + @Override @SideOnly(Side.CLIENT) public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rnd) @@ -382,7 +397,7 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace { return 7; } public boolean isBurning() - { return burntime_left_ > 0; } + { return (burntime_left_ > 0); } private boolean transferItems(final int index_from, final int index_to, int count) { @@ -622,6 +637,14 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace return true; } + private void sync_blockstate() + { + final IBlockState state = world.getBlockState(pos); + if((state.getBlock() instanceof BlockDecorFurnaceElectrical) && (state.getValue(LIT) != isBurning())) { + world.setBlockState(pos, state.withProperty(LIT, isBurning()), 2); + } + } + @Override public void update() { @@ -631,7 +654,8 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace if(was_burning) burntime_left_ -= TICK_INTERVAL; if(burntime_left_ < 0) burntime_left_ = 0; if(world.isRemote) return; - boolean dirty = false; + boolean update_blockstate = (was_burning != isBurning()); + boolean dirty = update_blockstate; boolean shift_in = false; boolean shift_out = false; if(--fifo_timer_ <= 0) { @@ -649,7 +673,7 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace } else { // smelt if(!isBurning() && can_smelt) { - if(heat_up()) dirty = true; + if(heat_up()) { dirty = true; update_blockstate = true; } } if(isBurning() && can_smelt) { if(heat_up()) dirty = true; @@ -667,14 +691,11 @@ public class BlockDecorFurnaceElectrical extends BlockDecorFurnace } } else if(proc_time_elapsed_ > 0) { proc_time_elapsed_ -= ((stacks_.get(SMELTING_INPUT_SLOT_NO)).isEmpty() ? 20 : 1); - if(proc_time_elapsed_ < 0) { proc_time_elapsed_ = 0; shift_out = true; } + if(proc_time_elapsed_ < 0) { proc_time_elapsed_ = 0; shift_out = true; update_blockstate = true; } } - if(was_burning != isBurning()) { + if(update_blockstate) { dirty = true; - final IBlockState state = world.getBlockState(pos); - if(state.getBlock() instanceof BlockDecorFurnace) { - world.setBlockState(pos, state.withProperty(LIT, isBurning())); - } + sync_blockstate(); } if(adjacent_inventory_shift(shift_in, shift_out)) dirty = true; if(dirty) markDirty(); diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java index 5bfd95b..e8f565c 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/BlockDecorPassiveFluidAccumulator.java @@ -15,8 +15,6 @@ package wile.engineersdecor.blocks; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.EnumHand; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import wile.engineersdecor.ModEngineersDecor; import wile.engineersdecor.detail.ModAuxiliaries; import net.minecraft.block.Block; import net.minecraft.block.SoundType; @@ -41,7 +39,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected implements ModAuxiliaries.IExperimentalFeature +public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected { public BlockDecorPassiveFluidAccumulator(@Nonnull String registryName, long config, @Nullable Material material, float hardness, float resistance, @Nullable SoundType sound, @Nonnull AxisAlignedBB unrotatedAABB) { super(registryName, config, material, hardness, resistance, sound, unrotatedAABB); } @@ -59,7 +57,7 @@ public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected implem if(world.isRemote) return true; TileEntity te = world.getTileEntity(pos); if(!(te instanceof BTileEntity)) return true; - ((BTileEntity)te).debug_info_dump(player); + ((BTileEntity)te).send_device_stats(player); return true; } @@ -70,7 +68,7 @@ public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected implem // Tile entity //-------------------------------------------------------------------------------------------------------------------- - public static class BTileEntity extends TileEntity implements IFluidHandler, IFluidTankProperties, ICapabilityProvider, ITickable, ModAuxiliaries.IExperimentalFeature + public static class BTileEntity extends TileEntity implements IFluidHandler, IFluidTankProperties, ICapabilityProvider, ITickable { protected static int tick_idle_interval = 20; // ca 1000ms, simulates suction delay and saves CPU when not drained. protected static int max_flowrate = 1000; @@ -83,15 +81,13 @@ public class BlockDecorPassiveFluidAccumulator extends BlockDecorDirected implem private int tick_timer_ = 0; private int round_robin_ = 0; private boolean initialized_ = false; - - private int total_volume_filled_ = 0; private int total_volume_drained_ = 0; - @Deprecated - public void debug_info_dump(EntityPlayer player) + + public void send_device_stats(EntityPlayer player) { int t_vol = (tank_==null) ? 0 : (tank_.amount); - ModAuxiliaries.playerChatMessage(player,"pfacc I:" + total_volume_filled_ + " O:" + total_volume_drained_ + " B:" + t_vol); + ModAuxiliaries.playerChatMessage(player,"" + t_vol + "mB"); } public void block_changed() diff --git a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java index ee7d7d8..ec63845 100644 --- a/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java +++ b/1.12/src/main/java/wile/engineersdecor/blocks/ModBlocks.java @@ -285,12 +285,12 @@ public class ModBlocks THIN_STEEL_POLE_HEAD, THICK_STEEL_POLE_HEAD, STEEL_DOUBLE_T_SUPPORT, - STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI + STRAIGHT_CHECK_VALVE, STRAIGHT_REDSTONE_VALVE, STRAIGHT_REDSTONE_ANALOG_VALVE, STRAIGHT_PIPE_VALVE_TEI, + PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, + SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI }; private static final Object dev_content[] = { - PASSIVE_FLUID_ACCUMULATOR, PASSIVE_FLUID_ACCUMULATOR_TEI, - SMALL_ELECTRICAL_FURNACE, SMALL_ELECTRICAL_FURNACE_TEI }; //-------------------------------------------------------------------------------------------------------------------- diff --git a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java index d892d79..1e901f6 100644 --- a/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java +++ b/1.12/src/main/java/wile/engineersdecor/detail/ModConfig.java @@ -75,6 +75,11 @@ public class ModConfig @Config.RequiresMcRestart public boolean without_lab_furnace = false; + @Config.Comment({"Disable small electrical pass-through furnace."}) + @Config.Name("Without electrical furnace") + @Config.RequiresMcRestart + public boolean without_electrical_furnace = false; + @Config.Comment({"Disable treated wood table, stool, windowsill, pole, etc."}) @Config.Name("Without tr. wood furniture") @Config.RequiresMcRestart @@ -110,6 +115,14 @@ public class ModConfig @Config.Comment({"Disable history refabrication feature of the treated wood crafting table."}) @Config.Name("Without crafting table history") public boolean without_crafting_table_history = false; + + @Config.Comment({"Disable check valve, and redstone controlled valves."}) + @Config.Name("Without valves") + public boolean without_valves = false; + + @Config.Comment({"Disable the passive fluid accumulator."}) + @Config.Name("Without fluid accumulator") + public boolean without_passive_fluid_accumulator = false; } @Config.Comment({ @@ -276,12 +289,15 @@ public class ModConfig if(optout.without_ie_concrete_wall && rn.startsWith("concrete_wall")) return true; if(optout.without_panzer_glass && rn.startsWith("panzerglass_")) return true; if(optout.without_crafting_table && (block instanceof BlockDecorCraftingTable)) return true; - if(optout.without_lab_furnace && (block instanceof BlockDecorFurnace)) return true; + if(optout.without_lab_furnace && ((block instanceof BlockDecorFurnace)) && (!(block instanceof BlockDecorFurnaceElectrical))) return true; + if(optout.without_electrical_furnace && (block instanceof BlockDecorFurnaceElectrical)) return true; + if(optout.without_passive_fluid_accumulator && (block instanceof BlockDecorPassiveFluidAccumulator)) return true; if(optout.without_windows && rn.endsWith("_window")) return true; if(optout.without_light_sources && rn.endsWith("_light")) return true; if(optout.without_ladders && (block instanceof BlockDecorLadder)) return true; if(optout.without_walls && rn.endsWith("_wall")) return true; if(optout.without_stairs && rn.endsWith("_stairs")) return true; + if(optout.without_valves && rn.contains("_pipe_valve")) return true; if(optout.without_treated_wood_furniture) { if(block instanceof BlockDecorChair) return true; if(rn.equals("treated_wood_pole")) return true; diff --git a/1.12/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json b/1.12/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json index 75fc6ec..f0c937f 100644 --- a/1.12/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json +++ b/1.12/src/main/resources/assets/engineersdecor/blockstates/small_electrical_furnace.json @@ -7,6 +7,9 @@ "normal": [{}], "inventory": [{}], "facing": { "north": {"y":0}, "south": {"y":180}, "west": {"y":-90}, "east": {"y":90}, "up":{}, "down":{} }, - "lit": { "false":{ "textures":{ "gloom": "engineersdecor:blocks/furnace/small_electrical_furnace_gloom_off" } }, "true":{}} + "lit": { "false":{}, "true":{ "textures": { + "front": "engineersdecor:blocks/furnace/small_electrical_furnace_front_lit", + "back": "engineersdecor:blocks/furnace/small_electrical_furnace_back_lit" + }}} } } diff --git a/1.12/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json b/1.12/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json index f28842c..f72e9d6 100644 --- a/1.12/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json +++ b/1.12/src/main/resources/assets/engineersdecor/models/block/furnace/small_electrical_furnace_model.json @@ -7,7 +7,8 @@ "left": "engineersdecor:blocks/furnace/small_electrical_furnace_left", "right": "engineersdecor:blocks/furnace/small_electrical_furnace_right", "front": "engineersdecor:blocks/furnace/small_electrical_furnace_front", - "back": "engineersdecor:blocks/furnace/small_electrical_furnace_back" + "back": "engineersdecor:blocks/furnace/small_electrical_furnace_back", + "radiator": "engineersdecor:blocks/furnace/small_electrical_furnace_radiator" }, "elements": [ { @@ -15,9 +16,9 @@ "to": [13.75, 17, 15], "rotation": {"angle": 45, "axis": "z", "origin": [15.5, 13.5, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 5.5], "texture": "#front"}, - "east": {"uv": [0, 1, 5, 15], "rotation": 90, "texture": "#top"}, - "south": {"uv": [0, 0, 1, 5.5], "texture": "#back"} + "north": {"uv": [0, 0, 1, 5.5], "texture": "#radiator"}, + "east": {"uv": [0, 1, 5, 15], "rotation": 90, "texture": "#radiator"}, + "south": {"uv": [0, 0, 1, 5.5], "texture": "#radiator"} } }, { @@ -25,9 +26,9 @@ "to": [3.25, 17, 15], "rotation": {"angle": -45, "axis": "z", "origin": [0.5, 13.5, 8]}, "faces": { - "north": {"uv": [0, 0, 1, 5.5], "texture": "#front"}, - "south": {"uv": [0, 0, 1, 5.5], "texture": "#back"}, - "west": {"uv": [0, 1, 5, 15], "rotation": 270, "texture": "#top"} + "north": {"uv": [0, 0, 1, 5.5], "texture": "#radiator"}, + "south": {"uv": [0, 0, 1, 5.5], "texture": "#radiator"}, + "west": {"uv": [11, 1, 16, 15], "rotation": 270, "texture": "#radiator"} } }, { diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..e1a73d3c5e23ccf0a9d7cc1e3b590e2d39a40950 GIT binary patch literal 893 zcmV-@1A_dCP)$Nbsg*V8dYVrTCv;hrvE7=03vU!<#Nfz#RYxeQ)?y0$YQZzx7#5i zgb;9dR23Bwj-R`eb0&m92!TJZey05J6CyHti_iXAYoienK~)JMOrBJgS}PBK{Lbg! zennLQSS%LA7$=9VHS}mvL|7~qwAK(2%#3f>zwo`^Oa=hX&(Dc5(pnpx9;J0%M=1q& zXS>~!bEcFs<>3DQ9)Maaecw+ZL{;VN>}-;qbEW~RO3oRp6%iqK9bPNB>!3kOiS>F- z6cI#~o12?2s&NeG81KvV>C=yYFQagK`$;A+ySs@8ec!*!gQLO^9{fLf zV5JaboJs*4(6R4{DRJ>nJQxo(lxOb_>`TGFh6gE(J+G=rYtS6?MmwlE$%8&8l2^W& zXIuj@1hT;6ZpY(b?93UrKJ!3d@<6=ON2OF}vmbCXsu_Jy<}tjQ)HiuBo6YcQ?A>vM zO>GQTQ2}!(65i)Qe|~wA2l;~sA3XTac~DAutGc9=$T_oGeZ~7g57&B7p>beBt!TCP zc>s`AIZJ^Y##?%8&eke2-Ond@Fv}UYfn}HYZk|c;I6ThX-gp>{M{lR!2WEv{m047( z2AV`#8wY2o&d!{8Y~zzWD23a7<)IZcG-|Em{5w1~A!|I%gT>|h?}Pcj!Gpg5)-q7} TCf^ap00000NkvXXu0mjfg|(a3 literal 0 HcmV?d00001 diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png.mcmeta b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png.mcmeta new file mode 100644 index 0000000..e82fabf --- /dev/null +++ b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_back_lit.png.mcmeta @@ -0,0 +1 @@ +{ "animation":{ "frames": [0,1,2], "frametime":16, "interpolate":true }} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_front_lit.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_front_lit.png new file mode 100644 index 0000000000000000000000000000000000000000..850b21d86c9df48dbe469b6106e3ea3b3f2b53b8 GIT binary patch literal 876 zcmV-y1C#uTP)HD6$yE`I+^Ye3tVPL=CFYCiF5D}Oe8KAX>s$ymU>~=d;mDU;;7Z;4< z$iu?}x3{;52qMBf)Xa#8WucU^T>tRx4c~wLBPk_PN~~6^CE2`30aO)LrIf;Evtge5 z<+kzDuLEX=siN{L|@aQ8*YIF8g>$!5ms=_y^;VP>S1@Cd9mQc6Sw0GsU=H^U?7a!1aY z!{IO~$X&HK%-lzJ zXTHhv>jUUlE4)??7K{X8Mzab`(yL5vb$4>ktX3bj28w|F2gGRct%9)XYbZ65SV$*QPMByxAU2+RYEI3B`Rc(5)VSffwMy6-4C(W~(E zJTRK`G&ZKQ`H2Vla~>2C`Xmgs(Wzh&th4^1iLdftyO5yD6Z~Pym*@de3BnLM`k00Pyc>vHSWs?&n30ak=Y7EV& zOBt{7pb%|jS28L>pOtk^th2JO%5T*eiPw41T4kN4hx*d7Z_W?`9#}w&AglZ}53E)` zj*Tu9Qet17aKS@(4y9;*od+jh{h0^6;KBCa;KA>AVW<3+`8(+V0000;t4gcSDc+Qt_bDn3ifd%#x5 z#54csE*+OQA`YUHPWY%?j!J&>*LuTS>8YNwOspIYEU*4Fr3r_69B<#&!I6{vTjs^( d$NQD{F=p_{zuxql$r@-YgQu&X%Q~loCIIb@K0yEg diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png deleted file mode 100644 index 02da0360fe33acdd23c7f887409f9b706e6c3f4c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 693 zcmV;m0!safP)h649aa%+62aP!(pEtsjg}G%ksyf1T<#-oF8j_{>_#MlyWk-f@0RZ_&rUJ>Fuz$j zySU{1#ijh^l>iAa5+5Aw*oLVdo1-q0wlo5d>|mAh$!X`2q7r$R?i2Q z7jwqvPjK}3N#sZy@_l0Vm6gZu>iOW&+a@9%j5pv8?mw$aK1hHB_~$-AK)|h-ghM0X zKx?vH{W)JdKSQH6L1-#@Ho&r79B1`atgZlH^>rU)fSG|AZicEN8fy5UJ)im@0TN&| zKKO>}!Bp;8jOBa~K!ny*l@G*OzIYl5O=7mou(yp59h%DOi=8??5LTYO2NbgirIAFn zuvDcFX68~KBtQa;!Uw%>=>u1ABbp(A9{8X#FCg5!vV?n+ILyiSGQC^`akN_j`LBEHJfCE@D zvAYpMz^OAIxN-OPGG>vy|A}E|gZ-UNoXCUcyEW&75DFi}94{-7a(_^nSkiou00}TE zAM|!mQNWA55c6O1g4X-LaO?U7@@&9x`y<)bCh>b89Sb~MAFG=eifmvp2XovVQBZCC bhk4-#zUdTDfe9UT00000NkvXXu0mjf1t2%c diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png.mcmeta b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png.mcmeta deleted file mode 100644 index e745021..0000000 --- a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_gloom_on.png.mcmeta +++ /dev/null @@ -1 +0,0 @@ -{ "animation":{ "frames": [0,1,2,3,4,5,6,7], "frametime":8, "interpolate":true }} \ No newline at end of file diff --git a/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_radiator.png b/1.12/src/main/resources/assets/engineersdecor/textures/blocks/furnace/small_electrical_furnace_radiator.png new file mode 100644 index 0000000000000000000000000000000000000000..d54c0994f9125a8a8b56f5e3b3b080c73fafb302 GIT binary patch literal 448 zcmV;x0YCnUP)i@X7>Nj z8X$toxT@UTv zOQ!v1Ai*#>}QEjL*f?lzugUE8I6J|8?O423b