diff --git a/gradle.properties b/gradle.properties index 9d11f8c..670b139 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -libzontreck=1201.13.042524.0527 +libzontreck=1201.13.043024.0404 ## Environment Properties @@ -48,7 +48,7 @@ mod_name=Aria's Essentials # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1201.2.042524.0537 +mod_version=1201.2.043024.0417 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 b/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 index 0c5cdbe..d8e524a 100644 --- a/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 +++ b/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-04-23T21:56:19.854483943 Block States: ariasessentials +// 1.20.1 2024-04-26T11:35:05.580755664 Block States: ariasessentials ae2f6cd918bd461be7fb693641eaa5b78410b538 assets/ariasessentials/blockstates/clinker_brick_block.json f48474f63edb825feaa3cc2c990ecd5ed6909c74 assets/ariasessentials/blockstates/clinker_brick_slab.json 5b501afd2a40c586b6811b9784ca2cd1a2dba373 assets/ariasessentials/blockstates/clinker_brick_stained_block.json @@ -34,7 +34,7 @@ acdba80ab9bebc435f3cfdc80f845fa942eaf1d4 assets/ariasessentials/blockstates/stee b2076aa8074c942d074509a3ee27df350f81ab0f assets/ariasessentials/blockstates/steel_floor_grating_top.json a637df1cfe9b47f5691beb585ad9e7f72a8a641b assets/ariasessentials/blockstates/steel_railing.json 7c667fb64bd412a080e1d92d9b7e194ef1a7cb25 assets/ariasessentials/blockstates/steel_table.json -1bef53c224409e06091b0f9da5407589e173845b assets/ariasessentials/blockstates/tflipflop.json +ea6637a7465981525768e7ba089113c0297278f9 assets/ariasessentials/blockstates/tflipflop.json e03106a0ee60bc58f97f5cc3b1ad921f245c99dd assets/ariasessentials/models/block/clinker_brick_block_model0.json d777dea2873725f45fadd678d411040f530f8f58 assets/ariasessentials/models/block/clinker_brick_block_model1.json c480c6d87ce48bdf5d6fbb846a9c435a5c263c06 assets/ariasessentials/models/block/clinker_brick_block_model2.json diff --git a/src/generated/resources/assets/ariasessentials/blockstates/tflipflop.json b/src/generated/resources/assets/ariasessentials/blockstates/tflipflop.json index 9cf31bf..fcf17b7 100644 --- a/src/generated/resources/assets/ariasessentials/blockstates/tflipflop.json +++ b/src/generated/resources/assets/ariasessentials/blockstates/tflipflop.json @@ -1,62 +1,62 @@ { "variants": { - "facing=east,input_power=false,powered=false": { + "facing=east,inputpower=false,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 90 }, - "facing=east,input_power=false,powered=true": { + "facing=east,inputpower=false,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 90 }, - "facing=east,input_power=true,powered=false": { + "facing=east,inputpower=true,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 90 }, - "facing=east,input_power=true,powered=true": { + "facing=east,inputpower=true,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 90 }, - "facing=north,input_power=false,powered=false": { + "facing=north,inputpower=false,powered=false": { "model": "ariasessentials:block/tflipflop" }, - "facing=north,input_power=false,powered=true": { + "facing=north,inputpower=false,powered=true": { "model": "ariasessentials:block/tflipflop" }, - "facing=north,input_power=true,powered=false": { + "facing=north,inputpower=true,powered=false": { "model": "ariasessentials:block/tflipflop" }, - "facing=north,input_power=true,powered=true": { + "facing=north,inputpower=true,powered=true": { "model": "ariasessentials:block/tflipflop" }, - "facing=south,input_power=false,powered=false": { + "facing=south,inputpower=false,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 180 }, - "facing=south,input_power=false,powered=true": { + "facing=south,inputpower=false,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 180 }, - "facing=south,input_power=true,powered=false": { + "facing=south,inputpower=true,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 180 }, - "facing=south,input_power=true,powered=true": { + "facing=south,inputpower=true,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 180 }, - "facing=west,input_power=false,powered=false": { + "facing=west,inputpower=false,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 270 }, - "facing=west,input_power=false,powered=true": { + "facing=west,inputpower=false,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 270 }, - "facing=west,input_power=true,powered=false": { + "facing=west,inputpower=true,powered=false": { "model": "ariasessentials:block/tflipflop", "y": 270 }, - "facing=west,input_power=true,powered=true": { + "facing=west,inputpower=true,powered=true": { "model": "ariasessentials:block/tflipflop", "y": 270 } diff --git a/src/main/java/dev/zontreck/essentials/blocks/BlockCustomVoxels.java b/src/main/java/dev/zontreck/essentials/blocks/BlockCustomVoxels.java deleted file mode 100644 index 2ffc173..0000000 --- a/src/main/java/dev/zontreck/essentials/blocks/BlockCustomVoxels.java +++ /dev/null @@ -1,22 +0,0 @@ -package dev.zontreck.essentials.blocks; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.VoxelShape; - -public class BlockCustomVoxels extends PartialTransparentBlock -{ - private VoxelShape superShape; - protected BlockCustomVoxels(Properties p_54120_, VoxelShape shape) { - super(p_54120_); - this.superShape = shape; - } - - @Override - public VoxelShape getShape(BlockState p_60555_, BlockGetter p_60556_, BlockPos p_60557_, CollisionContext p_60558_) { - return superShape; - } -} diff --git a/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java b/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java index 2428e33..383cb73 100644 --- a/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java @@ -3,6 +3,10 @@ package dev.zontreck.essentials.blocks; import dev.zontreck.essentials.AriasEssentials; import dev.zontreck.essentials.blocks.logicgates.TFlipFlopBlock; import dev.zontreck.essentials.items.CreativeModeTabs; +import dev.zontreck.libzontreck.blocks.BlockCustomVoxels; +import dev.zontreck.libzontreck.blocks.PartialTransparentBlock; +import dev.zontreck.libzontreck.blocks.PartialTransparentSlabBlock; +import dev.zontreck.libzontreck.blocks.RotatableBlockCustomVoxels; import dev.zontreck.libzontreck.edlibmc.Auxiliaries; import dev.zontreck.libzontreck.edlibmc.StandardBlocks; import net.minecraft.core.BlockPos; @@ -318,6 +322,7 @@ public class ModBlocks { public static final RegistryObject STEEL_CATWALK_BLOCK = registerWithItem(BLOCKS.register("steel_catwalk_block", ()-> new Block(gratingBlock)), new Item.Properties()); + public static final VoxelShape SHAPE_T_FLIPFLOP = Block.box(0, 0, 0, 16, 1, 16); public static final RegistryObject TFLIPFLOP_BLOCK = registerWithItem(BLOCKS.register("tflipflop", () -> new TFlipFlopBlock(noViewBlocking().noOcclusion().noCollission())), new Item.Properties()); diff --git a/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentBlock.java b/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentBlock.java deleted file mode 100644 index 45dfe82..0000000 --- a/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentBlock.java +++ /dev/null @@ -1,18 +0,0 @@ -package dev.zontreck.essentials.blocks; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.AbstractGlassBlock; -import net.minecraft.world.level.block.state.BlockState; - -public class PartialTransparentBlock extends AbstractGlassBlock -{ - protected PartialTransparentBlock(Properties p_48729_) { - super(p_48729_); - } - - @Override - public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) { - return true; - } -} diff --git a/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentSlabBlock.java b/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentSlabBlock.java deleted file mode 100644 index 3d6b45c..0000000 --- a/src/main/java/dev/zontreck/essentials/blocks/PartialTransparentSlabBlock.java +++ /dev/null @@ -1,19 +0,0 @@ -package dev.zontreck.essentials.blocks; - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.AbstractGlassBlock; -import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.state.BlockState; - -public class PartialTransparentSlabBlock extends SlabBlock -{ - protected PartialTransparentSlabBlock(Properties p_48729_) { - super(p_48729_); - } - - @Override - public boolean propagatesSkylightDown(BlockState p_48740_, BlockGetter p_48741_, BlockPos p_48742_) { - return true; - } -} diff --git a/src/main/java/dev/zontreck/essentials/blocks/RotatableBlock.java b/src/main/java/dev/zontreck/essentials/blocks/RotatableBlock.java deleted file mode 100644 index 52b8478..0000000 --- a/src/main/java/dev/zontreck/essentials/blocks/RotatableBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package dev.zontreck.essentials.blocks; - -import net.minecraft.world.item.context.BlockPlaceContext; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.HorizontalDirectionalBlock; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; - -public class RotatableBlock extends HorizontalDirectionalBlock -{ - protected RotatableBlock(Properties pProperties) { - super(pProperties); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder pBuilder) { - super.createBlockStateDefinition(pBuilder); - pBuilder.add(FACING); - } - - - @Override - public BlockState getStateForPlacement(BlockPlaceContext pContext) { - return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection()); - } -} \ No newline at end of file diff --git a/src/main/java/dev/zontreck/essentials/blocks/RotatableBlockCustomVoxels.java b/src/main/java/dev/zontreck/essentials/blocks/RotatableBlockCustomVoxels.java deleted file mode 100644 index 86c86ea..0000000 --- a/src/main/java/dev/zontreck/essentials/blocks/RotatableBlockCustomVoxels.java +++ /dev/null @@ -1,35 +0,0 @@ -package dev.zontreck.essentials.blocks; - -import dev.zontreck.ariaslib.util.Maps; -import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; -import net.minecraft.world.phys.shapes.VoxelShape; - -import java.util.HashMap; -import java.util.Map; - - -public class RotatableBlockCustomVoxels extends RotatableBlock -{ - private Map rotatedShapes = new HashMap<>(); - - protected RotatableBlockCustomVoxels(Properties properties, VoxelShape north, VoxelShape south, VoxelShape east, VoxelShape west) { - super(properties); - rotatedShapes = Maps.of(new Maps.Entry<>(Direction.NORTH, north), new Maps.Entry<>(Direction.SOUTH, south), new Maps.Entry<>(Direction.WEST, west), new Maps.Entry<>(Direction.EAST, east), new Maps.Entry<>(Direction.NORTH, north), new Maps.Entry<>(Direction.DOWN, north)); - } - - @Override - public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - Direction facing = state.getValue(FACING); - return rotatedShapes.get(facing); - } - - @Override - public boolean propagatesSkylightDown(BlockState p_49928_, BlockGetter p_49929_, BlockPos p_49930_) { - return true; - } -} diff --git a/src/main/java/dev/zontreck/essentials/blocks/logicgates/TFlipFlopBlock.java b/src/main/java/dev/zontreck/essentials/blocks/logicgates/TFlipFlopBlock.java index b6f87e8..42d3fb0 100644 --- a/src/main/java/dev/zontreck/essentials/blocks/logicgates/TFlipFlopBlock.java +++ b/src/main/java/dev/zontreck/essentials/blocks/logicgates/TFlipFlopBlock.java @@ -1,75 +1,54 @@ package dev.zontreck.essentials.blocks.logicgates; -import dev.zontreck.essentials.blocks.RotatableBlock; +import dev.zontreck.essentials.AriasEssentials; +import dev.zontreck.essentials.blocks.ModBlocks; +import dev.zontreck.libzontreck.blocks.RedstoneBlock; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.*; +import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import net.minecraft.world.level.block.state.properties.BooleanProperty; -import org.jetbrains.annotations.Nullable; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.VoxelShape; -public class TFlipFlopBlock extends RotatableBlock +public class TFlipFlopBlock extends RedstoneBlock { - public static final BooleanProperty POWERED = BlockStateProperties.POWERED; - public static final BooleanProperty INPUTPOWER = BooleanProperty.create("input_power"); public TFlipFlopBlock(Properties p_49795_) { - super(p_49795_); + super(p_49795_, Direction.NORTH, Direction.SOUTH); } @Override - public BlockState rotate(BlockState p_55115_, Rotation p_55116_) { - return p_55115_.setValue(FACING, p_55116_.rotate(p_55115_.getValue(FACING))); - } - - @Override - public BlockState mirror(BlockState p_55112_, Mirror p_55113_) { - return p_55112_.rotate(p_55113_.getRotation(p_55112_.getValue(FACING))); - } - - - @Override - public BlockState getStateForPlacement(BlockPlaceContext p_55087_) { - return super.getStateForPlacement(p_55087_).setValue(POWERED, false).setValue(INPUTPOWER, false); - } - - @Override - protected void createBlockStateDefinition(StateDefinition.Builder builder) { - super.createBlockStateDefinition(builder); - builder.add(POWERED, INPUTPOWER); - } - - @Override - public boolean canConnectRedstone(BlockState state, BlockGetter level, BlockPos pos, @Nullable Direction direction) { + public boolean propagatesSkylightDown(BlockState p_49928_, BlockGetter p_49929_, BlockPos p_49930_) { return true; } + @Override + public VoxelShape getShape(BlockState p_60555_, BlockGetter p_60556_, BlockPos p_60557_, CollisionContext p_60558_) { + return ModBlocks.SHAPE_T_FLIPFLOP; + } + + @Override + protected void onRedstone(LevelReader levelReader, BlockPos blockPos, boolean b) { + } + + @Override + protected void onRedstoneInputChanged(LevelReader levelReader, BlockPos blockPos, boolean b) { + BlockState state = levelReader.getBlockState(blockPos); + AriasEssentials.LOGGER.info("Redstone connected to TFlipFlop block, B : " + b + "; INP:" + state.getValue(INPUT_POWER) + "; POW:" + state.getValue(POWERED)); + if (b) { + if (state.getValue(POWERED)) { + state.setValue(POWERED, false); + } else { + state.setValue(POWERED, true); + } + } + } + @Override public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) { - return state.getValue(POWERED) && state.getValue(FACING) == direction ? 15 : 0; - } - - public void updatePowered(BlockState state) - { - boolean powered = state.getValue(POWERED); - boolean inputPower = state.getValue(INPUTPOWER); - - if(inputPower)return; - - inputPower = true; - powered = !powered; - - state.setValue((POWERED), powered); - state.setValue((INPUTPOWER), inputPower); - } - - public void removePower(BlockState state) - { - state.setValue(INPUTPOWER, false); + int signal = super.getSignal(state, level, pos, direction); + return state.getValue(FACING) == direction ? signal : 0; } } diff --git a/src/main/resources/assets/ariasessentials/models/block/logicgates/redstone_tflipflop.bbmodel b/src/main/resources/assets/ariasessentials/models/block/logicgates/redstone_tflipflop.bbmodel index 62463f0..43b17fc 100644 --- a/src/main/resources/assets/ariasessentials/models/block/logicgates/redstone_tflipflop.bbmodel +++ b/src/main/resources/assets/ariasessentials/models/block/logicgates/redstone_tflipflop.bbmodel @@ -1 +1 @@ -{"meta":{"format_version":"4.9","model_format":"java_block","box_uv":false},"name":"tflipflop","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,0],"to":[16,0.25,16],"autouv":0,"color":4,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":0},"east":{"uv":[0,0,16,16],"texture":0},"south":{"uv":[0,0,16,16],"texture":0},"west":{"uv":[0,0,16,16],"texture":0},"up":{"uv":[0,0,16,16],"rotation":270,"texture":0},"down":{"uv":[16,0,0,16],"rotation":90,"texture":0}},"type":"cube","uuid":"6ee87a67-7b5b-776a-921d-31996e4fc4b1"},{"name":"torch","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,0.5,14.25],"to":[9.149999999999999,3.25,15],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[1,0,2,3],"texture":3},"east":{"uv":[2,0,2.75,2.75],"texture":3},"south":{"uv":[0,3,1,6],"texture":3},"west":{"uv":[0,0,1,3],"texture":3},"up":{"uv":[4,1,3,0],"rotation":270,"texture":3},"down":{"uv":[2,3,1,4],"rotation":90,"texture":3}},"type":"cube","uuid":"5719ff79-ec66-b969-5065-ca4707d376b6"},{"name":"indicator","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,3.2499999999999996,14.25],"to":[9.149999999999999,4.25,15],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":4},"east":{"uv":[0,0,16,16],"texture":4},"south":{"uv":[0,0,16,16],"texture":4},"west":{"uv":[0,0,16,16],"texture":4},"up":{"uv":[0,0,16,16],"rotation":270,"texture":4},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"6ad6333f-d348-c38b-7248-092f275f20d0"},{"name":"torch","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,0.5,4.25],"to":[9.149999999999999,3.25,5],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0.75,2.75],"texture":3},"east":{"uv":[0,0,0.75,2.75],"texture":3},"south":{"uv":[0,0,0.75,2.75],"texture":3},"west":{"uv":[0,0,0.75,2.75],"texture":3},"up":{"uv":[0,0,0.75,0.75],"rotation":270,"texture":3},"down":{"uv":[0,0,0.75,0.75],"rotation":90,"texture":3}},"type":"cube","uuid":"f14671dc-ab6e-40c4-e6e4-12e68121a66a"},{"name":"torch","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,0.5,1.25],"to":[9.149999999999999,3.25,2],"autouv":1,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0.75,2.75],"texture":3},"east":{"uv":[0,0,0.75,2.75],"texture":3},"south":{"uv":[0,0,0.75,2.75],"texture":3},"west":{"uv":[0,0,0.75,2.75],"texture":3},"up":{"uv":[0,0,0.75,0.75],"rotation":270,"texture":3},"down":{"uv":[0,0,0.75,0.75],"rotation":90,"texture":3}},"type":"cube","uuid":"f5ee3c0e-8dca-0749-be61-c29aec042cec"},{"name":"lock_bar","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3,0.5,11],"to":[13,1,12],"autouv":0,"color":9,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,9,1],"texture":2},"east":{"uv":[2,3,3,4],"texture":2},"south":{"uv":[0,1,9,2],"texture":2},"west":{"uv":[2,2,3,3],"texture":2},"up":{"uv":[1,11,0,2],"rotation":270,"texture":2},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"00b86e03-593b-7ea9-0d5c-d410efa603bb"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0.25,0.25,0.25],"to":[15.75,0.5,15.75],"autouv":1,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,15.5,0.25],"texture":0},"east":{"uv":[0,0,15.5,0.25],"texture":0},"south":{"uv":[0,0,15.5,0.25],"texture":0},"west":{"uv":[0,0,15.5,0.25],"texture":0},"up":{"uv":[0,0,15.5,15.5],"rotation":270,"texture":1},"down":{"uv":[0,0,15.5,15.5],"rotation":90,"texture":null}},"type":"cube","uuid":"70cdfb63-6983-46ac-c64f-5d139ee02b56"},{"name":"indicator","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,3.2499999999999996,4.25],"to":[9.149999999999999,4.25,5],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":4},"east":{"uv":[0,0,16,16],"texture":4},"south":{"uv":[0,0,16,16],"texture":4},"west":{"uv":[0,0,16,16],"texture":4},"up":{"uv":[0,0,16,16],"rotation":270,"texture":4},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"c5083ded-86e9-3def-44b0-718c97d41ade"},{"name":"indicator","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.399999999999999,3.2499999999999996,1.25],"to":[9.149999999999999,4.25,2],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":4},"east":{"uv":[0,0,16,16],"texture":4},"south":{"uv":[0,0,16,16],"texture":4},"west":{"uv":[0,0,16,16],"texture":4},"up":{"uv":[0,0,16,16],"rotation":270,"texture":4},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"3278e5e9-3228-e3db-6be2-1a2d6cabdb1d"}],"outliner":[{"name":"base","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"08890b43-7b79-31ac-b4ae-af59395020c5","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["70cdfb63-6983-46ac-c64f-5d139ee02b56","00b86e03-593b-7ea9-0d5c-d410efa603bb","6ee87a67-7b5b-776a-921d-31996e4fc4b1"]},{"name":"input","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"fce1f3ca-f703-4418-f950-f2fddb1d35d7","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["6ad6333f-d348-c38b-7248-092f275f20d0","5719ff79-ec66-b969-5065-ca4707d376b6"]},{"name":"state","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"8fd3a6eb-cf3b-05b3-e33b-76c89aaff656","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["c5083ded-86e9-3def-44b0-718c97d41ade","f14671dc-ab6e-40c4-e6e4-12e68121a66a"]},{"name":"state","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"2b896569-ecaa-f15e-7a43-9ecbb8fdcd6f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["3278e5e9-3228-e3db-6be2-1a2d6cabdb1d","f5ee3c0e-8dca-0749-be61-c29aec042cec"]}],"textures":[{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/logic_gate.png","name":"logic_gate.png","folder":"block/logicgates","namespace":"ariasessentials","id":"0","width":16,"height":16,"uv_width":32,"uv_height":32,"particle":true,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"fc146ff8-eb63-70f5-b4c1-f6e9c0a3d522","relative_path":"../../../../textures/block/logicgates/logic_gate.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAQRJREFUOE91k9uKhTAMRRv1q31QBFFEP1ntsDOzJCfjKQTb2qzuXGrjONau60rbtoWv5k3TFEattciu6yrneT6mtU3TVOUAQI6am5mbRgYAcsA8z1VOMilgDkDOGvd9u0mBHDFblsUBckA68rUHgBAEwVlz27atchsg1gAIARURYvu+u0YdBkDyvgGiGjuO4zfIUv5lXkDdFvOQ1XwAYtZRhUPMRYQ4gJ9P4f9KlxVQ0lhazwHENwUK4W1wqVchK2CNAsJ5A9m6ro+CGHdsJJTlr59XJ0YFlI6y6l/si6jG9/UWMuDNIffJc2YYhg9A7EZamr38ThzS970DiI+XmEH5lQL7AYuQKCQQq/dmAAAAAElFTkSuQmCC"},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/tflipflop.png","name":"tflipflop.png","folder":"block/logicgates","namespace":"ariasessentials","id":"1","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"ad2c5c62-9aaf-8c8e-b419-d8a21cfc2b74","relative_path":"../../../../textures/block/logicgates/tflipflop.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAWtJREFUOE91kz1qw0AQhWdlVTmKEbh3nb/GuPFNbLBxISEQsmXpKDIGNwkktXujY6RPZWnDm+SJ1SZZGPZv5tu3s7MmSRIbhqGMRiNhj3EQBMJmrRVY27Zyu916w9ykaWoRQAACMTbGqKH5AIIUkGWZRRAMCjgmAMFoXdepQQECaSbPcwUggNIpH2sE8AqAMBhjUxSF5WkEcU4Ar0AVLsSUZaka4UwAk/cfwFVjqqr6vqSIAuq6lsViodIxx2luHnw1AwBOPB6Pcne5yHNVqaqX5VKeylIh1+u1f1oMxuOxKOB1tdINOJ5OJwU8Hg6qAHsPRSFv67V8TCYDQBRFojmgLDh9Tqcyn881AO1+v5f3zUb7pml+A/AKvCN2z+ezzGazPifIAZM8iP6ZmN1u1yugI4BuIbEi/V79UYmuAj4dn9WF/QXSv+AD3EKiKr9Oep84jgcAtxpZ0lzz/4lCttutAiiPP9EH+b+UsC+heB6jdMm9ewAAAABJRU5ErkJggg=="},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/locked_bar.png","name":"locked_bar.png","folder":"block/logicgates","namespace":"ariasessentials","id":"2","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"b7624b75-7c1f-ec24-cb46-69865ce1f1d9","relative_path":"../../../../textures/block/logicgates/locked_bar.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAElJREFUOE9jVFdX/89AANy8eZMRlxJGqhigY+XLcOXYZgZ8NuF1AVUMWDu/B6c/8QUROAxALhg1YCDDgFAyJiRPVtwjGzoMDAAAj+cyEWdOocgAAAAASUVORK5CYII="},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch.png","name":"torch.png","folder":"block/logicgates","namespace":"ariasessentials","id":"3","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"e424e05b-ce6b-2b7c-d1b3-9ecfcecf09a6","relative_path":"../../../../textures/block/logicgates/torch.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAU9JREFUOE9tU1tSAzEMs9OLLKXQU/D46EB53v8wZU2lSNkMQ2Y6m/ohW7KT50NUy4is4FlLv4i4lOwZATfiArH9E4n7x50AkO1kfS8KlCsaQgQwwL6PtEWhREX81HZfVUUuVuTJIFi2iAQAbYpakSWQFYFoX4m8C4Bg6ObrGIXqAKi1B1gPBkxVSUUgtufnfRSEM4AKUCSc1raqbp/UzOb98A+AOJKrW52okC06BtDbbdfPvGk0wDQ6gGnSvbZ0ytf9Zjey50w6Y+gjj+17avlyIwCRmvmJJhOsBTvEwmlaeVqiPCZ4YHeLQ0hrgcSpfXb4vPQOLNYQSIQBsvM4oYPEYwcAeFj6nvA9aM5caVUaPrVjITF67s/jBKCczkCVAMZHowJ+TFh5+p6WKOw1KZhj9/Fl/gWwXthaUjjtOwVXoLiigCpca6vJjGkLr/9/ATbAoJLQB1pkAAAAAElFTkSuQmCC"},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/off.png","name":"off.png","folder":"block/logicgates","namespace":"ariasessentials","id":"4","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"0752c378-3d0a-10ad-d4d4-551ffb907a2a","relative_path":"../../../../textures/block/logicgates/off.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAB5JREFUOE9jZGBg+M9AAWAcNYBhNAwYRsOAYViEAQBOThABC541RwAAAABJRU5ErkJggg=="}],"display":{"thirdperson_righthand":{"translation":[0,4.5,0],"scale":[0.5,0.5,0.5]},"thirdperson_lefthand":{"translation":[0,4,0],"scale":[0.5,0.5,0.5]},"firstperson_righthand":{"translation":[0,3.5,0],"scale":[0.5,0.5,0.5]},"firstperson_lefthand":{"translation":[0,4.5,0],"scale":[0.5,0.5,0.5]},"ground":{"scale":[0.5,0.5,0.5]},"gui":{"rotation":[45,45,0],"translation":[0,-0.5,0],"scale":[0.5,0.5,0.5]},"head":{"translation":[0,14.25,0]},"fixed":{"rotation":[-90,0,0],"translation":[0,0,-3.75],"scale":[0.5,0.5,0.5]}}} \ No newline at end of file +{"meta":{"format_version":"4.9","model_format":"java_block","box_uv":false},"name":"tflipflop_a3","parent":"","ambientocclusion":true,"front_gui_light":false,"visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"unhandled_root_fields":{},"resolution":{"width":16,"height":16},"elements":[{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,0],"to":[16,0.25,16],"autouv":0,"color":4,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":0},"east":{"uv":[0,0,16,16],"texture":0},"south":{"uv":[0,0,16,16],"texture":0},"west":{"uv":[0,0,16,16],"texture":0},"up":{"uv":[0,0,16,16],"rotation":270,"texture":0},"down":{"uv":[16,0,0,16],"rotation":90,"texture":0}},"type":"cube","uuid":"6ee87a67-7b5b-776a-921d-31996e4fc4b1"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0.25,0.25,0.25],"to":[15.75,0.5,15.75],"autouv":1,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,15.5,0.25],"texture":0},"east":{"uv":[0,0,15.5,0.25],"texture":0},"south":{"uv":[0,0,15.5,0.25],"texture":0},"west":{"uv":[0,0,15.5,0.25],"texture":0},"up":{"uv":[0,0,15.5,15.5],"rotation":270,"texture":1},"down":{"uv":[0,0,15.5,15.5],"rotation":90,"texture":null}},"type":"cube","uuid":"70cdfb63-6983-46ac-c64f-5d139ee02b56"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,0,0],"to":[16,1,16],"autouv":1,"color":0,"visibility":false,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,1]},"east":{"uv":[0,0,16,1]},"south":{"uv":[0,0,16,1]},"west":{"uv":[0,0,16,1]},"up":{"uv":[0,0,16,16]},"down":{"uv":[0,0,16,16]}},"type":"cube","uuid":"1f338881-e5fc-53c8-fedb-910930605af6"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,0.5,14],"to":[9.2,3,14.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,9.75,14.5],"texture":3},"east":{"uv":[6,6,9.75,14.5],"texture":3},"south":{"uv":[6,6,9.75,14.5],"texture":3},"west":{"uv":[6,6,9.75,14.5],"texture":3},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"50950f94-42c2-35ab-b6fb-fedb87b2395d"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.1,2.9999999999999996,14],"to":[9.549999999999999,3.7499999999999996,14.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[4,0,11.75,5.5],"texture":3},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[4,0,11.75,5.5],"texture":4},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"0063735d-5cf6-9c67-3f27-bed7e2727e0f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,2.9999999999999996,13.65],"to":[9.2,3.7499999999999996,15.1],"autouv":0,"color":0,"origin":[8.825,3.375,14.375],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[4,0,11.75,5.5],"texture":4},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[4,0,11.75,5.5],"texture":3},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"58793944-9320-7334-09bf-db1b54cb9ee3"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,3.475,14],"to":[9.2,3.475,14.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[6,3,10,6],"texture":4},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"99632aba-4240-459b-2f50-b493b19d736a"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,2.9999999999999996,3.6500000000000012],"to":[9.2,3.7499999999999996,5.100000000000001],"autouv":0,"color":0,"origin":[8.825,3.375,14.375],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[4,0,11.75,5.5],"texture":4},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[4,0,11.75,5.5],"texture":3},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"72c4438f-97e0-daf7-bdeb-2d407d7e10f0"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,3.475,4],"to":[9.2,3.475,4.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[6,3,10,6],"texture":4},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"3c957cbf-f24a-3cea-f5ec-adf23ca7b13a"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.1,2.9999999999999996,4],"to":[9.549999999999999,3.7499999999999996,4.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[4,0,11.75,5.5],"texture":3},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[4,0,11.75,5.5],"texture":4},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"9988af10-7d03-de99-6ce1-848daf21060e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,0.5,4],"to":[9.2,3,4.75],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,9.75,14.5],"texture":3},"east":{"uv":[6,6,9.75,14.5],"texture":3},"south":{"uv":[6,6,9.75,14.5],"texture":3},"west":{"uv":[6,6,9.75,14.5],"texture":3},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"0cb29969-f4dc-85fc-d05d-7e99798645e3"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,0.5,0.7999999999999992],"to":[9.2,3,1.5500000000000012],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[6,6,9.75,14.5],"texture":3},"east":{"uv":[6,6,9.75,14.5],"texture":3},"south":{"uv":[6,6,9.75,14.5],"texture":3},"west":{"uv":[6,6,9.75,14.5],"texture":3},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"080f4854-60e7-f6e0-5338-3ea9a130e7bc"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.1,2.9999999999999996,0.7999999999999992],"to":[9.549999999999999,3.7499999999999996,1.5500000000000012],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[4,0,11.75,5.5],"texture":4},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[4,0,11.75,5.5],"texture":4},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[0,0,0,0],"texture":null},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"e1db51fc-226b-674e-d348-d25f4a1aa922"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,3.475,0.7999999999999992],"to":[9.2,3.475,1.5500000000000012],"autouv":0,"color":0,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[0,0,0,0],"texture":null},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[0,0,0,0],"texture":null},"up":{"uv":[6,3,10,6],"texture":4},"down":{"uv":[0,0,0,0],"texture":null}},"type":"cube","uuid":"16a39391-83a7-8925-71ae-966f1cc2621a"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[8.45,2.9999999999999996,0.4500000000000002],"to":[9.2,3.7499999999999996,1.9000000000000035],"autouv":0,"color":0,"origin":[8.825,3.375,14.375],"faces":{"north":{"uv":[0,0,0,0],"texture":null},"east":{"uv":[4,0,11.75,5.5],"texture":4},"south":{"uv":[0,0,0,0],"texture":null},"west":{"uv":[4,0,11.75,5.5],"texture":4},"up":{"uv":[0,0,0,0],"rotation":270,"texture":null},"down":{"uv":[0,0,0,0],"rotation":90,"texture":null}},"type":"cube","uuid":"3029845f-7d2a-b01b-32fd-6cff43f268cf"}],"outliner":[{"name":"base","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"08890b43-7b79-31ac-b4ae-af59395020c5","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["70cdfb63-6983-46ac-c64f-5d139ee02b56","6ee87a67-7b5b-776a-921d-31996e4fc4b1"]},{"name":"input","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"fce1f3ca-f703-4418-f950-f2fddb1d35d7","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["50950f94-42c2-35ab-b6fb-fedb87b2395d","0063735d-5cf6-9c67-3f27-bed7e2727e0f","99632aba-4240-459b-2f50-b493b19d736a","58793944-9320-7334-09bf-db1b54cb9ee3"]},{"name":"state","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"8fd3a6eb-cf3b-05b3-e33b-76c89aaff656","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["0cb29969-f4dc-85fc-d05d-7e99798645e3","9988af10-7d03-de99-6ce1-848daf21060e","3c957cbf-f24a-3cea-f5ec-adf23ca7b13a","72c4438f-97e0-daf7-bdeb-2d407d7e10f0"]},{"name":"state","origin":[0,0,0],"color":0,"nbt":"{}","uuid":"3e88a852-6489-cc81-d9ff-d46768d979b4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["080f4854-60e7-f6e0-5338-3ea9a130e7bc","e1db51fc-226b-674e-d348-d25f4a1aa922","16a39391-83a7-8925-71ae-966f1cc2621a","3029845f-7d2a-b01b-32fd-6cff43f268cf"]},{"name":"VoxelShapes","origin":[8,8,8],"color":0,"nbt":"{}","uuid":"cabc1e95-9318-0ad0-037a-7acb1f6d1fa4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":false,"autouv":0,"children":["1f338881-e5fc-53c8-fedb-910930605af6"]}],"textures":[{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/logic_gate.png","name":"logic_gate.png","folder":"block/logicgates","namespace":"ariasessentials","id":"0","width":16,"height":16,"uv_width":32,"uv_height":32,"particle":true,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"fc146ff8-eb63-70f5-b4c1-f6e9c0a3d522","relative_path":"../../../../textures/block/logicgates/logic_gate.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAQRJREFUOE91k9uKhTAMRRv1q31QBFFEP1ntsDOzJCfjKQTb2qzuXGrjONau60rbtoWv5k3TFEattciu6yrneT6mtU3TVOUAQI6am5mbRgYAcsA8z1VOMilgDkDOGvd9u0mBHDFblsUBckA68rUHgBAEwVlz27atchsg1gAIARURYvu+u0YdBkDyvgGiGjuO4zfIUv5lXkDdFvOQ1XwAYtZRhUPMRYQ4gJ9P4f9KlxVQ0lhazwHENwUK4W1wqVchK2CNAsJ5A9m6ro+CGHdsJJTlr59XJ0YFlI6y6l/si6jG9/UWMuDNIffJc2YYhg9A7EZamr38ThzS970DiI+XmEH5lQL7AYuQKCQQq/dmAAAAAElFTkSuQmCC"},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/tflipflop.png","name":"tflipflop.png","folder":"block/logicgates","namespace":"ariasessentials","id":"1","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"ad2c5c62-9aaf-8c8e-b419-d8a21cfc2b74","relative_path":"../../../../textures/block/logicgates/tflipflop.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAWtJREFUOE91kz1qw0AQhWdlVTmKEbh3nb/GuPFNbLBxISEQsmXpKDIGNwkktXujY6RPZWnDm+SJ1SZZGPZv5tu3s7MmSRIbhqGMRiNhj3EQBMJmrRVY27Zyu916w9ykaWoRQAACMTbGqKH5AIIUkGWZRRAMCjgmAMFoXdepQQECaSbPcwUggNIpH2sE8AqAMBhjUxSF5WkEcU4Ar0AVLsSUZaka4UwAk/cfwFVjqqr6vqSIAuq6lsViodIxx2luHnw1AwBOPB6Pcne5yHNVqaqX5VKeylIh1+u1f1oMxuOxKOB1tdINOJ5OJwU8Hg6qAHsPRSFv67V8TCYDQBRFojmgLDh9Tqcyn881AO1+v5f3zUb7pml+A/AKvCN2z+ezzGazPifIAZM8iP6ZmN1u1yugI4BuIbEi/V79UYmuAj4dn9WF/QXSv+AD3EKiKr9Oep84jgcAtxpZ0lzz/4lCttutAiiPP9EH+b+UsC+heB6jdMm9ewAAAABJRU5ErkJggg=="},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/locked_bar.png","name":"locked_bar.png","folder":"block/logicgates","namespace":"ariasessentials","id":"2","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"b7624b75-7c1f-ec24-cb46-69865ce1f1d9","relative_path":"../../../../textures/block/logicgates/locked_bar.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAElJREFUOE9jVFdX/89AANy8eZMRlxJGqhigY+XLcOXYZgZ8NuF1AVUMWDu/B6c/8QUROAxALhg1YCDDgFAyJiRPVtwjGzoMDAAAj+cyEWdOocgAAAAASUVORK5CYII="},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_off.png","name":"torch_off.png","folder":"block/logicgates","namespace":"ariasessentials","id":"3","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"e424e05b-ce6b-2b7c-d1b3-9ecfcecf09a6","relative_path":"../../../../textures/block/logicgates/torch_off.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAKFJREFUOE/d070OQUEUBOCZ4yE0EsVNqNVK0Sg8KqKj1XoAIQqFxjswMndV/uLkdrbbZM+XM5Ms0fCw4Ty+AXrC3779Z2DQDjkfIVDA9lJfX87HDoadAkBGgM35lgNG3RDJGggA69M1B0yqAngqBCyPSWDaCwUIL+EOZvs00HqUWDqY5wEvXoYdZJEG+g/AEQzskhHGFSUQYYDE6pAEfv2ld1SuLxFu9BJNAAAAAElFTkSuQmCC"},{"path":"/media/tara/Data/DevEnv/Minecraft/Mods/Arias-Essentials/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_on.png","name":"torch_on.png","folder":"block/logicgates","namespace":"ariasessentials","id":"4","width":16,"height":16,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"64e004b0-acdb-af16-1327-e8ed2a4c1558","relative_path":"../../../../textures/block/logicgates/torch_on.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAQhJREFUOE+Vk7FKBDEQhr+JbAwWFoLYCBYHWltbio2FzyLX6fvYeoedtrY+gCgWFjaHreua9XZkNnuCt7dgpgkJM1/+/w8RBuoCdNN7PoCtGBmDrGpdeWiNY+91G/IBl6BlCJTOEYDP7tqyaaCquFpS0lNwHoLazC+gKKCuyQbM1h2x8MxRiDUbsaEEJlX159KegoWF95AA3zG26YWvfwIWSR/uOLVBQRGFh1m77dXgKxztJoA5sPX+rckDHO85FZEW4IC713ke4HSUADblFG5eMgFn+04dgomwDK6fsgFrXYgpg0k+wISnYTMyzQYcdACzYIDHTAsnI1FFcAYQ4fY5EzD0zZfPfwA8c2QRtqPBGAAAAABJRU5ErkJggg=="}],"display":{"thirdperson_righthand":{"translation":[0,4.5,0],"scale":[0.5,0.5,0.5]},"thirdperson_lefthand":{"translation":[0,4,0],"scale":[0.5,0.5,0.5]},"firstperson_righthand":{"translation":[0,3.5,0],"scale":[0.5,0.5,0.5]},"firstperson_lefthand":{"translation":[0,4.5,0],"scale":[0.5,0.5,0.5]},"ground":{"scale":[0.5,0.5,0.5]},"gui":{"rotation":[45,45,0],"translation":[0,-0.5,0],"scale":[0.5,0.5,0.5]},"head":{"translation":[0,14.25,0]},"fixed":{"rotation":[-90,0,0],"translation":[0,0,-3.75],"scale":[0.5,0.5,0.5]}}} \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/models/block/logicgates/tflipflop.json b/src/main/resources/assets/ariasessentials/models/block/logicgates/tflipflop.json index bc429a3..2453cba 100644 --- a/src/main/resources/assets/ariasessentials/models/block/logicgates/tflipflop.json +++ b/src/main/resources/assets/ariasessentials/models/block/logicgates/tflipflop.json @@ -3,9 +3,7 @@ "textures": { "0": "ariasessentials:block/logicgates/logic_gate", "1": "ariasessentials:block/logicgates/tflipflop", - "2": "ariasessentials:block/logicgates/locked_bar", - "3": "ariasessentials:block/logicgates/torch", - "4": "ariasessentials:block/logicgates/off", + "3": "ariasessentials:block/logicgates/torch_off", "particle": "ariasessentials:block/logicgates/logic_gate" }, "elements": [ @@ -20,18 +18,6 @@ "up": {"uv": [0, 0, 15.5, 15.5], "rotation": 270, "texture": "#1"} } }, - { - "name": "lock_bar", - "from": [3, 0.5, 11], - "to": [13, 1, 12], - "faces": { - "north": {"uv": [0, 0, 9, 1], "texture": "#2"}, - "east": {"uv": [2, 3, 3, 4], "texture": "#2"}, - "south": {"uv": [0, 1, 9, 2], "texture": "#2"}, - "west": {"uv": [2, 2, 3, 3], "texture": "#2"}, - "up": {"uv": [1, 11, 0, 2], "rotation": 270, "texture": "#2"} - } - }, { "from": [0, 0, 0], "to": [16, 0.25, 16], @@ -45,78 +31,105 @@ } }, { - "name": "indicator", - "from": [8.4, 3.25, 14.25], - "to": [9.15, 4.25, 15], + "from": [8.45, 0.5, 14], + "to": [9.2, 3, 14.75], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"} + "north": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "east": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "south": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "west": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"} } }, { - "name": "torch", - "from": [8.4, 0.5, 14.25], - "to": [9.15, 3.25, 15], + "from": [8.1, 3, 14], + "to": [9.55, 3.75, 14.75], "faces": { - "north": {"uv": [1, 0, 2, 3], "texture": "#3"}, - "east": {"uv": [2, 0, 2.75, 2.75], "texture": "#3"}, - "south": {"uv": [0, 3, 1, 6], "texture": "#3"}, - "west": {"uv": [0, 0, 1, 3], "texture": "#3"}, - "up": {"uv": [4, 1, 3, 0], "rotation": 270, "texture": "#3"}, - "down": {"uv": [2, 3, 1, 4], "rotation": 90, "texture": "#3"} + "north": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "south": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} } }, { - "name": "indicator", - "from": [8.4, 3.25, 4.25], - "to": [9.15, 4.25, 5], + "from": [8.45, 3.475, 14], + "to": [9.2, 3.475, 14.75], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"} + "up": {"uv": [6, 3, 10, 6], "texture": "#3"} } }, { - "name": "torch", - "from": [8.4, 0.5, 4.25], - "to": [9.15, 3.25, 5], + "from": [8.45, 3, 13.65], + "to": [9.2, 3.75, 15.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.825, 3.375, 14.375]}, "faces": { - "north": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "east": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "south": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "west": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "up": {"uv": [0, 0, 0.75, 0.75], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 0.75, 0.75], "rotation": 90, "texture": "#3"} + "east": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "west": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} } }, { - "name": "indicator", - "from": [8.4, 3.25, 1.25], - "to": [9.15, 4.25, 2], + "from": [8.45, 0.5, 4], + "to": [9.2, 3, 4.75], "faces": { - "north": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "east": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "south": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "west": {"uv": [0, 0, 16, 16], "texture": "#4"}, - "up": {"uv": [0, 0, 16, 16], "rotation": 270, "texture": "#4"} + "north": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "east": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "south": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "west": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"} } }, { - "name": "torch", - "from": [8.4, 0.5, 1.25], - "to": [9.15, 3.25, 2], + "from": [8.1, 3, 4], + "to": [9.55, 3.75, 4.75], "faces": { - "north": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "east": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "south": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "west": {"uv": [0, 0, 0.75, 2.75], "texture": "#3"}, - "up": {"uv": [0, 0, 0.75, 0.75], "rotation": 270, "texture": "#3"}, - "down": {"uv": [0, 0, 0.75, 0.75], "rotation": 90, "texture": "#3"} + "north": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "south": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} + } + }, + { + "from": [8.45, 3.475, 4], + "to": [9.2, 3.475, 4.75], + "faces": { + "up": {"uv": [6, 3, 10, 6], "texture": "#3"} + } + }, + { + "from": [8.45, 3, 3.65], + "to": [9.2, 3.75, 5.1], + "rotation": {"angle": 0, "axis": "y", "origin": [8.825, 3.375, 14.375]}, + "faces": { + "east": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "west": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} + } + }, + { + "from": [8.45, 0.5, 0.8], + "to": [9.2, 3, 1.55], + "faces": { + "north": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "east": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "south": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"}, + "west": {"uv": [6, 6, 9.75, 14.5], "texture": "#3"} + } + }, + { + "from": [8.1, 3, 0.8], + "to": [9.55, 3.75, 1.55], + "faces": { + "north": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "south": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} + } + }, + { + "from": [8.45, 3.475, 0.8], + "to": [9.2, 3.475, 1.55], + "faces": { + "up": {"uv": [6, 3, 10, 6], "texture": "#3"} + } + }, + { + "from": [8.45, 3, 0.45], + "to": [9.2, 3.75, 1.9], + "rotation": {"angle": 0, "axis": "y", "origin": [8.825, 3.375, 14.375]}, + "faces": { + "east": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"}, + "west": {"uv": [4, 0, 11.75, 5.5], "texture": "#3"} } } ], @@ -160,28 +173,28 @@ "origin": [0, 0, 0], "color": 0, "nbt": "{}", - "children": [0, 1, 2] + "children": [0, 1] }, { "name": "input", "origin": [0, 0, 0], "color": 0, "nbt": "{}", - "children": [3, 4] + "children": [2, 3, 4, 5] }, { "name": "state", "origin": [0, 0, 0], "color": 0, "nbt": "{}", - "children": [5, 6] + "children": [6, 7, 8, 9] }, { "name": "state", "origin": [0, 0, 0], "color": 0, "nbt": "{}", - "children": [7, 8] + "children": [10, 11, 12, 13] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_off.png b/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_off.png new file mode 100644 index 0000000..18b18c2 Binary files /dev/null and b/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_off.png differ diff --git a/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_on.png b/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_on.png new file mode 100644 index 0000000..5401dbf Binary files /dev/null and b/src/main/resources/assets/ariasessentials/textures/block/logicgates/torch_on.png differ