From 1cff933373397dd79b9f439190b639f2713a9076 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 19 Aug 2021 13:59:28 +0700 Subject: [PATCH] Move android caps to subpackage --- .../ru/dbotthepony/mc/otm/OverdriveThatMatters.java | 13 ++----------- .../capability/{ => android}/AndroidCapability.java | 5 ++++- .../{ => android}/AndroidCapabilityPlayer.java | 5 +++-- .../java/ru/dbotthepony/mc/otm/item/ItemPill.java | 4 +--- 4 files changed, 10 insertions(+), 17 deletions(-) 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%) diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java index 7b9332455..27043315a 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java +++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java @@ -1,33 +1,24 @@ package ru.dbotthepony.mc.otm; -import net.minecraft.world.inventory.MenuType; import net.minecraft.world.item.CreativeModeTab; -import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.InterModComms; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; -import net.minecraftforge.fmlserverevents.FMLServerStartedEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -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.client.AndroidGui; import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.matter.MatterRegistry; import ru.dbotthepony.mc.otm.network.MatteryNetworking; -import ru.dbotthepony.mc.otm.shapes.Point; -import ru.dbotthepony.mc.otm.shapes.Rectangle; import java.util.stream.Collectors; 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 00d54cad8..1759056b8 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.client.player.LocalPlayer; import net.minecraft.core.Direction; @@ -19,6 +19,9 @@ import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import ru.dbotthepony.mc.otm.OverdriveThatMatters; +import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.IMatteryEnergyStorage; +import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.AndroidCapabilityChangePacket; import javax.annotation.Nonnull; 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 817883c46..9581b80f3 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,10 +1,9 @@ -package ru.dbotthepony.mc.otm.capability; +package ru.dbotthepony.mc.otm.capability.android; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; -import net.minecraft.world.food.FoodData; import net.minecraftforge.client.event.InputUpdateEvent; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.event.AttachCapabilitiesEvent; @@ -12,6 +11,8 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fmllegacy.network.PacketDistributor; import ru.dbotthepony.mc.otm.Registry; +import ru.dbotthepony.mc.otm.capability.IAndroidCapability; +import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.network.AndroidCapabilityChangePacket; import ru.dbotthepony.mc.otm.network.MatteryNetworking; 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 af3d1e808..7d5572211 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java +++ b/src/main/java/ru/dbotthepony/mc/otm/item/ItemPill.java @@ -2,7 +2,6 @@ package ru.dbotthepony.mc.otm.item; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.InteractionHand; @@ -12,9 +11,8 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; import net.minecraft.world.level.Level; import net.minecraftforge.common.util.FakePlayer; -import org.apache.logging.log4j.core.jmx.Server; import ru.dbotthepony.mc.otm.OverdriveThatMatters; -import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; +import ru.dbotthepony.mc.otm.capability.android.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.IAndroidCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability;