minecraft
/
PhysicalConnectivity
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Reorganize code

This commit is contained in:
Shadowfacts 2021-02-28 13:48:39 -05:00
parent a8f0387577
commit 9b4fc548e5
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
56 changed files with 152 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/shadowfacts/phycon/mixin/client/MixinHandledScreen.java
View File

@ -3,7 +3,7 @@ package net.shadowfacts.phycon.mixin.client;
import net.minecraft.client.gui.screen.ingame.HandledScreen; import net.minecraft.client.gui.screen.ingame.HandledScreen;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.screen.slot.Slot; import net.minecraft.screen.slot.Slot;
import net.shadowfacts.phycon.network.block.terminal.TerminalScreen; import net.shadowfacts.phycon.block.terminal.TerminalScreen;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;

2
src/main/kotlin/net/shadowfacts/phycon/PhysicalConnectivityClient.kt
View File

@ -7,7 +7,7 @@ import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry
import net.minecraft.client.render.RenderLayer import net.minecraft.client.render.RenderLayer
import net.shadowfacts.phycon.init.PhyBlocks import net.shadowfacts.phycon.init.PhyBlocks
import net.shadowfacts.phycon.init.PhyScreens import net.shadowfacts.phycon.init.PhyScreens
import net.shadowfacts.phycon.network.block.terminal.TerminalScreen import net.shadowfacts.phycon.block.terminal.TerminalScreen
import net.shadowfacts.phycon.networking.ClientReceiver import net.shadowfacts.phycon.networking.ClientReceiver
import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems

3
src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network package net.shadowfacts.phycon.block
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerEntity
@ -8,7 +8,6 @@ import net.minecraft.world.World
import net.minecraft.world.WorldAccess import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.api.Interface import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.api.NetworkComponentBlock import net.shadowfacts.phycon.api.NetworkComponentBlock
import net.shadowfacts.phycon.block.BlockWithEntity
/** /**
* @author shadowfacts * @author shadowfacts

11
src/main/kotlin/net/shadowfacts/phycon/network/DeviceBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/DeviceBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network package net.shadowfacts.phycon.block
import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
@ -16,10 +16,11 @@ import net.shadowfacts.phycon.api.frame.PacketFrame
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.api.util.MACAddress import net.shadowfacts.phycon.api.util.MACAddress
import net.shadowfacts.phycon.network.frame.ARPQueryFrame import net.shadowfacts.phycon.util.NetworkUtil
import net.shadowfacts.phycon.network.frame.ARPResponseFrame import net.shadowfacts.phycon.frame.ARPQueryFrame
import net.shadowfacts.phycon.network.frame.BasePacketFrame import net.shadowfacts.phycon.frame.ARPResponseFrame
import net.shadowfacts.phycon.network.packet.* import net.shadowfacts.phycon.frame.BasePacketFrame
import net.shadowfacts.phycon.packet.*
import java.util.* import java.util.*
/** /**

4
src/main/kotlin/net/shadowfacts/phycon/network/FaceDeviceBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/FaceDeviceBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network package net.shadowfacts.phycon.block
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
@ -16,7 +16,7 @@ import net.minecraft.world.World
import net.minecraft.world.WorldAccess import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.api.Interface import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.api.NetworkComponentBlock import net.shadowfacts.phycon.api.NetworkComponentBlock
import net.shadowfacts.phycon.network.block.cable.CableBlock import net.shadowfacts.phycon.block.cable.CableBlock
import java.util.* import java.util.*

2
src/main/kotlin/net/shadowfacts/phycon/network/block/cable/CableBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/cable/CableBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.cable package net.shadowfacts.phycon.block.cable
import net.minecraft.block.* import net.minecraft.block.*
import net.minecraft.block.piston.PistonBehavior import net.minecraft.block.piston.PistonBehavior

6
src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.extractor package net.shadowfacts.phycon.block.extractor
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
@ -19,7 +19,7 @@ import net.minecraft.world.World
import net.minecraft.world.WorldAccess import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.api.Interface import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.network.DeviceBlock import net.shadowfacts.phycon.block.DeviceBlock
import java.util.* import java.util.*
/** /**
@ -108,4 +108,4 @@ class ExtractorBlock: DeviceBlock<ExtractorBlockEntity>(Settings.of(Material.MET
} }
} }
} }

16
src/main/kotlin/net/shadowfacts/phycon/network/block/extractor/ExtractorBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/extractor/ExtractorBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.extractor package net.shadowfacts.phycon.block.extractor
import alexiil.mc.lib.attributes.SearchOptions import alexiil.mc.lib.attributes.SearchOptions
import alexiil.mc.lib.attributes.Simulation import alexiil.mc.lib.attributes.Simulation
@ -11,13 +11,13 @@ import net.minecraft.nbt.CompoundTag
import net.minecraft.util.math.Direction import net.minecraft.util.math.Direction
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.component.ActivationController import net.shadowfacts.phycon.component.ActivationController
import net.shadowfacts.phycon.network.component.NetworkStackDispatcher import net.shadowfacts.phycon.component.NetworkStackDispatcher
import net.shadowfacts.phycon.network.component.handleItemStack import net.shadowfacts.phycon.component.handleItemStack
import net.shadowfacts.phycon.network.packet.CapacityPacket import net.shadowfacts.phycon.packet.CapacityPacket
import net.shadowfacts.phycon.network.packet.ItemStackPacket import net.shadowfacts.phycon.packet.ItemStackPacket
import net.shadowfacts.phycon.network.packet.RemoteActivationPacket import net.shadowfacts.phycon.packet.RemoteActivationPacket
import net.shadowfacts.phycon.util.ActivationMode import net.shadowfacts.phycon.util.ActivationMode
import kotlin.properties.Delegates import kotlin.properties.Delegates

8
src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.miner package net.shadowfacts.phycon.block.miner
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
@ -16,8 +16,8 @@ import net.minecraft.world.World
import net.minecraft.world.WorldAccess import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.api.Interface import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.network.DeviceBlock import net.shadowfacts.phycon.block.DeviceBlock
import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock import net.shadowfacts.phycon.block.extractor.ExtractorBlock
import java.util.* import java.util.*
/** /**
@ -66,4 +66,4 @@ class MinerBlock: DeviceBlock<MinerBlockEntity>(Settings.of(Material.METAL)) {
} }
} }
} }

18
src/main/kotlin/net/shadowfacts/phycon/network/block/miner/MinerBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/miner/MinerBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.miner package net.shadowfacts.phycon.block.miner
import alexiil.mc.lib.attributes.item.GroupedItemInvView import alexiil.mc.lib.attributes.item.GroupedItemInvView
import alexiil.mc.lib.attributes.item.ItemStackUtil import alexiil.mc.lib.attributes.item.ItemStackUtil
@ -11,15 +11,13 @@ import net.minecraft.util.math.BlockPos
import net.minecraft.util.math.Direction import net.minecraft.util.math.Direction
import net.minecraft.world.World import net.minecraft.world.World
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
import net.shadowfacts.phycon.network.component.NetworkStackDispatcher import net.shadowfacts.phycon.component.NetworkStackDispatcher
import net.shadowfacts.phycon.network.component.NetworkStackProvider import net.shadowfacts.phycon.component.NetworkStackProvider
import net.shadowfacts.phycon.network.component.handleItemStack import net.shadowfacts.phycon.component.handleItemStack
import net.shadowfacts.phycon.network.component.spawnItemStack import net.shadowfacts.phycon.packet.*
import net.shadowfacts.phycon.network.packet.*
import kotlin.math.min import kotlin.math.min
/** /**
@ -144,4 +142,4 @@ class MinerBlockEntity: DeviceBlockEntity(PhyBlockEntities.MINER),
class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) { class PendingInsertion(stack: ItemStack, timestamp: Long): NetworkStackDispatcher.PendingInsertion<PendingInsertion>(stack, timestamp) {
} }
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.netinterface package net.shadowfacts.phycon.block.netinterface
import alexiil.mc.lib.attributes.AttributeList import alexiil.mc.lib.attributes.AttributeList
import alexiil.mc.lib.attributes.AttributeProvider import alexiil.mc.lib.attributes.AttributeProvider
@ -12,7 +12,7 @@ import net.minecraft.world.BlockView
import net.minecraft.world.World import net.minecraft.world.World
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.api.NetworkComponentBlock import net.shadowfacts.phycon.api.NetworkComponentBlock
import net.shadowfacts.phycon.network.FaceDeviceBlock import net.shadowfacts.phycon.block.FaceDeviceBlock
/** /**
* @author shadowfacts * @author shadowfacts

16
src/main/kotlin/net/shadowfacts/phycon/network/block/netinterface/InterfaceBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/netinterface/InterfaceBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.netinterface package net.shadowfacts.phycon.block.netinterface
import alexiil.mc.lib.attributes.SearchOptions import alexiil.mc.lib.attributes.SearchOptions
import alexiil.mc.lib.attributes.Simulation import alexiil.mc.lib.attributes.Simulation
@ -8,13 +8,13 @@ import net.minecraft.item.ItemStack
import net.minecraft.util.math.Direction import net.minecraft.util.math.Direction
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.FaceDeviceBlock import net.shadowfacts.phycon.block.FaceDeviceBlock
import net.shadowfacts.phycon.network.component.ItemStackPacketHandler import net.shadowfacts.phycon.component.ItemStackPacketHandler
import net.shadowfacts.phycon.network.component.NetworkStackProvider import net.shadowfacts.phycon.component.NetworkStackProvider
import net.shadowfacts.phycon.network.component.NetworkStackReceiver import net.shadowfacts.phycon.component.NetworkStackReceiver
import net.shadowfacts.phycon.network.component.handleItemStack import net.shadowfacts.phycon.component.handleItemStack
import net.shadowfacts.phycon.network.packet.* import net.shadowfacts.phycon.packet.*
import kotlin.math.min import kotlin.math.min
/** /**

2
src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.netswitch package net.shadowfacts.phycon.block.netswitch
import alexiil.mc.lib.attributes.AttributeList import alexiil.mc.lib.attributes.AttributeList
import alexiil.mc.lib.attributes.AttributeProvider import alexiil.mc.lib.attributes.AttributeProvider

6
src/main/kotlin/net/shadowfacts/phycon/network/block/netswitch/SwitchBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/netswitch/SwitchBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.netswitch package net.shadowfacts.phycon.block.netswitch
import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable import net.fabricmc.fabric.api.block.entity.BlockEntityClientSerializable
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
@ -13,8 +13,8 @@ import net.shadowfacts.phycon.api.frame.EthernetFrame
import net.shadowfacts.phycon.api.frame.PacketFrame import net.shadowfacts.phycon.api.frame.PacketFrame
import net.shadowfacts.phycon.api.util.MACAddress import net.shadowfacts.phycon.api.util.MACAddress
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.NetworkUtil import net.shadowfacts.phycon.util.NetworkUtil
import net.shadowfacts.phycon.network.packet.ItemStackPacket import net.shadowfacts.phycon.packet.ItemStackPacket
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
/** /**

7
src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlock.kt
View File

@ -1,10 +1,9 @@
package net.shadowfacts.phycon.network.block.redstone package net.shadowfacts.phycon.block.redstone
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
import net.minecraft.block.Material import net.minecraft.block.Material
import net.minecraft.item.ItemPlacementContext import net.minecraft.item.ItemPlacementContext
import net.minecraft.server.world.ServerWorld
import net.minecraft.state.StateManager import net.minecraft.state.StateManager
import net.minecraft.state.property.Properties import net.minecraft.state.property.Properties
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
@ -12,10 +11,8 @@ import net.minecraft.util.math.BlockPos
import net.minecraft.util.math.Direction import net.minecraft.util.math.Direction
import net.minecraft.world.BlockView import net.minecraft.world.BlockView
import net.minecraft.world.World import net.minecraft.world.World
import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.FaceDeviceBlock import net.shadowfacts.phycon.block.FaceDeviceBlock
import java.util.*
/** /**
* @author shadowfacts * @author shadowfacts

6
src/main/kotlin/net/shadowfacts/phycon/network/block/redstone/RedstoneControllerBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/redstone/RedstoneControllerBlockEntity.kt
View File

@ -1,12 +1,12 @@
package net.shadowfacts.phycon.network.block.redstone package net.shadowfacts.phycon.block.redstone
import net.minecraft.block.BlockState import net.minecraft.block.BlockState
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.packet.RemoteActivationPacket import net.shadowfacts.phycon.packet.RemoteActivationPacket
import net.shadowfacts.phycon.util.RedstoneMode import net.shadowfacts.phycon.util.RedstoneMode
/** /**

4
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlock.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlock.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import alexiil.mc.lib.attributes.AttributeList import alexiil.mc.lib.attributes.AttributeList
import alexiil.mc.lib.attributes.AttributeProvider import alexiil.mc.lib.attributes.AttributeProvider
@ -16,7 +16,7 @@ import net.minecraft.world.World
import net.minecraft.world.WorldAccess import net.minecraft.world.WorldAccess
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.api.NetworkComponentBlock import net.shadowfacts.phycon.api.NetworkComponentBlock
import net.shadowfacts.phycon.network.DeviceBlock import net.shadowfacts.phycon.block.DeviceBlock
import java.util.* import java.util.*
/** /**

11
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBlockEntity.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBlockEntity.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import alexiil.mc.lib.attributes.item.GroupedItemInvView import alexiil.mc.lib.attributes.item.GroupedItemInvView
import alexiil.mc.lib.attributes.item.ItemStackCollections import alexiil.mc.lib.attributes.item.ItemStackCollections
@ -12,7 +12,6 @@ import net.minecraft.inventory.Inventory
import net.minecraft.inventory.InventoryChangedListener import net.minecraft.inventory.InventoryChangedListener
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.minecraft.nbt.ListTag
import net.minecraft.network.PacketByteBuf import net.minecraft.network.PacketByteBuf
import net.minecraft.screen.ScreenHandler import net.minecraft.screen.ScreenHandler
import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.server.network.ServerPlayerEntity
@ -23,10 +22,10 @@ import net.shadowfacts.phycon.api.Interface
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.init.PhyBlockEntities import net.shadowfacts.phycon.init.PhyBlockEntities
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.NetworkUtil import net.shadowfacts.phycon.util.NetworkUtil
import net.shadowfacts.phycon.network.component.* import net.shadowfacts.phycon.component.*
import net.shadowfacts.phycon.network.packet.* import net.shadowfacts.phycon.packet.*
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import java.util.* import java.util.*
import kotlin.math.min import kotlin.math.min

2
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalBufferInventory.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalBufferInventory.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import alexiil.mc.lib.attributes.item.ItemStackUtil import alexiil.mc.lib.attributes.item.ItemStackUtil
import net.minecraft.inventory.SimpleInventory import net.minecraft.inventory.SimpleInventory

2
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalFakeSlot.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalFakeSlot.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import net.minecraft.screen.slot.Slot import net.minecraft.screen.slot.Slot
import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerEntity

2
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreen.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreen.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import com.mojang.blaze3d.systems.RenderSystem import com.mojang.blaze3d.systems.RenderSystem
import net.minecraft.client.MinecraftClient import net.minecraft.client.MinecraftClient

5
src/main/kotlin/net/shadowfacts/phycon/network/block/terminal/TerminalScreenHandler.kt → src/main/kotlin/net/shadowfacts/phycon/block/terminal/TerminalScreenHandler.kt
View File

@ -1,6 +1,5 @@
package net.shadowfacts.phycon.network.block.terminal package net.shadowfacts.phycon.block.terminal
import net.minecraft.client.network.ClientPlayerEntity
import net.minecraft.screen.slot.Slot import net.minecraft.screen.slot.Slot
import net.minecraft.screen.slot.SlotActionType import net.minecraft.screen.slot.SlotActionType
import net.minecraft.entity.player.PlayerEntity import net.minecraft.entity.player.PlayerEntity
@ -14,11 +13,9 @@ import net.minecraft.util.registry.Registry
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.init.PhyBlocks import net.shadowfacts.phycon.init.PhyBlocks
import net.shadowfacts.phycon.init.PhyScreens import net.shadowfacts.phycon.init.PhyScreens
import net.shadowfacts.phycon.networking.C2STerminalRequestItem
import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems import net.shadowfacts.phycon.networking.S2CTerminalUpdateDisplayedItems
import net.shadowfacts.phycon.util.SortMode import net.shadowfacts.phycon.util.SortMode
import java.lang.ref.WeakReference import java.lang.ref.WeakReference
import kotlin.math.ceil
import kotlin.math.min import kotlin.math.min
/** /**

4
src/main/kotlin/net/shadowfacts/phycon/network/component/ActivationController.kt → src/main/kotlin/net/shadowfacts/phycon/component/ActivationController.kt
View File

@ -1,7 +1,7 @@
package net.shadowfacts.phycon.network.component package net.shadowfacts.phycon.component
import net.minecraft.block.entity.BlockEntity import net.minecraft.block.entity.BlockEntity
import net.shadowfacts.phycon.network.packet.RemoteActivationPacket import net.shadowfacts.phycon.packet.RemoteActivationPacket
import net.shadowfacts.phycon.util.ActivationMode import net.shadowfacts.phycon.util.ActivationMode
/** /**

6
src/main/kotlin/net/shadowfacts/phycon/network/component/ItemStackPacketHandler.kt → src/main/kotlin/net/shadowfacts/phycon/component/ItemStackPacketHandler.kt
View File

@ -1,11 +1,11 @@
package net.shadowfacts.phycon.network.component package net.shadowfacts.phycon.component
import net.minecraft.block.entity.BlockEntity import net.minecraft.block.entity.BlockEntity
import net.minecraft.entity.ItemEntity import net.minecraft.entity.ItemEntity
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.PacketSink import net.shadowfacts.phycon.api.PacketSink
import net.shadowfacts.phycon.api.PacketSource import net.shadowfacts.phycon.api.PacketSource
import net.shadowfacts.phycon.network.packet.ItemStackPacket import net.shadowfacts.phycon.packet.ItemStackPacket
/** /**
* @author shadowfacts * @author shadowfacts
@ -32,4 +32,4 @@ fun <Self> Self.spawnItemStack(stack: ItemStack) where Self: BlockEntity, Self:
// todo: calculate entity spawn point by finding non-obstructed location // todo: calculate entity spawn point by finding non-obstructed location
val entity = ItemEntity(world!!, pos.x.toDouble(), pos.y + 1.0, pos.z.toDouble(), stack) val entity = ItemEntity(world!!, pos.x.toDouble(), pos.y + 1.0, pos.z.toDouble(), stack)
world!!.spawnEntity(entity) world!!.spawnEntity(entity)
} }

8
src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackDispatcher.kt → src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackDispatcher.kt
View File

@ -1,12 +1,12 @@
package net.shadowfacts.phycon.network.component package net.shadowfacts.phycon.component
import alexiil.mc.lib.attributes.item.ItemStackUtil import alexiil.mc.lib.attributes.item.ItemStackUtil
import net.minecraft.block.entity.BlockEntity import net.minecraft.block.entity.BlockEntity
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.packet.CapacityPacket import net.shadowfacts.phycon.packet.CapacityPacket
import net.shadowfacts.phycon.network.packet.CheckCapacityPacket import net.shadowfacts.phycon.packet.CheckCapacityPacket
import net.shadowfacts.phycon.network.packet.ItemStackPacket import net.shadowfacts.phycon.packet.ItemStackPacket
/** /**
* @author shadowfacts * @author shadowfacts

4
src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackProvider.kt → src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackProvider.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.component package net.shadowfacts.phycon.component
import net.shadowfacts.phycon.api.NetworkDevice import net.shadowfacts.phycon.api.NetworkDevice
@ -6,4 +6,4 @@ import net.shadowfacts.phycon.api.NetworkDevice
* @author shadowfacts * @author shadowfacts
*/ */
interface NetworkStackProvider: NetworkDevice { interface NetworkStackProvider: NetworkDevice {
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/component/NetworkStackReceiver.kt → src/main/kotlin/net/shadowfacts/phycon/component/NetworkStackReceiver.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.component package net.shadowfacts.phycon.component
import net.shadowfacts.phycon.api.NetworkDevice import net.shadowfacts.phycon.api.NetworkDevice
@ -6,4 +6,4 @@ import net.shadowfacts.phycon.api.NetworkDevice
* @author shadowfacts * @author shadowfacts
*/ */
interface NetworkStackReceiver: NetworkDevice { interface NetworkStackReceiver: NetworkDevice {
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/frame/ARPFrame.kt → src/main/kotlin/net/shadowfacts/phycon/frame/ARPFrame.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.frame package net.shadowfacts.phycon.frame
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.api.util.MACAddress import net.shadowfacts.phycon.api.util.MACAddress
@ -19,4 +19,4 @@ class ARPResponseFrame(
source: MACAddress, source: MACAddress,
destination: MACAddress, destination: MACAddress,
): BaseFrame(source, destination) { ): BaseFrame(source, destination) {
} }

6
src/main/kotlin/net/shadowfacts/phycon/network/frame/BaseFrame.kt → src/main/kotlin/net/shadowfacts/phycon/frame/BaseFrame.kt
View File

@ -1,8 +1,6 @@
package net.shadowfacts.phycon.network.frame package net.shadowfacts.phycon.frame
import net.shadowfacts.phycon.api.frame.EthernetFrame import net.shadowfacts.phycon.api.frame.EthernetFrame
import net.shadowfacts.phycon.api.frame.PacketFrame
import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.MACAddress import net.shadowfacts.phycon.api.util.MACAddress
/** /**
@ -14,4 +12,4 @@ open class BaseFrame(
): EthernetFrame { ): EthernetFrame {
override fun getSource() = source override fun getSource() = source
override fun getDestination() = destination override fun getDestination() = destination
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/frame/BasePacketFrame.kt → src/main/kotlin/net/shadowfacts/phycon/frame/BasePacketFrame.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.frame package net.shadowfacts.phycon.frame
import net.shadowfacts.phycon.api.frame.PacketFrame import net.shadowfacts.phycon.api.frame.PacketFrame
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
@ -13,4 +13,4 @@ class BasePacketFrame(
destination: MACAddress, destination: MACAddress,
): BaseFrame(source, destination), PacketFrame { ): BaseFrame(source, destination), PacketFrame {
override fun getPacket() = packet override fun getPacket() = packet
} }

24
src/main/kotlin/net/shadowfacts/phycon/init/PhyBlockEntities.kt
View File

@ -5,18 +5,18 @@ import net.minecraft.block.entity.BlockEntity
import net.minecraft.block.entity.BlockEntityType import net.minecraft.block.entity.BlockEntityType
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.minecraft.util.registry.Registry import net.minecraft.util.registry.Registry
import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock import net.shadowfacts.phycon.block.extractor.ExtractorBlock
import net.shadowfacts.phycon.network.block.extractor.ExtractorBlockEntity import net.shadowfacts.phycon.block.extractor.ExtractorBlockEntity
import net.shadowfacts.phycon.network.block.miner.MinerBlock import net.shadowfacts.phycon.block.miner.MinerBlock
import net.shadowfacts.phycon.network.block.miner.MinerBlockEntity import net.shadowfacts.phycon.block.miner.MinerBlockEntity
import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlockEntity import net.shadowfacts.phycon.block.netinterface.InterfaceBlockEntity
import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock import net.shadowfacts.phycon.block.netswitch.SwitchBlock
import net.shadowfacts.phycon.network.block.netswitch.SwitchBlockEntity import net.shadowfacts.phycon.block.netswitch.SwitchBlockEntity
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
import net.shadowfacts.phycon.network.block.terminal.TerminalBlock import net.shadowfacts.phycon.block.terminal.TerminalBlock
import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
/** /**
* @author shadowfacts * @author shadowfacts

14
src/main/kotlin/net/shadowfacts/phycon/init/PhyBlocks.kt
View File

@ -3,13 +3,13 @@ package net.shadowfacts.phycon.init
import net.minecraft.block.Block import net.minecraft.block.Block
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.minecraft.util.registry.Registry import net.minecraft.util.registry.Registry
import net.shadowfacts.phycon.network.block.cable.CableBlock import net.shadowfacts.phycon.block.cable.CableBlock
import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock import net.shadowfacts.phycon.block.extractor.ExtractorBlock
import net.shadowfacts.phycon.network.block.miner.MinerBlock import net.shadowfacts.phycon.block.miner.MinerBlock
import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock import net.shadowfacts.phycon.block.netswitch.SwitchBlock
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
import net.shadowfacts.phycon.network.block.terminal.TerminalBlock import net.shadowfacts.phycon.block.terminal.TerminalBlock
/** /**
* @author shadowfacts * @author shadowfacts

14
src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
View File

@ -6,13 +6,13 @@ import net.minecraft.util.Identifier
import net.minecraft.util.registry.Registry import net.minecraft.util.registry.Registry
import net.shadowfacts.phycon.item.ConsoleItem import net.shadowfacts.phycon.item.ConsoleItem
import net.shadowfacts.phycon.item.ScrewdriverItem import net.shadowfacts.phycon.item.ScrewdriverItem
import net.shadowfacts.phycon.network.block.cable.CableBlock import net.shadowfacts.phycon.block.cable.CableBlock
import net.shadowfacts.phycon.network.block.extractor.ExtractorBlock import net.shadowfacts.phycon.block.extractor.ExtractorBlock
import net.shadowfacts.phycon.network.block.miner.MinerBlock import net.shadowfacts.phycon.block.miner.MinerBlock
import net.shadowfacts.phycon.network.block.netinterface.InterfaceBlock import net.shadowfacts.phycon.block.netinterface.InterfaceBlock
import net.shadowfacts.phycon.network.block.netswitch.SwitchBlock import net.shadowfacts.phycon.block.netswitch.SwitchBlock
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlock import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlock
import net.shadowfacts.phycon.network.block.terminal.TerminalBlock import net.shadowfacts.phycon.block.terminal.TerminalBlock
/** /**
* @author shadowfacts * @author shadowfacts

4
src/main/kotlin/net/shadowfacts/phycon/init/PhyScreens.kt
View File

@ -4,7 +4,7 @@ import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry
import net.minecraft.screen.ScreenHandlerType import net.minecraft.screen.ScreenHandlerType
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
object PhyScreens { object PhyScreens {
@ -15,4 +15,4 @@ object PhyScreens {
TERMINAL_SCREEN_HANDLER = ScreenHandlerRegistry.registerExtended(Identifier(PhysicalConnectivity.MODID, "terminal"), ::TerminalScreenHandler) TERMINAL_SCREEN_HANDLER = ScreenHandlerRegistry.registerExtended(Identifier(PhysicalConnectivity.MODID, "terminal"), ::TerminalScreenHandler)
} }
} }

4
src/main/kotlin/net/shadowfacts/phycon/item/ConsoleItem.kt
View File

@ -6,8 +6,8 @@ import net.minecraft.item.ItemUsageContext
import net.minecraft.util.ActionResult import net.minecraft.util.ActionResult
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.DeviceBlock import net.shadowfacts.phycon.block.DeviceBlock
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.screen.console.DeviceConsoleScreen import net.shadowfacts.phycon.screen.console.DeviceConsoleScreen
/** /**

4
src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureActivationMode.kt
View File

@ -11,8 +11,8 @@ import net.minecraft.util.Identifier
import net.minecraft.util.registry.Registry import net.minecraft.util.registry.Registry
import net.minecraft.util.registry.RegistryKey import net.minecraft.util.registry.RegistryKey
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.component.ActivationController import net.shadowfacts.phycon.component.ActivationController
import net.shadowfacts.phycon.util.ActivationMode import net.shadowfacts.phycon.util.ActivationMode
/** /**

2
src/main/kotlin/net/shadowfacts/phycon/networking/C2SConfigureRedstoneController.kt
View File

@ -12,7 +12,7 @@ import net.minecraft.util.registry.Registry
import net.minecraft.util.registry.RegistryKey import net.minecraft.util.registry.RegistryKey
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
import net.shadowfacts.phycon.util.RedstoneMode import net.shadowfacts.phycon.util.RedstoneMode
/** /**

4
src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalRequestItem.kt
View File

@ -13,7 +13,7 @@ import net.minecraft.util.Identifier
import net.minecraft.util.registry.Registry import net.minecraft.util.registry.Registry
import net.minecraft.util.registry.RegistryKey import net.minecraft.util.registry.RegistryKey
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
/** /**
* @author shadowfacts * @author shadowfacts
@ -52,4 +52,4 @@ object C2STerminalRequestItem: ServerReceiver {
} }
} }
} }

6
src/main/kotlin/net/shadowfacts/phycon/networking/C2STerminalUpdateDisplayedItems.kt
View File

@ -10,8 +10,8 @@ import net.minecraft.server.network.ServerPlayNetworkHandler
import net.minecraft.server.network.ServerPlayerEntity import net.minecraft.server.network.ServerPlayerEntity
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.shadowfacts.phycon.PhysicalConnectivity import net.shadowfacts.phycon.PhysicalConnectivity
import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
import net.shadowfacts.phycon.util.SortMode import net.shadowfacts.phycon.util.SortMode
/** /**
@ -47,4 +47,4 @@ object C2STerminalUpdateDisplayedItems: ServerReceiver {
screenHandler.sendUpdatedItemsToClient(player, query, sortMode) screenHandler.sendUpdatedItemsToClient(player, query, sortMode)
} }
} }
} }

6
src/main/kotlin/net/shadowfacts/phycon/networking/S2CTerminalUpdateDisplayedItems.kt
View File

@ -7,8 +7,8 @@ import net.minecraft.client.MinecraftClient
import net.minecraft.client.network.ClientPlayNetworkHandler import net.minecraft.client.network.ClientPlayNetworkHandler
import net.minecraft.network.Packet import net.minecraft.network.Packet
import net.minecraft.network.PacketByteBuf import net.minecraft.network.PacketByteBuf
import net.shadowfacts.phycon.network.block.terminal.TerminalBlockEntity import net.shadowfacts.phycon.block.terminal.TerminalBlockEntity
import net.shadowfacts.phycon.network.block.terminal.TerminalScreenHandler import net.shadowfacts.phycon.block.terminal.TerminalScreenHandler
import net.shadowfacts.phycon.util.SortMode import net.shadowfacts.phycon.util.SortMode
/** /**
@ -54,4 +54,4 @@ object S2CTerminalUpdateDisplayedItems: ClientReceiver {
screenHandler.receivedUpdatedItemsFromServer(entries, query, sortMode) screenHandler.receivedUpdatedItemsFromServer(entries, query, sortMode)
} }
} }
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/packet/BasePacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/BasePacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.shadowfacts.phycon.api.packet.Packet import net.shadowfacts.phycon.api.packet.Packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
@ -14,4 +14,4 @@ abstract class BasePacket(
override fun getSource() = source override fun getSource() = source
override fun getDestination() = destination override fun getDestination() = destination
} }

6
src/main/kotlin/net/shadowfacts/phycon/network/packet/CapacityPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/CapacityPacket.kt
View File

@ -1,8 +1,8 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.component.NetworkStackReceiver import net.shadowfacts.phycon.component.NetworkStackReceiver
/** /**
* @author shadowfacts * @author shadowfacts
@ -14,4 +14,4 @@ class CapacityPacket(
source: IPAddress, source: IPAddress,
destination: IPAddress destination: IPAddress
): BasePacket(source, destination) { ): BasePacket(source, destination) {
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/packet/CheckCapacityPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/CheckCapacityPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
@ -7,4 +7,4 @@ import net.shadowfacts.phycon.api.util.IPAddress
* @author shadowfacts * @author shadowfacts
*/ */
class CheckCapacityPacket(val stack: ItemStack, source: IPAddress, destination: IPAddress): BasePacket(source, destination) { class CheckCapacityPacket(val stack: ItemStack, source: IPAddress, destination: IPAddress): BasePacket(source, destination) {
} }

4
src/main/kotlin/net/shadowfacts/phycon/network/packet/DeviceRemovedPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/DeviceRemovedPacket.kt
View File

@ -1,7 +1,7 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
/** /**
* @author shadowfacts * @author shadowfacts

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/ExtractStackPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/ExtractStackPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/ItemStackPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/ItemStackPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/LocateStackPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/LocateStackPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/ReadInventoryPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/ReadInventoryPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import alexiil.mc.lib.attributes.item.GroupedItemInvView import alexiil.mc.lib.attributes.item.GroupedItemInvView
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/RemoteActivationPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/RemoteActivationPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

2
src/main/kotlin/net/shadowfacts/phycon/network/packet/RequestInventoryPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/RequestInventoryPacket.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress

4
src/main/kotlin/net/shadowfacts/phycon/network/packet/StackLocationPacket.kt → src/main/kotlin/net/shadowfacts/phycon/packet/StackLocationPacket.kt
View File

@ -1,8 +1,8 @@
package net.shadowfacts.phycon.network.packet package net.shadowfacts.phycon.packet
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.component.NetworkStackProvider import net.shadowfacts.phycon.component.NetworkStackProvider
/** /**
* @author shadowfacts * @author shadowfacts

6
src/main/kotlin/net/shadowfacts/phycon/screen/console/ActivatableDeviceViewController.kt
View File

@ -2,15 +2,13 @@ package net.shadowfacts.phycon.screen.console
import net.minecraft.client.MinecraftClient import net.minecraft.client.MinecraftClient
import net.minecraft.text.TranslatableText import net.minecraft.text.TranslatableText
import net.shadowfacts.cacao.geometry.Axis
import net.shadowfacts.cacao.util.Color import net.shadowfacts.cacao.util.Color
import net.shadowfacts.cacao.view.Label import net.shadowfacts.cacao.view.Label
import net.shadowfacts.cacao.view.StackView
import net.shadowfacts.cacao.view.button.EnumButton import net.shadowfacts.cacao.view.button.EnumButton
import net.shadowfacts.cacao.viewcontroller.ViewController import net.shadowfacts.cacao.viewcontroller.ViewController
import net.shadowfacts.kiwidsl.dsl import net.shadowfacts.kiwidsl.dsl
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.component.ActivationController import net.shadowfacts.phycon.component.ActivationController
import net.shadowfacts.phycon.networking.C2SConfigureActivationMode import net.shadowfacts.phycon.networking.C2SConfigureActivationMode
import net.shadowfacts.phycon.util.ActivationMode import net.shadowfacts.phycon.util.ActivationMode

9
src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceConsoleScreen.kt
View File

@ -12,9 +12,9 @@ import net.shadowfacts.cacao.viewcontroller.TabViewController
import net.shadowfacts.cacao.viewcontroller.ViewController import net.shadowfacts.cacao.viewcontroller.ViewController
import net.shadowfacts.cacao.window.Window import net.shadowfacts.cacao.window.Window
import net.shadowfacts.kiwidsl.dsl import net.shadowfacts.kiwidsl.dsl
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
import net.shadowfacts.phycon.network.component.ActivationController import net.shadowfacts.phycon.component.ActivationController
import org.lwjgl.glfw.GLFW import org.lwjgl.glfw.GLFW
/** /**
@ -44,7 +44,8 @@ class DeviceConsoleScreen(
)) ))
} }
if (device is RedstoneControllerBlockEntity) { if (device is RedstoneControllerBlockEntity) {
tabs.add(TabViewController.SimpleTab( tabs.add(
TabViewController.SimpleTab(
TextureView(Texture(Identifier("textures/block/redstone_torch.png"), 0, 0, 16, 16)).apply { TextureView(Texture(Identifier("textures/block/redstone_torch.png"), 0, 0, 16, 16)).apply {
intrinsicContentSize = Size(16.0, 16.0) intrinsicContentSize = Size(16.0, 16.0)
}, },

2
src/main/kotlin/net/shadowfacts/phycon/screen/console/DeviceDetailsViewController.kt
View File

@ -7,7 +7,7 @@ import net.shadowfacts.cacao.view.Label
import net.shadowfacts.cacao.view.StackView import net.shadowfacts.cacao.view.StackView
import net.shadowfacts.cacao.viewcontroller.ViewController import net.shadowfacts.cacao.viewcontroller.ViewController
import net.shadowfacts.kiwidsl.dsl import net.shadowfacts.kiwidsl.dsl
import net.shadowfacts.phycon.network.DeviceBlockEntity import net.shadowfacts.phycon.block.DeviceBlockEntity
/** /**
* @author shadowfacts * @author shadowfacts

2
src/main/kotlin/net/shadowfacts/phycon/screen/console/RedstoneControllerViewController.kt
View File

@ -11,7 +11,7 @@ import net.shadowfacts.cacao.view.textfield.TextField
import net.shadowfacts.cacao.viewcontroller.ViewController import net.shadowfacts.cacao.viewcontroller.ViewController
import net.shadowfacts.kiwidsl.dsl import net.shadowfacts.kiwidsl.dsl
import net.shadowfacts.phycon.api.util.IPAddress import net.shadowfacts.phycon.api.util.IPAddress
import net.shadowfacts.phycon.network.block.redstone.RedstoneControllerBlockEntity import net.shadowfacts.phycon.block.redstone.RedstoneControllerBlockEntity
import net.shadowfacts.phycon.networking.C2SConfigureRedstoneController import net.shadowfacts.phycon.networking.C2SConfigureRedstoneController
import net.shadowfacts.phycon.util.RedstoneMode import net.shadowfacts.phycon.util.RedstoneMode

2
src/main/kotlin/net/shadowfacts/phycon/network/NetworkUtil.kt → src/main/kotlin/net/shadowfacts/phycon/util/NetworkUtil.kt
View File

@ -1,4 +1,4 @@
package net.shadowfacts.phycon.network package net.shadowfacts.phycon.util
import net.minecraft.util.math.BlockPos import net.minecraft.util.math.BlockPos
import net.minecraft.util.math.Direction import net.minecraft.util.math.Direction