Rename the main classes

src/main/java/com/minelittlepony/unicopia/AwaitTickQueue.java

@@ -38,7 +38,7 @@ public class AwaitTickQueue {
                 try {
                     task.accept(world);
                 } catch (Exception e) {
-                    UnicopiaCore.LOGGER.error(e);
+                    Unicopia.LOGGER.error(e);
                 }
             }
         }

src/main/java/com/minelittlepony/unicopia/USounds.java

@@ -21,7 +21,7 @@ public interface USounds {
     SoundEvent RECORD_FUNK = register("record.funk");
 
     static SoundEvent register(String name) {
-        Identifier id = new Identifier(UnicopiaCore.MODID, name);
+        Identifier id = new Identifier(Unicopia.MODID, name);
         return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(id));
     }
 

src/main/java/com/minelittlepony/unicopia/UTags.java

@@ -6,8 +6,8 @@ import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 
 public interface UTags {
-    Tag<Item> CURSED_ARTEFACTS = TagRegistry.item(new Identifier(UnicopiaCore.MODID, "cursed_artefacts"));
+    Tag<Item> CURSED_ARTEFACTS = TagRegistry.item(new Identifier(Unicopia.MODID, "cursed_artefacts"));
-    Tag<Item> HAMMERPACE_IMMUNE = TagRegistry.item(new Identifier(UnicopiaCore.MODID, "hammerspace_immune"));
+    Tag<Item> HAMMERPACE_IMMUNE = TagRegistry.item(new Identifier(Unicopia.MODID, "hammerspace_immune"));
 
     static void bootstrap() { }
 }

src/main/java/com/minelittlepony/unicopia/Unicopia.java

@@ -22,10 +22,8 @@ import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
 import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
 import com.minelittlepony.unicopia.structure.UStructures;
 
-public class UnicopiaCore implements ModInitializer {
+public class Unicopia implements ModInitializer {
     public static final String MODID = "unicopia";
-    public static final String NAME = "@NAME@";
-    public static final String VERSION = "@VERSION@";
 
     public static final Logger LOGGER = LogManager.getLogger();
 

src/main/java/com/minelittlepony/unicopia/block/UBlocks.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.block;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.gas.CloudAnvilBlock;
 import com.minelittlepony.unicopia.gas.CloudBlock;
 import com.minelittlepony.unicopia.gas.CloudDoorBlock;
@@ -73,7 +73,7 @@ public interface UBlocks {
 
 
     static <T extends Block> T register(T block, String name) {
-        return Registry.BLOCK.add(new Identifier(UnicopiaCore.MODID, name), block);
+        return Registry.BLOCK.add(new Identifier(Unicopia.MODID, name), block);
     }
 
     static void bootstrap() { }

src/main/java/com/minelittlepony/unicopia/client/KeyBindingsHandler.java

@@ -4,7 +4,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import com.minelittlepony.unicopia.KeyBind;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.Abilities;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
@@ -27,7 +27,7 @@ class KeyBindingsHandler {
     public void addKeybind(KeyBind p) {
         KeyBindingRegistry.INSTANCE.addCategory(p.getKeyCategory());
 
-        FabricKeyBinding b = FabricKeyBinding.Builder.create(new Identifier(UnicopiaCore.MODID, p.getKeyName()), InputUtil.Type.KEYSYM, p.getKeyCode(), p.getKeyCategory()).build();
+        FabricKeyBinding b = FabricKeyBinding.Builder.create(new Identifier(Unicopia.MODID, p.getKeyName()), InputUtil.Type.KEYSYM, p.getKeyCode(), p.getKeyCategory()).build();
         KeyBindingRegistry.INSTANCE.register(b);
 
         bindings.add(b);

src/main/java/com/minelittlepony/unicopia/client/UnicopiaClient.java

@@ -10,7 +10,7 @@ import com.minelittlepony.jumpingcastle.api.Target;
 import com.minelittlepony.unicopia.Config;
 import com.minelittlepony.unicopia.InteractionManager;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.Abilities;
 import com.minelittlepony.unicopia.block.UBlocks;
 import com.minelittlepony.unicopia.client.render.DisguiseRenderer;
@@ -38,7 +38,7 @@ import net.minecraft.item.BlockItem;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ExtendedBlockView;
 
-public class UnicopiaCoreClient extends InteractionManager implements ClientModInitializer {
+public class UnicopiaClient extends InteractionManager implements ClientModInitializer {
 
     private final KeyBindingsHandler keyboard = new KeyBindingsHandler();
 
@@ -149,7 +149,7 @@ public class UnicopiaCoreClient extends InteractionManager implements ClientModI
         ColorProviderRegistry.ITEM.register((stack, tint) -> {
             return getLeavesColor(((BlockItem)stack.getItem()).getBlock().getDefaultState(), null, null, tint);
         }, UItems.apple_leaves);
-        ColorProviderRegistry.BLOCK.register(UnicopiaCoreClient::getLeavesColor, UBlocks.apple_leaves);
+        ColorProviderRegistry.BLOCK.register(UnicopiaClient::getLeavesColor, UBlocks.apple_leaves);
         ColorProviderRegistry.ITEM.register((stack, tint) -> {
             if (MAGI.test(MinecraftClient.getInstance().player)) {
                 return SpellRegistry.instance().getSpellTintFromStack(stack);
@@ -181,7 +181,7 @@ public class UnicopiaCoreClient extends InteractionManager implements ClientModI
             if (newRace != clientPlayerRace) {
                 clientPlayerRace = newRace;
 
-                UnicopiaCore.getConnection().send(new MsgRequestCapabilities(player, clientPlayerRace), Target.SERVER);
+                Unicopia.getConnection().send(new MsgRequestCapabilities(player, clientPlayerRace), Target.SERVER);
             }
         }
 

src/main/java/com/minelittlepony/unicopia/client/gui/SpellBookScreen.java

@@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.client.gui;
 import org.lwjgl.opengl.GL11;
 
 import com.minelittlepony.common.client.gui.element.Button;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.container.SpellBookContainer;
 import com.minelittlepony.unicopia.container.SpellBookContainer.SpellbookSlot;
 import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
@@ -162,7 +162,7 @@ public class SpellBookScreen extends AbstractContainerScreen<SpellBookContainer>
                 blit(left, top, 0, 0, containerWidth, containerHeight, 512, 256);
             } else {
                 if (player.getWorld().random.nextInt(100) == 0) {
-                    UnicopiaCore.LOGGER.fatal("Missing texture " + texture);
+                    Unicopia.LOGGER.fatal("Missing texture " + texture);
                 }
             }
         }

src/main/java/com/minelittlepony/unicopia/client/render/CuccoonEntityRenderer.java

@@ -1,7 +1,7 @@
 package com.minelittlepony.unicopia.client.render;
 
 import com.minelittlepony.unicopia.InteractionManager;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.client.render.model.CuccoonEntityModel;
 import com.minelittlepony.unicopia.entity.CuccoonEntity;
 import com.mojang.blaze3d.platform.GlStateManager;
@@ -15,7 +15,7 @@ import net.minecraft.util.Identifier;
 
 public class CuccoonEntityRenderer extends LivingEntityRenderer<CuccoonEntity, CuccoonEntityModel> {
 
-    private static final Identifier TEXTURE = new Identifier(UnicopiaCore.MODID, "textures/entity/cuccoon.png");
+    private static final Identifier TEXTURE = new Identifier(Unicopia.MODID, "textures/entity/cuccoon.png");
 
     public CuccoonEntityRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) {
         super(manager, new CuccoonEntityModel(), 1);

src/main/java/com/minelittlepony/unicopia/client/render/SpearEntityRenderer.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.client.render;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.SpearEntity;
 
 import net.fabricmc.fabric.api.client.render.EntityRendererRegistry;
@@ -9,7 +9,7 @@ import net.minecraft.client.render.entity.ProjectileEntityRenderer;
 import net.minecraft.util.Identifier;
 
 public class SpearEntityRenderer extends ProjectileEntityRenderer<SpearEntity> {
-    public static final Identifier TEXTURE = new Identifier(UnicopiaCore.MODID, "textures/entity/projectiles/spear.png");
+    public static final Identifier TEXTURE = new Identifier(Unicopia.MODID, "textures/entity/projectiles/spear.png");
 
     public SpearEntityRenderer(EntityRenderDispatcher manager, EntityRendererRegistry.Context context) {
         super(manager);

src/main/java/com/minelittlepony/unicopia/container/UContainers.java

@@ -1,14 +1,14 @@
 package com.minelittlepony.unicopia.container;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 
 import net.fabricmc.fabric.api.container.ContainerProviderRegistry;
 import net.minecraft.util.Identifier;
 
 public interface UContainers {
 
-    Identifier BAG_OF_HOLDING = new Identifier(UnicopiaCore.MODID, "bag_of_holding");
+    Identifier BAG_OF_HOLDING = new Identifier(Unicopia.MODID, "bag_of_holding");
-    Identifier SPELL_BOOK = new Identifier(UnicopiaCore.MODID, "spell_book");
+    Identifier SPELL_BOOK = new Identifier(Unicopia.MODID, "spell_book");
 
     static void bootstrap() {
         ContainerProviderRegistry.INSTANCE.registerFactory(BAG_OF_HOLDING, BagOfHoldingContainer::new);

src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java

@@ -13,7 +13,7 @@ import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
 import net.minecraft.resource.JsonDataLoader;
@@ -23,7 +23,7 @@ import net.minecraft.util.SystemUtil;
 import net.minecraft.util.profiler.Profiler;
 
 public class Pages extends JsonDataLoader implements IdentifiableResourceReloadListener {
-    private static final Identifier ID = new Identifier(UnicopiaCore.MODID, "pages");
+    private static final Identifier ID = new Identifier(Unicopia.MODID, "pages");
     private static final Gson GSON = new GsonBuilder()
             .setPrettyPrinting()
             .disableHtmlEscaping()

src/main/java/com/minelittlepony/unicopia/enchanting/recipe/AffineIngredients.java

@@ -5,7 +5,7 @@ import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
 import net.minecraft.resource.JsonDataLoader;
@@ -14,7 +14,7 @@ import net.minecraft.util.Identifier;
 import net.minecraft.util.profiler.Profiler;
 
 public class AffineIngredients extends JsonDataLoader implements IdentifiableResourceReloadListener {
-    private static final Identifier ID = new Identifier(UnicopiaCore.MODID, "ingredients");
+    private static final Identifier ID = new Identifier(Unicopia.MODID, "ingredients");
     private static final Gson GSON = new GsonBuilder()
             .setPrettyPrinting()
             .disableHtmlEscaping()

src/main/java/com/minelittlepony/unicopia/entity/ButterflyEntity.java

@@ -4,7 +4,7 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
@@ -222,7 +222,7 @@ public class ButterflyEntity extends AmbientEntity {
         WHITE_MONARCH,
         BRIMSTONE;
 
-        private final Identifier skin = new Identifier(UnicopiaCore.MODID, "textures/entity/butterfly/" + name().toLowerCase() + ".png");
+        private final Identifier skin = new Identifier(Unicopia.MODID, "textures/entity/butterfly/" + name().toLowerCase() + ".png");
 
         public Identifier getSkin() {
             return skin;

src/main/java/com/minelittlepony/unicopia/entity/player/AbilityDelegate.java

@@ -4,7 +4,7 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.jumpingcastle.api.Target;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.AbilityReceiver;
 import com.minelittlepony.unicopia.ability.Ability;
 import com.minelittlepony.unicopia.ability.Abilities;
@@ -159,7 +159,7 @@ class AbilityDelegate implements AbilityReceiver, Updatable, NbtSerialisable {
         Ability.IData data = ability.tryActivate(player);
 
         if (data != null) {
-            UnicopiaCore.getConnection().send(new MsgPlayerAbility(player.getOwner(), ability, data), Target.SERVER);
+            Unicopia.getConnection().send(new MsgPlayerAbility(player.getOwner(), ability, data), Target.SERVER);
         }
 
         return data != null;

src/main/java/com/minelittlepony/unicopia/entity/player/PlayerImpl.java

@@ -4,7 +4,7 @@ import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Race;
 import com.minelittlepony.unicopia.UTags;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.ability.AbilityReceiver;
 import com.minelittlepony.unicopia.enchanting.PageOwner;
 import com.minelittlepony.unicopia.entity.FlightControl;
@@ -170,9 +170,9 @@ public class PlayerImpl implements Pony {
 
         if (!getWorld().isClient()) {
             if (full) {
-                UnicopiaCore.getConnection().broadcast(new MsgPlayerCapabilities(this));
+                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(this));
             } else {
-                UnicopiaCore.getConnection().broadcast(new MsgPlayerCapabilities(getSpecies(), getOwner()));
+                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(getSpecies(), getOwner()));
             }
         }
     }

src/main/java/com/minelittlepony/unicopia/item/UEffects.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.item;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.util.CustomStatusEffect;
 import com.minelittlepony.unicopia.util.MagicalDamageSource;
 
@@ -12,7 +12,7 @@ import net.minecraft.util.Identifier;
 
 public interface UEffects {
 
-    StatusEffect FOOD_POISONING = new CustomStatusEffect(new Identifier(UnicopiaCore.MODID, "food_poisoning"), StatusEffectType.BENEFICIAL, 3484199)
+    StatusEffect FOOD_POISONING = new CustomStatusEffect(new Identifier(Unicopia.MODID, "food_poisoning"), StatusEffectType.BENEFICIAL, 3484199)
             .setSilent()
             .direct((p, e, i) -> {
                 StatusEffectInstance nausea = e.getStatusEffect(StatusEffects.NAUSEA);

src/main/java/com/minelittlepony/unicopia/mixin/client/MixinCamera.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.client.mixin;
+package com.minelittlepony.unicopia.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/com/minelittlepony/unicopia/mixin/client/MixinGameRenderer.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.client.mixin;
+package com.minelittlepony.unicopia.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/com/minelittlepony/unicopia/mixin/client/MixinKeyboardInput.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.client.mixin;
+package com.minelittlepony.unicopia.mixin.client;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/com/minelittlepony/unicopia/mixin/client/MixinMouse.java

@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.client.mixin;
+package com.minelittlepony.unicopia.mixin.client;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java

@@ -11,7 +11,7 @@ import com.google.gson.annotations.Expose;
 import com.minelittlepony.jumpingcastle.api.Channel;
 import com.minelittlepony.jumpingcastle.api.Message;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import net.minecraft.entity.player.PlayerEntity;
@@ -57,7 +57,7 @@ public class MsgPlayerCapabilities implements Message, Message.Handler<MsgPlayer
         PlayerEntity self = server.getPlayerManager().getPlayer(senderId);
 
         if (self == null) {
-            UnicopiaCore.LOGGER.warn("[Unicopia] [CLIENT] [MsgPlayerCapabilities] Player with id %s was not found!\n", senderId.toString());
+            Unicopia.LOGGER.warn("[Unicopia] [CLIENT] [MsgPlayerCapabilities] Player with id %s was not found!\n", senderId.toString());
         } else {
             Pony player = Pony.of(self);
 

src/main/java/com/minelittlepony/unicopia/network/MsgRequestCapabilities.java

@@ -6,7 +6,7 @@ import com.google.gson.annotations.Expose;
 import com.minelittlepony.jumpingcastle.api.Channel;
 import com.minelittlepony.jumpingcastle.api.Message;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.player.Pony;
 
 import net.minecraft.entity.player.PlayerEntity;
@@ -28,7 +28,7 @@ public class MsgRequestCapabilities implements Message, Message.Handler<MsgReque
     public void onPayload(MsgRequestCapabilities message, Channel channel) {
         MinecraftServer server = channel.getServer();
 
-        UnicopiaCore.LOGGER.warn("[Unicopia] [SERVER] [MsgRequestCapabilities] Sending capabilities to player %s\n", senderId.toString());
+        Unicopia.LOGGER.warn("[Unicopia] [SERVER] [MsgRequestCapabilities] Sending capabilities to player %s\n", senderId.toString());
         Pony player = Pony.of(server.getPlayerManager().getPlayer(senderId));
 
         if (player.getSpecies().isDefault()) {

src/main/java/com/minelittlepony/unicopia/structure/CloudDungeonFeature.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.Random;
 import java.util.function.Function;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.mojang.datafixers.Dynamic;
 
 import net.minecraft.nbt.CompoundTag;
@@ -33,9 +33,9 @@ import net.minecraft.world.gen.feature.StructureFeature;
 class CloudDungeonFeature extends AbstractTempleFeature<DefaultFeatureConfig> {
     private static final BlockPos POS = new BlockPos(4, 0, 15);
     private static final Identifier[] VARIANTS = new Identifier[] {
-            new Identifier(UnicopiaCore.MODID, "cloud/temple_small"),
+            new Identifier(Unicopia.MODID, "cloud/temple_small"),
-            new Identifier(UnicopiaCore.MODID, "cloud/house_small"),
+            new Identifier(Unicopia.MODID, "cloud/house_small"),
-            new Identifier(UnicopiaCore.MODID, "cloud/island_small")
+            new Identifier(Unicopia.MODID, "cloud/island_small")
     };
 
     public CloudDungeonFeature(Function<Dynamic<?>, ? extends DefaultFeatureConfig> func) {

src/main/java/com/minelittlepony/unicopia/structure/RuinFeature.java

@@ -4,7 +4,7 @@ import java.util.Arrays;
 import java.util.Random;
 import java.util.function.Function;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 import com.mojang.datafixers.Dynamic;
 
 import net.minecraft.nbt.CompoundTag;
@@ -33,11 +33,11 @@ import net.minecraft.world.gen.feature.StructureFeature;
 class RuinFeature extends AbstractTempleFeature<DefaultFeatureConfig> {
     private static final BlockPos POS = new BlockPos(4, 0, 15);
     private static final Identifier[] VARIANTS = new Identifier[] {
-            new Identifier(UnicopiaCore.MODID, "ground/tower"),
+            new Identifier(Unicopia.MODID, "ground/tower"),
-            new Identifier(UnicopiaCore.MODID, "ground/temple_with_book"),
+            new Identifier(Unicopia.MODID, "ground/temple_with_book"),
-            new Identifier(UnicopiaCore.MODID, "ground/temple_without_book"),
+            new Identifier(Unicopia.MODID, "ground/temple_without_book"),
-            new Identifier(UnicopiaCore.MODID, "ground/wizard_tower_red"),
+            new Identifier(Unicopia.MODID, "ground/wizard_tower_red"),
-            new Identifier(UnicopiaCore.MODID, "ground/wizard_tower_blue")
+            new Identifier(Unicopia.MODID, "ground/wizard_tower_blue")
     };
 
     public RuinFeature(Function<Dynamic<?>, ? extends DefaultFeatureConfig> func) {

src/main/java/com/minelittlepony/unicopia/structure/UStructures.java

@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.structure;
 
-import com.minelittlepony.unicopia.UnicopiaCore;
+import com.minelittlepony.unicopia.Unicopia;
 
 import net.minecraft.structure.StructurePieceType;
 import net.minecraft.util.Identifier;
@@ -18,11 +18,11 @@ public interface UStructures {
     StructureFeature<DefaultFeatureConfig> RUIN = feature("ruin", new RuinFeature(DefaultFeatureConfig::deserialize));
 
     static StructurePieceType part(String id, StructurePieceType type) {
-        return Registry.register(Registry.STRUCTURE_PIECE, new Identifier(UnicopiaCore.MODID, id), type);
+        return Registry.register(Registry.STRUCTURE_PIECE, new Identifier(Unicopia.MODID, id), type);
     }
 
     static <C extends FeatureConfig, F extends Feature<C>> F feature(String id, F feature) {
-        return Registry.register(Registry.FEATURE, new Identifier(UnicopiaCore.MODID, id), feature);
+        return Registry.register(Registry.FEATURE, new Identifier(Unicopia.MODID, id), feature);
      }
 
     static void bootstrap() { }