From 1f6f4605b1bca85b33cb19f8c52cbc6f908a109a Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Mon, 15 Jan 2024 15:10:18 +0000 Subject: [PATCH] Rename to gtnewhorizons --- gradle.properties | 4 ++-- .../com/{colen => gtnewhorizons}/postea/Postea.java | 6 +++--- .../postea/api/BlockReplacementManager.java | 4 ++-- .../postea/api/ItemStackReplacementManager.java | 2 +- .../postea/api/TileEntityReplacementManager.java | 4 ++-- .../postea/mixins/PosteaLoadingPlugin.java | 2 +- .../postea/mixins/early/MixinAnvilChunkLoader.java | 12 +++++------- .../postea/mixins/early/MixinChunk.java | 4 ++-- .../postea/mixins/early/MixinItemStack.java | 4 ++-- .../postea/mixins/interfaces/IChunkMixin.java | 2 +- .../postea/utility/BlockConversionInfo.java | 2 +- .../postea/utility/BlockInfo.java | 2 +- .../postea/utility/ChunkFixerUtility.java | 10 +++++----- .../postea/utility/ItemFixerUtility.java | 4 ++-- .../postea/utility/PosteaUtilities.java | 2 +- src/main/resources/mixins.postea.early.json | 6 +++--- 16 files changed, 34 insertions(+), 36 deletions(-) rename src/main/java/com/{colen => gtnewhorizons}/postea/Postea.java (82%) rename src/main/java/com/{colen => gtnewhorizons}/postea/api/BlockReplacementManager.java (92%) rename src/main/java/com/{colen => gtnewhorizons}/postea/api/ItemStackReplacementManager.java (95%) rename src/main/java/com/{colen => gtnewhorizons}/postea/api/TileEntityReplacementManager.java (89%) rename src/main/java/com/{colen => gtnewhorizons}/postea/mixins/PosteaLoadingPlugin.java (96%) rename src/main/java/com/{colen => gtnewhorizons}/postea/mixins/early/MixinAnvilChunkLoader.java (82%) rename src/main/java/com/{colen => gtnewhorizons}/postea/mixins/early/MixinChunk.java (84%) rename src/main/java/com/{colen => gtnewhorizons}/postea/mixins/early/MixinItemStack.java (83%) rename src/main/java/com/{colen => gtnewhorizons}/postea/mixins/interfaces/IChunkMixin.java (68%) rename src/main/java/com/{colen => gtnewhorizons}/postea/utility/BlockConversionInfo.java (88%) rename src/main/java/com/{colen => gtnewhorizons}/postea/utility/BlockInfo.java (94%) rename src/main/java/com/{colen => gtnewhorizons}/postea/utility/ChunkFixerUtility.java (96%) rename src/main/java/com/{colen => gtnewhorizons}/postea/utility/ItemFixerUtility.java (89%) rename src/main/java/com/{colen => gtnewhorizons}/postea/utility/PosteaUtilities.java (98%) diff --git a/gradle.properties b/gradle.properties index 2267337..08981a2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ modName = Postea # This is a case-sensitive string to identify your mod. Convention is to use lower case. modId = postea -modGroup = com.colen.postea +modGroup = com.gtnewhorizons.postea # WHY is there no version field? # The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the @@ -37,7 +37,7 @@ enableModernJavaSyntax = true enableGenericInjection = false # Generate a class with String fields for the mod id, name, version and group name named with the fields below -generateGradleTokenClass = com.colen.postea.Tags +generateGradleTokenClass = com.gtnewhorizons.postea.Tags gradleTokenModId = MODID gradleTokenModName = MODNAME gradleTokenVersion = VERSION diff --git a/src/main/java/com/colen/postea/Postea.java b/src/main/java/com/gtnewhorizons/postea/Postea.java similarity index 82% rename from src/main/java/com/colen/postea/Postea.java rename to src/main/java/com/gtnewhorizons/postea/Postea.java index e7dcc99..bb98bc5 100644 --- a/src/main/java/com/colen/postea/Postea.java +++ b/src/main/java/com/gtnewhorizons/postea/Postea.java @@ -1,7 +1,7 @@ -package com.colen.postea; +package com.gtnewhorizons.postea; -import static com.colen.postea.api.BlockReplacementManager.blockReplacementMap; -import static com.colen.postea.api.BlockReplacementManager.posteaMarkedIDs; +import static com.gtnewhorizons.postea.api.BlockReplacementManager.blockReplacementMap; +import static com.gtnewhorizons.postea.api.BlockReplacementManager.posteaMarkedIDs; import net.minecraft.block.Block; diff --git a/src/main/java/com/colen/postea/api/BlockReplacementManager.java b/src/main/java/com/gtnewhorizons/postea/api/BlockReplacementManager.java similarity index 92% rename from src/main/java/com/colen/postea/api/BlockReplacementManager.java rename to src/main/java/com/gtnewhorizons/postea/api/BlockReplacementManager.java index 6811237..c6bfaaf 100644 --- a/src/main/java/com/colen/postea/api/BlockReplacementManager.java +++ b/src/main/java/com/gtnewhorizons/postea/api/BlockReplacementManager.java @@ -1,4 +1,4 @@ -package com.colen.postea.api; +package com.gtnewhorizons.postea.api; import java.util.HashMap; import java.util.HashSet; @@ -7,7 +7,7 @@ import java.util.function.BiFunction; import net.minecraft.world.World; -import com.colen.postea.utility.BlockConversionInfo; +import com.gtnewhorizons.postea.utility.BlockConversionInfo; public class BlockReplacementManager { diff --git a/src/main/java/com/colen/postea/api/ItemStackReplacementManager.java b/src/main/java/com/gtnewhorizons/postea/api/ItemStackReplacementManager.java similarity index 95% rename from src/main/java/com/colen/postea/api/ItemStackReplacementManager.java rename to src/main/java/com/gtnewhorizons/postea/api/ItemStackReplacementManager.java index 451a621..bdcc674 100644 --- a/src/main/java/com/colen/postea/api/ItemStackReplacementManager.java +++ b/src/main/java/com/gtnewhorizons/postea/api/ItemStackReplacementManager.java @@ -1,4 +1,4 @@ -package com.colen.postea.api; +package com.gtnewhorizons.postea.api; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/colen/postea/api/TileEntityReplacementManager.java b/src/main/java/com/gtnewhorizons/postea/api/TileEntityReplacementManager.java similarity index 89% rename from src/main/java/com/colen/postea/api/TileEntityReplacementManager.java rename to src/main/java/com/gtnewhorizons/postea/api/TileEntityReplacementManager.java index d7a57ef..8711551 100644 --- a/src/main/java/com/colen/postea/api/TileEntityReplacementManager.java +++ b/src/main/java/com/gtnewhorizons/postea/api/TileEntityReplacementManager.java @@ -1,4 +1,4 @@ -package com.colen.postea.api; +package com.gtnewhorizons.postea.api; import java.util.HashMap; import java.util.function.BiFunction; @@ -6,7 +6,7 @@ import java.util.function.BiFunction; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import com.colen.postea.utility.BlockInfo; +import com.gtnewhorizons.postea.utility.BlockInfo; public class TileEntityReplacementManager { diff --git a/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java b/src/main/java/com/gtnewhorizons/postea/mixins/PosteaLoadingPlugin.java similarity index 96% rename from src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java rename to src/main/java/com/gtnewhorizons/postea/mixins/PosteaLoadingPlugin.java index 7500b65..590e2f6 100644 --- a/src/main/java/com/colen/postea/mixins/PosteaLoadingPlugin.java +++ b/src/main/java/com/gtnewhorizons/postea/mixins/PosteaLoadingPlugin.java @@ -1,4 +1,4 @@ -package com.colen.postea.mixins; +package com.gtnewhorizons.postea.mixins; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinAnvilChunkLoader.java similarity index 82% rename from src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java rename to src/main/java/com/gtnewhorizons/postea/mixins/early/MixinAnvilChunkLoader.java index 53cf8be..f45608e 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinAnvilChunkLoader.java +++ b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinAnvilChunkLoader.java @@ -1,7 +1,4 @@ -package com.colen.postea.mixins.early; - -import static com.colen.postea.utility.ChunkFixerUtility.POSTEA_UPDATE_CODE; -import static com.colen.postea.utility.ChunkFixerUtility.processChunkNBT; +package com.gtnewhorizons.postea.mixins.early; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -14,7 +11,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.colen.postea.mixins.interfaces.IChunkMixin; +import com.gtnewhorizons.postea.mixins.interfaces.IChunkMixin; +import com.gtnewhorizons.postea.utility.ChunkFixerUtility; @Mixin(AnvilChunkLoader.class) public abstract class MixinAnvilChunkLoader { @@ -22,7 +20,7 @@ public abstract class MixinAnvilChunkLoader { @Inject(method = "checkedReadChunkFromNBT__Async", at = @At("HEAD"), remap = false) private void onCheckedReadChunkFromNBT__Async(World world, int x, int z, NBTTagCompound compound, CallbackInfoReturnable cir) { - processChunkNBT(compound, world); + ChunkFixerUtility.processChunkNBT(compound, world); } @Inject(method = "readChunkFromNBT", at = @At("RETURN")) @@ -34,7 +32,7 @@ public abstract class MixinAnvilChunkLoader { iChunkMixin.Postea$setPosteaCode(posteaCode); // Chunk has been updated with Postea, so we will mark it to save later. - if (posteaCode != POSTEA_UPDATE_CODE) chunk.setChunkModified(); + if (posteaCode != ChunkFixerUtility.POSTEA_UPDATE_CODE) chunk.setChunkModified(); } } diff --git a/src/main/java/com/colen/postea/mixins/early/MixinChunk.java b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinChunk.java similarity index 84% rename from src/main/java/com/colen/postea/mixins/early/MixinChunk.java rename to src/main/java/com/gtnewhorizons/postea/mixins/early/MixinChunk.java index d3fa83c..be547b1 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinChunk.java +++ b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinChunk.java @@ -1,11 +1,11 @@ -package com.colen.postea.mixins.early; +package com.gtnewhorizons.postea.mixins.early; import net.minecraft.world.chunk.Chunk; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; -import com.colen.postea.mixins.interfaces.IChunkMixin; +import com.gtnewhorizons.postea.mixins.interfaces.IChunkMixin; @Mixin(Chunk.class) public class MixinChunk implements IChunkMixin { diff --git a/src/main/java/com/colen/postea/mixins/early/MixinItemStack.java b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinItemStack.java similarity index 83% rename from src/main/java/com/colen/postea/mixins/early/MixinItemStack.java rename to src/main/java/com/gtnewhorizons/postea/mixins/early/MixinItemStack.java index 55d46f2..7ca19d3 100644 --- a/src/main/java/com/colen/postea/mixins/early/MixinItemStack.java +++ b/src/main/java/com/gtnewhorizons/postea/mixins/early/MixinItemStack.java @@ -1,6 +1,6 @@ -package com.colen.postea.mixins.early; +package com.gtnewhorizons.postea.mixins.early; -import static com.colen.postea.utility.ItemFixerUtility.fixItemStack; +import static com.gtnewhorizons.postea.utility.ItemFixerUtility.fixItemStack; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java b/src/main/java/com/gtnewhorizons/postea/mixins/interfaces/IChunkMixin.java similarity index 68% rename from src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java rename to src/main/java/com/gtnewhorizons/postea/mixins/interfaces/IChunkMixin.java index 74915ee..6c4596a 100644 --- a/src/main/java/com/colen/postea/mixins/interfaces/IChunkMixin.java +++ b/src/main/java/com/gtnewhorizons/postea/mixins/interfaces/IChunkMixin.java @@ -1,4 +1,4 @@ -package com.colen.postea.mixins.interfaces; +package com.gtnewhorizons.postea.mixins.interfaces; public interface IChunkMixin { diff --git a/src/main/java/com/colen/postea/utility/BlockConversionInfo.java b/src/main/java/com/gtnewhorizons/postea/utility/BlockConversionInfo.java similarity index 88% rename from src/main/java/com/colen/postea/utility/BlockConversionInfo.java rename to src/main/java/com/gtnewhorizons/postea/utility/BlockConversionInfo.java index 0bb0265..fecfd7c 100644 --- a/src/main/java/com/colen/postea/utility/BlockConversionInfo.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/BlockConversionInfo.java @@ -1,4 +1,4 @@ -package com.colen.postea.utility; +package com.gtnewhorizons.postea.utility; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/com/colen/postea/utility/BlockInfo.java b/src/main/java/com/gtnewhorizons/postea/utility/BlockInfo.java similarity index 94% rename from src/main/java/com/colen/postea/utility/BlockInfo.java rename to src/main/java/com/gtnewhorizons/postea/utility/BlockInfo.java index 9935399..484f7f6 100644 --- a/src/main/java/com/colen/postea/utility/BlockInfo.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/BlockInfo.java @@ -1,4 +1,4 @@ -package com.colen.postea.utility; +package com.gtnewhorizons.postea.utility; import java.util.function.Function; diff --git a/src/main/java/com/colen/postea/utility/ChunkFixerUtility.java b/src/main/java/com/gtnewhorizons/postea/utility/ChunkFixerUtility.java similarity index 96% rename from src/main/java/com/colen/postea/utility/ChunkFixerUtility.java rename to src/main/java/com/gtnewhorizons/postea/utility/ChunkFixerUtility.java index 877f4c9..30d73cc 100644 --- a/src/main/java/com/colen/postea/utility/ChunkFixerUtility.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/ChunkFixerUtility.java @@ -1,7 +1,7 @@ -package com.colen.postea.utility; +package com.gtnewhorizons.postea.utility; -import static com.colen.postea.api.BlockReplacementManager.blockNotConvertible; -import static com.colen.postea.utility.PosteaUtilities.getModListHash; +import static com.gtnewhorizons.postea.api.BlockReplacementManager.blockNotConvertible; +import static com.gtnewhorizons.postea.utility.PosteaUtilities.getModListHash; import java.util.ArrayList; import java.util.HashMap; @@ -14,8 +14,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import com.colen.postea.api.BlockReplacementManager; -import com.colen.postea.api.TileEntityReplacementManager; +import com.gtnewhorizons.postea.api.BlockReplacementManager; +import com.gtnewhorizons.postea.api.TileEntityReplacementManager; import akka.japi.Pair; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/colen/postea/utility/ItemFixerUtility.java b/src/main/java/com/gtnewhorizons/postea/utility/ItemFixerUtility.java similarity index 89% rename from src/main/java/com/colen/postea/utility/ItemFixerUtility.java rename to src/main/java/com/gtnewhorizons/postea/utility/ItemFixerUtility.java index 74ce862..0699f23 100644 --- a/src/main/java/com/colen/postea/utility/ItemFixerUtility.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/ItemFixerUtility.java @@ -1,11 +1,11 @@ -package com.colen.postea.utility; +package com.gtnewhorizons.postea.utility; import java.util.function.Function; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; -import com.colen.postea.api.ItemStackReplacementManager; +import com.gtnewhorizons.postea.api.ItemStackReplacementManager; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/colen/postea/utility/PosteaUtilities.java b/src/main/java/com/gtnewhorizons/postea/utility/PosteaUtilities.java similarity index 98% rename from src/main/java/com/colen/postea/utility/PosteaUtilities.java rename to src/main/java/com/gtnewhorizons/postea/utility/PosteaUtilities.java index f7450ef..967ff16 100644 --- a/src/main/java/com/colen/postea/utility/PosteaUtilities.java +++ b/src/main/java/com/gtnewhorizons/postea/utility/PosteaUtilities.java @@ -1,4 +1,4 @@ -package com.colen.postea.utility; +package com.gtnewhorizons.postea.utility; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/resources/mixins.postea.early.json b/src/main/resources/mixins.postea.early.json index 4b7d10e..d1f22dc 100644 --- a/src/main/resources/mixins.postea.early.json +++ b/src/main/resources/mixins.postea.early.json @@ -6,9 +6,9 @@ "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8", "mixins": [ - "MixinAnvilChunkLoader", - "MixinChunk", - "MixinItemStack" + "com.gtnewhorizons.postea.mixins.early.MixinAnvilChunkLoader", + "com.gtnewhorizons.postea.mixins.early.MixinChunk", + "com.gtnewhorizons.postea.mixins.early.MixinItemStack" ], "client": [], "server": []