diff --git a/build.gradle b/build.gradle index 324e79d4..a3fc2e5c 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ allprojects { sourceCompatibility = 1.8 targetCompatibility = 1.8 - group = "com.patchworkmc.patchwork-api" + group = "net.patchworkmc.patchwork-api" dependencies { minecraft "com.mojang:minecraft:$Globals.mcVersion" diff --git a/checkstyle.xml b/checkstyle.xml index 8636e957..2e14bd8e 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -69,7 +69,7 @@ - + @@ -161,7 +161,7 @@ + value="^net\.patchworkmc|^net\.minecraftforge|^cpw\.mods\.modlauncher\.api"/> diff --git a/patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/PatchworkBiomes.java b/patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/PatchworkBiomes.java similarity index 98% rename from patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/PatchworkBiomes.java rename to patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/PatchworkBiomes.java index c575293e..4c36acbd 100644 --- a/patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/PatchworkBiomes.java +++ b/patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/PatchworkBiomes.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.biomes; +package net.patchworkmc.impl.biomes; import java.util.Iterator; import java.util.Set; diff --git a/patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/RiverSupplier.java b/patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/RiverSupplier.java similarity index 95% rename from patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/RiverSupplier.java rename to patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/RiverSupplier.java index 881e54ee..bbb2cb80 100644 --- a/patchwork-biomes/src/main/java/com/patchworkmc/impl/biomes/RiverSupplier.java +++ b/patchwork-biomes/src/main/java/net/patchworkmc/impl/biomes/RiverSupplier.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.biomes; +package net.patchworkmc.impl.biomes; import net.minecraft.world.biome.Biome; diff --git a/patchwork-biomes/src/main/java/com/patchworkmc/mixin/biomes/MixinBiome.java b/patchwork-biomes/src/main/java/net/patchworkmc/mixin/biomes/MixinBiome.java similarity index 88% rename from patchwork-biomes/src/main/java/com/patchworkmc/mixin/biomes/MixinBiome.java rename to patchwork-biomes/src/main/java/net/patchworkmc/mixin/biomes/MixinBiome.java index 62e95da1..93f4bd87 100644 --- a/patchwork-biomes/src/main/java/com/patchworkmc/mixin/biomes/MixinBiome.java +++ b/patchwork-biomes/src/main/java/net/patchworkmc/mixin/biomes/MixinBiome.java @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.biomes; +package net.patchworkmc.mixin.biomes; import org.spongepowered.asm.mixin.Mixin; import net.minecraft.world.biome.Biome; -import com.patchworkmc.impl.biomes.RiverSupplier; -import com.patchworkmc.impl.biomes.PatchworkBiomes; +import net.patchworkmc.impl.biomes.RiverSupplier; +import net.patchworkmc.impl.biomes.PatchworkBiomes; @Mixin(Biome.class) public class MixinBiome implements RiverSupplier { diff --git a/patchwork-biomes/src/main/resources/fabric.mod.json b/patchwork-biomes/src/main/resources/fabric.mod.json index 2046f8d0..973beb17 100644 --- a/patchwork-biomes/src/main/resources/fabric.mod.json +++ b/patchwork-biomes/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "description": "Implementation of the Forge Biomes API.", "entrypoints": { "main": [ - "com.patchworkmc.impl.biomes.PatchworkBiomes" + "net.patchworkmc.impl.biomes.PatchworkBiomes" ] }, "mixins": [ diff --git a/patchwork-biomes/src/main/resources/patchwork-biomes.mixins.json b/patchwork-biomes/src/main/resources/patchwork-biomes.mixins.json index ec95c9d7..27e15959 100644 --- a/patchwork-biomes/src/main/resources/patchwork-biomes.mixins.json +++ b/patchwork-biomes/src/main/resources/patchwork-biomes.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.biomes", + "package": "net.patchworkmc.mixin.biomes", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinBiome" diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java index b7468ab5..02dd66cf 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/Capability.java @@ -39,7 +39,7 @@ * as the ability to read and write the interface to NBT * *

When {@link CapabilityManager#register} is called, {@link CapabilityManager} creates a single instance of this class, - * which is then passed to any listeners of {@link com.patchworkmc.api.capability.CapabilityRegisteredCallback}. + * which is then passed to any listeners of {@link net.patchworkmc.api.capability.CapabilityRegisteredCallback}. * *

After registration, instances of this class may be used with {@link ICapabilityProvider#getCapability} and the * functions within {@link IStorage} diff --git a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java index 3547b1e4..bc47cf41 100644 --- a/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java +++ b/patchwork-capabilities/src/main/java/net/minecraftforge/common/capabilities/CapabilityManager.java @@ -29,7 +29,7 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import com.patchworkmc.api.capability.CapabilityRegisteredCallback; +import net.patchworkmc.api.capability.CapabilityRegisteredCallback; public enum CapabilityManager { INSTANCE; diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/api/capability/CapabilityRegisteredCallback.java b/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityRegisteredCallback.java similarity index 91% rename from patchwork-capabilities/src/main/java/com/patchworkmc/api/capability/CapabilityRegisteredCallback.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityRegisteredCallback.java index 1984ff93..0186551d 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/api/capability/CapabilityRegisteredCallback.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/api/capability/CapabilityRegisteredCallback.java @@ -17,13 +17,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.api.capability; +package net.patchworkmc.api.capability; import net.minecraftforge.common.capabilities.Capability; import net.fabricmc.fabric.api.event.Event; -import com.patchworkmc.impl.capability.CapabilityRegisteredCallbackInternal; +import net.patchworkmc.impl.capability.CapabilityRegisteredCallbackInternal; public interface CapabilityRegisteredCallback { void onCapabilityRegistered(Capability capability); diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/BaseCapabilityProvider.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java similarity index 97% rename from patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/BaseCapabilityProvider.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java index db1c69c0..31a3d2c1 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/BaseCapabilityProvider.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/BaseCapabilityProvider.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.capability; +package net.patchworkmc.impl.capability; import javax.annotation.Nullable; diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityProviderHolder.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java similarity index 98% rename from patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityProviderHolder.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java index 852474f8..3e16d5cc 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityProviderHolder.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityProviderHolder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.capability; +package net.patchworkmc.impl.capability; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java similarity index 95% rename from patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java index b235c960..f8b56981 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/impl/capability/CapabilityRegisteredCallbackInternal.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.capability; +package net.patchworkmc.impl.capability; import java.util.IdentityHashMap; import java.util.Map; @@ -28,7 +28,7 @@ import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; -import com.patchworkmc.api.capability.CapabilityRegisteredCallback; +import net.patchworkmc.api.capability.CapabilityRegisteredCallback; public class CapabilityRegisteredCallbackInternal { private static final Logger LOGGER = LogManager.getLogger(CapabilityRegisteredCallback.class); diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/BlockEntityMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/BlockEntityMixin.java similarity index 93% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/BlockEntityMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/BlockEntityMixin.java index d2c09e66..dfc87474 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/BlockEntityMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/BlockEntityMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import javax.annotation.Nonnull; @@ -31,8 +31,8 @@ import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; -import com.patchworkmc.impl.capability.BaseCapabilityProvider; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.BaseCapabilityProvider; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(BlockEntity.class) public class BlockEntityMixin implements CapabilityProviderHolder { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ChunkSerializerMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ChunkSerializerMixin.java similarity index 97% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ChunkSerializerMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ChunkSerializerMixin.java index 615a1810..0089dd37 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ChunkSerializerMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ChunkSerializerMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import java.util.function.Consumer; @@ -48,7 +48,7 @@ import net.minecraft.world.chunk.UpgradeData; import net.minecraft.world.chunk.WorldChunk; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(ChunkSerializer.class) public class ChunkSerializerMixin { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ClientWorldMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ClientWorldMixin.java similarity index 93% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ClientWorldMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ClientWorldMixin.java index 8f05c9a3..aaf58a82 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ClientWorldMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ClientWorldMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -26,7 +26,7 @@ import net.minecraft.client.world.ClientWorld; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; // World implements CapabilityProviderHolder already because of WorldMixin @Mixin(ClientWorld.class) diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/EntityMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/EntityMixin.java similarity index 94% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/EntityMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/EntityMixin.java index 2e2037c7..e91a6cc8 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/EntityMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/EntityMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import javax.annotation.Nonnull; @@ -32,8 +32,8 @@ import net.minecraft.entity.Entity; import net.minecraft.nbt.CompoundTag; -import com.patchworkmc.impl.capability.BaseCapabilityProvider; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.BaseCapabilityProvider; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(Entity.class) public class EntityMixin implements CapabilityProviderHolder { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemEntityMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemEntityMixin.java similarity index 93% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemEntityMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemEntityMixin.java index b6689ed2..d4d75ffb 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemEntityMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemEntityMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -27,7 +27,7 @@ import net.minecraft.entity.ItemEntity; import net.minecraft.item.ItemStack; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(ItemEntity.class) public class ItemEntityMixin { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemStackMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemStackMixin.java similarity index 95% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemStackMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemStackMixin.java index 120f746b..4a9ec557 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ItemStackMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ItemStackMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import javax.annotation.Nonnull; @@ -32,8 +32,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import com.patchworkmc.impl.capability.BaseCapabilityProvider; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.BaseCapabilityProvider; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(ItemStack.class) public class ItemStackMixin implements CapabilityProviderHolder { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ServerWorldMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ServerWorldMixin.java similarity index 93% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ServerWorldMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ServerWorldMixin.java index 8edffe73..ea8ba227 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/ServerWorldMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/ServerWorldMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -26,7 +26,7 @@ import net.minecraft.server.world.ServerWorld; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; // World implements CapabilityProviderHolder already because of WorldMixin @Mixin(ServerWorld.class) diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldChunkMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldChunkMixin.java similarity index 90% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldChunkMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldChunkMixin.java index ca6eea4b..d55c1744 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldChunkMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldChunkMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import javax.annotation.Nonnull; @@ -29,8 +29,8 @@ import net.minecraft.world.chunk.WorldChunk; -import com.patchworkmc.impl.capability.BaseCapabilityProvider; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.BaseCapabilityProvider; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(WorldChunk.class) public class WorldChunkMixin implements CapabilityProviderHolder { diff --git a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldMixin.java b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldMixin.java similarity index 88% rename from patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldMixin.java rename to patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldMixin.java index 8f824c23..d21925cd 100644 --- a/patchwork-capabilities/src/main/java/com/patchworkmc/mixin/capability/WorldMixin.java +++ b/patchwork-capabilities/src/main/java/net/patchworkmc/mixin/capability/WorldMixin.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.capability; +package net.patchworkmc.mixin.capability; import javax.annotation.Nonnull; @@ -26,8 +26,8 @@ import net.minecraft.world.World; -import com.patchworkmc.impl.capability.BaseCapabilityProvider; -import com.patchworkmc.impl.capability.CapabilityProviderHolder; +import net.patchworkmc.impl.capability.BaseCapabilityProvider; +import net.patchworkmc.impl.capability.CapabilityProviderHolder; @Mixin(World.class) public class WorldMixin implements CapabilityProviderHolder { diff --git a/patchwork-capabilities/src/main/resources/patchwork-capabilities.mixins.json b/patchwork-capabilities/src/main/resources/patchwork-capabilities.mixins.json index 88bd49f8..d9fbf88f 100644 --- a/patchwork-capabilities/src/main/resources/patchwork-capabilities.mixins.json +++ b/patchwork-capabilities/src/main/resources/patchwork-capabilities.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.capability", + "package": "net.patchworkmc.mixin.capability", "compatibilityLevel": "JAVA_8", "mixins": [ "BlockEntityMixin", diff --git a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/ForgeInitializer.java b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/ForgeInitializer.java similarity index 96% rename from patchwork-dispatcher/src/main/java/com/patchworkmc/api/ForgeInitializer.java rename to patchwork-dispatcher/src/main/java/net/patchworkmc/api/ForgeInitializer.java index f32f9349..264bed8c 100644 --- a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/ForgeInitializer.java +++ b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/ForgeInitializer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.api; +package net.patchworkmc.api; public interface ForgeInitializer { String getModId(); diff --git a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/block/PatchworkBlockSettings.java b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/block/PatchworkBlockSettings.java similarity index 97% rename from patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/block/PatchworkBlockSettings.java rename to patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/block/PatchworkBlockSettings.java index 10387f4f..778a6029 100644 --- a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/block/PatchworkBlockSettings.java +++ b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/block/PatchworkBlockSettings.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.api.redirects.block; +package net.patchworkmc.api.redirects.block; import net.minecraft.block.Block; import net.minecraft.sound.BlockSoundGroup; diff --git a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java similarity index 97% rename from patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java rename to patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java index 749a4922..6ee6d02e 100644 --- a/patchwork-dispatcher/src/main/java/com/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java +++ b/patchwork-dispatcher/src/main/java/net/patchworkmc/api/redirects/itemgroup/PatchworkItemGroup.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.api.redirects.itemgroup; +package net.patchworkmc.api.redirects.itemgroup; import net.minecraft.item.ItemGroup; import net.minecraft.util.Identifier; diff --git a/patchwork-dispatcher/src/main/java/com/patchworkmc/impl/Patchwork.java b/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/Patchwork.java similarity index 96% rename from patchwork-dispatcher/src/main/java/com/patchworkmc/impl/Patchwork.java rename to patchwork-dispatcher/src/main/java/net/patchworkmc/impl/Patchwork.java index e3de67ec..a39277b5 100644 --- a/patchwork-dispatcher/src/main/java/com/patchworkmc/impl/Patchwork.java +++ b/patchwork-dispatcher/src/main/java/net/patchworkmc/impl/Patchwork.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl; +package net.patchworkmc.impl; import java.util.HashMap; import java.util.Map; @@ -48,8 +48,8 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; -import com.patchworkmc.api.ForgeInitializer; -import com.patchworkmc.impl.registries.RegistryEventDispatcher; +import net.patchworkmc.api.ForgeInitializer; +import net.patchworkmc.impl.registries.RegistryEventDispatcher; public class Patchwork implements ModInitializer { private static final Logger LOGGER = LogManager.getLogger(Patchwork.class); diff --git a/patchwork-dispatcher/src/main/resources/fabric.mod.json b/patchwork-dispatcher/src/main/resources/fabric.mod.json index 90304152..91330e46 100644 --- a/patchwork-dispatcher/src/main/resources/fabric.mod.json +++ b/patchwork-dispatcher/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "environment": "*", "entrypoints": { "main": [ - "com.patchworkmc.impl.Patchwork" + "net.patchworkmc.impl.Patchwork" ] }, "depends": { diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/api/enumhacks/EnumHacks.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/api/enumhacks/EnumHacks.java similarity index 91% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/api/enumhacks/EnumHacks.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/api/enumhacks/EnumHacks.java index 2f85a656..dab15186 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/api/enumhacks/EnumHacks.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/api/enumhacks/EnumHacks.java @@ -1,190 +1,190 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.api.enumhacks; - -import java.lang.invoke.CallSite; -import java.lang.invoke.LambdaMetafactory; -import java.lang.invoke.MethodHandle; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; -import java.lang.reflect.Field; -import java.util.function.IntFunction; -import java.util.function.Predicate; - -import com.google.common.collect.ImmutableList; -import org.apache.commons.lang3.ArrayUtils; -import net.minecraftforge.common.util.TriPredicate; - -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BannerPattern; -import net.minecraft.enchantment.EnchantmentTarget; -import net.minecraft.entity.EntityCategory; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnRestriction; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.structure.pool.StructurePool; -import net.minecraft.structure.processor.StructureProcessor; -import net.minecraft.util.Formatting; -import net.minecraft.util.Rarity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ViewableWorld; -import net.minecraft.world.gen.feature.OreFeatureConfig; - -import com.patchworkmc.impl.enumhacks.HackableEnum; -import com.patchworkmc.impl.enumhacks.PatchworkEnchantmentTarget; -import com.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; -import com.patchworkmc.mixin.enumhacks.BannerPatternAccessor; -import com.patchworkmc.mixin.enumhacks.EntityCategoryAccessor; -import com.patchworkmc.mixin.enumhacks.OreFeatureConfigTargetAccessor; -import com.patchworkmc.mixin.enumhacks.RarityAccessor; -import com.patchworkmc.mixin.enumhacks.SpawnRestrictionLocationAccessor; -import com.patchworkmc.mixin.enumhacks.StructurePoolProjectionAccessor; - -/** - * A bunch of awful, awful hacks to implement IExtensibleEnum. - * No, seriously. These are AWFUL hacks. Especially EnchantmentTarget. - * @author NuclearFarts - */ -public final class EnumHacks { - public EnumHacks() { } - - private static final EnchantmentTargetFactory ENCHANTMENT_TARGET_FACTORY; - private static final Field ENUM_CACHE; - private static final Field ENUM_DIRECTORY_CACHE; - - static { - // Enum values are cached on Class objects. Store the Fields to reset the caches. - boolean attemptDirectory = true; - Field enumCache; - - try { - enumCache = Class.class.getDeclaredField("enumConstants"); - } catch (NoSuchFieldException e) { - // don't blow up quite yet. we might be on openj9. - try { - enumCache = Class.class.getDeclaredField("enumVars"); - attemptDirectory = false; // if we didn't go into the catch block, we're on openj9, which caches both in one object. don't look for the other one. - } catch (NoSuchFieldException e2) { - // we aren't on openj9 either. blow up. - throw new RuntimeException("Problem getting enumConstants field", e); - } - } - - ENUM_CACHE = enumCache; - ENUM_CACHE.setAccessible(true); - - if (attemptDirectory) { - try { - ENUM_DIRECTORY_CACHE = Class.class.getDeclaredField("enumConstantDirectory"); - ENUM_DIRECTORY_CACHE.setAccessible(true); - } catch (NoSuchFieldException | SecurityException e) { - throw new RuntimeException("Problem getting enumConstantDirectory field", e); - } - } else { - ENUM_DIRECTORY_CACHE = null; - } - - // We can't use a constructor accessor because we get around EnchantmentTarget being abstract by using EnchantmentTarget$1. - // EnchantmentTarget$1 is a private anonymous internal class and cannot be used as a return type. Mixin doesn't like that so @Coerce won't work for some reason. - // get a lookup that has access to EnchantmentTarget's private methods, including constructor. - MethodHandles.Lookup lookup = ((PatchworkEnchantmentTarget) EnchantmentTarget.ALL).patchwork_getEnchantmentTargetPrivateLookup(); - MethodType type = MethodType.methodType(EnchantmentTarget.class, String.class, int.class); - - try { - MethodHandle enchTargetCtor = lookup.findConstructor(EnchantmentTarget.ALL.getClass(), type.changeReturnType(void.class)); // ctors have void return internally - // LambdaMetafactory stuff is technically unnecessary but it means we don't have to catch Throwable every time we instantiate an EnchantmentTarget and I'd rather not do that. - CallSite site = LambdaMetafactory.metafactory(lookup, "create", MethodType.methodType(EnchantmentTargetFactory.class), type, enchTargetCtor, type); - ENCHANTMENT_TARGET_FACTORY = (EnchantmentTargetFactory) site.getTarget().invoke(); - } catch (Throwable e) { - throw new RuntimeException("Could not get EnchantmentTarget constructor/set up factory", e); - } - } - - @SuppressWarnings("unchecked") - private static void addToValues(T[] origArray, T newValue) { - ((HackableEnum) newValue).patchwork_setValues(ArrayUtils.add(origArray, newValue)); - } - - private static void clearCachedValues(Class> clazz) { - try { - ENUM_CACHE.set(clazz, null); - - if (ENUM_DIRECTORY_CACHE != null) { - ENUM_DIRECTORY_CACHE.set(clazz, null); - } - } catch (IllegalArgumentException | IllegalAccessException e) { - throw new RuntimeException("Exception clearing enum cache for class " + clazz.getSimpleName(), e); - } - } - - private static > T constructAndAdd(Class clazz, IntFunction constructor) { - T[] values = clazz.getEnumConstants(); - T instance = constructor.apply(values.length); - addToValues(values, instance); - clearCachedValues(clazz); - return instance; - } - - public static Rarity createRarity(String name, Formatting formatting) { - return constructAndAdd(Rarity.class, ordinal -> RarityAccessor.invokeConstructor(name, ordinal, formatting)); - } - - public static EntityCategory createEntityCategory(String constantName, String name, int spawnCap, boolean peaceful, boolean animal) { - return constructAndAdd(EntityCategory.class, ordinal -> EntityCategoryAccessor.invokeConstructor(constantName, ordinal, name, spawnCap, peaceful, animal)); - } - - public static StructurePool.Projection createStructurePoolProjection(String name, String id, ImmutableList processors) { - StructurePool.Projection instance = constructAndAdd(StructurePool.Projection.class, ordinal -> StructurePoolProjectionAccessor.invokeConstructor(name, ordinal, id, processors)); - StructurePoolProjectionAccessor.getIdProjectionMap().put(id, instance); - return instance; - } - - public static OreFeatureConfig.Target createOreFeatureConfigTarget(String constantName, String name, Predicate predicate) { - OreFeatureConfig.Target instance = constructAndAdd(OreFeatureConfig.Target.class, ordinal -> OreFeatureConfigTargetAccessor.invokeConstructor(constantName, ordinal, name, predicate)); - OreFeatureConfigTargetAccessor.getNameMap().put(name, instance); - return instance; - } - - public static BannerPattern createBannerPattern(String constantName, String name, String id, ItemStack baseStack) { - return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, baseStack)); - } - - public static BannerPattern createBannerPattern(String constantName, String name, String id, String recipePattern0, String recipePattern1, String recipePattern2) { - return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, recipePattern0, recipePattern1, recipePattern2)); - } - - public static SpawnRestriction.Location createSpawnRestrictionLocation(String name, TriPredicate> predicate) { - SpawnRestriction.Location instance = constructAndAdd(SpawnRestriction.Location.class, ordinal -> SpawnRestrictionLocationAccessor.invokeConstructor(name, ordinal)); - ((PatchworkSpawnRestrictionLocation) (Object) instance).patchwork_setPredicate(predicate); - return instance; - } - - public static EnchantmentTarget createEnchantmentTarget(String name, Predicate predicate) { - EnchantmentTarget instance = constructAndAdd(EnchantmentTarget.class, ordinal -> ENCHANTMENT_TARGET_FACTORY.create(name, ordinal)); - ((PatchworkEnchantmentTarget) instance).patchwork_setPredicate(predicate); - return instance; - } - - @FunctionalInterface - public interface EnchantmentTargetFactory { - EnchantmentTarget create(String target, int ordinal); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.api.enumhacks; + +import java.lang.invoke.CallSite; +import java.lang.invoke.LambdaMetafactory; +import java.lang.invoke.MethodHandle; +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodType; +import java.lang.reflect.Field; +import java.util.function.IntFunction; +import java.util.function.Predicate; + +import com.google.common.collect.ImmutableList; +import org.apache.commons.lang3.ArrayUtils; +import net.minecraftforge.common.util.TriPredicate; + +import net.minecraft.block.BlockState; +import net.minecraft.block.entity.BannerPattern; +import net.minecraft.enchantment.EnchantmentTarget; +import net.minecraft.entity.EntityCategory; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnRestriction; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.structure.pool.StructurePool; +import net.minecraft.structure.processor.StructureProcessor; +import net.minecraft.util.Formatting; +import net.minecraft.util.Rarity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ViewableWorld; +import net.minecraft.world.gen.feature.OreFeatureConfig; + +import net.patchworkmc.impl.enumhacks.HackableEnum; +import net.patchworkmc.impl.enumhacks.PatchworkEnchantmentTarget; +import net.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; +import net.patchworkmc.mixin.enumhacks.BannerPatternAccessor; +import net.patchworkmc.mixin.enumhacks.EntityCategoryAccessor; +import net.patchworkmc.mixin.enumhacks.OreFeatureConfigTargetAccessor; +import net.patchworkmc.mixin.enumhacks.RarityAccessor; +import net.patchworkmc.mixin.enumhacks.SpawnRestrictionLocationAccessor; +import net.patchworkmc.mixin.enumhacks.StructurePoolProjectionAccessor; + +/** + * A bunch of awful, awful hacks to implement IExtensibleEnum. + * No, seriously. These are AWFUL hacks. Especially EnchantmentTarget. + * @author NuclearFarts + */ +public final class EnumHacks { + public EnumHacks() { } + + private static final EnchantmentTargetFactory ENCHANTMENT_TARGET_FACTORY; + private static final Field ENUM_CACHE; + private static final Field ENUM_DIRECTORY_CACHE; + + static { + // Enum values are cached on Class objects. Store the Fields to reset the caches. + boolean attemptDirectory = true; + Field enumCache; + + try { + enumCache = Class.class.getDeclaredField("enumConstants"); + } catch (NoSuchFieldException e) { + // don't blow up quite yet. we might be on openj9. + try { + enumCache = Class.class.getDeclaredField("enumVars"); + attemptDirectory = false; // if we didn't go into the catch block, we're on openj9, which caches both in one object. don't look for the other one. + } catch (NoSuchFieldException e2) { + // we aren't on openj9 either. blow up. + throw new RuntimeException("Problem getting enumConstants field", e); + } + } + + ENUM_CACHE = enumCache; + ENUM_CACHE.setAccessible(true); + + if (attemptDirectory) { + try { + ENUM_DIRECTORY_CACHE = Class.class.getDeclaredField("enumConstantDirectory"); + ENUM_DIRECTORY_CACHE.setAccessible(true); + } catch (NoSuchFieldException | SecurityException e) { + throw new RuntimeException("Problem getting enumConstantDirectory field", e); + } + } else { + ENUM_DIRECTORY_CACHE = null; + } + + // We can't use a constructor accessor because we get around EnchantmentTarget being abstract by using EnchantmentTarget$1. + // EnchantmentTarget$1 is a private anonymous internal class and cannot be used as a return type. Mixin doesn't like that so @Coerce won't work for some reason. + // get a lookup that has access to EnchantmentTarget's private methods, including constructor. + MethodHandles.Lookup lookup = ((PatchworkEnchantmentTarget) EnchantmentTarget.ALL).patchwork_getEnchantmentTargetPrivateLookup(); + MethodType type = MethodType.methodType(EnchantmentTarget.class, String.class, int.class); + + try { + MethodHandle enchTargetCtor = lookup.findConstructor(EnchantmentTarget.ALL.getClass(), type.changeReturnType(void.class)); // ctors have void return internally + // LambdaMetafactory stuff is technically unnecessary but it means we don't have to catch Throwable every time we instantiate an EnchantmentTarget and I'd rather not do that. + CallSite site = LambdaMetafactory.metafactory(lookup, "create", MethodType.methodType(EnchantmentTargetFactory.class), type, enchTargetCtor, type); + ENCHANTMENT_TARGET_FACTORY = (EnchantmentTargetFactory) site.getTarget().invoke(); + } catch (Throwable e) { + throw new RuntimeException("Could not get EnchantmentTarget constructor/set up factory", e); + } + } + + @SuppressWarnings("unchecked") + private static void addToValues(T[] origArray, T newValue) { + ((HackableEnum) newValue).patchwork_setValues(ArrayUtils.add(origArray, newValue)); + } + + private static void clearCachedValues(Class> clazz) { + try { + ENUM_CACHE.set(clazz, null); + + if (ENUM_DIRECTORY_CACHE != null) { + ENUM_DIRECTORY_CACHE.set(clazz, null); + } + } catch (IllegalArgumentException | IllegalAccessException e) { + throw new RuntimeException("Exception clearing enum cache for class " + clazz.getSimpleName(), e); + } + } + + private static > T constructAndAdd(Class clazz, IntFunction constructor) { + T[] values = clazz.getEnumConstants(); + T instance = constructor.apply(values.length); + addToValues(values, instance); + clearCachedValues(clazz); + return instance; + } + + public static Rarity createRarity(String name, Formatting formatting) { + return constructAndAdd(Rarity.class, ordinal -> RarityAccessor.invokeConstructor(name, ordinal, formatting)); + } + + public static EntityCategory createEntityCategory(String constantName, String name, int spawnCap, boolean peaceful, boolean animal) { + return constructAndAdd(EntityCategory.class, ordinal -> EntityCategoryAccessor.invokeConstructor(constantName, ordinal, name, spawnCap, peaceful, animal)); + } + + public static StructurePool.Projection createStructurePoolProjection(String name, String id, ImmutableList processors) { + StructurePool.Projection instance = constructAndAdd(StructurePool.Projection.class, ordinal -> StructurePoolProjectionAccessor.invokeConstructor(name, ordinal, id, processors)); + StructurePoolProjectionAccessor.getIdProjectionMap().put(id, instance); + return instance; + } + + public static OreFeatureConfig.Target createOreFeatureConfigTarget(String constantName, String name, Predicate predicate) { + OreFeatureConfig.Target instance = constructAndAdd(OreFeatureConfig.Target.class, ordinal -> OreFeatureConfigTargetAccessor.invokeConstructor(constantName, ordinal, name, predicate)); + OreFeatureConfigTargetAccessor.getNameMap().put(name, instance); + return instance; + } + + public static BannerPattern createBannerPattern(String constantName, String name, String id, ItemStack baseStack) { + return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, baseStack)); + } + + public static BannerPattern createBannerPattern(String constantName, String name, String id, String recipePattern0, String recipePattern1, String recipePattern2) { + return constructAndAdd(BannerPattern.class, ordinal -> BannerPatternAccessor.invokeConstructor(constantName, ordinal, name, id, recipePattern0, recipePattern1, recipePattern2)); + } + + public static SpawnRestriction.Location createSpawnRestrictionLocation(String name, TriPredicate> predicate) { + SpawnRestriction.Location instance = constructAndAdd(SpawnRestriction.Location.class, ordinal -> SpawnRestrictionLocationAccessor.invokeConstructor(name, ordinal)); + ((PatchworkSpawnRestrictionLocation) (Object) instance).patchwork_setPredicate(predicate); + return instance; + } + + public static EnchantmentTarget createEnchantmentTarget(String name, Predicate predicate) { + EnchantmentTarget instance = constructAndAdd(EnchantmentTarget.class, ordinal -> ENCHANTMENT_TARGET_FACTORY.create(name, ordinal)); + ((PatchworkEnchantmentTarget) instance).patchwork_setPredicate(predicate); + return instance; + } + + @FunctionalInterface + public interface EnchantmentTargetFactory { + EnchantmentTarget create(String target, int ordinal); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/HackableEnum.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/HackableEnum.java similarity index 93% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/HackableEnum.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/HackableEnum.java index d2f59c67..6d298071 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/HackableEnum.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/HackableEnum.java @@ -1,24 +1,24 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.impl.enumhacks; - -public interface HackableEnum { - void patchwork_setValues(T[] values); -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.impl.enumhacks; + +public interface HackableEnum { + void patchwork_setValues(T[] values); +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java similarity index 93% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java index 1de09c92..9bf6b27e 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkEnchantmentTarget.java @@ -1,31 +1,31 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.impl.enumhacks; - -import java.lang.invoke.MethodHandles; -import java.util.function.Predicate; - -import net.minecraft.item.Item; - -public interface PatchworkEnchantmentTarget { - void patchwork_setPredicate(Predicate predicate); - - MethodHandles.Lookup patchwork_getEnchantmentTargetPrivateLookup(); -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.impl.enumhacks; + +import java.lang.invoke.MethodHandles; +import java.util.function.Predicate; + +import net.minecraft.item.Item; + +public interface PatchworkEnchantmentTarget { + void patchwork_setPredicate(Predicate predicate); + + MethodHandles.Lookup patchwork_getEnchantmentTargetPrivateLookup(); +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java similarity index 94% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java index 1c87febf..9f70aac0 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/impl/enumhacks/PatchworkSpawnRestrictionLocation.java @@ -1,35 +1,35 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.impl.enumhacks; - -import net.minecraftforge.common.util.TriPredicate; - -import net.minecraft.entity.EntityType; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ViewableWorld; - -public interface PatchworkSpawnRestrictionLocation { - boolean patchwork_useVanillaBehavior(); - - void patchwork_setPredicate(TriPredicate> predicate); - - // Forge method, so no prefix - boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType type); -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.impl.enumhacks; + +import net.minecraftforge.common.util.TriPredicate; + +import net.minecraft.entity.EntityType; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ViewableWorld; + +public interface PatchworkSpawnRestrictionLocation { + boolean patchwork_useVanillaBehavior(); + + void patchwork_setPredicate(TriPredicate> predicate); + + // Forge method, so no prefix + boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType type); +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java similarity index 95% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java index 0a87c28c..877592d0 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/BannerPatternAccessor.java @@ -1,39 +1,39 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.block.entity.BannerPattern; -import net.minecraft.item.ItemStack; - -@Mixin(BannerPattern.class) -public interface BannerPatternAccessor { - @Invoker("") - static BannerPattern invokeConstructor(String constantName, int ordinal, String name, String id, ItemStack baseStack) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } - - @Invoker("") - static BannerPattern invokeConstructor(String constantName, int ordinal, String name, String id, String recipePattern0, String recipePattern1, String recipePattern2) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.block.entity.BannerPattern; +import net.minecraft.item.ItemStack; + +@Mixin(BannerPattern.class) +public interface BannerPatternAccessor { + @Invoker("") + static BannerPattern invokeConstructor(String constantName, int ordinal, String name, String id, ItemStack baseStack) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } + + @Invoker("") + static BannerPattern invokeConstructor(String constantName, int ordinal, String name, String id, String recipePattern0, String recipePattern1, String recipePattern2) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java similarity index 94% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java index a79bf9c5..d7940379 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/EntityCategoryAccessor.java @@ -1,33 +1,33 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.entity.EntityCategory; - -@Mixin(EntityCategory.class) -public interface EntityCategoryAccessor { - @Invoker("") - static EntityCategory invokeConstructor(String constantName, int index, String name, int spawnCap, boolean peaceful, boolean animal) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.entity.EntityCategory; + +@Mixin(EntityCategory.class) +public interface EntityCategoryAccessor { + @Invoker("") + static EntityCategory invokeConstructor(String constantName, int index, String name, int spawnCap, boolean peaceful, boolean animal) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinBannerPattern.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinBannerPattern.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinBannerPattern.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinBannerPattern.java index 3c9091ae..2d4b0b71 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinBannerPattern.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinBannerPattern.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.block.entity.BannerPattern; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(BannerPattern.class) -public class MixinBannerPattern implements HackableEnum { - @Shadow - @Final - @Mutable - private static BannerPattern[] field_11833; - - @Override - public void patchwork_setValues(BannerPattern[] values) { - field_11833 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.block.entity.BannerPattern; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(BannerPattern.class) +public class MixinBannerPattern implements HackableEnum { + @Shadow + @Final + @Mutable + private static BannerPattern[] field_11833; + + @Override + public void patchwork_setValues(BannerPattern[] values) { + field_11833 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java index 4e7339f7..41d9ec34 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTarget.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.enchantment.EnchantmentTarget; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(EnchantmentTarget.class) -public class MixinEnchantmentTarget implements HackableEnum { - @Shadow - @Final - @Mutable - private static EnchantmentTarget[] field_9077; - - @Override - public void patchwork_setValues(EnchantmentTarget[] values) { - field_9077 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.enchantment.EnchantmentTarget; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(EnchantmentTarget.class) +public class MixinEnchantmentTarget implements HackableEnum { + @Shadow + @Final + @Mutable + private static EnchantmentTarget[] field_9077; + + @Override + public void patchwork_setValues(EnchantmentTarget[] values) { + field_9077 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java similarity index 92% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java index 316b291c..2213c3b3 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEnchantmentTargetInner.java @@ -1,61 +1,61 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodHandles.Lookup; -import java.util.function.Predicate; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.item.Item; - -import com.patchworkmc.impl.enumhacks.PatchworkEnchantmentTarget; - -@Mixin(targets = "net.minecraft.enchantment.EnchantmentTarget$1") -public class MixinEnchantmentTargetInner implements PatchworkEnchantmentTarget { - @Unique - private boolean isPatchwork = false; - - @Unique - private Predicate predicate; - - @Inject(method = "isAcceptableItem(Lnet/minecraft/item/Item;)Z", at = @At("HEAD"), cancellable = true) - private void checkItem(Item item, CallbackInfoReturnable callback) { - if (isPatchwork) { - callback.setReturnValue(predicate.test(item)); - } - } - - @Override - public void patchwork_setPredicate(Predicate predicate) { - this.predicate = predicate; - isPatchwork = true; - } - - @Override - public Lookup patchwork_getEnchantmentTargetPrivateLookup() { - return MethodHandles.lookup(); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodHandles.Lookup; +import java.util.function.Predicate; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.item.Item; + +import net.patchworkmc.impl.enumhacks.PatchworkEnchantmentTarget; + +@Mixin(targets = "net.minecraft.enchantment.EnchantmentTarget$1") +public class MixinEnchantmentTargetInner implements PatchworkEnchantmentTarget { + @Unique + private boolean isPatchwork = false; + + @Unique + private Predicate predicate; + + @Inject(method = "isAcceptableItem(Lnet/minecraft/item/Item;)Z", at = @At("HEAD"), cancellable = true) + private void checkItem(Item item, CallbackInfoReturnable callback) { + if (isPatchwork) { + callback.setReturnValue(predicate.test(item)); + } + } + + @Override + public void patchwork_setPredicate(Predicate predicate) { + this.predicate = predicate; + isPatchwork = true; + } + + @Override + public Lookup patchwork_getEnchantmentTargetPrivateLookup() { + return MethodHandles.lookup(); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEntityCategory.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEntityCategory.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEntityCategory.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEntityCategory.java index 26a1a345..b6d5bb77 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinEntityCategory.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinEntityCategory.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.entity.EntityCategory; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(EntityCategory.class) -public class MixinEntityCategory implements HackableEnum { - @Shadow - @Final - @Mutable - private static EntityCategory[] field_6301; - - @Override - public void patchwork_setValues(EntityCategory[] values) { - field_6301 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.entity.EntityCategory; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(EntityCategory.class) +public class MixinEntityCategory implements HackableEnum { + @Shadow + @Final + @Mutable + private static EntityCategory[] field_6301; + + @Override + public void patchwork_setValues(EntityCategory[] values) { + field_6301 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java index 0b252650..7d5b3fa7 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinOreFeatureConfigTarget.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.world.gen.feature.OreFeatureConfig; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(OreFeatureConfig.Target.class) -public class MixinOreFeatureConfigTarget implements HackableEnum { - @Shadow - @Final - @Mutable - private static OreFeatureConfig.Target[] field_13729; - - @Override - public void patchwork_setValues(OreFeatureConfig.Target[] values) { - field_13729 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.world.gen.feature.OreFeatureConfig; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(OreFeatureConfig.Target.class) +public class MixinOreFeatureConfigTarget implements HackableEnum { + @Shadow + @Final + @Mutable + private static OreFeatureConfig.Target[] field_13729; + + @Override + public void patchwork_setValues(OreFeatureConfig.Target[] values) { + field_13729 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinRarity.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinRarity.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinRarity.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinRarity.java index 506e351d..f9521035 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinRarity.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinRarity.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.util.Rarity; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(Rarity.class) -public class MixinRarity implements HackableEnum { - @Shadow - @Final - @Mutable - private static Rarity[] field_8905; - - @Override - public void patchwork_setValues(Rarity[] values) { - field_8905 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.util.Rarity; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(Rarity.class) +public class MixinRarity implements HackableEnum { + @Shadow + @Final + @Mutable + private static Rarity[] field_8905; + + @Override + public void patchwork_setValues(Rarity[] values) { + field_8905 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java similarity index 93% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java index c0f84173..e888e2eb 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnHelper.java @@ -1,49 +1,49 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnRestriction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.SpawnHelper; -import net.minecraft.world.ViewableWorld; - -import com.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; - -@Mixin(SpawnHelper.class) -public class MixinSpawnHelper { - @Inject(method = "canSpawn(Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Z", - at = @At(value = "INVOKE", target = "net/minecraft/world/ViewableWorld.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"), - cancellable = true) - private static void handleCustomSpawnRestrictionLocation(SpawnRestriction.Location location, ViewableWorld world, BlockPos pos, EntityType type, CallbackInfoReturnable callback) { - PatchworkSpawnRestrictionLocation patchworkLocation = (PatchworkSpawnRestrictionLocation) (Object) location; - - if (patchworkLocation.patchwork_useVanillaBehavior()) { - return; - } - - callback.setReturnValue(patchworkLocation.canSpawnAt(world, pos, type)); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnRestriction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.SpawnHelper; +import net.minecraft.world.ViewableWorld; + +import net.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; + +@Mixin(SpawnHelper.class) +public class MixinSpawnHelper { + @Inject(method = "canSpawn(Lnet/minecraft/entity/SpawnRestriction$Location;Lnet/minecraft/world/CollisionView;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Z", + at = @At(value = "INVOKE", target = "net/minecraft/world/ViewableWorld.getBlockState(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/block/BlockState;"), + cancellable = true) + private static void handleCustomSpawnRestrictionLocation(SpawnRestriction.Location location, ViewableWorld world, BlockPos pos, EntityType type, CallbackInfoReturnable callback) { + PatchworkSpawnRestrictionLocation patchworkLocation = (PatchworkSpawnRestrictionLocation) (Object) location; + + if (patchworkLocation.patchwork_useVanillaBehavior()) { + return; + } + + callback.setReturnValue(patchworkLocation.canSpawnAt(world, pos, type)); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java index 55de0090..bfee559d 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinSpawnRestrictionLocation.java @@ -1,65 +1,65 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import net.minecraftforge.common.util.TriPredicate; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnRestriction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.ViewableWorld; - -import com.patchworkmc.impl.enumhacks.HackableEnum; -import com.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; - -@Mixin(SpawnRestriction.Location.class) -public class MixinSpawnRestrictionLocation implements PatchworkSpawnRestrictionLocation, HackableEnum { - @Unique - private TriPredicate> predicate; - - @Shadow - @Final - @Mutable - private static SpawnRestriction.Location[] field_6319; - - public boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType type) { - return predicate.test(world, pos, type); - } - - @Override - public boolean patchwork_useVanillaBehavior() { - return predicate == null; - } - - @Override - public void patchwork_setPredicate(TriPredicate> predicate) { - this.predicate = predicate; - } - - @Override - public void patchwork_setValues(SpawnRestriction.Location[] values) { - field_6319 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import net.minecraftforge.common.util.TriPredicate; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.Unique; + +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnRestriction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ViewableWorld; + +import net.patchworkmc.impl.enumhacks.HackableEnum; +import net.patchworkmc.impl.enumhacks.PatchworkSpawnRestrictionLocation; + +@Mixin(SpawnRestriction.Location.class) +public class MixinSpawnRestrictionLocation implements PatchworkSpawnRestrictionLocation, HackableEnum { + @Unique + private TriPredicate> predicate; + + @Shadow + @Final + @Mutable + private static SpawnRestriction.Location[] field_6319; + + public boolean canSpawnAt(ViewableWorld world, BlockPos pos, EntityType type) { + return predicate.test(world, pos, type); + } + + @Override + public boolean patchwork_useVanillaBehavior() { + return predicate == null; + } + + @Override + public void patchwork_setPredicate(TriPredicate> predicate) { + this.predicate = predicate; + } + + @Override + public void patchwork_setValues(SpawnRestriction.Location[] values) { + field_6319 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java similarity index 90% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java index 398b2f9c..b2d6dc2e 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/MixinStructurePoolProjection.java @@ -1,42 +1,42 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Mutable; -import org.spongepowered.asm.mixin.Shadow; - -import net.minecraft.structure.pool.StructurePool; - -import com.patchworkmc.impl.enumhacks.HackableEnum; - -@Mixin(StructurePool.Projection.class) -public class MixinStructurePoolProjection implements HackableEnum { - @Shadow - @Final - @Mutable - private static StructurePool.Projection[] field_16683; - - @Override - public void patchwork_setValues(StructurePool.Projection[] values) { - field_16683 = values; - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Mutable; +import org.spongepowered.asm.mixin.Shadow; + +import net.minecraft.structure.pool.StructurePool; + +import net.patchworkmc.impl.enumhacks.HackableEnum; + +@Mixin(StructurePool.Projection.class) +public class MixinStructurePoolProjection implements HackableEnum { + @Shadow + @Final + @Mutable + private static StructurePool.Projection[] field_16683; + + @Override + public void patchwork_setValues(StructurePool.Projection[] values) { + field_16683 = values; + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java similarity index 95% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java index 08476136..b8699aa7 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/OreFeatureConfigTargetAccessor.java @@ -1,43 +1,43 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import java.util.Map; -import java.util.function.Predicate; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.block.BlockState; -import net.minecraft.world.gen.feature.OreFeatureConfig; - -@Mixin(OreFeatureConfig.Target.class) -public interface OreFeatureConfigTargetAccessor { - @Invoker("") - static OreFeatureConfig.Target invokeConstructor(String constantName, int ordinal, String name, Predicate predicate) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } - - @Accessor("nameMap") - static Map getNameMap() { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import java.util.Map; +import java.util.function.Predicate; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.block.BlockState; +import net.minecraft.world.gen.feature.OreFeatureConfig; + +@Mixin(OreFeatureConfig.Target.class) +public interface OreFeatureConfigTargetAccessor { + @Invoker("") + static OreFeatureConfig.Target invokeConstructor(String constantName, int ordinal, String name, Predicate predicate) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } + + @Accessor("nameMap") + static Map getNameMap() { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/RarityAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/RarityAccessor.java similarity index 94% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/RarityAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/RarityAccessor.java index 2fb4bfac..2a40540c 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/RarityAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/RarityAccessor.java @@ -1,34 +1,34 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.util.Formatting; -import net.minecraft.util.Rarity; - -@Mixin(Rarity.class) -public interface RarityAccessor { - @Invoker("") - static Rarity invokeConstructor(String name, int ordinal, Formatting formatting) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.util.Formatting; +import net.minecraft.util.Rarity; + +@Mixin(Rarity.class) +public interface RarityAccessor { + @Invoker("") + static Rarity invokeConstructor(String name, int ordinal, Formatting formatting) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java similarity index 94% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java index fa17634e..ffa43fd4 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/SpawnRestrictionLocationAccessor.java @@ -1,33 +1,33 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.entity.SpawnRestriction; - -@Mixin(SpawnRestriction.Location.class) -public interface SpawnRestrictionLocationAccessor { - @Invoker("") - static SpawnRestriction.Location invokeConstructor(String name, int ordinal) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.entity.SpawnRestriction; + +@Mixin(SpawnRestriction.Location.class) +public interface SpawnRestrictionLocationAccessor { + @Invoker("") + static SpawnRestriction.Location invokeConstructor(String name, int ordinal) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java similarity index 95% rename from patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java rename to patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java index 878b5bfc..1f251207 100644 --- a/patchwork-enum-hacks/src/main/java/com/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java +++ b/patchwork-enum-hacks/src/main/java/net/patchworkmc/mixin/enumhacks/StructurePoolProjectionAccessor.java @@ -1,43 +1,43 @@ -/* - * Minecraft Forge, Patchwork Project - * Copyright (c) 2016-2020, 2019-2020 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation version 2.1 - * of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -package com.patchworkmc.mixin.enumhacks; - -import java.util.Map; - -import com.google.common.collect.ImmutableList; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; - -import net.minecraft.structure.pool.StructurePool; -import net.minecraft.structure.processor.StructureProcessor; - -@Mixin(StructurePool.Projection.class) -public interface StructurePoolProjectionAccessor { - @Invoker("") - static StructurePool.Projection invokeConstructor(String name, int ordinal, String id, ImmutableList processors) { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } - - @Accessor("PROJECTIONS_BY_ID") - static Map getIdProjectionMap() { - throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); - } -} +/* + * Minecraft Forge, Patchwork Project + * Copyright (c) 2016-2020, 2019-2020 + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation version 2.1 + * of the License. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package net.patchworkmc.mixin.enumhacks; + +import java.util.Map; + +import com.google.common.collect.ImmutableList; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.structure.pool.StructurePool; +import net.minecraft.structure.processor.StructureProcessor; + +@Mixin(StructurePool.Projection.class) +public interface StructurePoolProjectionAccessor { + @Invoker("") + static StructurePool.Projection invokeConstructor(String name, int ordinal, String id, ImmutableList processors) { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } + + @Accessor("PROJECTIONS_BY_ID") + static Map getIdProjectionMap() { + throw new IllegalStateException("Mixin did not transform accessor! Something is very wrong!"); + } +} diff --git a/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json b/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json index a85257b2..a7ab7842 100644 --- a/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json +++ b/patchwork-enum-hacks/src/main/resources/patchwork-enum-hacks.mixins.json @@ -1,25 +1,25 @@ -{ - "required": true, - "package": "com.patchworkmc.mixin.enumhacks", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "BannerPatternAccessor", - "MixinBannerPattern", - "MixinEnchantmentTargetInner", - "MixinEnchantmentTarget", - "EntityCategoryAccessor", - "MixinEntityCategory", - "OreFeatureConfigTargetAccessor", - "MixinOreFeatureConfigTarget", - "RarityAccessor", - "MixinRarity", - "MixinSpawnHelper", - "SpawnRestrictionLocationAccessor", - "MixinSpawnRestrictionLocation", - "StructurePoolProjectionAccessor", - "MixinStructurePoolProjection" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file +{ + "required": true, + "package": "net.patchworkmc.mixin.enumhacks", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "BannerPatternAccessor", + "MixinBannerPattern", + "MixinEnchantmentTargetInner", + "MixinEnchantmentTarget", + "EntityCategoryAccessor", + "MixinEntityCategory", + "OreFeatureConfigTargetAccessor", + "MixinOreFeatureConfigTarget", + "RarityAccessor", + "MixinRarity", + "MixinSpawnHelper", + "SpawnRestrictionLocationAccessor", + "MixinSpawnRestrictionLocation", + "StructurePoolProjectionAccessor", + "MixinStructurePoolProjection" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java index c6ce38be..97e9342f 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingAttackEvent.java @@ -29,7 +29,7 @@ * {@link LivingEntity#damage(DamageSource, float)} and * {@link net.minecraft.entity.player.PlayerEntity#damage(DamageSource, float)}.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingAttack(LivingEntity, DamageSource, float)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingAttack(LivingEntity, DamageSource, float)}.

* *

{@link #source} contains the {@link DamageSource} of the attack. * {@link #damage} contains the amount of damage dealt to the entity.

diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDamageEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDamageEvent.java index 51cece1e..c4b9de88 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDamageEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDamageEvent.java @@ -31,7 +31,7 @@ * {@link LivingEntity#applyDamage(DamageSource, float)} and * {@link net.minecraft.entity.player.PlayerEntity#applyDamage(DamageSource, float)}.

* - *

This event is fired via the {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingDamage(LivingEntity, DamageSource, float)}.

+ *

This event is fired via the {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingDamage(LivingEntity, DamageSource, float)}.

* *

{@link #source} contains the DamageSource that caused this Entity to be hurt.

*

{@link #amount} contains the final amount of damage that will be dealt to entity.

diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java index 37a43b8a..c8ad720b 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingDeathEvent.java @@ -32,7 +32,7 @@ * {@link net.minecraft.entity.player.PlayerEntity#onDeath(DamageSource)}, and * {@link net.minecraft.server.network.ServerPlayerEntity#onDeath(DamageSource)}.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingDeath(LivingEntity, DamageSource)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingDeath(LivingEntity, DamageSource)}.

* *

{@link #source} contains the {@link DamageSource} that caused the {@link LivingEntity} to die.

* diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java index 1312d2cd..7442cbf0 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingFallEvent.java @@ -29,7 +29,7 @@ * *

For players that are able to fly, {@link net.minecraftforge.event.entity.player.PlayerFlyableFallEvent} will be fired instead.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingFall(LivingEntity, float, float)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingFall(LivingEntity, float, float)}.

* *

{@link #distance} contains the distance the {@link LivingEntity} is to fall. If this event is cancelled, this value is set to 0.0F.

* diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java index 3a1de6bf..f2a554ff 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingHurtEvent.java @@ -28,7 +28,7 @@ * {@link LivingEntity#applyDamage(DamageSource, float)} and * {@link net.minecraft.entity.player.PlayerEntity#applyDamage(DamageSource, float)}.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingHurt(LivingEntity, DamageSource, float)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingHurt(LivingEntity, DamageSource, float)}.

* *

{@link #source} contains the {@link DamageSource} that caused this {@link LivingEntity} to be hurt. * {@link #amount} contains the amount of damage dealt to the {@link LivingEntity} that was hurt.

diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java index de3c07ae..c20b886f 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java @@ -28,7 +28,7 @@ *

This event is fired whenever a {@link MobEntity} sets a target to attack in * {@link MobEntity#setTarget(LivingEntity)}.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#onLivingSetAttackTarget(LivingEntity, LivingEntity)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#onLivingSetAttackTarget(LivingEntity, LivingEntity)}.

* *

{@link #target} contains the newly targeted Entity.

* diff --git a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java index e0cc1fac..3ab22bb6 100644 --- a/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java +++ b/patchwork-events-entity/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java @@ -136,7 +136,7 @@ public boolean hasResult() { *

SpecialSpawn is fired when an Entity is to be spawned. * This allows you to do special initializers in the new entity.

* - *

This event is fired via {@link com.patchworkmc.impl.event.entity.EntityEvents#doSpecialSpawn(MobEntity, IWorld, double, double, double, MobSpawnerLogic, SpawnType)}.

+ *

This event is fired via {@link net.patchworkmc.impl.event.entity.EntityEvents#doSpecialSpawn(MobEntity, IWorld, double, double, double, MobSpawnerLogic, SpawnType)}.

* *

This event is cancellable. * If this event is canceled, the entity's {@link MobEntity#initialize} method is not called.

diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/impl/event/entity/EntityEvents.java b/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java similarity index 99% rename from patchwork-events-entity/src/main/java/com/patchworkmc/impl/event/entity/EntityEvents.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java index 2bfe6349..92d88374 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/impl/event/entity/EntityEvents.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/impl/event/entity/EntityEvents.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.event.entity; +package net.patchworkmc.impl.event.entity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java similarity index 93% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java index e2acb19f..a424e1b0 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(ClientPlayerEntity.class) public class MixinClientPlayerEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientWorld.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientWorld.java similarity index 93% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientWorld.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientWorld.java index e18b7b5b..a3b192ff 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinClientWorld.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinClientWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.entity.Entity; import net.minecraft.world.World; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(ClientWorld.class) public class MixinClientWorld { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntity.java similarity index 94% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntity.java index a780bde3..94513412 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -31,7 +31,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.world.World; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(Entity.class) public abstract class MixinEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntityType.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntityType.java similarity index 96% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntityType.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntityType.java index 9b0a6d73..65a22c44 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinEntityType.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinEntityType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import javax.annotation.Nullable; @@ -37,7 +37,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(EntityType.class) public class MixinEntityType { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinLivingEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinLivingEntity.java similarity index 97% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinLivingEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinLivingEntity.java index cb8d0512..2c38f304 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinLivingEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinLivingEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -30,7 +30,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(LivingEntity.class) public class MixinLivingEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobEntity.java similarity index 93% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobEntity.java index 21c7b7aa..3c421ad0 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -27,7 +27,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.mob.MobEntity; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(MobEntity.class) public class MixinMobEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java similarity index 95% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java index 8c1f3036..856dbe59 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinMobSpawnerLogic.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -30,7 +30,7 @@ import net.minecraft.world.ViewableWorld; import net.minecraft.world.World; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(MobSpawnerLogic.class) public class MixinMobSpawnerLogic { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java similarity index 94% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java index a5f249eb..434af9f0 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinOtherClientPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.damage.DamageSource; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(OtherClientPlayerEntity.class) public class MixinOtherClientPlayerEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerEntity.java similarity index 98% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerEntity.java index 6cb40fb5..8ab0389b 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -35,7 +35,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(PlayerEntity.class) public class MixinPlayerEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerManager.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerManager.java similarity index 93% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerManager.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerManager.java index 9c9f31b1..afe509d9 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinPlayerManager.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinPlayerManager.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.server.PlayerManager; import net.minecraft.server.network.ServerPlayerEntity; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(PlayerManager.class) public class MixinPlayerManager { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java similarity index 93% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java index c88f61c2..e6411ccc 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.entity.damage.DamageSource; import net.minecraft.server.network.ServerPlayerEntity; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(ServerPlayerEntity.class) public class MixinServerPlayerEntity { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerWorld.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerWorld.java similarity index 96% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerWorld.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerWorld.java index 4d4f454c..38a4fa06 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinServerWorld.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinServerWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -30,7 +30,7 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(ServerWorld.class) public class MixinServerWorld { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinSpawnHelper.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinSpawnHelper.java similarity index 97% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinSpawnHelper.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinSpawnHelper.java index 7bc4c781..40b3c4b2 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinSpawnHelper.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinSpawnHelper.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -33,7 +33,7 @@ import net.minecraft.world.SpawnHelper; import net.minecraft.world.ViewableWorld; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(SpawnHelper.class) public class MixinSpawnHelper { diff --git a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinWorldChunk.java b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinWorldChunk.java similarity index 94% rename from patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinWorldChunk.java rename to patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinWorldChunk.java index 38dd0465..dbeea78d 100644 --- a/patchwork-events-entity/src/main/java/com/patchworkmc/mixin/event/entity/MixinWorldChunk.java +++ b/patchwork-events-entity/src/main/java/net/patchworkmc/mixin/event/entity/MixinWorldChunk.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.entity; +package net.patchworkmc.mixin.event.entity; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -30,7 +30,7 @@ import net.minecraft.util.math.ChunkPos; import net.minecraft.world.chunk.WorldChunk; -import com.patchworkmc.impl.event.entity.EntityEvents; +import net.patchworkmc.impl.event.entity.EntityEvents; @Mixin(WorldChunk.class) public class MixinWorldChunk { diff --git a/patchwork-events-entity/src/main/resources/fabric.mod.json b/patchwork-events-entity/src/main/resources/fabric.mod.json index a318becb..1ef5968b 100644 --- a/patchwork-events-entity/src/main/resources/fabric.mod.json +++ b/patchwork-events-entity/src/main/resources/fabric.mod.json @@ -12,7 +12,7 @@ "environment": "*", "entrypoints": { "main": [ - "com.patchworkmc.impl.event.entity.EntityEvents" + "net.patchworkmc.impl.event.entity.EntityEvents" ] }, "depends": { diff --git a/patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json b/patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json index 566edabc..24e97798 100644 --- a/patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json +++ b/patchwork-events-entity/src/main/resources/patchwork-events-entity.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.event.entity", + "package": "net.patchworkmc.mixin.event.entity", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinEntity", diff --git a/patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinKeyboard.java b/patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinKeyboard.java similarity index 97% rename from patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinKeyboard.java rename to patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinKeyboard.java index 6586d1ff..4c0794f2 100644 --- a/patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinKeyboard.java +++ b/patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinKeyboard.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.input; +package net.patchworkmc.mixin.event.input; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinMouse.java b/patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinMouse.java similarity index 98% rename from patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinMouse.java rename to patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinMouse.java index c78b8814..86e11674 100644 --- a/patchwork-events-input/src/main/java/com/patchworkmc/mixin/event/input/MixinMouse.java +++ b/patchwork-events-input/src/main/java/net/patchworkmc/mixin/event/input/MixinMouse.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.input; +package net.patchworkmc.mixin.event.input; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/patchwork-events-input/src/main/resources/patchwork-events-input.mixins.json b/patchwork-events-input/src/main/resources/patchwork-events-input.mixins.json index af35c946..9ff0c654 100644 --- a/patchwork-events-input/src/main/resources/patchwork-events-input.mixins.json +++ b/patchwork-events-input/src/main/resources/patchwork-events-input.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.event.input", + "package": "net.patchworkmc.mixin.event.input", "compatibilityLevel": "JAVA_8", "client": [ "MixinKeyboard", diff --git a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/impl/event/lifecycle/LifecycleEvents.java b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java similarity index 98% rename from patchwork-events-lifecycle/src/main/java/com/patchworkmc/impl/event/lifecycle/LifecycleEvents.java rename to patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java index dcaeadca..8c360c28 100644 --- a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/impl/event/lifecycle/LifecycleEvents.java +++ b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/impl/event/lifecycle/LifecycleEvents.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.event.lifecycle; +package net.patchworkmc.impl.event.lifecycle; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; diff --git a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java similarity index 92% rename from patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java rename to patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java index 78094055..482e5b4a 100644 --- a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java +++ b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinClientWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.lifecycle; +package net.patchworkmc.mixin.event.lifecycle; import java.util.function.BooleanSupplier; @@ -30,7 +30,7 @@ import net.minecraft.client.world.ClientWorld; import net.minecraft.world.World; -import com.patchworkmc.impl.event.lifecycle.LifecycleEvents; +import net.patchworkmc.impl.event.lifecycle.LifecycleEvents; @Mixin(ClientWorld.class) public class MixinClientWorld { diff --git a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java similarity index 94% rename from patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java rename to patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java index d52c8c16..ec0edf93 100644 --- a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java +++ b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinMinecraftServerSubclass.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.lifecycle; +package net.patchworkmc.mixin.event.lifecycle; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -28,7 +28,7 @@ import net.minecraft.server.dedicated.MinecraftDedicatedServer; import net.minecraft.server.integrated.IntegratedServer; -import com.patchworkmc.impl.event.lifecycle.LifecycleEvents; +import net.patchworkmc.impl.event.lifecycle.LifecycleEvents; /** * Mixes into {@link IntegratedServer} and {@link MinecraftDedicatedServer} in order to implement diff --git a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java similarity index 93% rename from patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java rename to patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java index d492eb8d..4626ebc1 100644 --- a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java +++ b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.lifecycle; +package net.patchworkmc.mixin.event.lifecycle; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -26,7 +26,7 @@ import net.minecraft.entity.player.PlayerEntity; -import com.patchworkmc.impl.event.lifecycle.LifecycleEvents; +import net.patchworkmc.impl.event.lifecycle.LifecycleEvents; @Mixin(PlayerEntity.class) public class MixinPlayerEntity { diff --git a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java similarity index 92% rename from patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java rename to patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java index 5cf841e7..1e707eaa 100644 --- a/patchwork-events-lifecycle/src/main/java/com/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java +++ b/patchwork-events-lifecycle/src/main/java/net/patchworkmc/mixin/event/lifecycle/MixinServerWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.lifecycle; +package net.patchworkmc.mixin.event.lifecycle; import java.util.function.BooleanSupplier; @@ -30,7 +30,7 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.world.World; -import com.patchworkmc.impl.event.lifecycle.LifecycleEvents; +import net.patchworkmc.impl.event.lifecycle.LifecycleEvents; @Mixin(ServerWorld.class) public class MixinServerWorld { diff --git a/patchwork-events-lifecycle/src/main/resources/fabric.mod.json b/patchwork-events-lifecycle/src/main/resources/fabric.mod.json index 7f668ee5..ff25ef66 100644 --- a/patchwork-events-lifecycle/src/main/resources/fabric.mod.json +++ b/patchwork-events-lifecycle/src/main/resources/fabric.mod.json @@ -18,7 +18,7 @@ }, "entrypoints": { "main": [ - "com.patchworkmc.impl.event.lifecycle.LifecycleEvents" + "net.patchworkmc.impl.event.lifecycle.LifecycleEvents" ] }, "mixins": [ diff --git a/patchwork-events-lifecycle/src/main/resources/patchwork-events-lifecycle.mixins.json b/patchwork-events-lifecycle/src/main/resources/patchwork-events-lifecycle.mixins.json index 4b94481b..017d842b 100644 --- a/patchwork-events-lifecycle/src/main/resources/patchwork-events-lifecycle.mixins.json +++ b/patchwork-events-lifecycle/src/main/resources/patchwork-events-lifecycle.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.event.lifecycle", + "package": "net.patchworkmc.mixin.event.lifecycle", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinMinecraftServerSubclass", diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/impl/event/world/WorldEvents.java b/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java similarity index 97% rename from patchwork-events-world/src/main/java/com/patchworkmc/impl/event/world/WorldEvents.java rename to patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java index 5b22b3f0..1ee82ef6 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/impl/event/world/WorldEvents.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/impl/event/world/WorldEvents.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.event.world; +package net.patchworkmc.impl.event.world; import java.util.Collections; import java.util.List; diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinChunkGenerator.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinChunkGenerator.java similarity index 96% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinChunkGenerator.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinChunkGenerator.java index ac18aaa7..09bc449c 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinChunkGenerator.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinChunkGenerator.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinClientWorld.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java similarity index 95% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinClientWorld.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java index bd6b5db7..0e0b030d 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinClientWorld.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinClientWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import java.util.function.BiFunction; @@ -34,7 +34,7 @@ import net.minecraft.world.World; import net.minecraft.client.world.ClientWorld; -import com.patchworkmc.impl.event.world.WorldEvents; +import net.patchworkmc.impl.event.world.WorldEvents; @Mixin(ClientWorld.class) public abstract class MixinClientWorld extends World { diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftClient.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftClient.java similarity index 94% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftClient.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftClient.java index 496c0555..e2e76e3c 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftClient.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftClient.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; @@ -29,7 +29,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.client.world.ClientWorld; -import com.patchworkmc.impl.event.world.WorldEvents; +import net.patchworkmc.impl.event.world.WorldEvents; @Mixin(MinecraftClient.class) public class MixinMinecraftClient { diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftServer.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java similarity index 97% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftServer.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java index e050ece3..c7a79b86 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinMinecraftServer.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinMinecraftServer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import java.io.IOException; import java.util.Iterator; @@ -35,7 +35,7 @@ import net.minecraft.util.NonBlockingThreadExecutor; import net.minecraft.world.dimension.DimensionType; -import com.patchworkmc.impl.event.world.WorldEvents; +import net.patchworkmc.impl.event.world.WorldEvents; @Mixin(MinecraftServer.class) public abstract class MixinMinecraftServer extends NonBlockingThreadExecutor { diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java similarity index 98% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java index 6d0d6f01..be161e55 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerPlayerInteractionManager.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerWorld.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java similarity index 96% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerWorld.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java index b1234d0b..4028167e 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinServerWorld.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinServerWorld.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import java.util.function.BiFunction; @@ -35,7 +35,7 @@ import net.minecraft.world.World; import net.minecraft.server.world.ServerWorld; -import com.patchworkmc.impl.event.world.WorldEvents; +import net.patchworkmc.impl.event.world.WorldEvents; @Mixin(ServerWorld.class) public abstract class MixinServerWorld extends World { diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinSpawnHelper.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSpawnHelper.java similarity index 96% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinSpawnHelper.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSpawnHelper.java index d7fdaed4..b791f845 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinSpawnHelper.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinSpawnHelper.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import java.util.List; import java.util.Random; @@ -33,7 +33,7 @@ import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.chunk.ChunkGenerator; -import com.patchworkmc.impl.event.world.WorldEvents; +import net.patchworkmc.impl.event.world.WorldEvents; @Mixin(SpawnHelper.class) public class MixinSpawnHelper { diff --git a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java similarity index 97% rename from patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java rename to patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java index c8c224f2..90eabae8 100644 --- a/patchwork-events-world/src/main/java/com/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java +++ b/patchwork-events-world/src/main/java/net/patchworkmc/mixin/event/world/MixinThreadedAnvilChunkStorage.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.event.world; +package net.patchworkmc.mixin.event.world; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.ChunkWatchEvent; diff --git a/patchwork-events-world/src/main/resources/patchwork-events-world.mixins.json b/patchwork-events-world/src/main/resources/patchwork-events-world.mixins.json index 1992e07c..c05375cc 100644 --- a/patchwork-events-world/src/main/resources/patchwork-events-world.mixins.json +++ b/patchwork-events-world/src/main/resources/patchwork-events-world.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.event.world", + "package": "net.patchworkmc.mixin.event.world", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinChunkGenerator", diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java similarity index 97% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java index 472ccb00..d6a08c45 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/impl/extensions/item/PatchworkItemSettingsExtensions.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.extensions.item; +package net.patchworkmc.impl.extensions.item; import java.util.Map; import java.util.concurrent.Callable; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java similarity index 95% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java index 9a611bc6..6f42875e 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/ItemTagsAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinAxeItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinAxeItem.java similarity index 96% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinAxeItem.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinAxeItem.java index 16a392da..170cf2d8 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinAxeItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinAxeItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import org.spongepowered.asm.mixin.Mixin; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java similarity index 97% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java index c681448e..ed2da2c6 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinEnchantedBookItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import org.spongepowered.asm.mixin.Mixin; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java similarity index 97% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItem.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java index 0413ae20..d85cea19 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import java.util.HashSet; import java.util.Map; @@ -46,7 +46,7 @@ import net.minecraft.tag.Tag; import net.minecraft.util.Identifier; -import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; +import net.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; @Mixin(Item.class) public abstract class MixinItem implements IForgeItem { diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItemSettings.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItemSettings.java similarity index 93% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItemSettings.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItemSettings.java index 52d0152a..2521e2d8 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinItemSettings.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinItemSettings.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import java.util.HashMap; import java.util.Map; @@ -28,7 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; -import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; +import net.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; @Mixin(Item.Settings.class) public abstract class MixinItemSettings implements PatchworkItemSettingsExtensions { diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinPotionItems.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinPotionItems.java similarity index 97% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinPotionItems.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinPotionItems.java index 86f3b156..687174c9 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinPotionItems.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinPotionItems.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import org.spongepowered.asm.mixin.Mixin; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java similarity index 97% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java index 82811a2e..6bb1b7ad 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/MixinSpawnEggItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item; +package net.patchworkmc.mixin.extensions.item; import org.spongepowered.asm.mixin.Mixin; import net.minecraftforge.common.extensions.IForgeItem; diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItem.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java similarity index 93% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItem.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java index 32be33f5..6b4460bd 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItem.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item.client; +package net.patchworkmc.mixin.extensions.item.client; import javax.annotation.Nullable; @@ -31,7 +31,7 @@ import net.minecraft.client.render.item.ItemDynamicRenderer; import net.minecraft.item.Item; -import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; +import net.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; @Mixin(Item.class) public abstract class MixinItem implements IForgeItem { diff --git a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java similarity index 92% rename from patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java rename to patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java index cfaf0699..6bddf65e 100644 --- a/patchwork-extensions-item/src/main/java/com/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java +++ b/patchwork-extensions-item/src/main/java/net/patchworkmc/mixin/extensions/item/client/MixinItemSettings.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.item.client; +package net.patchworkmc.mixin.extensions.item.client; import java.util.concurrent.Callable; import java.util.function.Supplier; @@ -28,7 +28,7 @@ import net.minecraft.client.render.item.ItemDynamicRenderer; import net.minecraft.item.Item; -import com.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; +import net.patchworkmc.impl.extensions.item.PatchworkItemSettingsExtensions; @Mixin(Item.Settings.class) public abstract class MixinItemSettings implements PatchworkItemSettingsExtensions { diff --git a/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json b/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json index de1ed012..1de9eaae 100644 --- a/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json +++ b/patchwork-extensions-item/src/main/resources/patchwork-extensions-item.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.extensions.item", + "package": "net.patchworkmc.mixin.extensions.item", "compatibilityLevel": "JAVA_8", "mixins": [ "ItemTagsAccessor", diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/impl/extensions/shearing/Shearables.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/impl/extensions/shearing/Shearables.java similarity index 97% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/impl/extensions/shearing/Shearables.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/impl/extensions/shearing/Shearables.java index 0420e7bb..3f2b6296 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/impl/extensions/shearing/Shearables.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/impl/extensions/shearing/Shearables.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.extensions.shearing; +package net.patchworkmc.impl.extensions.shearing; import java.util.List; import java.util.Random; diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java similarity index 96% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java index 1ff5931b..2bc0408f 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinDispenserBehavior.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import java.util.List; @@ -37,7 +37,7 @@ import net.minecraft.util.math.Box; import net.minecraft.world.World; -import com.patchworkmc.impl.extensions.shearing.Shearables; +import net.patchworkmc.impl.extensions.shearing.Shearables; /** * Patches the inner class containing the logic for dispensers when using shears, to allow them to shear any diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java similarity index 98% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java index 90e9ce42..578ce838 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinMooshroomEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import java.util.ArrayList; import java.util.List; diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java similarity index 96% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java index 5b8897e6..21e492ba 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearableBlock.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import net.minecraftforge.common.IShearable; import org.spongepowered.asm.mixin.Mixin; diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java similarity index 95% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java index f9817f4c..02ebc06f 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinShearsItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import net.minecraftforge.common.IShearable; import org.spongepowered.asm.mixin.Mixin; @@ -32,7 +32,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; -import com.patchworkmc.impl.extensions.shearing.Shearables; +import net.patchworkmc.impl.extensions.shearing.Shearables; /** * Patch {@link ShearsItem} to allow it to shear any {@link IShearable}. diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java similarity index 98% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java index d240d948..aca39776 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSheepEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import java.util.List; import java.util.Map; diff --git a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java similarity index 97% rename from patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java rename to patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java index 93a99160..cac16314 100644 --- a/patchwork-extensions-shearing/src/main/java/com/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java +++ b/patchwork-extensions-shearing/src/main/java/net/patchworkmc/mixin/extensions/shearing/MixinSnowGolemEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extensions.shearing; +package net.patchworkmc.mixin.extensions.shearing; import java.util.ArrayList; import java.util.List; diff --git a/patchwork-extensions-shearing/src/main/resources/patchwork-extensions-shearing.mixins.json b/patchwork-extensions-shearing/src/main/resources/patchwork-extensions-shearing.mixins.json index 8402e907..65d795cf 100644 --- a/patchwork-extensions-shearing/src/main/resources/patchwork-extensions-shearing.mixins.json +++ b/patchwork-extensions-shearing/src/main/resources/patchwork-extensions-shearing.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.extensions.shearing", + "package": "net.patchworkmc.mixin.extensions.shearing", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinDispenserBehavior", diff --git a/patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java b/patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java similarity index 96% rename from patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java rename to patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java index 77b58a9a..bb3fa3df 100644 --- a/patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java +++ b/patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeBuilderExtensions.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.extension; +package net.patchworkmc.impl.extension; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; diff --git a/patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java b/patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java similarity index 96% rename from patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java rename to patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java index bc48c7f0..2f099a58 100644 --- a/patchwork-extensions/src/main/java/com/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java +++ b/patchwork-extensions/src/main/java/net/patchworkmc/impl/extension/PatchworkEntityTypeExtensions.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.extension; +package net.patchworkmc.impl.extension; import net.minecraft.entity.Entity; diff --git a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityType.java b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityType.java similarity index 95% rename from patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityType.java rename to patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityType.java index 11300eb7..3ede44a1 100644 --- a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityType.java +++ b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extension; +package net.patchworkmc.mixin.extension; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -27,7 +27,7 @@ import net.minecraft.entity.EntityType; -import com.patchworkmc.impl.extension.PatchworkEntityTypeExtensions; +import net.patchworkmc.impl.extension.PatchworkEntityTypeExtensions; @Mixin(EntityType.class) public class MixinEntityType implements PatchworkEntityTypeExtensions { diff --git a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java similarity index 93% rename from patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java rename to patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java index 61b19559..99ad0ab3 100644 --- a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java +++ b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinEntityTypeBuilder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extension; +package net.patchworkmc.mixin.extension; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; @@ -27,8 +27,8 @@ import net.minecraft.entity.EntityType; -import com.patchworkmc.impl.extension.PatchworkEntityTypeBuilderExtensions; -import com.patchworkmc.impl.extension.PatchworkEntityTypeExtensions; +import net.patchworkmc.impl.extension.PatchworkEntityTypeBuilderExtensions; +import net.patchworkmc.impl.extension.PatchworkEntityTypeExtensions; @Mixin(EntityType.Builder.class) public class MixinEntityTypeBuilder implements PatchworkEntityTypeBuilderExtensions { diff --git a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinStatusEffect.java b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinStatusEffect.java similarity index 96% rename from patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinStatusEffect.java rename to patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinStatusEffect.java index 20f28fa0..13782644 100644 --- a/patchwork-extensions/src/main/java/com/patchworkmc/mixin/extension/MixinStatusEffect.java +++ b/patchwork-extensions/src/main/java/net/patchworkmc/mixin/extension/MixinStatusEffect.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.extension; +package net.patchworkmc.mixin.extension; import net.minecraftforge.common.extensions.IForgeEffect; import org.spongepowered.asm.mixin.Mixin; diff --git a/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json b/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json index 2334765e..2e791eb6 100644 --- a/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json +++ b/patchwork-extensions/src/main/resources/patchwork-extensions.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.extension", + "package": "net.patchworkmc.mixin.extension", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinEntityType", diff --git a/patchwork-fml/src/main/java/net/minecraftforge/fml/LogicalSidedProvider.java b/patchwork-fml/src/main/java/net/minecraftforge/fml/LogicalSidedProvider.java index 1b557948..4ef79263 100644 --- a/patchwork-fml/src/main/java/net/minecraftforge/fml/LogicalSidedProvider.java +++ b/patchwork-fml/src/main/java/net/minecraftforge/fml/LogicalSidedProvider.java @@ -27,7 +27,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.world.World; -import com.patchworkmc.impl.fml.PatchworkFML; +import net.patchworkmc.impl.fml.PatchworkFML; public enum LogicalSidedProvider { WORKQUEUE(Supplier::get, Supplier::get), diff --git a/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java b/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java index 33ee8cdd..65b4bfe7 100644 --- a/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java +++ b/patchwork-fml/src/main/java/net/minecraftforge/fml/common/ObfuscationReflectionHelper.java @@ -34,7 +34,7 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; -import com.patchworkmc.impl.fml.PatchworkMappingService; +import net.patchworkmc.impl.fml.PatchworkMappingService; /** * Some reflection helper code. diff --git a/patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkFML.java b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkFML.java similarity index 98% rename from patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkFML.java rename to patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkFML.java index 6003b853..28f7491d 100644 --- a/patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkFML.java +++ b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkFML.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.fml; +package net.patchworkmc.impl.fml; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; diff --git a/patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkMappingService.java b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java similarity index 99% rename from patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkMappingService.java rename to patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java index dfd80a3c..05886798 100644 --- a/patchwork-fml/src/main/java/com/patchworkmc/impl/fml/PatchworkMappingService.java +++ b/patchwork-fml/src/main/java/net/patchworkmc/impl/fml/PatchworkMappingService.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.fml; +package net.patchworkmc.impl.fml; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/patchwork-fml/src/main/resources/fabric.mod.json b/patchwork-fml/src/main/resources/fabric.mod.json index a7c2c91d..2d646a95 100644 --- a/patchwork-fml/src/main/resources/fabric.mod.json +++ b/patchwork-fml/src/main/resources/fabric.mod.json @@ -17,7 +17,7 @@ }, "entrypoints": { "main": [ - "com.patchworkmc.impl.fml.PatchworkFML" + "net.patchworkmc.impl.fml.PatchworkFML" ] }, "description": "Implementation of FML's mod-facing interface.", diff --git a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java similarity index 98% rename from patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java rename to patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java index 8d805944..9fb96cdc 100644 --- a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinAbstractInventoryScreen.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.gui; +package net.patchworkmc.mixin.gui; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinGameRenderer.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java similarity index 98% rename from patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinGameRenderer.java rename to patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java index 366e27c8..8a528896 100644 --- a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinGameRenderer.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinGameRenderer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.gui; +package net.patchworkmc.mixin.gui; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinKeyboard.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinKeyboard.java similarity index 99% rename from patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinKeyboard.java rename to patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinKeyboard.java index 2398842d..09b9fcdb 100644 --- a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinKeyboard.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinKeyboard.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.gui; +package net.patchworkmc.mixin.gui; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinMouse.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMouse.java similarity index 99% rename from patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinMouse.java rename to patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMouse.java index d144e536..df436bc5 100644 --- a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinMouse.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinMouse.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.gui; +package net.patchworkmc.mixin.gui; import net.minecraftforge.client.event.GuiScreenEvent; import net.minecraftforge.common.MinecraftForge; diff --git a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinScreen.java b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java similarity index 98% rename from patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinScreen.java rename to patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java index 20056a0e..855bea39 100644 --- a/patchwork-gui/src/main/java/com/patchworkmc/mixin/gui/MixinScreen.java +++ b/patchwork-gui/src/main/java/net/patchworkmc/mixin/gui/MixinScreen.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.gui; +package net.patchworkmc.mixin.gui; import java.util.List; import java.util.function.Consumer; diff --git a/patchwork-gui/src/main/resources/patchwork-gui.mixins.json b/patchwork-gui/src/main/resources/patchwork-gui.mixins.json index d030e47c..2ac5e292 100644 --- a/patchwork-gui/src/main/resources/patchwork-gui.mixins.json +++ b/patchwork-gui/src/main/resources/patchwork-gui.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.gui", + "package": "net.patchworkmc.mixin.gui", "compatibilityLevel": "JAVA_8", "client": [ "MixinAbstractInventoryScreen", diff --git a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinAdvancementRewards.java b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinAdvancementRewards.java similarity index 97% rename from patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinAdvancementRewards.java rename to patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinAdvancementRewards.java index fd70469d..834cbd2f 100644 --- a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinAdvancementRewards.java +++ b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinAdvancementRewards.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.loot; +package net.patchworkmc.mixin.loot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinFishingBobberEntity.java b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinFishingBobberEntity.java similarity index 98% rename from patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinFishingBobberEntity.java rename to patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinFishingBobberEntity.java index 25aeb9ec..d46cc88b 100644 --- a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinFishingBobberEntity.java +++ b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinFishingBobberEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.loot; +package net.patchworkmc.mixin.loot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinLootContextTypes.java b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinLootContextTypes.java similarity index 98% rename from patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinLootContextTypes.java rename to patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinLootContextTypes.java index 52e5989c..235be89b 100644 --- a/patchwork-loot/src/main/java/com/patchworkmc/mixin/loot/MixinLootContextTypes.java +++ b/patchwork-loot/src/main/java/net/patchworkmc/mixin/loot/MixinLootContextTypes.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.loot; +package net.patchworkmc.mixin.loot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/patchwork-loot/src/main/resources/patchwork-loot.mixins.json b/patchwork-loot/src/main/resources/patchwork-loot.mixins.json index cceae575..137951b0 100644 --- a/patchwork-loot/src/main/resources/patchwork-loot.mixins.json +++ b/patchwork-loot/src/main/resources/patchwork-loot.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.loot", + "package": "net.patchworkmc.mixin.loot", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinAdvancementRewards", diff --git a/patchwork-networking-messages/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java b/patchwork-networking-messages/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java index 270e41d2..2ddf5bb9 100644 --- a/patchwork-networking-messages/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java +++ b/patchwork-networking-messages/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java @@ -39,8 +39,8 @@ import net.fabricmc.fabric.api.network.PacketContext; -import com.patchworkmc.impl.networking.ClientEntitySpawner; -import com.patchworkmc.impl.networking.PatchworkNetworking; +import net.patchworkmc.impl.networking.ClientEntitySpawner; +import net.patchworkmc.impl.networking.PatchworkNetworking; public class FMLPlayMessages { /** @@ -48,7 +48,7 @@ public class FMLPlayMessages { * {@link net.minecraft.client.network.packet.EntitySpawnS2CPacket} or {@link net.minecraft.client.network.packet.MobSpawnS2CPacket} * *

To customize how your entity is created clientside (instead of using the default factory provided to the {@link EntityType}) - * see {@link com.patchworkmc.mixin.networking.MixinEntityTypeBuilder#setCustomClientFactory}. + * see {@link net.patchworkmc.mixin.networking.MixinEntityTypeBuilder#setCustomClientFactory}. */ public static class SpawnEntity { private final Entity entity; diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ClientEntitySpawner.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ClientEntitySpawner.java similarity index 96% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ClientEntitySpawner.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ClientEntitySpawner.java index 2e00bdb7..96136894 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ClientEntitySpawner.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ClientEntitySpawner.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.function.BiFunction; diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ContainerSyncAccess.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ContainerSyncAccess.java similarity index 95% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ContainerSyncAccess.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ContainerSyncAccess.java index 93c8fb93..6f0f87d9 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/ContainerSyncAccess.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/ContainerSyncAccess.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; public interface ContainerSyncAccess { int patchwork$getNewContainerSyncId(); diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java similarity index 99% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java index c5a36371..f72c66eb 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/impl/networking/PatchworkPlayNetworkingMessages.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.function.Consumer; diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityType.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityType.java similarity index 94% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityType.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityType.java index 1d298220..f2b44ed3 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityType.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking; +package net.patchworkmc.mixin.networking; import java.util.function.BiFunction; @@ -29,7 +29,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.world.World; -import com.patchworkmc.impl.networking.ClientEntitySpawner; +import net.patchworkmc.impl.networking.ClientEntitySpawner; @Mixin(EntityType.class) public class MixinEntityType implements ClientEntitySpawner { diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java similarity index 95% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java index 2cd88bfe..cf94ea35 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinEntityTypeBuilder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking; +package net.patchworkmc.mixin.networking; import java.util.function.BiFunction; @@ -32,7 +32,7 @@ import net.minecraft.entity.EntityType; import net.minecraft.world.World; -import com.patchworkmc.impl.networking.ClientEntitySpawner; +import net.patchworkmc.impl.networking.ClientEntitySpawner; @Mixin(EntityType.Builder.class) public class MixinEntityTypeBuilder { diff --git a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinServerPlayerEntity.java b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinServerPlayerEntity.java similarity index 93% rename from patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinServerPlayerEntity.java rename to patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinServerPlayerEntity.java index 4d6a33ea..55c8ec24 100644 --- a/patchwork-networking-messages/src/main/java/com/patchworkmc/mixin/networking/MixinServerPlayerEntity.java +++ b/patchwork-networking-messages/src/main/java/net/patchworkmc/mixin/networking/MixinServerPlayerEntity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking; +package net.patchworkmc.mixin.networking; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; @@ -25,7 +25,7 @@ import net.minecraft.server.network.ServerPlayerEntity; -import com.patchworkmc.impl.networking.ContainerSyncAccess; +import net.patchworkmc.impl.networking.ContainerSyncAccess; @Mixin(ServerPlayerEntity.class) public class MixinServerPlayerEntity implements ContainerSyncAccess { diff --git a/patchwork-networking-messages/src/main/resources/fabric.mod.json b/patchwork-networking-messages/src/main/resources/fabric.mod.json index f2b4e4e5..e3723ef8 100644 --- a/patchwork-networking-messages/src/main/resources/fabric.mod.json +++ b/patchwork-networking-messages/src/main/resources/fabric.mod.json @@ -20,7 +20,7 @@ }, "entrypoints": { "main": [ - "com.patchworkmc.impl.networking.PatchworkPlayNetworkingMessages" + "net.patchworkmc.impl.networking.PatchworkPlayNetworkingMessages" ] }, "mixins": [ diff --git a/patchwork-networking-messages/src/main/resources/patchwork-networking-messages.mixins.json b/patchwork-networking-messages/src/main/resources/patchwork-networking-messages.mixins.json index 12c13ed0..0cd067e8 100644 --- a/patchwork-networking-messages/src/main/resources/patchwork-networking-messages.mixins.json +++ b/patchwork-networking-messages/src/main/resources/patchwork-networking-messages.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.networking", + "package": "net.patchworkmc.mixin.networking", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinEntityType", diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java index 730abd38..1fc09346 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkDirection.java @@ -36,8 +36,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.PacketByteBuf; -import com.patchworkmc.mixin.networking.accessor.CustomPayloadC2SPacketAccessor; -import com.patchworkmc.mixin.networking.accessor.CustomPayloadS2CPacketAccessor; +import net.patchworkmc.mixin.networking.accessor.CustomPayloadC2SPacketAccessor; +import net.patchworkmc.mixin.networking.accessor.CustomPayloadS2CPacketAccessor; public enum NetworkDirection { PLAY_TO_SERVER(NetworkEvent.ClientCustomPayloadEvent::new, LogicalSide.CLIENT, 1), diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java index 6eaac080..99197df3 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkEvent.java @@ -42,8 +42,8 @@ import net.fabricmc.api.EnvType; import net.fabricmc.fabric.api.network.PacketContext; -import com.patchworkmc.impl.networking.PatchworkNetworking; -import com.patchworkmc.mixin.networking.accessor.ClientConnectionAccessor; +import net.patchworkmc.impl.networking.PatchworkNetworking; +import net.patchworkmc.mixin.networking.accessor.ClientConnectionAccessor; public class NetworkEvent extends Event { private final PacketByteBuf payload; diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java index 95c5f64f..696982ca 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java @@ -26,9 +26,9 @@ import net.minecraft.network.Packet; import net.minecraft.server.network.ServerPlayerEntity; -import com.patchworkmc.impl.networking.ListenableChannel; -import com.patchworkmc.impl.networking.MessageFactory; -import com.patchworkmc.impl.networking.PatchworkNetworking; +import net.patchworkmc.impl.networking.ListenableChannel; +import net.patchworkmc.impl.networking.MessageFactory; +import net.patchworkmc.impl.networking.PatchworkNetworking; public class NetworkHooks { public static boolean onCustomPayload(final ICustomPacket packet, final ClientConnection connection) { diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java index a794a870..6ba80a40 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/NetworkRegistry.java @@ -39,10 +39,10 @@ import net.minecraft.util.Identifier; import net.minecraft.util.PacketByteBuf; -import com.patchworkmc.impl.networking.ListenableChannel; -import com.patchworkmc.impl.networking.NetworkChannelVersion; -import com.patchworkmc.impl.networking.NetworkVersionManager; -import com.patchworkmc.impl.networking.PatchworkNetworking; +import net.patchworkmc.impl.networking.ListenableChannel; +import net.patchworkmc.impl.networking.NetworkChannelVersion; +import net.patchworkmc.impl.networking.NetworkVersionManager; +import net.patchworkmc.impl.networking.PatchworkNetworking; /** * The network registry. Tracks channels on behalf of mods. diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java index 06b0f1f1..6f85cc62 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.network.NetworkEvent; import net.minecraftforge.fml.network.NetworkRegistry; -import com.patchworkmc.impl.networking.ListenableChannel; +import net.patchworkmc.impl.networking.ListenableChannel; public class EventNetworkChannel implements ListenableChannel { private final IEventBus networkEventBus; diff --git a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java index ed1a0882..e9d3b7f3 100644 --- a/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java +++ b/patchwork-networking/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java @@ -41,7 +41,7 @@ import net.minecraft.util.Identifier; import net.minecraft.util.PacketByteBuf; -import com.patchworkmc.impl.networking.ListenableChannel; +import net.patchworkmc.impl.networking.ListenableChannel; public class SimpleChannel implements ListenableChannel { private final Identifier channelName; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/ListenableChannel.java b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/ListenableChannel.java similarity index 96% rename from patchwork-networking/src/main/java/com/patchworkmc/impl/networking/ListenableChannel.java rename to patchwork-networking/src/main/java/net/patchworkmc/impl/networking/ListenableChannel.java index d6aeebf1..796c9154 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/ListenableChannel.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/ListenableChannel.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.List; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/MessageFactory.java b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/MessageFactory.java similarity index 96% rename from patchwork-networking/src/main/java/com/patchworkmc/impl/networking/MessageFactory.java rename to patchwork-networking/src/main/java/net/patchworkmc/impl/networking/MessageFactory.java index 39c8b476..3ba9d556 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/MessageFactory.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/MessageFactory.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.function.Consumer; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkChannelVersion.java b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkChannelVersion.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkChannelVersion.java rename to patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkChannelVersion.java index 9a47bb70..1f16763d 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkChannelVersion.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkChannelVersion.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.Objects; import java.util.function.Predicate; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkVersionManager.java b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkVersionManager.java similarity index 99% rename from patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkVersionManager.java rename to patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkVersionManager.java index 92b6a4f5..8a23a4e4 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/NetworkVersionManager.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/NetworkVersionManager.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.ArrayList; import java.util.Collections; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/PatchworkNetworking.java b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/PatchworkNetworking.java similarity index 94% rename from patchwork-networking/src/main/java/com/patchworkmc/impl/networking/PatchworkNetworking.java rename to patchwork-networking/src/main/java/net/patchworkmc/impl/networking/PatchworkNetworking.java index b15bca75..cbe8b2a7 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/impl/networking/PatchworkNetworking.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/impl/networking/PatchworkNetworking.java @@ -17,13 +17,13 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.networking; +package net.patchworkmc.impl.networking; import java.util.concurrent.CompletableFuture; import net.minecraft.util.ThreadExecutor; -import com.patchworkmc.mixin.networking.accessor.ThreadExecutorAccessor; +import net.patchworkmc.mixin.networking.accessor.ThreadExecutorAccessor; public class PatchworkNetworking { private static MessageFactory factory; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java index 90e94fa0..3b96560e 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ClientConnectionAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import io.netty.channel.Channel; import org.spongepowered.asm.mixin.Mixin; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java index 8f157a10..d502f2f7 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadC2SPacketAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java index 65608019..347d71a9 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/CustomPayloadS2CPacketAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java index 5a630310..6ec305a5 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryRequestS2CPacketAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java index 1b5393c7..a3878742 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/LoginQueryResponseC2SPacketAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Invoker; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java similarity index 95% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java index c1848081..7303ebf3 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/accessor/ThreadExecutorAccessor.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.accessor; +package net.patchworkmc.mixin.networking.accessor; import java.util.concurrent.CompletableFuture; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java index 88a27a0c..419ad9b9 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientLoginNetworkHandler.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.handler; +package net.patchworkmc.mixin.networking.handler; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java index 8c4e5cb5..4f3acaa7 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinClientPlayNetworkHandler.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.handler; +package net.patchworkmc.mixin.networking.handler; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java index 14cb05f7..842d2f6c 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerLoginNetworkHandler.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.handler; +package net.patchworkmc.mixin.networking.handler; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java index c41ed02c..4abfe81e 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/handler/MixinServerPlayNetworkHandler.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.handler; +package net.patchworkmc.mixin.networking.handler; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkHooks; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java index 6a4b52eb..8daf57dc 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadC2SPacket.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.packet; +package net.patchworkmc.mixin.networking.packet; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkDirection; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java index e8cd32b2..824383cb 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinCustomPayloadS2CPacket.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.packet; +package net.patchworkmc.mixin.networking.packet; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkDirection; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java index ff8c8fb4..e655c1a1 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryRequestS2CPacket.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.packet; +package net.patchworkmc.mixin.networking.packet; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkDirection; diff --git a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java similarity index 97% rename from patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java rename to patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java index 70a679d7..656f0cb4 100644 --- a/patchwork-networking/src/main/java/com/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java +++ b/patchwork-networking/src/main/java/net/patchworkmc/mixin/networking/packet/MixinLoginQueryResponseC2SPacket.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.networking.packet; +package net.patchworkmc.mixin.networking.packet; import net.minecraftforge.fml.network.ICustomPacket; import net.minecraftforge.fml.network.NetworkDirection; diff --git a/patchwork-networking/src/main/resources/patchwork-networking.accessor.mixins.json b/patchwork-networking/src/main/resources/patchwork-networking.accessor.mixins.json index ab5930f4..96f61ea0 100644 --- a/patchwork-networking/src/main/resources/patchwork-networking.accessor.mixins.json +++ b/patchwork-networking/src/main/resources/patchwork-networking.accessor.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.networking.accessor", + "package": "net.patchworkmc.mixin.networking.accessor", "compatibilityLevel": "JAVA_8", "mixins": [ "ClientConnectionAccessor", diff --git a/patchwork-networking/src/main/resources/patchwork-networking.handler.mixins.json b/patchwork-networking/src/main/resources/patchwork-networking.handler.mixins.json index 7374ed5c..6c0d8733 100644 --- a/patchwork-networking/src/main/resources/patchwork-networking.handler.mixins.json +++ b/patchwork-networking/src/main/resources/patchwork-networking.handler.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.networking.handler", + "package": "net.patchworkmc.mixin.networking.handler", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinServerLoginNetworkHandler", diff --git a/patchwork-networking/src/main/resources/patchwork-networking.packet.mixins.json b/patchwork-networking/src/main/resources/patchwork-networking.packet.mixins.json index 609aca66..06cf9b31 100644 --- a/patchwork-networking/src/main/resources/patchwork-networking.packet.mixins.json +++ b/patchwork-networking/src/main/resources/patchwork-networking.packet.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.networking.packet", + "package": "net.patchworkmc.mixin.networking.packet", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinCustomPayloadC2SPacket", diff --git a/patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java b/patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java index a27e25e0..41054f51 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java @@ -32,7 +32,7 @@ import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry; import net.fabricmc.fabric.api.client.render.BlockEntityRendererRegistry; -import com.patchworkmc.impl.registries.AddedKeybinds; +import net.patchworkmc.impl.registries.AddedKeybinds; public class ClientRegistry { private static Map, Identifier> entityShaderMap = new ConcurrentHashMap<>(); diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistries.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistries.java index 8ddb4d91..3c2b1c82 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistries.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/registries/ForgeRegistries.java @@ -59,8 +59,8 @@ import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; -import com.patchworkmc.impl.registries.RegistryClassMapping; -import com.patchworkmc.impl.registries.RegistryEventDispatcher; +import net.patchworkmc.impl.registries.RegistryClassMapping; +import net.patchworkmc.impl.registries.RegistryEventDispatcher; /** * A class that exposes static references to all vanilla registries. diff --git a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java index 4fa9340a..ca4f2985 100644 --- a/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java +++ b/patchwork-registries/src/main/java/net/minecraftforge/registries/RegistryManager.java @@ -24,7 +24,7 @@ import net.minecraft.util.Identifier; -import com.patchworkmc.impl.registries.RegistryClassMapping; +import net.patchworkmc.impl.registries.RegistryClassMapping; public class RegistryManager { public static final RegistryManager ACTIVE = new RegistryManager("ACTIVE"); diff --git a/patchwork-registries/src/main/java/com/patchworkmc/api/registries/ObjectHolderRegistry.java b/patchwork-registries/src/main/java/net/patchworkmc/api/registries/ObjectHolderRegistry.java similarity index 96% rename from patchwork-registries/src/main/java/com/patchworkmc/api/registries/ObjectHolderRegistry.java rename to patchwork-registries/src/main/java/net/patchworkmc/api/registries/ObjectHolderRegistry.java index ff70cfc4..43ee602d 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/api/registries/ObjectHolderRegistry.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/api/registries/ObjectHolderRegistry.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.api.registries; +package net.patchworkmc.api.registries; import java.util.ArrayList; import java.util.HashMap; @@ -31,7 +31,7 @@ import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback; -import com.patchworkmc.impl.registries.RegistryClassMapping; +import net.patchworkmc.impl.registries.RegistryClassMapping; public class ObjectHolderRegistry { public static final ObjectHolderRegistry INSTANCE = new ObjectHolderRegistry(); diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/AddedKeybinds.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/AddedKeybinds.java similarity index 97% rename from patchwork-registries/src/main/java/com/patchworkmc/impl/registries/AddedKeybinds.java rename to patchwork-registries/src/main/java/net/patchworkmc/impl/registries/AddedKeybinds.java index 76418ade..f6f0ea1f 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/AddedKeybinds.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/AddedKeybinds.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.registries; +package net.patchworkmc.impl.registries; import java.util.ArrayList; import java.util.HashSet; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java similarity index 97% rename from patchwork-registries/src/main/java/com/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java rename to patchwork-registries/src/main/java/net/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java index d17cee6d..17907290 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/ExtendedForgeRegistryEntry.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.registries; +package net.patchworkmc.impl.registries; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.registries.IForgeRegistryEntry; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/Identifiers.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java similarity index 98% rename from patchwork-registries/src/main/java/com/patchworkmc/impl/registries/Identifiers.java rename to patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java index 0c99c63a..e60a9bb0 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/Identifiers.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/Identifiers.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.registries; +package net.patchworkmc.impl.registries; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryClassMapping.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryClassMapping.java similarity index 97% rename from patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryClassMapping.java rename to patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryClassMapping.java index 7954d711..e69a0782 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryClassMapping.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryClassMapping.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.registries; +package net.patchworkmc.impl.registries; import java.util.HashMap; import java.util.Map; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryEventDispatcher.java b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java similarity index 98% rename from patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryEventDispatcher.java rename to patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java index 17b99583..b016b1b0 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/impl/registries/RegistryEventDispatcher.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/impl/registries/RegistryEventDispatcher.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.impl.registries; +package net.patchworkmc.impl.registries; import java.util.ArrayList; import java.util.List; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinActivity.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinActivity.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinActivity.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinActivity.java index bfe26c4f..6fc3279f 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinActivity.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinActivity.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Activity.class) public class MixinActivity implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiome.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiome.java index d01c2ba1..a4886a4d 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiome.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiome.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Biome.class) public class MixinBiome implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiomeSourceType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiomeSourceType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiomeSourceType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiomeSourceType.java index 08fe59e4..aeb9d24d 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBiomeSourceType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBiomeSourceType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(BiomeSourceType.class) public class MixinBiomeSourceType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlock.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlock.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlock.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlock.java index 896fef62..8c4a2bc1 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlock.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlock.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Block.class) public class MixinBlock implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlockEntityType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlockEntityType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlockEntityType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlockEntityType.java index b42af8a3..5955dae2 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinBlockEntityType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinBlockEntityType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(BlockEntityType.class) public class MixinBlockEntityType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCarver.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinCarver.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCarver.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinCarver.java index 80adf7f6..8a8838d3 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinCarver.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinCarver.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Carver.class) public class MixinCarver implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkGeneratorType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkGeneratorType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkGeneratorType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkGeneratorType.java index 0f67090a..fdf3d2fe 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkGeneratorType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkGeneratorType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(ChunkGeneratorType.class) public class MixinChunkGeneratorType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkStatus.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkStatus.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkStatus.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkStatus.java index 23df3c47..5ba81fd2 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinChunkStatus.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinChunkStatus.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(ChunkStatus.class) public class MixinChunkStatus implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinContainerType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinContainerType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinContainerType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinContainerType.java index 41b82381..a4f6c18a 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinContainerType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinContainerType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(ContainerType.class) public class MixinContainerType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinDecorator.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinDecorator.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinDecorator.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinDecorator.java index 8ff166c7..baa60607 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinDecorator.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinDecorator.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Decorator.class) public class MixinDecorator implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEnchantment.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEnchantment.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEnchantment.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEnchantment.java index 4d74a997..2aed1df2 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEnchantment.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEnchantment.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Enchantment.class) public class MixinEnchantment implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEntityType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEntityType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEntityType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEntityType.java index d76b37e8..f2ea1ca4 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinEntityType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinEntityType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(EntityType.class) public class MixinEntityType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFeature.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFeature.java index ba3eb68f..fe01389c 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFeature.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFeature.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.gen.feature.Feature; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Feature.class) public class MixinFeature implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFluid.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFluid.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFluid.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFluid.java index 8d15e643..ba2f4676 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinFluid.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinFluid.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Fluid.class) public class MixinFluid implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameOptions.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameOptions.java similarity index 93% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameOptions.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameOptions.java index 39624df3..55292ab4 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameOptions.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameOptions.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -28,7 +28,7 @@ import net.minecraft.client.options.GameOptions; import net.minecraft.client.options.KeyBinding; -import com.patchworkmc.impl.registries.AddedKeybinds; +import net.patchworkmc.impl.registries.AddedKeybinds; @Mixin(GameOptions.class) public abstract class MixinGameOptions { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameRenderer.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameRenderer.java similarity index 98% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameRenderer.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameRenderer.java index d69647cf..4b4b5b58 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinGameRenderer.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinGameRenderer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import javax.annotation.Nullable; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinItem.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinItem.java index 54f8f9ca..36cec86c 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinItem.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinItem.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Item.class) public class MixinItem implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinMemoryModuleType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinMemoryModuleType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinMemoryModuleType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinMemoryModuleType.java index 81d35850..feabaac7 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinMemoryModuleType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinMemoryModuleType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(MemoryModuleType.class) public class MixinMemoryModuleType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPaintingMotive.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPaintingMotive.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPaintingMotive.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPaintingMotive.java index 35c693c3..5629ce81 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPaintingMotive.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPaintingMotive.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(PaintingMotive.class) public class MixinPaintingMotive implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinParticleType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinParticleType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinParticleType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinParticleType.java index 8138d081..d9df6636 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinParticleType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinParticleType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(ParticleType.class) public class MixinParticleType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPointOfInterestType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPointOfInterestType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPointOfInterestType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPointOfInterestType.java index 65f8a484..217d9d4f 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPointOfInterestType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPointOfInterestType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(PointOfInterestType.class) public class MixinPointOfInterestType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPotion.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPotion.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPotion.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPotion.java index 56e1d881..26fd4fc8 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinPotion.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinPotion.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Potion.class) public class MixinPotion implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializer.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializer.java similarity index 96% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializer.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializer.java index 2ee4db4a..cf9c0fa0 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializer.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializer.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java similarity index 92% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java index 4b1680d6..c38f7da0 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinRecipeSerializerSubclass.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -32,8 +32,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin({ShapedRecipe.Serializer.class, ShapelessRecipe.Serializer.class, CookingRecipeSerializer.class, CuttingRecipe.Serializer.class, SpecialRecipeSerializer.class}) public class MixinRecipeSerializerSubclass implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSchedule.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSchedule.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSchedule.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSchedule.java index 23ea9810..5b83c739 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSchedule.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSchedule.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(Schedule.class) public class MixinSchedule implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSensorType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSensorType.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSensorType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSensorType.java index 9765da91..34f56c2c 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSensorType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSensorType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(SensorType.class) public class MixinSensorType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSoundEvent.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSoundEvent.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSoundEvent.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSoundEvent.java index 7e9a3050..578dbd9f 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSoundEvent.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSoundEvent.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(SoundEvent.class) public class MixinSoundEvent implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatType.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatType.java similarity index 90% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatType.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatType.java index b58bc40b..13c956e9 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatType.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatType.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(StatType.class) public class MixinStatType implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatusEffect.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatusEffect.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatusEffect.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatusEffect.java index 0793f264..79b89da3 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinStatusEffect.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinStatusEffect.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(StatusEffect.class) public class MixinStatusEffect implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSurfaceBuilder.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSurfaceBuilder.java index bbc96c15..122097c9 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinSurfaceBuilder.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinSurfaceBuilder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.gen.surfacebuilder.SurfaceBuilder; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(SurfaceBuilder.class) public class MixinSurfaceBuilder implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinVillagerProfession.java b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinVillagerProfession.java similarity index 91% rename from patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinVillagerProfession.java rename to patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinVillagerProfession.java index 1fc9b724..a1657adc 100644 --- a/patchwork-registries/src/main/java/com/patchworkmc/mixin/registries/MixinVillagerProfession.java +++ b/patchwork-registries/src/main/java/net/patchworkmc/mixin/registries/MixinVillagerProfession.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.registries; +package net.patchworkmc.mixin.registries; import net.minecraftforge.registries.IForgeRegistryEntry; import org.spongepowered.asm.mixin.Mixin; @@ -27,8 +27,8 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import com.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; -import com.patchworkmc.impl.registries.Identifiers; +import net.patchworkmc.impl.registries.ExtendedForgeRegistryEntry; +import net.patchworkmc.impl.registries.Identifiers; @Mixin(VillagerProfession.class) public class MixinVillagerProfession implements ExtendedForgeRegistryEntry { diff --git a/patchwork-registries/src/main/resources/patchwork-registries.mixins.json b/patchwork-registries/src/main/resources/patchwork-registries.mixins.json index 7c680aa8..7315bb3b 100644 --- a/patchwork-registries/src/main/resources/patchwork-registries.mixins.json +++ b/patchwork-registries/src/main/resources/patchwork-registries.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.registries", + "package": "net.patchworkmc.mixin.registries", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinActivity", diff --git a/patchwork-vanilla-patches/src/main/java/com/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java b/patchwork-vanilla-patches/src/main/java/net/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java similarity index 97% rename from patchwork-vanilla-patches/src/main/java/com/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java rename to patchwork-vanilla-patches/src/main/java/net/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java index b3650bc1..71bd4f65 100644 --- a/patchwork-vanilla-patches/src/main/java/com/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java +++ b/patchwork-vanilla-patches/src/main/java/net/patchworkmc/mixin/patches/bugfixes/MixinEntityTypeBuilder.java @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -package com.patchworkmc.mixin.patches.bugfixes; +package net.patchworkmc.mixin.patches.bugfixes; import com.mojang.datafixers.DSL; import com.mojang.datafixers.schemas.Schema; diff --git a/patchwork-vanilla-patches/src/main/resources/patchwork-vanilla-patches.bugfixes.mixins.json b/patchwork-vanilla-patches/src/main/resources/patchwork-vanilla-patches.bugfixes.mixins.json index 329edf09..690e3391 100644 --- a/patchwork-vanilla-patches/src/main/resources/patchwork-vanilla-patches.bugfixes.mixins.json +++ b/patchwork-vanilla-patches/src/main/resources/patchwork-vanilla-patches.bugfixes.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "com.patchworkmc.mixin.patches.bugfixes", + "package": "net.patchworkmc.mixin.patches.bugfixes", "compatibilityLevel": "JAVA_8", "mixins": [ "MixinEntityTypeBuilder",