From 634fee9bebb07a08c05d7b7eebd9ceaed308d778 Mon Sep 17 00:00:00 2001 From: Anastasia Chrysanthemum Date: Mon, 11 May 2026 09:04:39 +1000 Subject: [PATCH] refactor: Consistency and cleanup. --- ...ge.java => CowponentsBlockEntitiesNeoForge.java} | 4 ++-- .../cowponents/impl/util}/package-info.java | 2 +- .../CowponentsInstancesDedicatedNeoForge.java | 10 ---------- .../neoforge/server/dedicated/package-info.java | 6 ------ .../entities/impl/client/network}/package-info.java | 2 +- .../entities/impl/duck}/package-info.java | 2 +- .../client/CowponentsExtensionsClientNeoForge.java | 13 ------------- .../CowponentsExtensionsDedicatedNeoForge.java | 10 ---------- .../neoforge/server/dedicated/package-info.java | 6 ------ 9 files changed, 5 insertions(+), 50 deletions(-) rename block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/{CowponentsInstancesNeoForge.java => CowponentsBlockEntitiesNeoForge.java} (79%) rename {entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server => core/xplat/src/main/java/lgbt/greenhouse/cowponents/impl/util}/package-info.java (64%) delete mode 100644 entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/CowponentsInstancesDedicatedNeoForge.java delete mode 100644 entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/package-info.java rename {extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client => entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/client/network}/package-info.java (64%) rename {extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server => entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/duck}/package-info.java (64%) delete mode 100644 extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/CowponentsExtensionsClientNeoForge.java delete mode 100644 extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/CowponentsExtensionsDedicatedNeoForge.java delete mode 100644 extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/package-info.java diff --git a/block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsInstancesNeoForge.java b/block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsBlockEntitiesNeoForge.java similarity index 79% rename from block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsInstancesNeoForge.java rename to block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsBlockEntitiesNeoForge.java index 8bc92ea..f24f139 100644 --- a/block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsInstancesNeoForge.java +++ b/block_entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/block_entities/impl/neoforge/CowponentsBlockEntitiesNeoForge.java @@ -7,8 +7,8 @@ import net.neoforged.fml.common.Mod; @Mod(CowponentsBlockEntities.MOD_ID) @EventBusSubscriber(modid = CowponentsBlockEntities.MOD_ID) -public class CowponentsInstancesNeoForge { - public CowponentsInstancesNeoForge(IEventBus eventBus) { +public class CowponentsBlockEntitiesNeoForge { + public CowponentsBlockEntitiesNeoForge(IEventBus eventBus) { CowponentsBlockEntities.init(); } } diff --git a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/package-info.java b/core/xplat/src/main/java/lgbt/greenhouse/cowponents/impl/util/package-info.java similarity index 64% rename from entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/package-info.java rename to core/xplat/src/main/java/lgbt/greenhouse/cowponents/impl/util/package-info.java index 2687627..5a2200c 100644 --- a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/package-info.java +++ b/core/xplat/src/main/java/lgbt/greenhouse/cowponents/impl/util/package-info.java @@ -1,6 +1,6 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.cowponents.entities.impl.neoforge.server; +package lgbt.greenhouse.cowponents.impl.util; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/CowponentsInstancesDedicatedNeoForge.java b/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/CowponentsInstancesDedicatedNeoForge.java deleted file mode 100644 index b719fa4..0000000 --- a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/CowponentsInstancesDedicatedNeoForge.java +++ /dev/null @@ -1,10 +0,0 @@ -package lgbt.greenhouse.cowponents.entities.impl.neoforge.server.dedicated; - -import lgbt.greenhouse.cowponents.entities.impl.CowponentsEntities; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.fml.common.Mod; - -@Mod(value = CowponentsEntities.MOD_ID, dist = Dist.DEDICATED_SERVER) -public class CowponentsInstancesDedicatedNeoForge { - -} diff --git a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/package-info.java b/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/package-info.java deleted file mode 100644 index 49cc70a..0000000 --- a/entities/neoforge/src/main/java/lgbt/greenhouse/cowponents/entities/impl/neoforge/server/dedicated/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.cowponents.entities.impl.neoforge.server.dedicated; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; diff --git a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/package-info.java b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/client/network/package-info.java similarity index 64% rename from extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/package-info.java rename to entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/client/network/package-info.java index 6ce6293..48ce39c 100644 --- a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/package-info.java +++ b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/client/network/package-info.java @@ -1,6 +1,6 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.cowponents.extensions.impl.neoforge.client; +package lgbt.greenhouse.cowponents.entities.impl.client.network; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/package-info.java b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/duck/package-info.java similarity index 64% rename from extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/package-info.java rename to entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/duck/package-info.java index 229133e..6b64572 100644 --- a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/package-info.java +++ b/entities/xplat/src/main/java/lgbt/greenhouse/cowponents/entities/impl/duck/package-info.java @@ -1,6 +1,6 @@ @ApiStatus.Internal @NullMarked -package lgbt.greenhouse.cowponents.extensions.impl.neoforge.server; +package lgbt.greenhouse.cowponents.entities.impl.duck; import org.jetbrains.annotations.ApiStatus; import org.jspecify.annotations.NullMarked; diff --git a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/CowponentsExtensionsClientNeoForge.java b/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/CowponentsExtensionsClientNeoForge.java deleted file mode 100644 index 353a14a..0000000 --- a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/client/CowponentsExtensionsClientNeoForge.java +++ /dev/null @@ -1,13 +0,0 @@ -package lgbt.greenhouse.cowponents.extensions.impl.neoforge.client; - -import lgbt.greenhouse.cowponents.extensions.impl.CowponentsExtensions; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.fml.common.Mod; - -@Mod(value = CowponentsExtensions.MOD_ID, dist = Dist.CLIENT) -public class CowponentsExtensionsClientNeoForge { - public CowponentsExtensionsClientNeoForge(IEventBus eventBus) { - - } -} diff --git a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/CowponentsExtensionsDedicatedNeoForge.java b/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/CowponentsExtensionsDedicatedNeoForge.java deleted file mode 100644 index c8a73f2..0000000 --- a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/CowponentsExtensionsDedicatedNeoForge.java +++ /dev/null @@ -1,10 +0,0 @@ -package lgbt.greenhouse.cowponents.extensions.impl.neoforge.server.dedicated; - -import lgbt.greenhouse.cowponents.extensions.impl.CowponentsExtensions; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.fml.common.Mod; - -@Mod(value = CowponentsExtensions.MOD_ID, dist = Dist.DEDICATED_SERVER) -public class CowponentsExtensionsDedicatedNeoForge { - -} diff --git a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/package-info.java b/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/package-info.java deleted file mode 100644 index 6019089..0000000 --- a/extensions/neoforge/src/main/java/lgbt/greenhouse/cowponents/extensions/impl/neoforge/server/dedicated/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -@ApiStatus.Internal -@NullMarked -package lgbt.greenhouse.cowponents.extensions.impl.neoforge.server.dedicated; - -import org.jetbrains.annotations.ApiStatus; -import org.jspecify.annotations.NullMarked; -- 2.51.2