Merge shared and common packages

Was honestly just confusing what is library, what is common, and what shared

src/main/java/knightminer/inspirations/Inspirations.java

@@ -4,14 +4,14 @@
 import com.electronwill.nightconfig.core.io.WritingMode;
 import knightminer.inspirations.building.InspirationsBuilding;
 import knightminer.inspirations.cauldrons.InspirationsCaudrons;
+import knightminer.inspirations.common.CommonsClientEvents;
 import knightminer.inspirations.common.Config;
+import knightminer.inspirations.common.InspirationsCommons;
 import knightminer.inspirations.common.datagen.InspirationsBlockTagsProvider;
 import knightminer.inspirations.common.datagen.InspirationsFluidTagsProvider;
 import knightminer.inspirations.common.datagen.InspirationsItemTagsProvider;
 import knightminer.inspirations.common.datagen.InspirationsLootTableProvider;
 import knightminer.inspirations.common.network.InspirationsNetwork;
-import knightminer.inspirations.shared.InspirationsShared;
-import knightminer.inspirations.shared.SharedClientEvents;
 import knightminer.inspirations.tools.InspirationsTools;
 import knightminer.inspirations.tweaks.InspirationsTweaks;
 import knightminer.inspirations.utility.InspirationsUtility;
@@ -61,7 +61,7 @@ public Inspirations() {
 
     IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
     modBus.register(this);
-    modBus.register(new InspirationsShared());
+    modBus.register(new InspirationsCommons());
     modBus.register(new InspirationsBuilding());
     modBus.register(new InspirationsUtility());
     modBus.register(new InspirationsTools());
@@ -72,7 +72,7 @@ public Inspirations() {
 
     InspirationsNetwork.INSTANCE.setup();
 
-    DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> SharedClientEvents::onConstruct);
+    DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> CommonsClientEvents::onConstruct);
   }
 
   @SubscribeEvent

src/main/java/knightminer/inspirations/building/BuildingClientEvents.java

@@ -6,7 +6,7 @@
 import knightminer.inspirations.building.block.type.ShelfType;
 import knightminer.inspirations.building.client.ShelfBlockEntityRenderer;
 import knightminer.inspirations.building.client.ShelfContainerScreen;
-import knightminer.inspirations.common.ClientEvents;
+import knightminer.inspirations.common.AbstractClientEvents;
 import knightminer.inspirations.library.MiscUtil;
 import knightminer.inspirations.library.client.ClientUtil;
 import knightminer.inspirations.library.client.model.ShelfModel;
@@ -40,7 +40,7 @@
 
 @SuppressWarnings("unused")
 @EventBusSubscriber(modid = Inspirations.modID, value = Dist.CLIENT, bus = Bus.MOD)
-public class BuildingClientEvents extends ClientEvents {
+public class BuildingClientEvents extends AbstractClientEvents {
   private static final Minecraft mc = Minecraft.getInstance();
 
   @SubscribeEvent

src/main/java/knightminer/inspirations/building/client/ShelfContainerScreen.java

@@ -7,7 +7,7 @@
 import knightminer.inspirations.building.block.menu.ShelfContainerMenu;
 import knightminer.inspirations.library.InspirationsRegistry;
 import knightminer.inspirations.library.client.ClientUtil;
-import knightminer.inspirations.shared.client.BackgroundContainerScreen;
+import knightminer.inspirations.common.client.BackgroundContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.Slot;

src/main/java/knightminer/inspirations/cauldrons/CauldronsClientEvents.java

@@ -5,7 +5,7 @@
 import knightminer.inspirations.cauldrons.block.entity.PotionCauldronBlockEntity;
 import knightminer.inspirations.cauldrons.client.BoilingParticle;
 import knightminer.inspirations.cauldrons.item.MixedDyedBottleItem;
-import knightminer.inspirations.common.ClientEvents;
+import knightminer.inspirations.common.AbstractClientEvents;
 import knightminer.inspirations.library.MiscUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.color.block.BlockColors;
@@ -26,7 +26,7 @@
 
 @SuppressWarnings("unused")
 @EventBusSubscriber(modid = Inspirations.modID, value = Dist.CLIENT, bus = Bus.MOD)
-public class CauldronsClientEvents extends ClientEvents {
+public class CauldronsClientEvents extends AbstractClientEvents {
   @SubscribeEvent
   static void clientSetup(FMLClientSetupEvent event) {
     ItemBlockRenderTypes.setRenderLayer(InspirationsCaudrons.honey, RenderType.translucent());

src/main/java/knightminer/inspirations/cauldrons/data/VanillaEnum.java

@@ -1,14 +1,14 @@
 package knightminer.inspirations.cauldrons.data;
 
-import knightminer.inspirations.shared.InspirationsShared;
+import knightminer.inspirations.common.InspirationsCommons;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import slimeknights.mantle.registration.object.EnumObject;
 
 /**
  * Class containing {@link EnumObject} instances for many colored vanilla blocks.
- * This class is currently only used in datagen. To prevent wasted memory, any objects used outside data gen should be called via {@link InspirationsShared}
+ * This class is currently only used in datagen. To prevent wasted memory, any objects used outside data gen should be called via {@link InspirationsCommons}
  */
 public class VanillaEnum {
   public static final EnumObject<DyeColor,Block> BED = new EnumObject.Builder<DyeColor,Block>(DyeColor.class)
@@ -30,7 +30,7 @@ public class VanillaEnum {
       .put(DyeColor.BLACK,      Blocks.BLACK_BED.delegate)
       .build();
 
-  public static final EnumObject<DyeColor,Block> CARPET = InspirationsShared.VANILLA_CARPETS;
+  public static final EnumObject<DyeColor,Block> CARPET = InspirationsCommons.VANILLA_CARPETS;
 
   public static final EnumObject<DyeColor,Block> SHULKER_BOX = new EnumObject.Builder<DyeColor,Block>(DyeColor.class)
       .put(DyeColor.WHITE, Blocks.WHITE_SHULKER_BOX.delegate)

src/main/java/knightminer/inspirations/common/ClientEvents.java → src/main/java/knightminer/inspirations/common/AbstractClientEvents.java

@@ -1,26 +1,26 @@
 package knightminer.inspirations.common;
 
 import knightminer.inspirations.Inspirations;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.client.gui.screens.inventory.MenuAccess;
-import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.ItemBlockRenderTypes;
-import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.block.BlockColor;
+import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColor;
 import net.minecraft.client.color.item.ItemColors;
+import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.MenuAccess;
+import net.minecraft.client.renderer.ItemBlockRenderTypes;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.item.ItemProperties;
+import net.minecraft.client.renderer.item.ItemPropertyFunction;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
-import net.minecraft.client.renderer.item.ItemPropertyFunction;
-import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.Block;
 
 import javax.annotation.Nullable;
 
-public abstract class ClientEvents {
+public abstract class AbstractClientEvents {
   /*
    * Null safe handlers
    */

src/main/java/knightminer/inspirations/shared/SharedClientEvents.java → src/main/java/knightminer/inspirations/common/CommonsClientEvents.java

@@ -1,8 +1,7 @@
-package knightminer.inspirations.shared;
+package knightminer.inspirations.common;
 
 import com.google.common.collect.ImmutableSet;
 import knightminer.inspirations.Inspirations;
-import knightminer.inspirations.common.ClientEvents;
 import knightminer.inspirations.library.client.ClientUtil;
 import knightminer.inspirations.library.client.ConfigurableResourcePack;
 import net.minecraft.client.Minecraft;
@@ -18,7 +17,7 @@
 
 @SuppressWarnings("unused")
 @EventBusSubscriber(modid = Inspirations.modID, value = Dist.CLIENT, bus = Bus.MOD)
-public class SharedClientEvents extends ClientEvents {
+public class CommonsClientEvents extends AbstractClientEvents {
   public static ConfigurableResourcePack configPack;
 
   /**

src/main/java/knightminer/inspirations/common/CommonsEvents.java

@@ -0,0 +1,9 @@
+package knightminer.inspirations.common;
+
+import knightminer.inspirations.Inspirations;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
+
+@EventBusSubscriber(modid = Inspirations.modID, bus = Bus.FORGE)
+public class CommonsEvents {
+}

src/main/java/knightminer/inspirations/shared/InspirationsShared.java → src/main/java/knightminer/inspirations/common/InspirationsCommons.java

@@ -1,7 +1,6 @@
-package knightminer.inspirations.shared;
+package knightminer.inspirations.common;
 
 import knightminer.inspirations.Inspirations;
-import knightminer.inspirations.common.ModuleBase;
 import knightminer.inspirations.common.data.ConfigEnabledCondition;
 import knightminer.inspirations.library.recipe.ModItemList;
 import knightminer.inspirations.library.recipe.crafting.ShapelessNoContainerRecipe;
@@ -22,7 +21,7 @@
  * Base module for common code between the modules
  */
 @SuppressWarnings("unused")
-public class InspirationsShared extends ModuleBase {
+public class InspirationsCommons extends ModuleBase {
   public static LootItemConditionType lootConfig;
   public static LootItemFunctionType textureFunction;
 

src/main/java/knightminer/inspirations/shared/client/BackgroundContainerScreen.java → src/main/java/knightminer/inspirations/common/client/BackgroundContainerScreen.java

@@ -1,4 +1,4 @@
-package knightminer.inspirations.shared.client;
+package knightminer.inspirations.common.client;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import knightminer.inspirations.Inspirations;

src/main/java/knightminer/inspirations/shared/client/package-info.java → src/main/java/knightminer/inspirations/common/client/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
-package knightminer.inspirations.shared.client;
+package knightminer.inspirations.common.client;
 
 import net.minecraft.MethodsReturnNonnullByDefault;
 

src/main/java/knightminer/inspirations/common/data/ConfigEnabledCondition.java

@@ -6,7 +6,7 @@
 import com.google.gson.JsonSyntaxException;
 import knightminer.inspirations.Inspirations;
 import knightminer.inspirations.common.Config;
-import knightminer.inspirations.shared.InspirationsShared;
+import knightminer.inspirations.common.InspirationsCommons;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.storage.loot.LootContext;
@@ -53,7 +53,7 @@ public boolean test(LootContext lootContext) {
 
   @Override
   public LootItemConditionType getType() {
-    return InspirationsShared.lootConfig;
+    return InspirationsCommons.lootConfig;
   }
 
   public static class ConditionSerializer implements Serializer<ConfigEnabledCondition>, IConditionSerializer<ConfigEnabledCondition> {

src/main/java/knightminer/inspirations/common/datagen/InspirationsItemTagsProvider.java

@@ -2,10 +2,10 @@
 
 import knightminer.inspirations.Inspirations;
 import knightminer.inspirations.building.InspirationsBuilding;
-import knightminer.inspirations.library.InspirationsTags;
 import knightminer.inspirations.cauldrons.InspirationsCaudrons;
 import knightminer.inspirations.cauldrons.data.VanillaEnum;
-import knightminer.inspirations.shared.InspirationsShared;
+import knightminer.inspirations.common.InspirationsCommons;
+import knightminer.inspirations.library.InspirationsTags;
 import knightminer.inspirations.tools.InspirationsTools;
 import knightminer.inspirations.utility.InspirationsUtility;
 import net.minecraft.data.DataGenerator;
@@ -55,7 +55,7 @@ private void registerInspTags() {
 
     // item list of all relevant carpets
     TagAppender<Item> carpetBuilder = this.tag(InspirationsTags.Items.CARPETS);
-    InspirationsShared.VANILLA_CARPETS.forEach(block -> carpetBuilder.add(block.asItem()));
+    InspirationsCommons.VANILLA_CARPETS.forEach(block -> carpetBuilder.add(block.asItem()));
 
     // item list of all relevant shulker boxes
     TagAppender<Item> shulkerBoxBuilder = this.tag(InspirationsTags.Items.SHULKER_BOXES);

src/main/java/knightminer/inspirations/common/network/MilkablePacket.java

@@ -1,6 +1,6 @@
 package knightminer.inspirations.common.network;
 
-import knightminer.inspirations.shared.SharedEvents;
+import knightminer.inspirations.common.CommonsEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.Entity;
@@ -46,7 +46,7 @@ private static void handle(MilkablePacket packet) {
       }
 
       // value for not milkable does not matter as long as its greater than 0
-      entity.getPersistentData().putShort(SharedEvents.TAG_MILKCOOLDOWN, (short)(packet.milkable ? 0 : 100));
+      entity.getPersistentData().putShort(CommonsEvents.TAG_MILKCOOLDOWN, (short)(packet.milkable ? 0 : 100));
     }
   }
 }

src/main/java/knightminer/inspirations/tools/ToolsClientEvents.java

@@ -1,7 +1,7 @@
 package knightminer.inspirations.tools;
 
 import knightminer.inspirations.Inspirations;
-import knightminer.inspirations.common.ClientEvents;
+import knightminer.inspirations.common.AbstractClientEvents;
 import knightminer.inspirations.library.MiscUtil;
 import knightminer.inspirations.tools.client.BarometerPropertyGetter;
 import knightminer.inspirations.tools.client.DimensionCompassPropertyGetter;
@@ -21,7 +21,7 @@
 
 @SuppressWarnings("unused")
 @EventBusSubscriber(modid = Inspirations.modID, value = Dist.CLIENT, bus = Bus.MOD)
-public class ToolsClientEvents extends ClientEvents {
+public class ToolsClientEvents extends AbstractClientEvents {
 
   @SubscribeEvent
   static void clientSetup(FMLClientSetupEvent event) {

src/main/java/knightminer/inspirations/tweaks/InspirationsTweaks.java

@@ -2,9 +2,9 @@
 
 import com.google.common.collect.ImmutableSet;
 import knightminer.inspirations.common.Config;
+import knightminer.inspirations.common.InspirationsCommons;
 import knightminer.inspirations.common.ModuleBase;
 import knightminer.inspirations.common.item.HidableItem;
-import knightminer.inspirations.shared.InspirationsShared;
 import knightminer.inspirations.tweaks.block.BlockCropBlock;
 import knightminer.inspirations.tweaks.block.CactusCropBlock;
 import knightminer.inspirations.tweaks.block.DryHopperBlock;
@@ -84,7 +84,7 @@ void registerBlocks(Register<Block> event) {
     EnumObject.Builder<DyeColor,FlatCarpetBlock> flatBuilder = new EnumObject.Builder<>(DyeColor.class);
     EnumObject.Builder<DyeColor,FittedCarpetBlock> fittedBuilder = new EnumObject.Builder<>(DyeColor.class);
     for (DyeColor color : DyeColor.values()) {
-      Block original = InspirationsShared.VANILLA_CARPETS.get(color);
+      Block original = InspirationsCommons.VANILLA_CARPETS.get(color);
       Block.Properties props = Block.Properties.copy(original);
       if (replaceVanilla) {
         flatBuilder.putDelegate(color, registry.register(new FlatCarpetBlock(color, props), original).delegate);
@@ -114,7 +114,7 @@ void registerItem(Register<Item> event) {
 
     if (Config.enableFittedCarpets.getAsBoolean()) {
       for (DyeColor color : DyeColor.values()) {
-        Block carpet = InspirationsShared.VANILLA_CARPETS.get(color);
+        Block carpet = InspirationsCommons.VANILLA_CARPETS.get(color);
         BlockItem item = registry.registerBlockItem(carpet, decorationProps);
         Item.BY_BLOCK.put(carpet, item);
         Item.BY_BLOCK.put(Objects.requireNonNull(flatCarpets.get(color)), item);

src/main/java/knightminer/inspirations/tweaks/TweaksClientEvents.java

@@ -1,10 +1,10 @@
 package knightminer.inspirations.tweaks;
 
 import knightminer.inspirations.Inspirations;
-import knightminer.inspirations.common.ClientEvents;
+import knightminer.inspirations.common.AbstractClientEvents;
+import knightminer.inspirations.common.CommonsClientEvents;
 import knightminer.inspirations.common.Config;
 import knightminer.inspirations.library.client.model.TrimModel;
-import knightminer.inspirations.shared.SharedClientEvents;
 import knightminer.inspirations.tweaks.client.PortalColorHandler;
 import net.minecraft.client.color.block.BlockColors;
 import net.minecraft.client.color.item.ItemColors;
@@ -39,7 +39,7 @@
 
 @SuppressWarnings({"unused", "WeakerAccess"})
 @EventBusSubscriber(modid = Inspirations.modID, value = Dist.CLIENT, bus = Bus.MOD)
-public class TweaksClientEvents extends ClientEvents {
+public class TweaksClientEvents extends AbstractClientEvents {
   @SubscribeEvent
   static void clientSetup(FMLClientSetupEvent event) {
     RenderType cutout = RenderType.cutout();
@@ -52,10 +52,10 @@ static void clientSetup(FMLClientSetupEvent event) {
   @SubscribeEvent
   static void modelRegistry(ModelRegistryEvent event) {
     // add model replacements to the config pack
-    SharedClientEvents.configPack.addBlockstateReplacement(Config.customPortalColor, Blocks.NETHER_PORTAL, "nether_portal");
-    SharedClientEvents.configPack.addItemModelReplacement(Config.coloredEnchantedRibbons, Items.ENCHANTED_BOOK, "enchanted_book");
-    SharedClientEvents.configPack.addItemModelReplacement(Config.coloredFireworkItems, Items.FIREWORK_ROCKET, "fireworks");
-    SharedClientEvents.configPack.addItemModelReplacement(Config.betterCauldronItem, Items.CAULDRON, "cauldron");
+    CommonsClientEvents.configPack.addBlockstateReplacement(Config.customPortalColor, Blocks.NETHER_PORTAL, "nether_portal");
+    CommonsClientEvents.configPack.addItemModelReplacement(Config.coloredEnchantedRibbons, Items.ENCHANTED_BOOK, "enchanted_book");
+    CommonsClientEvents.configPack.addItemModelReplacement(Config.coloredFireworkItems, Items.FIREWORK_ROCKET, "fireworks");
+    CommonsClientEvents.configPack.addItemModelReplacement(Config.betterCauldronItem, Items.CAULDRON, "cauldron");
   }
 
   @SubscribeEvent