cleaningup code

src/main/java/com/yusuf/bentenmod/BenTenMod.java → src/main/java/io/github/realyusufismail/bentenmod/BenTenMod.java

@@ -16,10 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod;
+package io.github.realyusufismail.bentenmod;
 
-import com.yusuf.bentenmod.core.init.*;
-import com.yusuf.bentenmod.core.util.ModResourceLocation;
+import io.github.realyusufismail.bentenmod.core.init.*;
+import io.github.realyusufismail.bentenmod.core.util.ModResourceLocation;
+import io.github.realyusufismail.bentenmod.data.DataGenerators;
 import net.minecraft.item.crafting.IRecipeSerializer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.BiomeLoadingEvent;
@@ -35,8 +36,6 @@
 
 @Mod("bentenmod")
 public class BenTenMod {
-    // Directly reference a log4j logger.
-    public static final Logger LOGGER = LogManager.getLogger();
     public static final String MOD_ID = "bentenmod";
 
     public BenTenMod() {
@@ -52,11 +51,10 @@ public BenTenMod() {
         GeckoLib.initialize();
 
         bus.addGenericListener(IRecipeSerializer.class, RegisterRecipeInit::registerRecipes);
-        MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGH, OreGenerationInit::addOres);
+        bus.addListener(DataGenerators::gatherData);
         MinecraftForge.EVENT_BUS.addListener(this::onBiomeLoad);
+        MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGH, OreGenerationInit::addOres);
         MinecraftForge.EVENT_BUS.register(this);
-
-        bus.register(this);
     }
 
     public static ModResourceLocation getId(String path) {

src/main/java/com/yusuf/bentenmod/client/ClientModEventSubscriber.java → src/main/java/io/github/realyusufismail/bentenmod/client/ClientModEventSubscriber.java

@@ -16,14 +16,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client;
+package io.github.realyusufismail.bentenmod.client;
 
-import com.yusuf.bentenmod.BenTenMod;
-import com.yusuf.bentenmod.client.renderer.KraabRenderer;
-import com.yusuf.bentenmod.client.renderer.VilgaxRenderer;
-import com.yusuf.bentenmod.core.init.EntityTypesInit;
-import com.yusuf.bentenmod.core.keybind.Keybindings;
-import com.yusuf.bentenmod.entity.KraabBoltEntity;
+import io.github.realyusufismail.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.client.renderer.KraabRenderer;
+import io.github.realyusufismail.bentenmod.client.renderer.VilgaxRenderer;
+import io.github.realyusufismail.bentenmod.core.init.EntityTypesInit;
+import io.github.realyusufismail.bentenmod.core.keybind.Keybindings;
+import io.github.realyusufismail.bentenmod.entity.KraabBoltEntity;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/yusuf/bentenmod/client/GeoProjectilesRenderer.java → src/main/java/io/github/realyusufismail/bentenmod/client/GeoProjectilesRenderer.java

@@ -16,7 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client;
+package io.github.realyusufismail.bentenmod.client;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import java.awt.Color;

src/main/java/com/yusuf/bentenmod/client/model/KraabModel.java → src/main/java/io/github/realyusufismail/bentenmod/client/model/KraabModel.java

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client.model;
+package io.github.realyusufismail.bentenmod.client.model;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
-import com.yusuf.bentenmod.entity.KraabEntity;
+import io.github.realyusufismail.bentenmod.entity.KraabEntity;
 import net.minecraft.client.renderer.entity.model.EntityModel;
 import net.minecraft.client.renderer.model.ModelRenderer;
 import net.minecraft.util.math.MathHelper;

src/main/java/com/yusuf/bentenmod/client/model/VilgaxModel.java → src/main/java/io/github/realyusufismail/bentenmod/client/model/VilgaxModel.java

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client.model;
+package io.github.realyusufismail.bentenmod.client.model;
 
-import com.yusuf.bentenmod.BenTenMod;
-import com.yusuf.bentenmod.entity.VilgaxEntity;
+import io.github.realyusufismail.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.entity.VilgaxEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

src/main/java/io/github/realyusufismail/bentenmod/client/model/package-info.java

@@ -0,0 +1,6 @@
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package io.github.realyusufismail.bentenmod.client.model;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/com/yusuf/bentenmod/client/renderer/package-info.java → src/main/java/io/github/realyusufismail/bentenmod/client/package-info.java

@@ -1,6 +1,6 @@
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
-package com.yusuf.bentenmod.client.renderer;
+package io.github.realyusufismail.bentenmod.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 import mcp.MethodsReturnNonnullByDefault;

src/main/java/com/yusuf/bentenmod/client/renderer/KraabRenderer.java → src/main/java/io/github/realyusufismail/bentenmod/client/renderer/KraabRenderer.java

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client.renderer;
+package io.github.realyusufismail.bentenmod.client.renderer;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.yusuf.bentenmod.BenTenMod;
-import com.yusuf.bentenmod.client.model.KraabModel;
-import com.yusuf.bentenmod.entity.KraabEntity;
+import io.github.realyusufismail.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.client.model.KraabModel;
+import io.github.realyusufismail.bentenmod.entity.KraabEntity;
 import net.minecraft.client.renderer.entity.EntityRendererManager;
 import net.minecraft.client.renderer.entity.MobRenderer;
 import net.minecraft.util.ResourceLocation;

src/main/java/com/yusuf/bentenmod/client/renderer/VilgaxRenderer.java → src/main/java/io/github/realyusufismail/bentenmod/client/renderer/VilgaxRenderer.java

@@ -16,12 +16,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.client.renderer;
+package io.github.realyusufismail.bentenmod.client.renderer;
 
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.vertex.IVertexBuilder;
-import com.yusuf.bentenmod.client.model.VilgaxModel;
-import com.yusuf.bentenmod.entity.VilgaxEntity;
+import io.github.realyusufismail.bentenmod.client.model.VilgaxModel;
+import io.github.realyusufismail.bentenmod.entity.VilgaxEntity;
 import net.minecraft.client.renderer.IRenderTypeBuffer;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.entity.EntityRendererManager;

src/main/java/io/github/realyusufismail/bentenmod/client/renderer/package-info.java

@@ -0,0 +1,6 @@
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+package io.github.realyusufismail.bentenmod.client.renderer;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import mcp.MethodsReturnNonnullByDefault;

src/main/java/com/yusuf/bentenmod/common/LangKeys.java → src/main/java/io/github/realyusufismail/bentenmod/common/LangKeys.java

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common;
+package io.github.realyusufismail.bentenmod.common;
 
-import com.yusuf.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.BenTenMod;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TranslationTextComponent;
 

src/main/java/com/yusuf/bentenmod/common/events/HeatblastArmor.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/HeatblastArmor.java

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.core.init.ItemInit;
+import io.github.realyusufismail.bentenmod.core.init.ItemInit;
 import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.EquipmentSlotType;

src/main/java/com/yusuf/bentenmod/common/events/InputEvents.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/InputEvents.java

@@ -16,10 +16,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.BenTenMod;
-import com.yusuf.bentenmod.core.init.KeybindsInit;
+import io.github.realyusufismail.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.core.init.KeybindsInit;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.InputEvent;

src/main/java/com/yusuf/bentenmod/common/events/JacketArmorItem.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/JacketArmorItem.java

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.core.init.ItemInit;
+import io.github.realyusufismail.bentenmod.core.init.ItemInit;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ArmorItem;

src/main/java/com/yusuf/bentenmod/common/events/LegendaryArmor.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/LegendaryArmor.java

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.core.init.ItemInit;
+import io.github.realyusufismail.bentenmod.core.init.ItemInit;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ArmorItem;

src/main/java/com/yusuf/bentenmod/common/events/RegisterEvent.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/RegisterEvent.java

@@ -16,11 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.BenTenMod;
-import com.yusuf.bentenmod.core.init.EntityTypesInit;
-import com.yusuf.bentenmod.item.ModSpawnEggItem;
+import io.github.realyusufismail.bentenmod.BenTenMod;
+import io.github.realyusufismail.bentenmod.core.init.EntityTypesInit;
+import io.github.realyusufismail.bentenmod.item.ModSpawnEggItem;
 import net.minecraft.entity.EntityType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.event.RegistryEvent;

src/main/java/com/yusuf/bentenmod/common/events/Xlr8Armor.java → src/main/java/io/github/realyusufismail/bentenmod/common/events/Xlr8Armor.java

@@ -16,9 +16,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */ 
-package com.yusuf.bentenmod.common.events;
+package io.github.realyusufismail.bentenmod.common.events;
 
-import com.yusuf.bentenmod.core.init.ItemInit;
+import io.github.realyusufismail.bentenmod.core.init.ItemInit;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.EquipmentSlotType;
 import net.minecraft.item.ArmorItem;