From 3fd6de14d12159791fcdcf466271dfd7f30ab46f Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 8 Sep 2021 21:32:36 +0700 Subject: [PATCH] Move capabilities to sub packages --- .../ru/dbotthepony/mc/otm/OverdriveThatMatters.java | 4 ++-- .../ru/dbotthepony/mc/otm/android/AndroidFeature.java | 2 +- .../mc/otm/android/AndroidFeatureType.java | 4 +--- .../dbotthepony/mc/otm/android/AndroidResearch.java | 2 +- .../mc/otm/android/AndroidResearchType.java | 2 +- .../otm/android/feature/AndroidLimbOverclocking.java | 2 +- .../mc/otm/android/feature/AndroidNanobotsArmor.java | 3 +-- .../android/feature/AndroidNanobotsRegeneration.java | 2 +- .../dbotthepony/mc/otm/block/BlockAndroidStation.java | 2 +- .../ru/dbotthepony/mc/otm/block/BlockMatterCable.java | 2 +- .../otm/block/entity/BlockEntityAndroidStation.java | 2 +- .../mc/otm/block/entity/BlockEntityMatterBottler.java | 3 +++ .../mc/otm/block/entity/BlockEntityMatterCable.java | 6 +++--- .../block/entity/BlockEntityMatterCapacitorBank.java | 6 +++--- .../otm/block/entity/BlockEntityMatterDecomposer.java | 5 ++++- .../mc/otm/block/entity/BlockEntityMatterPanel.java | 1 + .../otm/block/entity/BlockEntityMatterReplicator.java | 1 + .../mc/otm/block/entity/BlockEntityMatterScanner.java | 1 + .../otm/block/entity/BlockEntityPatternStorage.java | 3 +-- .../mc/otm/capability/MatterTaskAllocation.java | 8 -------- .../mc/otm/capability/MatteryCapability.java | 5 +++++ .../capability/{ => android}/AndroidCapability.java | 5 +++-- .../{ => android}/AndroidCapabilityPlayer.java | 5 ++--- .../capability/{ => android}/IAndroidCapability.java | 2 +- .../otm/capability/{ => matter}/IMatterGridCell.java | 2 +- .../capability/{ => matter}/IMatterGridListener.java | 2 +- .../otm/capability/{ => matter}/IMatterHandler.java | 2 +- .../capability/{ => matter}/IMatterTaskProvider.java | 2 +- .../otm/capability/{ => matter}/IPatternStorage.java | 4 +++- .../{ => matter}/MatterHandlerCapability.java | 4 ++-- .../mc/otm/capability/{ => matter}/MatterTask.java | 3 +-- .../otm/capability/matter/MatterTaskAllocation.java | 11 +++++++++++ .../capability/{ => matter}/PatternInsertStatus.java | 2 +- .../mc/otm/capability/{ => matter}/PatternState.java | 2 +- .../java/ru/dbotthepony/mc/otm/client/AndroidGui.java | 2 +- .../ru/dbotthepony/mc/otm/client/EventHandler.java | 2 +- .../mc/otm/client/screen/AndroidStationScreen.java | 2 +- .../mc/otm/client/screen/MatterPanelScreen.java | 4 ++-- .../dbotthepony/mc/otm/item/ItemMatterCapacitor.java | 2 +- .../dbotthepony/mc/otm/item/ItemPatternStorage.java | 9 +++------ .../java/ru/dbotthepony/mc/otm/item/ItemPill.java | 4 ++-- .../java/ru/dbotthepony/mc/otm/matter/MatterGrid.java | 2 +- .../dbotthepony/mc/otm/menu/AndroidStationMenu.java | 2 +- .../ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java | 2 +- .../mc/otm/menu/MatterCapacitorBankMenu.java | 2 +- .../ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java | 6 +++--- .../mc/otm/menu/slot/MatterContainerInputSlot.java | 3 +-- .../mc/otm/menu/widget/MatterLevelWidget.java | 2 +- .../mc/otm/menu/widget/PatternStorageWidget.java | 8 +------- .../mc/otm/network/CancelMatterTaskPacket.java | 4 +--- .../dbotthepony/mc/otm/network/MatterTaskPacket.java | 3 +-- .../dbotthepony/mc/otm/network/PatternGridPacket.java | 2 +- .../otm/network/PatternReplicationRequestPacket.java | 2 +- .../mc/otm/network/android/AndroidFeaturePacket.java | 2 +- .../mc/otm/network/android/AndroidResearchPacket.java | 2 +- .../network/android/AndroidResearchRequestPacket.java | 2 +- .../mc/otm/network/android/AndroidStatusPacket.java | 2 +- 57 files changed, 92 insertions(+), 91 deletions(-) delete mode 100644 src/main/java/ru/dbotthepony/mc/otm/capability/MatterTaskAllocation.java rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => android}/AndroidCapability.java (98%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => android}/AndroidCapabilityPlayer.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => android}/IAndroidCapability.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/IMatterGridCell.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/IMatterGridListener.java (90%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/IMatterHandler.java (93%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/IMatterTaskProvider.java (96%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/IPatternStorage.java (92%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/MatterHandlerCapability.java (97%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/MatterTask.java (97%) create mode 100644 src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTaskAllocation.java rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/PatternInsertStatus.java (95%) rename src/main/java/ru/dbotthepony/mc/otm/capability/{ => matter}/PatternState.java (98%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index 8f63d36e1..e3c8809d5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -19,8 +19,8 @@ import net.minecraftforge.fmlserverevents.FMLServerStoppingEvent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import ru.dbotthepony.mc.otm.block.entity.BlockEntityBlackHole; -import ru.dbotthepony.mc.otm.capability.AndroidCapability; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.drive.DrivePool; import ru.dbotthepony.mc.otm.capability.drive.AbstractMatteryDrive; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeature.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeature.java index 018378324..2f6de8335 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeature.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeature.java @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.android; import net.minecraft.nbt.CompoundTag; import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; public class AndroidFeature implements INBTSerializable { public final AndroidFeatureType type; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeatureType.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeatureType.java index 127f6b715..51f5b4003 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeatureType.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidFeatureType.java @@ -3,9 +3,7 @@ package ru.dbotthepony.mc.otm.android; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraftforge.registries.*; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; - -import javax.annotation.Nullable; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; public class AndroidFeatureType extends ForgeRegistryEntry> { public interface AndroidFeatureFactory { diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java index 57961e057..edbf0c1b9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearch.java @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.android; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; import net.minecraftforge.common.util.INBTSerializable; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.android.AndroidResearchRequestPacket; import ru.dbotthepony.mc.otm.client.render.SkinElement; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchType.java b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchType.java index 5e62ea80c..570f90e12 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchType.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/AndroidResearchType.java @@ -4,7 +4,7 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; import net.minecraftforge.registries.ForgeRegistryEntry; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidLimbOverclocking.java b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidLimbOverclocking.java index b66611051..c1bb80c69 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidLimbOverclocking.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidLimbOverclocking.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.ai.attributes.Attributes; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import java.util.UUID; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsArmor.java b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsArmor.java index e369c9628..84cbaf83d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsArmor.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsArmor.java @@ -3,11 +3,10 @@ package ru.dbotthepony.mc.otm.android.feature; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsRegeneration.java b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsRegeneration.java index 7c5d19d99..129a90ed0 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsRegeneration.java +++ b/src/main/java/ru/dbotthepony/mc/otm/android/feature/AndroidNanobotsRegeneration.java @@ -6,7 +6,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/BlockAndroidStation.java b/src/main/java/ru/dbotthepony/mc/otm/block/BlockAndroidStation.java index 96b84ac3f..28e064627 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/BlockAndroidStation.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/BlockAndroidStation.java @@ -17,7 +17,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.common.util.LazyOptional; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityAndroidStation; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.shapes.BlockShapes; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java b/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java index 150f91ec3..ded5dac47 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/BlockMatterCable.java @@ -18,7 +18,7 @@ import net.minecraft.world.phys.shapes.BooleanOp; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import ru.dbotthepony.mc.otm.capability.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterCable; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityAndroidStation.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityAndroidStation.java index 8939d2392..045c187f0 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityAndroidStation.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityAndroidStation.java @@ -13,7 +13,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.MatteryMachineEnergyStorage; import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java index 7cedffbf7..5513b0721 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterBottler.java @@ -20,6 +20,9 @@ import net.minecraftforge.items.IItemHandler; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.MatterHandlerCapability; import ru.dbotthepony.mc.otm.container.MatteryContainer; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.menu.MatterBottlerMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java index 3bde48b14..782babc09 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCable.java @@ -8,13 +8,13 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; -import ru.dbotthepony.mc.otm.capability.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.BlockMatterCable; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; -import ru.dbotthepony.mc.otm.capability.IPatternStorage; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java index f92737692..0827685aa 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterCapacitorBank.java @@ -15,11 +15,11 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import ru.dbotthepony.mc.otm.block.BlockBatteryBank; -import ru.dbotthepony.mc.otm.capability.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; -import ru.dbotthepony.mc.otm.capability.IPatternStorage; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.container.MatteryContainer; import ru.dbotthepony.mc.otm.menu.MatterCapacitorBankMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java index 0a6fb9610..a79285a49 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterDecomposer.java @@ -21,8 +21,11 @@ import ru.dbotthepony.mc.otm.block.entity.worker.BlockEntityMatteryWorker; import ru.dbotthepony.mc.otm.block.entity.worker.MachineJob; import ru.dbotthepony.mc.otm.block.entity.worker.MachineJobStatus; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; +import ru.dbotthepony.mc.otm.capability.matter.MatterHandlerCapability; import ru.dbotthepony.mc.otm.container.MatteryContainer; -import ru.dbotthepony.mc.otm.capability.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.matter.MatterRegistry; import ru.dbotthepony.mc.otm.menu.MatterDecomposerMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java index 467fd65d7..b3a71dd6c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterPanel.java @@ -16,6 +16,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.*; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java index 693e375d6..d785e3c75 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterReplicator.java @@ -21,6 +21,7 @@ import ru.dbotthepony.mc.otm.block.entity.worker.MachineJob; import ru.dbotthepony.mc.otm.block.entity.worker.MachineJobStatus; import ru.dbotthepony.mc.otm.block.entity.worker.WorkTickContext; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.*; import ru.dbotthepony.mc.otm.container.MatteryContainer; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.matter.MatterRegistry; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java index 71abf4c4f..331f583d2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityMatterScanner.java @@ -19,6 +19,7 @@ import ru.dbotthepony.mc.otm.block.entity.worker.BlockEntityMatteryWorker; import ru.dbotthepony.mc.otm.block.entity.worker.MachineJob; import ru.dbotthepony.mc.otm.block.entity.worker.MachineJobStatus; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.*; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.matter.MatterRegistry; import ru.dbotthepony.mc.otm.Registry; diff --git a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java index 1422788d9..5d325ee8e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java +++ b/src/main/java/ru/dbotthepony/mc/otm/block/entity/BlockEntityPatternStorage.java @@ -17,9 +17,9 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.block.BlockPatternStorage; import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.*; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.container.MatteryContainer; @@ -29,7 +29,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.ArrayList; import java.util.Collection; -import java.util.concurrent.atomic.AtomicInteger; public class BlockEntityPatternStorage extends BlockEntityMattery implements IMatterGridCell, IPatternStorage { public BlockEntityPatternStorage(BlockPos p_155229_, BlockState p_155230_) { diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterTaskAllocation.java b/src/main/java/ru/dbotthepony/mc/otm/capability/MatterTaskAllocation.java deleted file mode 100644 index e3d469ca1..000000000 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterTaskAllocation.java +++ /dev/null @@ -1,8 +0,0 @@ -package ru.dbotthepony.mc.otm.capability; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public record MatterTaskAllocation(@Nonnull MatterTask task, @Nullable PatternState pattern) { - -} diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/MatteryCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/MatteryCapability.java index 0b54e8934..5e5662891 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/MatteryCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/MatteryCapability.java @@ -4,7 +4,12 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.energy.IEnergyStorage; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.drive.IMatteryDrive; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridCell; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterTaskProvider; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; import java.math.BigDecimal; import java.math.MathContext; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java similarity index 98% rename from src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapability.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java index 4b02b2043..2d2e76519 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapability.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.android; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; @@ -22,10 +22,11 @@ import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fmllegacy.network.PacketDistributor; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; +import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage; +import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.android.AndroidBatteryPacket; import ru.dbotthepony.mc.otm.network.android.AndroidEnergyPacket; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapabilityPlayer.java b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapabilityPlayer.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapabilityPlayer.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapabilityPlayer.java index 3495ada3f..e272a78ce 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapabilityPlayer.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/android/AndroidCapabilityPlayer.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.android; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; @@ -6,15 +6,14 @@ import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraftforge.client.event.InputUpdateEvent; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; +import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.android.AndroidResearchPacket; import ru.dbotthepony.mc.otm.network.android.AndroidStatusPacket; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IAndroidCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IAndroidCapability.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.java index 4c5526df4..416cff5a2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IAndroidCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/android/IAndroidCapability.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.android; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.entity.LivingEntity; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridCell.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridCell.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridCell.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridCell.java index 53cc8a57f..245db8bb2 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridCell.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridCell.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridListener.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridListener.java similarity index 90% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridListener.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridListener.java index 49ca7d203..299c97cef 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterGridListener.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterGridListener.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; public interface IMatterGridListener { default void onPatternAdded(PatternState state) { } diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterHandler.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterHandler.java similarity index 93% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IMatterHandler.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterHandler.java index 51a5134b5..00bb807ca 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterHandler.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterHandler.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import javax.annotation.Nonnull; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterTaskProvider.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterTaskProvider.java similarity index 96% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IMatterTaskProvider.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterTaskProvider.java index 53a7e931a..3d1339f6f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IMatterTaskProvider.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IMatterTaskProvider.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/IPatternStorage.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.java similarity index 92% rename from src/main/java/ru/dbotthepony/mc/otm/capability/IPatternStorage.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.java index c14d807c7..ada76a2c4 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/IPatternStorage.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/IPatternStorage.java @@ -1,6 +1,8 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import net.minecraft.world.item.Item; +import ru.dbotthepony.mc.otm.capability.matter.PatternInsertStatus; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java index 85bda0798..77672af55 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterHandlerCapability.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterHandlerCapability.java @@ -1,8 +1,8 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.Tag; import net.minecraftforge.common.util.INBTSerializable; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.matter.MatterRegistry; import javax.annotation.Nonnull; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterTask.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java similarity index 97% rename from src/main/java/ru/dbotthepony/mc/otm/capability/MatterTask.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java index 7cdb79b7d..ece9dbc8d 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/MatterTask.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTask.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -7,7 +7,6 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; -import net.minecraftforge.common.util.INBTSerializable; import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.RegistryManager; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTaskAllocation.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTaskAllocation.java new file mode 100644 index 000000000..d58c443a6 --- /dev/null +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/MatterTaskAllocation.java @@ -0,0 +1,11 @@ +package ru.dbotthepony.mc.otm.capability.matter; + +import ru.dbotthepony.mc.otm.capability.matter.MatterTask; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public record MatterTaskAllocation(@Nonnull MatterTask task, @Nullable PatternState pattern) { + +} diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/PatternInsertStatus.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternInsertStatus.java similarity index 95% rename from src/main/java/ru/dbotthepony/mc/otm/capability/PatternInsertStatus.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternInsertStatus.java index 9fb1c6159..84c1fc658 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/PatternInsertStatus.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternInsertStatus.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/capability/PatternState.java b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java similarity index 98% rename from src/main/java/ru/dbotthepony/mc/otm/capability/PatternState.java rename to src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java index 14c965819..14482dd97 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/capability/PatternState.java +++ b/src/main/java/ru/dbotthepony/mc/otm/capability/matter/PatternState.java @@ -1,4 +1,4 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.matter; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java b/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java index 22484b6a8..6d9227a09 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/AndroidGui.java @@ -14,7 +14,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.gui.ForgeIngameGui; import net.minecraftforge.eventbus.api.SubscribeEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java b/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java index 5ef8ee1f6..c005b151b 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java @@ -3,7 +3,7 @@ package ru.dbotthepony.mc.otm.client; import net.minecraftforge.client.event.InputUpdateEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import ru.dbotthepony.mc.otm.Registry; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.MatteryCapability; public class EventHandler { diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java index 193d0c478..cd49db89c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/AndroidStationScreen.java @@ -10,7 +10,7 @@ import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.client.render.RGBAColor; import ru.dbotthepony.mc.otm.client.render.RenderHelper; import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java index 145f01e09..f90c45170 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/client/screen/MatterPanelScreen.java @@ -9,8 +9,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.entity.player.Inventory; import net.minecraft.world.item.ItemStack; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.MatterTask; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.MatterTask; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.PatternReplicationRequestPacket; diff --git a/src/main/java/ru/dbotthepony/mc/otm/item/ItemMatterCapacitor.java b/src/main/java/ru/dbotthepony/mc/otm/item/ItemMatterCapacitor.java index 9cfb490ed..7b0b7d8c9 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/item/ItemMatterCapacitor.java +++ b/src/main/java/ru/dbotthepony/mc/otm/item/ItemMatterCapacitor.java @@ -11,7 +11,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.menu.FormattingHelper; diff --git a/src/main/java/ru/dbotthepony/mc/otm/item/ItemPatternStorage.java b/src/main/java/ru/dbotthepony/mc/otm/item/ItemPatternStorage.java index 65ce2fbeb..ca19a8d1e 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/item/ItemPatternStorage.java +++ b/src/main/java/ru/dbotthepony/mc/otm/item/ItemPatternStorage.java @@ -6,8 +6,6 @@ import net.minecraft.core.Direction; import net.minecraft.nbt.*; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; @@ -15,12 +13,11 @@ import net.minecraft.world.level.Level; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.common.util.LazyOptional; -import net.minecraftforge.registries.RegistryManager; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.IPatternStorage; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.capability.PatternInsertStatus; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.PatternInsertStatus; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java b/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java index d716f9d92..91bf2c9b7 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java +++ b/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java @@ -12,8 +12,8 @@ import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.common.util.FakePlayer; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import javax.annotation.Nullable; diff --git a/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java index 7f8dbd9db..a998a6440 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java +++ b/src/main/java/ru/dbotthepony/mc/otm/matter/MatterGrid.java @@ -5,7 +5,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.*; +import ru.dbotthepony.mc.otm.capability.matter.*; import javax.annotation.Nullable; import java.math.BigDecimal; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.java index 8f140c40b..5761359ef 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/AndroidStationMenu.java @@ -7,7 +7,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityAndroidStation; -import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.android.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.menu.slot.BatterySlot; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java index eea4712c2..3228cd13f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterBottlerMenu.java @@ -6,7 +6,7 @@ import net.minecraft.world.inventory.ContainerData; import net.minecraft.world.item.ItemStack; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterBottler; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.menu.slot.MatterySlot; import ru.dbotthepony.mc.otm.menu.widget.MatterLevelWidget; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java index 6f7e356f1..e640dbc38 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java @@ -5,7 +5,7 @@ import net.minecraft.world.SimpleContainer; import net.minecraft.world.entity.player.Inventory; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterCapacitorBank; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.menu.slot.MatterContainerInputSlot; import ru.dbotthepony.mc.otm.menu.widget.MatterLevelWidget; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java index 0609cc0f4..47034d1a5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterPanelMenu.java @@ -7,9 +7,9 @@ import net.minecraftforge.fmllegacy.network.PacketDistributor; import ru.dbotthepony.mc.otm.OverdriveThatMatters; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.block.entity.BlockEntityMatterPanel; -import ru.dbotthepony.mc.otm.capability.IMatterGridListener; -import ru.dbotthepony.mc.otm.capability.MatterTask; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.IMatterGridListener; +import ru.dbotthepony.mc.otm.capability.matter.MatterTask; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.network.CancelMatterTaskPacket; import ru.dbotthepony.mc.otm.network.MatterTaskPacket; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/slot/MatterContainerInputSlot.java b/src/main/java/ru/dbotthepony/mc/otm/menu/slot/MatterContainerInputSlot.java index 7ac195286..60ad33982 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/slot/MatterContainerInputSlot.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/slot/MatterContainerInputSlot.java @@ -1,9 +1,8 @@ package ru.dbotthepony.mc.otm.menu.slot; import net.minecraft.world.Container; -import net.minecraft.world.inventory.Slot; import net.minecraft.world.item.ItemStack; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import java.util.Optional; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java index 7fe44386d..06728efb5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/MatterLevelWidget.java @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.menu.widget; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TranslatableComponent; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; +import ru.dbotthepony.mc.otm.capability.matter.IMatterHandler; import ru.dbotthepony.mc.otm.menu.FormattingHelper; import ru.dbotthepony.mc.otm.menu.MatteryMenu; diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/PatternStorageWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/PatternStorageWidget.java index 9f8f2e1b3..daed7ec57 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/PatternStorageWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/PatternStorageWidget.java @@ -1,18 +1,12 @@ package ru.dbotthepony.mc.otm.menu.widget; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; -import ru.dbotthepony.mc.otm.capability.IMatterHandler; -import ru.dbotthepony.mc.otm.capability.IPatternStorage; -import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.menu.FormattingHelper; +import ru.dbotthepony.mc.otm.capability.matter.IPatternStorage; import ru.dbotthepony.mc.otm.menu.MatteryMenu; -import ru.dbotthepony.mc.otm.menu.data.BigDecimalDataContainer; import ru.dbotthepony.mc.otm.menu.data.LongDataContainer; import javax.annotation.Nullable; -import java.math.BigDecimal; import java.util.List; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java index 2e3bd4eb9..1858b4511 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/CancelMatterTaskPacket.java @@ -1,10 +1,8 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.network.FriendlyByteBuf; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.capability.MatterTask; +import ru.dbotthepony.mc.otm.capability.matter.MatterTask; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import java.util.UUID; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java index 83fb13657..62259f612 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/MatterTaskPacket.java @@ -6,8 +6,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fmllegacy.network.NetworkEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.MatterTask; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.MatterTask; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java index d67a848d8..e9170a940 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/PatternGridPacket.java @@ -6,7 +6,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fmllegacy.network.NetworkEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java index 62885cd54..1a3db4e89 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/PatternReplicationRequestPacket.java @@ -2,7 +2,7 @@ package ru.dbotthepony.mc.otm.network; import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fmllegacy.network.NetworkEvent; -import ru.dbotthepony.mc.otm.capability.PatternState; +import ru.dbotthepony.mc.otm.capability.matter.PatternState; import ru.dbotthepony.mc.otm.menu.MatterPanelMenu; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java index fc76064a5..1581b78ab 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidFeaturePacket.java @@ -7,7 +7,7 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fmllegacy.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.android.AndroidFeature; import ru.dbotthepony.mc.otm.android.AndroidFeatureType; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java index 537aa052a..068359d9c 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchPacket.java @@ -9,7 +9,7 @@ import net.minecraftforge.fmllegacy.network.NetworkEvent; import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.MatteryCapability; import java.util.function.Supplier; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java index 8ca296e25..040b3b0a5 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidResearchRequestPacket.java @@ -7,7 +7,7 @@ import ru.dbotthepony.mc.otm.Registry; import ru.dbotthepony.mc.otm.android.AndroidResearch; import ru.dbotthepony.mc.otm.android.AndroidResearchType; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.menu.AndroidStationMenu; import java.util.Objects; diff --git a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java index 2c48edb8b..519d3ed90 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java +++ b/src/main/java/ru/dbotthepony/mc/otm/network/android/AndroidStatusPacket.java @@ -6,7 +6,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fmllegacy.network.NetworkEvent; import ru.dbotthepony.mc.otm.capability.MatteryCapability; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import java.util.function.Supplier;