diff --git a/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java b/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java index 0c8a2e2..e34afce 100644 --- a/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java +++ b/src/main/java/dev/zontreck/otemod/blocks/UncrafterBlock.java @@ -1,11 +1,28 @@ package dev.zontreck.otemod.blocks; +import dev.zontreck.otemod.blocks.entity.CompressionChamberBlockEntity; +import dev.zontreck.otemod.blocks.entity.ModEntities; +import dev.zontreck.otemod.blocks.entity.UncrafterBlockEntity; +import dev.zontreck.otemod.networking.ModMessages; +import dev.zontreck.otemod.networking.packets.EnergySyncS2CPacket; import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; +import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraftforge.network.NetworkHooks; import org.jetbrains.annotations.Nullable; public class UncrafterBlock extends HorizontalDirectionalBlock implements EntityBlock @@ -17,6 +34,69 @@ public class UncrafterBlock extends HorizontalDirectionalBlock implements Entity @Nullable @Override public BlockEntity newBlockEntity(BlockPos blockPos, BlockState blockState) { - return null; + return new UncrafterBlockEntity(blockPos, blockState); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder p_49915_) { + super.createBlockStateDefinition(p_49915_); + p_49915_.add(FACING); + } + + @Override + public RenderShape getRenderShape(BlockState p_60550_) { + return RenderShape.MODEL; + } + + @Override + public InteractionResult use(BlockState state, Level lvl, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) + { + if(!lvl.isClientSide()) + { + BlockEntity be = lvl.getBlockEntity(pos); + if(be instanceof UncrafterBlockEntity entity) + { + NetworkHooks.openScreen(((ServerPlayer)player), entity, pos); + + ModMessages.sendToPlayer(new EnergySyncS2CPacket(entity.getEnergyStorage().getEnergyStored(), entity.getBlockPos()), (ServerPlayer)player); + + }else{ + throw new IllegalStateException("Our container is missing!"); + } + } + + return InteractionResult.sidedSuccess(lvl.isClientSide); + } + + @Override + public void onRemove(BlockState pState, Level pLevel, BlockPos pPos, BlockState pNewState, boolean pMovedByPiston) { + if(pState.getBlock() != pNewState.getBlock()) + { + BlockEntity be = pLevel.getBlockEntity(pPos); + if(be instanceof UncrafterBlockEntity) + { + ((UncrafterBlockEntity)be).doDrop(); + } + } + + super.onRemove(pState, pLevel, pPos, pNewState, pMovedByPiston); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(Level pLevel, BlockState pState, BlockEntityType pBlockEntityType) { + + return createTickerHelper(pBlockEntityType, ModEntities.UNCRAFTER.get(), UncrafterBlockEntity::tick); + } + + + protected static BlockEntityTicker createTickerHelper(BlockEntityType pServerType, BlockEntityType pClientType, BlockEntityTicker pTicker) { + return pClientType == pServerType ? (BlockEntityTicker) pTicker : null; + } + + + @Override + public BlockState getStateForPlacement(BlockPlaceContext pContext) { + return defaultBlockState().setValue(FACING, pContext.getHorizontalDirection()); } } diff --git a/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java b/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java index 8d013a9..f9746a7 100644 --- a/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java +++ b/src/main/java/dev/zontreck/otemod/data/ModBlockStatesProvider.java @@ -75,73 +75,6 @@ public class ModBlockStatesProvider extends BlockStateProvider { stairBlock(ModBlocks.DIRTY_GREEN_POOL_TILE_STAIRS, ModBlocks.DIRTY_GREEN_POOL_TILE); slabBlock(ModBlocks.DIRTY_GREEN_POOL_TILE_SLAB, ModBlocks.DIRTY_GREEN_POOL_TILE); - ResourceLocation[] clinkerBlock = new ResourceLocation[]{ - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture3"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture4"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture5"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture6"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_texture7") - }; - ResourceLocation[] clinkerStainedBlock = new ResourceLocation[]{ - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture3"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture4"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture5"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture6"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/clinker_brick/clinker_brick_stained_texture7") - }; - - ResourceLocation[] slagBricks = new ResourceLocation[]{ - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture3"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture4"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture5"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture6"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/slag_brick/slag_brick_texture7") - }; - - ResourceLocation[] rebarConcrete = new ResourceLocation[] { - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture3"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture4"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture5"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture6"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_texture7") - }; - - ResourceLocation[] rebarConcreteTile = new ResourceLocation[] { - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture3"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture4"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture5"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture6"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/concrete/rebar_concrete_tile_texture7") - }; - - ResourceLocation[] panzerglass = new ResourceLocation[]{ - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/glass/panzerglass_block_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/glass/panzerglass_block_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/glass/panzerglass_block_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/glass/panzerglass_block_texture3") - }; - - ResourceLocation[] oldIndustrialWood = new ResourceLocation[]{ - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/material/industrial_planks_texture0"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/material/industrial_planks_texture1"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/material/industrial_planks_texture2"), - new ResourceLocation(OTEMod.MOD_ID, "engineersdecor/material/industrial_planks_texture3"), - }; } diff --git a/src/main/java/dev/zontreck/otemod/items/ModItems.java b/src/main/java/dev/zontreck/otemod/items/ModItems.java index 4f7f4d9..91bf0e4 100644 --- a/src/main/java/dev/zontreck/otemod/items/ModItems.java +++ b/src/main/java/dev/zontreck/otemod/items/ModItems.java @@ -78,6 +78,8 @@ public class ModItems { public static final RegistryObject GREEN_BRICK = CreativeModeTabs.addToOTEModTab(ITEMS.register("green_brick", ()->new Item(new Item.Properties()))); + public static final RegistryObject PARTIAL_ITEM = CreativeModeTabs.addToOTEModTab(ITEMS.register("partial_item", PartialItem::new)); + //public static final RegistryObject POSSUM_SPAWN_EGG = ITEMS.register("possum_spawn_egg", () -> new ForgeSpawnEggItem(ModEntityTypes.POSSUM, 0x938686, 0xc68787, new Item.Properties()))); diff --git a/src/main/java/dev/zontreck/otemod/items/PartialItem.java b/src/main/java/dev/zontreck/otemod/items/PartialItem.java new file mode 100644 index 0000000..aee406e --- /dev/null +++ b/src/main/java/dev/zontreck/otemod/items/PartialItem.java @@ -0,0 +1,26 @@ +package dev.zontreck.otemod.items; + +import dev.zontreck.libzontreck.util.ChatHelpers; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.Level; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class PartialItem extends Item +{ + int uncraftSteps = 0; + + public PartialItem() { + super (new Properties().fireResistant()); + } + + @Override + public void appendHoverText(ItemStack p_41421_, @Nullable Level p_41422_, List tooltip, TooltipFlag p_41424_) { + tooltip.add(ChatHelpers.macro("!Yellow!This is a partially deconstructed item.")); + tooltip.add(ChatHelpers.macro("!Dark_Red!Steps remaining to uncraft: [0]", "!Yellow!" + uncraftSteps)); + } +} diff --git a/src/main/resources/assets/otemod/models/block/uncrafter.bbmodel b/src/main/resources/assets/otemod/models/block/uncrafter.bbmodel new file mode 100644 index 0000000..aefde62 --- /dev/null +++ b/src/main/resources/assets/otemod/models/block/uncrafter.bbmodel @@ -0,0 +1 @@ +{"meta":{"format_version":"4.9","model_format":"java_block","box_uv":false},"name":"uncrafter","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,16,16],"autouv":0,"color":7,"origin":[0,0,0],"faces":{"north":{"uv":[0,0,16,16],"texture":1},"east":{"uv":[0,0,16,16],"texture":1},"south":{"uv":[0,0,16,16],"texture":1},"west":{"uv":[0,0,16,16],"texture":1},"up":{"uv":[0,0,16,16],"texture":2},"down":{"uv":[0,0,16,16],"texture":0}},"type":"cube","uuid":"ac9de27a-27bc-3953-347e-b633ca2f05d9"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[5,11,-0.5],"to":[11,12,16.5],"autouv":0,"color":7,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"rotation":270,"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"rotation":90,"texture":1},"west":{"uv":[6,11,11,12],"rotation":180,"texture":1},"up":{"uv":[6,11,11,12],"rotation":90,"texture":1},"down":{"uv":[6,11,11,12],"rotation":90,"texture":1}},"type":"cube","uuid":"1dafc799-0573-2936-1311-5277bbe2652e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,4,5],"to":[16.5,5,11],"autouv":0,"color":9,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"rotation":180,"texture":1},"east":{"uv":[6,11,11,12],"rotation":270,"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"rotation":90,"texture":1},"up":{"uv":[6,11,11,12],"rotation":180,"texture":1},"down":{"uv":[6,11,11,12],"texture":1}},"type":"cube","uuid":"2f4b6eed-62e5-6d7b-6707-516136a671e5"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,11,5],"to":[16.5,12,11],"autouv":0,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"rotation":180,"texture":1},"east":{"uv":[6,11,11,12],"rotation":270,"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"rotation":90,"texture":1},"up":{"uv":[6,11,11,12],"rotation":180,"texture":1},"down":{"uv":[6,11,11,12],"texture":1}},"type":"cube","uuid":"b98f4fbb-737c-74a9-c960-584b01b39472"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,4,4],"to":[16.5,12,5],"autouv":0,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"texture":1},"up":{"uv":[6,11,11,12],"texture":1},"down":{"uv":[6,11,11,12],"texture":1}},"type":"cube","uuid":"9de6a778-9dd2-a194-cfc0-105d9bae615b"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,4,11],"to":[16.5,12,12],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"texture":1},"up":{"uv":[6,11,11,12],"texture":1},"down":{"uv":[6,11,11,12],"texture":1}},"type":"cube","uuid":"374756cf-fb4a-8aba-5a77-76c655b5952e"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[11,4,-0.5],"to":[12,12,16.5],"autouv":0,"color":2,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"texture":1},"up":{"uv":[6,11,11,12],"rotation":270,"texture":1},"down":{"uv":[6,11,11,12],"rotation":90,"texture":1}},"type":"cube","uuid":"e835d294-407d-2f80-4174-02eee646252f"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[5,4,-0.5],"to":[11,5,16.5],"autouv":0,"color":3,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"rotation":270,"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"rotation":90,"texture":1},"west":{"uv":[6,11,11,12],"rotation":180,"texture":1},"up":{"uv":[6,11,11,12],"rotation":90,"texture":1},"down":{"uv":[6,11,11,12],"rotation":90,"texture":1}},"type":"cube","uuid":"1d8996ea-5e9b-79a1-e32b-ca8f20eda51c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,4,-0.5],"to":[5,12,16.5],"autouv":0,"color":8,"origin":[0,0,0],"faces":{"north":{"uv":[6,11,11,12],"texture":1},"east":{"uv":[6,11,11,12],"texture":1},"south":{"uv":[6,11,11,12],"texture":1},"west":{"uv":[6,11,11,12],"texture":1},"up":{"uv":[6,11,11,12],"rotation":270,"texture":1},"down":{"uv":[6,11,11,12],"rotation":90,"texture":1}},"type":"cube","uuid":"7d422c33-810a-d373-3d84-a13bb8f5cc87"},{"name":"grid","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,16,2],"to":[14,16.75,14],"autouv":0,"color":7,"origin":[0,0,0],"faces":{"north":{"uv":[3,3,13,4],"texture":2},"east":{"uv":[3,3,13,4],"texture":2},"south":{"uv":[3,3,13,4],"texture":2},"west":{"uv":[3,3,13,4],"texture":2},"up":{"uv":[2,2,14,14],"texture":2},"down":{"uv":[0,0,12,12]}},"type":"cube","uuid":"32a37783-fda2-d727-cf9c-d99e2878a7e8"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[6,12,-0.5],"to":[10,13,16.5],"autouv":0,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[6,3,10,4],"texture":1},"east":{"uv":[6,3,7,4],"texture":1},"south":{"uv":[6,3,10,4],"texture":1},"west":{"uv":[6,3,7,4],"texture":1},"up":{"uv":[0,0,8,16]},"down":{"uv":[6,3,10,4],"texture":1}},"type":"cube","uuid":"46ecc3cc-7916-4bcd-28e2-eb941d684855"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[3,15,-0.5],"to":[13,16.5,16.5],"autouv":0,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[3,0,13,2],"texture":2},"east":{"uv":[3,0,13,2],"texture":2},"south":{"uv":[3,0,13,2],"texture":2},"west":{"uv":[3,0,13,2],"texture":2},"up":{"uv":[3,0,13,2],"texture":2},"down":{"uv":[3,0,13,2],"texture":2}},"type":"cube","uuid":"172385de-76db-6ec1-a312-45a3690ec58d"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4,14,-0.5],"to":[12,15,16.5],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[4,1,12,2],"texture":1},"east":{"uv":[4,1,5,2],"texture":1},"south":{"uv":[4,1,12,2],"texture":1},"west":{"uv":[4,1,5,2],"texture":1},"up":{"uv":[0,0,8,16]},"down":{"uv":[4,1,12,2],"texture":1}},"type":"cube","uuid":"a2c5a217-698e-37df-618c-e853252d2d01"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[5,13,-0.5],"to":[11,14,16.5],"autouv":0,"color":1,"origin":[0,0,0],"faces":{"north":{"uv":[5,2,11,3],"texture":1},"east":{"uv":[5,2,6,3],"texture":1},"south":{"uv":[5,2,11,3],"texture":1},"west":{"uv":[5,2,6,3],"texture":1},"up":{"uv":[0,0,8,16]},"down":{"uv":[5,2,11,3],"texture":1}},"type":"cube","uuid":"04c55b72-16de-230f-76a4-a4ae7a5a3ca2"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,12,6],"to":[16.5,13,10],"autouv":0,"color":7,"origin":[0,0,0],"faces":{"north":{"uv":[6,3,7,4],"texture":1},"east":{"uv":[6,3,10,4],"texture":1},"south":{"uv":[6,3,7,4],"texture":1},"west":{"uv":[6,3,10,4],"texture":1},"up":{"uv":[0,0,8,16],"rotation":270},"down":{"uv":[6,3,10,4],"rotation":90,"texture":1}},"type":"cube","uuid":"dc42b1da-d91b-bc2b-115b-f250a445652c"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,15,3],"to":[16.5,16.5,13],"autouv":0,"color":9,"origin":[0,0,0],"faces":{"north":{"uv":[3,0,13,2],"texture":2},"east":{"uv":[3,0,13,2],"texture":2},"south":{"uv":[3,0,13,2],"texture":2},"west":{"uv":[3,0,13,2],"texture":2},"up":{"uv":[3,0,13,2],"rotation":270,"texture":2},"down":{"uv":[3,0,13,2],"rotation":90,"texture":2}},"type":"cube","uuid":"a408a185-b0f6-84f3-ecb1-793a2b11fbb5"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,14,4],"to":[16.5,15,12],"autouv":0,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[4,1,5,2],"texture":1},"east":{"uv":[4,1,12,2],"texture":1},"south":{"uv":[4,1,5,2],"texture":1},"west":{"uv":[4,1,12,2],"texture":1},"up":{"uv":[0,0,8,16],"rotation":270},"down":{"uv":[4,1,12,2],"rotation":90,"texture":1}},"type":"cube","uuid":"dbb7dbc7-b9db-0fcc-0582-442ea86f6b55"},{"name":"cube","box_uv":false,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-0.5,13,5],"to":[16.5,14,11],"autouv":0,"color":6,"origin":[0,0,0],"faces":{"north":{"uv":[5,2,6,3],"texture":1},"east":{"uv":[5,2,11,3],"texture":1},"south":{"uv":[5,2,6,3],"texture":1},"west":{"uv":[5,2,11,3],"texture":1},"up":{"uv":[0,0,8,16],"rotation":270},"down":{"uv":[5,2,11,3],"rotation":90,"texture":1}},"type":"cube","uuid":"564a8245-c5cf-32cc-523c-a493d3c84175"}],"outliner":["ac9de27a-27bc-3953-347e-b633ca2f05d9",{"name":"connection_slots","origin":[0,0,0],"color":0,"uuid":"b714af95-2528-cdd1-2a58-be2ebce94bd9","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["1dafc799-0573-2936-1311-5277bbe2652e","2f4b6eed-62e5-6d7b-6707-516136a671e5","b98f4fbb-737c-74a9-c960-584b01b39472","9de6a778-9dd2-a194-cfc0-105d9bae615b","374756cf-fb4a-8aba-5a77-76c655b5952e","e835d294-407d-2f80-4174-02eee646252f","1d8996ea-5e9b-79a1-e32b-ca8f20eda51c","7d422c33-810a-d373-3d84-a13bb8f5cc87"]},"32a37783-fda2-d727-cf9c-d99e2878a7e8",{"name":"group","origin":[0,0,0],"color":0,"uuid":"2cd47851-5d22-a7c5-c742-179ec7b7ffe8","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["46ecc3cc-7916-4bcd-28e2-eb941d684855","172385de-76db-6ec1-a312-45a3690ec58d","a2c5a217-698e-37df-618c-e853252d2d01","04c55b72-16de-230f-76a4-a4ae7a5a3ca2"]},{"name":"group","origin":[0,0,0],"color":0,"uuid":"66b65636-382c-d904-0f28-0005d296751a","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["dc42b1da-d91b-bc2b-115b-f250a445652c","a408a185-b0f6-84f3-ecb1-793a2b11fbb5","dbb7dbc7-b9db-0fcc-0582-442ea86f6b55","564a8245-c5cf-32cc-523c-a493d3c84175"]}],"textures":[{"path":"/run/media/Backups/repos/OTEMod/src/main/resources/assets/otemod/textures/block/uncrafter_bottom.png","name":"uncrafter_bottom.png","folder":"block","namespace":"otemod","id":"0","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":"edabc1e0-d543-629f-6193-ef1589f8cd5a","relative_path":"../../../textures/block/uncrafter_bottom.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAGvSURBVDhPXVO7TgJREJ1FFtzloaJAIBpDpyGxsaGlsvEzNNHC2Jj4bf4BjY2JiY0xqMHwlofgsguYM+RsLk6z93JnzpwzZ7CqF5fLaTQqiC3Pk89kSs+56URi87m4gS+1fFF/O+m25Wk3K19uUiqthtSTabHKN7fL5509qTbeNSk986TpJtbAevFNfUNhYTLWLwJnq3B3v8Ql4/1Kyp/pA2JkxwSFSC73O+EZjVqOG94tSgAdIoMeo5YraqfD8VBBwZbdkR8yQAJATttN8SMRGcTjeqdeAlEGQFBjVa6uVQKSIcPUCyaUwjc2whegOkRoNztQ89F3TxK+Lx3HEScIlDr0749HYi8W8pjNrwDYFQkooq24o/BlOxM6ACal4UBlwnKdAXSdfbypbjBBkAUKzEB3BHIhb20PQO+/HC4MmpzXX8WdBzLZWC3ej21LaKM5LFjFhaGFkGJuLBgg1AXQBuXjfldpPRyUFABBCQTFjDATuqIAtBD7DxkIDNa0DDm4I8wtDV3ggrAjAZCMuQCALtFO5IQMTLosMLcO7+aqA3htBrSK2s0/EaWQHRvg/gfDmTZgal/FbwAAAABJRU5ErkJggg=="},{"path":"/run/media/Backups/repos/OTEMod/src/main/resources/assets/otemod/textures/block/uncrafter_side.png","name":"uncrafter_side.png","folder":"block","namespace":"otemod","id":"1","width":16,"height":16,"uv_width":16,"uv_height":16,"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":"e4e3cf2c-1109-a760-fc62-0831300ff7a0","relative_path":"../../../textures/block/uncrafter_side.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAAHvSURBVDhPfVNLLwNRFP5Gqx5VjEcrERuPtvFMEKIVQkJEbLHxIyy6ZcHWwk7sJcLaQiLxWGCjEkKZekSCRpuGKmXVjHtu515TwZdM5s69c77znXO+q2B2XofA3Ixc/ruYnZfHChE4bzWo6TReLBYMrKzg8o9oL9vfnQ7I02hxCRTXdECnBZGURh8R7hnEpKFEEFEgYc3I7D7c5v8RFF9vt45iFbmxCPZGx0GHRRYr0ptbWTrsoyO4LqvgSrWGRriSr+AK+jtb9QtvK5SKKpScBxHe2pGBbcbqxETlnJpCrNbDFXMFHRMT+r3NhmrtFBH/MKKLCyisAXJy2WPLfuIHABHwQJaQv6kHevyJ1+9QKxFcX0e+ywj8QfJ8BLD/URc+w427+VtB0NvCayr9TEFbXoJNNWU2kSROAffQAF6bOkBJuQImSVftDiQK7FyFtroKq/2HfIMkSWNhk6D6s0qgbkqwEf5WP+2932Z6QMFSQfvIkH7c1fftA2MKv5F83Gd6IHxDRLwEGgv1gFhjzIn/wmRj2QNiMpdhdpowjHh7rkLcSAJ8jPRBDaS7QGoI/hCzT14B9uvcUh0lqn+4Q7y8kjedOzHrNhq0ostESki4qmVGodS3vYGDwbEMgScawUvqTV4mIZeIhCLaI5hLpb0vjgfXWl4BbX4AAAAASUVORK5CYII="},{"path":"/run/media/Backups/repos/OTEMod/src/main/resources/assets/otemod/textures/block/uncrafter.png","name":"uncrafter.png","folder":"block","namespace":"otemod","id":"2","width":16,"height":512,"uv_width":16,"uv_height":16,"particle":false,"layers_enabled":false,"sync_to_project":"","render_mode":"default","render_sides":"auto","frame_time":10,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"internal":true,"saved":true,"uuid":"0b952e7d-256f-d0eb-1170-89403985b747","relative_path":"../../../textures/block/uncrafter.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAIACAYAAACLuuzTAAAAAXNSR0IArs4c6QAAAARzQklUCAgICHwIZIgAAANNSURBVHhe7Z0xTsMwFIbNQZi5A2JEYmFj4DQwwGkY2FiQGBF3YOYg0DRtCWlsP7/nENv5KiFVbfhTx/4/Pz/byYm7f/x2+9fD3eFt8M394+Hrk63Ax3v/wdurTODyqj/u/MIdBG6l/7w7xVMnshVwbluE283fl+z87nRz3NPu2COB7svu1YmF3s8nICkFRehrp6Ra2HlB35SzmMlsZ7MAPPhDJDNQsvLg7LqX+3w5xpvITCqBrEWohcrwgPjAHUco5fJgbO1kHogF4IHkCvTH/Ia6xAeMFyaAImlK4lh5aGGxnYdIUwlkLYLv14ivgUogvQjEB8QHxAedb+bN4qiItADS4AE8gAfz8MDHAHGIYxYgPmB+ITanMJx3EA2+Vamw9JY4mmMxe8EssMoiEB+0GB+E8ukiHpgFVmmmBpAGD1rngWquLTTcFQEFHjhnjlDMAum1AA/WxIOSR64NdK4NFAEewIOJfOICPVPATKq5Nl9cJGZieucKDzKZyby80CzQ1vpEs53NAlnNpMpokgKR1MF4xTTxQSakbYCiX/Sde/+C2c5mAUlbDK7FMdvZLJC1CLVkceABPKhqvDCOFbxTpmXxoJYQBx7AA3gwz3ok8yYQs0B6iAMP4EGRPDB7wSyQbqbRsM/8C8wC6UWABy3ywLzw3SyQ3hIbMFMDRYAHrfNANVnn65n+b7LO3DeaBVaJNHiwJh6Ik3GYSUKDuW9vtEAtwIOWeeBr1Ps9T9H9TAj4uVDBRZRA7e+sLzxokgc34Zbw9Rzr2hBwp/VfA3jAfufhfme696q79/14QV2N8AAe+O5/MGwb4lDXB5eowPBsU806KmD2AgISGrBeeXuVuN/6Qnf6Ts5oqvtGeAAPHM9fiD5zoWsl4t45drMlb0JS0haD+xew8++95dVMTK8F8olN5hN3DUFt5wVmujyLeaaGOUlIyy4wHgoVPEkDD8gfxBiQZKaY2PzxgfoXmJE2FPAZq/AQBx7Ag5iB4EHvkuiYKd1MghBHldVlvBCpi6N04P548get5Q9ieItG62qBbDxQT9JMhThJQEkvAvkD8gfFP38hFPpXxoMpOpVUBHgAD+BB14/O+3ymWpAGD+ABPIAH/cgiw6NIl36e6w/NB6pXl3BUBQAAAABJRU5ErkJggg=="}]} \ No newline at end of file diff --git a/src/main/resources/assets/otemod/models/block/uncrafter.json b/src/main/resources/assets/otemod/models/block/uncrafter.json index 541b112..5bc553c 100644 --- a/src/main/resources/assets/otemod/models/block/uncrafter.json +++ b/src/main/resources/assets/otemod/models/block/uncrafter.json @@ -20,8 +20,8 @@ } }, { - "from": [5, 11, -1], - "to": [11, 12, 17], + "from": [5, 11, -0.5], + "to": [11, 12, 16.5], "faces": { "north": {"uv": [6, 11, 11, 12], "rotation": 270, "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -32,8 +32,8 @@ } }, { - "from": [-1, 4, 5], - "to": [17, 5, 11], + "from": [-0.5, 4, 5], + "to": [16.5, 5, 11], "faces": { "north": {"uv": [6, 11, 11, 12], "rotation": 180, "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "rotation": 270, "texture": "#1"}, @@ -44,8 +44,8 @@ } }, { - "from": [-1, 11, 5], - "to": [17, 12, 11], + "from": [-0.5, 11, 5], + "to": [16.5, 12, 11], "faces": { "north": {"uv": [6, 11, 11, 12], "rotation": 180, "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "rotation": 270, "texture": "#1"}, @@ -56,8 +56,8 @@ } }, { - "from": [-1, 4, 4], - "to": [17, 12, 5], + "from": [-0.5, 4, 4], + "to": [16.5, 12, 5], "faces": { "north": {"uv": [6, 11, 11, 12], "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -68,8 +68,8 @@ } }, { - "from": [-1, 4, 11], - "to": [17, 12, 12], + "from": [-0.5, 4, 11], + "to": [16.5, 12, 12], "faces": { "north": {"uv": [6, 11, 11, 12], "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -80,8 +80,8 @@ } }, { - "from": [11, 4, -1], - "to": [12, 12, 17], + "from": [11, 4, -0.5], + "to": [12, 12, 16.5], "faces": { "north": {"uv": [6, 11, 11, 12], "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -92,8 +92,8 @@ } }, { - "from": [5, 4, -1], - "to": [11, 5, 17], + "from": [5, 4, -0.5], + "to": [11, 5, 16.5], "faces": { "north": {"uv": [6, 11, 11, 12], "rotation": 270, "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -104,8 +104,8 @@ } }, { - "from": [4, 4, -1], - "to": [5, 12, 17], + "from": [4, 4, -0.5], + "to": [5, 12, 16.5], "faces": { "north": {"uv": [6, 11, 11, 12], "texture": "#1"}, "east": {"uv": [6, 11, 11, 12], "texture": "#1"}, @@ -118,7 +118,7 @@ { "name": "grid", "from": [2, 16, 2], - "to": [14, 18, 14], + "to": [14, 16.75, 14], "faces": { "north": {"uv": [3, 3, 13, 4], "texture": "#2"}, "east": {"uv": [3, 3, 13, 4], "texture": "#2"}, @@ -129,8 +129,8 @@ } }, { - "from": [6, 12, -1], - "to": [10, 13, 17], + "from": [6, 12, -0.5], + "to": [10, 13, 16.5], "faces": { "north": {"uv": [6, 3, 10, 4], "texture": "#1"}, "east": {"uv": [6, 3, 7, 4], "texture": "#1"}, @@ -141,8 +141,8 @@ } }, { - "from": [3, 15, -1], - "to": [13, 17, 17], + "from": [3, 15, -0.5], + "to": [13, 16.5, 16.5], "faces": { "north": {"uv": [3, 0, 13, 2], "texture": "#2"}, "east": {"uv": [3, 0, 13, 2], "texture": "#2"}, @@ -153,8 +153,8 @@ } }, { - "from": [4, 14, -1], - "to": [12, 15, 17], + "from": [4, 14, -0.5], + "to": [12, 15, 16.5], "faces": { "north": {"uv": [4, 1, 12, 2], "texture": "#1"}, "east": {"uv": [4, 1, 5, 2], "texture": "#1"}, @@ -165,8 +165,8 @@ } }, { - "from": [5, 13, -1], - "to": [11, 14, 17], + "from": [5, 13, -0.5], + "to": [11, 14, 16.5], "faces": { "north": {"uv": [5, 2, 11, 3], "texture": "#1"}, "east": {"uv": [5, 2, 6, 3], "texture": "#1"}, @@ -177,8 +177,8 @@ } }, { - "from": [-1, 12, 6], - "to": [17, 13, 10], + "from": [-0.5, 12, 6], + "to": [16.5, 13, 10], "faces": { "north": {"uv": [6, 3, 7, 4], "texture": "#1"}, "east": {"uv": [6, 3, 10, 4], "texture": "#1"}, @@ -189,8 +189,8 @@ } }, { - "from": [-1, 15, 3], - "to": [17, 17, 13], + "from": [-0.5, 15, 3], + "to": [16.5, 16.5, 13], "faces": { "north": {"uv": [3, 0, 13, 2], "texture": "#2"}, "east": {"uv": [3, 0, 13, 2], "texture": "#2"}, @@ -201,8 +201,8 @@ } }, { - "from": [-1, 14, 4], - "to": [17, 15, 12], + "from": [-0.5, 14, 4], + "to": [16.5, 15, 12], "faces": { "north": {"uv": [4, 1, 5, 2], "texture": "#1"}, "east": {"uv": [4, 1, 12, 2], "texture": "#1"}, @@ -213,8 +213,8 @@ } }, { - "from": [-1, 13, 5], - "to": [17, 14, 11], + "from": [-0.5, 13, 5], + "to": [16.5, 14, 11], "faces": { "north": {"uv": [5, 2, 6, 3], "texture": "#1"}, "east": {"uv": [5, 2, 11, 3], "texture": "#1"}, @@ -225,7 +225,6 @@ } } ], - "display": {}, "groups": [ 0, { diff --git a/src/main/resources/assets/otemod/textures/item/partial_item.png b/src/main/resources/assets/otemod/textures/item/partial_item.png new file mode 100644 index 0000000..b08deca Binary files /dev/null and b/src/main/resources/assets/otemod/textures/item/partial_item.png differ