change package name to net.dragonmounts

README.md

@@ -1,7 +1,11 @@
-![LOGO](src/main/resources/logo2.png)
+![LOGO](src/main/resources/logo.png)
 
-# [Dragon-Mounts-2-Continued](https://www.curseforge.com/minecraft/mc-mods/dragon-mounts-2)
+# [Dragon Mounts 2: Continued](https://www.curseforge.com/minecraft/mc-mods/dragon-mounts-2)
 Dragon Mounts 2 is a sequel to Dragon Mounts, created by TheRPGAdventurer. A mod which adds over 15 new dragons to your game. In addition to new dragons, the mod adds in new armors and tools for players, Armors for Dragons, Nests that generates in every worlds, New Dragon breeds, and much more.
+
+The continued support for this mod is now maintained by The Dragon Mounts Team and is endorsed by the original DM2 developers. Our goal is to bring back the original essence of Dragon Mounts, fixing many bugs it once had since it's last update (v1.6.3).
+
+It is now completely dependency-free, and a lot of the codebase is cleaned up and most apparent bugs are fixed. This means you will no longer need LLibrary as a required dependency to run the mod, greatly enhancing compatibility with other mods.
 ## Licenses
 The mods binaries, as well as its textures and code are licensed under the **GPLv3 license**.
 

build.gradle

@@ -172,13 +172,13 @@ processResources {
     filterList.addAll(propertyStringList('mixin_configs').collect(config -> "mixins.${config}.json" as String))
 
     filesMatching(filterList) { fcd ->
-        def authors = propertyStringList('mod_authors', ',').join(', ')
+        def authors = propertyStringList('mod_authors', ',')
         fcd.expand(
                 'mod_id': propertyString('mod_id'),
                 'mod_name': propertyString('mod_name'),
                 'mod_version': project.version,
                 'mod_description': propertyString('mod_description'),
-                'mod_authors': authors.isEmpty() ? "" : authors.substring(1, authors.length() - 1),
+                'mod_authors': authors.isEmpty() ? "" : authors.join('", "'),
                 'mod_credits': propertyString('mod_credits'),
                 'mod_url': propertyString('mod_url'),
                 'mod_update_json': propertyString('mod_update_json'),

gradle.properties

@@ -16,17 +16,17 @@ show_testing_output = false
 # Mod Information
 # HIGHLY RECOMMEND complying with SemVer for mod_version: https://semver.org/
 mod_version = 2.0.0
-root_package = top.dragonmounts
+root_package=net.dragonmounts
 mod_id = dragonmounts
 mod_name = Dragon Mounts 2 Continued
 
 # Mod Metadata (Optional)
-mod_description =
-mod_url =
+mod_description=As a sequel to Dragon Mounts, this mod adds over 15 new dragons to your game. In addition to new dragons, the mod adds in new armors and tools for players, Armors for Dragons, Nests that generates in every world, New Dragon breeds, and much more.
+mod_url=https://github.com/DragonMountsTeam/DragonMounts2-Continued
 mod_update_json =
 # Delimit authors with commas
-mod_authors =
-mod_credits =
+mod_authors=TheRPGAdventurer,Kingdomall,Shannieann,UkanGundun,WolfShotz (Kay9Unit),FlaemWing,cesar_zorak,Alexthe666 (AlexModGuy),Majty/GuineaOwl,NightScale,Unakitononeko,Crafty,TheGreyGhost,The Dragon Mounts Team
+mod_credits=BarracudaATA, Kingdomall, Shannieann, Tomanex, JDSK0ala, Moaswies, 2190303755 (Number-Man), EnderEXE, Tomohiko, Signis Kerman
 mod_logo_path=logo.png
 
 # Mapping Properties

src/main/java/top/dragonmounts/DragonMounts.java → src/main/java/net/dragonmounts/DragonMounts.java

@@ -7,17 +7,17 @@
  **    May you find forgiveness for yourself and forgive others.
  **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts;
-
-import top.dragonmounts.client.gui.GuiHandler;
-import top.dragonmounts.compat.BaublesCompat;
-import top.dragonmounts.event.EventLiving;
-import top.dragonmounts.event.RegistryEventHandler;
-import top.dragonmounts.inits.DMArmors;
-import top.dragonmounts.inits.DMItemGroups;
-import top.dragonmounts.inits.ModTools;
-import top.dragonmounts.proxy.ServerProxy;
-import top.dragonmounts.util.debugging.testclasses.LoggerLimit;
+package net.dragonmounts;
+
+import net.dragonmounts.client.gui.GuiHandler;
+import net.dragonmounts.compat.BaublesCompat;
+import net.dragonmounts.event.EventLiving;
+import net.dragonmounts.event.RegistryEventHandler;
+import net.dragonmounts.inits.DMArmors;
+import net.dragonmounts.inits.DMItemGroups;
+import net.dragonmounts.inits.ModTools;
+import net.dragonmounts.proxy.ServerProxy;
+import net.dragonmounts.util.debugging.testclasses.LoggerLimit;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.MinecraftForge;
@@ -46,9 +46,9 @@ public class DragonMounts {
     /**
      * the canonical name of {@link DragonMountsConfigGuiFactory}
      */
-    public static final String GUI_FACTORY = "top.dragonmounts.DragonMountsConfigGuiFactory";
+    public static final String GUI_FACTORY = "net.dragonmounts.DragonMountsConfigGuiFactory";
 
-    @SidedProxy(serverSide="top.dragonmounts.proxy.ServerProxy", clientSide="top.dragonmounts.proxy.ClientProxy")
+    @SidedProxy(serverSide="net.dragonmounts.proxy.ServerProxy", clientSide="net.dragonmounts.proxy.ClientProxy")
     public static ServerProxy proxy;
 
     @Instance(value = DragonMountsTags.MOD_ID)

src/main/java/top/dragonmounts/DragonMountsConfig.java → src/main/java/net/dragonmounts/DragonMountsConfig.java

@@ -7,7 +7,7 @@
  **    May you find forgiveness for yourself and forgive others.
  **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts;
+package net.dragonmounts;
 
 import com.google.common.collect.Lists;
 import net.minecraft.util.text.TextFormatting;

src/main/java/top/dragonmounts/DragonMountsConfigGuiFactory.java → src/main/java/net/dragonmounts/DragonMountsConfigGuiFactory.java

@@ -7,7 +7,7 @@
 **    May you find forgiveness for yourself and forgive others.
 **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts;
+package net.dragonmounts;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;

src/main/java/top/dragonmounts/DragonMountsLootTables.java → src/main/java/net/dragonmounts/DragonMountsLootTables.java

@@ -1,11 +1,11 @@
-package top.dragonmounts;
+package net.dragonmounts;
 
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.storage.loot.LootTable;
 import net.minecraft.world.storage.loot.LootTableList;
 
-import static top.dragonmounts.DragonMounts.makeId;
+import static net.dragonmounts.DragonMounts.makeId;
 
 public class DragonMountsLootTables {
 	/**

src/main/java/top/dragonmounts/DragonMountsWorldGenerator.java → src/main/java/net/dragonmounts/DragonMountsWorldGenerator.java

@@ -1,4 +1,4 @@
-package top.dragonmounts;
+package net.dragonmounts;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -28,7 +28,7 @@
 import java.util.Random;
 import java.util.Set;
 
-import static top.dragonmounts.util.DMUtils.getSurface;
+import static net.dragonmounts.util.DMUtils.getSurface;
 
 /**
  * Handles world generation for dragon nests, make a separate package if we are gonna use Mappers to optimize instead of the IWorldGenerator

src/main/java/top/dragonmounts/api/IArmorEffect.java → src/main/java/net/dragonmounts/api/IArmorEffect.java

@@ -1,6 +1,6 @@
-package top.dragonmounts.api;
+package net.dragonmounts.api;
 
-import top.dragonmounts.capability.IArmorEffectManager;
+import net.dragonmounts.capability.IArmorEffectManager;
 import net.minecraft.entity.player.EntityPlayer;
 
 @FunctionalInterface

src/main/java/top/dragonmounts/api/IArmorEffectSource.java → src/main/java/net/dragonmounts/api/IArmorEffectSource.java

@@ -1,6 +1,6 @@
-package top.dragonmounts.api;
+package net.dragonmounts.api;
 
-import top.dragonmounts.capability.IArmorEffectManager;
+import net.dragonmounts.capability.IArmorEffectManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 

src/main/java/top/dragonmounts/api/IDescribableArmorEffect.java → src/main/java/net/dragonmounts/api/IDescribableArmorEffect.java

@@ -1,9 +1,9 @@
-package top.dragonmounts.api;
+package net.dragonmounts.api;
 
-import top.dragonmounts.capability.ArmorEffectManager;
-import top.dragonmounts.capability.IArmorEffectManager;
-import top.dragonmounts.registry.CooldownCategory;
-import top.dragonmounts.util.DMUtils;
+import net.dragonmounts.capability.ArmorEffectManager;
+import net.dragonmounts.capability.IArmorEffectManager;
+import net.dragonmounts.registry.CooldownCategory;
+import net.dragonmounts.util.DMUtils;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/top/dragonmounts/capability/ArmorEffectManager.java → src/main/java/net/dragonmounts/capability/ArmorEffectManager.java

@@ -1,11 +1,11 @@
-package top.dragonmounts.capability;
-
-import top.dragonmounts.api.IArmorEffect;
-import top.dragonmounts.api.IArmorEffectSource;
-import top.dragonmounts.compat.CooldownOverlayCompat;
-import top.dragonmounts.network.SInitCooldownPacket;
-import top.dragonmounts.network.SSyncCooldownPacket;
-import top.dragonmounts.registry.CooldownCategory;
+package net.dragonmounts.capability;
+
+import net.dragonmounts.api.IArmorEffect;
+import net.dragonmounts.api.IArmorEffectSource;
+import net.dragonmounts.compat.CooldownOverlayCompat;
+import net.dragonmounts.network.SInitCooldownPacket;
+import net.dragonmounts.network.SSyncCooldownPacket;
+import net.dragonmounts.registry.CooldownCategory;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
@@ -25,9 +25,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import static top.dragonmounts.DragonMounts.NETWORK_WRAPPER;
-import static top.dragonmounts.client.ClientUtil.getLocalPlayer;
-import static top.dragonmounts.inits.DMCapabilities.ARMOR_EFFECT_MANAGER;
+import static net.dragonmounts.DragonMounts.NETWORK_WRAPPER;
+import static net.dragonmounts.client.ClientUtil.getLocalPlayer;
+import static net.dragonmounts.inits.DMCapabilities.ARMOR_EFFECT_MANAGER;
 import static java.lang.System.arraycopy;
 import static java.util.Arrays.fill;
 

src/main/java/top/dragonmounts/capability/IArmorEffectManager.java → src/main/java/net/dragonmounts/capability/IArmorEffectManager.java

@@ -1,7 +1,7 @@
-package top.dragonmounts.capability;
+package net.dragonmounts.capability;
 
-import top.dragonmounts.api.IArmorEffect;
-import top.dragonmounts.registry.CooldownCategory;
+import net.dragonmounts.api.IArmorEffect;
+import net.dragonmounts.registry.CooldownCategory;
 import net.minecraft.nbt.NBTTagCompound;
 
 public interface IArmorEffectManager {

src/main/java/top/dragonmounts/capability/package-info.java → src/main/java/net/dragonmounts/capability/package-info.java

@@ -1,2 +1,2 @@
 @javax.annotation.ParametersAreNonnullByDefault
-package top.dragonmounts.capability;
+package net.dragonmounts.capability;

src/main/java/top/dragonmounts/client/ClientUtil.java → src/main/java/net/dragonmounts/client/ClientUtil.java

@@ -1,4 +1,4 @@
-package top.dragonmounts.client;
+package net.dragonmounts.client;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/top/dragonmounts/client/gui/GuiDragon.java → src/main/java/net/dragonmounts/client/gui/GuiDragon.java

@@ -1,12 +1,12 @@
-package top.dragonmounts.client.gui;
-
-import top.dragonmounts.DragonMounts;
-import top.dragonmounts.DragonMountsTags;
-import top.dragonmounts.client.model.dragon.anim.DragonAnimator;
-import top.dragonmounts.inventory.ContainerDragon;
-import top.dragonmounts.network.MessageDragonGui;
-import top.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
-import top.dragonmounts.util.DMUtils;
+package net.dragonmounts.client.gui;
+
+import net.dragonmounts.DragonMounts;
+import net.dragonmounts.DragonMountsTags;
+import net.dragonmounts.client.model.dragon.anim.DragonAnimator;
+import net.dragonmounts.inventory.ContainerDragon;
+import net.dragonmounts.network.MessageDragonGui;
+import net.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
+import net.dragonmounts.util.DMUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;

src/main/java/top/dragonmounts/client/gui/GuiDragonDebug.java → src/main/java/net/dragonmounts/client/gui/GuiDragonDebug.java

@@ -7,16 +7,16 @@
  **    May you find forgiveness for yourself and forgive others.
  **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts.client.gui;
+package net.dragonmounts.client.gui;
 
-import top.dragonmounts.DragonMounts;
-import top.dragonmounts.DragonMountsTags;
-import top.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
-import top.dragonmounts.objects.entity.entitytameabledragon.breeds.EnumDragonBreed;
-import top.dragonmounts.objects.entity.entitytameabledragon.helper.DragonBreedHelper;
-import top.dragonmounts.objects.entity.entitytameabledragon.helper.DragonLifeStageHelper;
-import top.dragonmounts.objects.entity.entitytameabledragon.helper.DragonReproductionHelper;
-import top.dragonmounts.util.DMUtils;
+import net.dragonmounts.DragonMounts;
+import net.dragonmounts.DragonMountsTags;
+import net.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
+import net.dragonmounts.objects.entity.entitytameabledragon.breeds.EnumDragonBreed;
+import net.dragonmounts.objects.entity.entitytameabledragon.helper.DragonBreedHelper;
+import net.dragonmounts.objects.entity.entitytameabledragon.helper.DragonLifeStageHelper;
+import net.dragonmounts.objects.entity.entitytameabledragon.helper.DragonReproductionHelper;
+import net.dragonmounts.util.DMUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;

src/main/java/top/dragonmounts/client/gui/GuiDragonShulker.java → src/main/java/net/dragonmounts/client/gui/GuiDragonShulker.java

@@ -1,8 +1,8 @@
-package top.dragonmounts.client.gui;
+package net.dragonmounts.client.gui;
 
-import top.dragonmounts.DragonMountsTags;
-import top.dragonmounts.inventory.ContainerDragonShulker;
-import top.dragonmounts.objects.tileentities.TileEntityDragonShulker;
+import net.dragonmounts.DragonMountsTags;
+import net.dragonmounts.inventory.ContainerDragonShulker;
+import net.dragonmounts.objects.tileentities.TileEntityDragonShulker;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/top/dragonmounts/client/gui/GuiDragonWhistle.java → src/main/java/net/dragonmounts/client/gui/GuiDragonWhistle.java

@@ -1,9 +1,9 @@
-package top.dragonmounts.client.gui;
+package net.dragonmounts.client.gui;
 
-import top.dragonmounts.DragonMounts;
-import top.dragonmounts.network.MessageDragonSit;
-import top.dragonmounts.network.MessageDragonTeleport;
-import top.dragonmounts.util.DMUtils;
+import net.dragonmounts.DragonMounts;
+import net.dragonmounts.network.MessageDragonSit;
+import net.dragonmounts.network.MessageDragonTeleport;
+import net.dragonmounts.util.DMUtils;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.world.World;

src/main/java/top/dragonmounts/client/gui/GuiHandler.java → src/main/java/net/dragonmounts/client/gui/GuiHandler.java

@@ -1,9 +1,9 @@
-package top.dragonmounts.client.gui;
+package net.dragonmounts.client.gui;
 
-import top.dragonmounts.inventory.ContainerDragon;
-import top.dragonmounts.inventory.ContainerDragonShulker;
-import top.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
-import top.dragonmounts.objects.tileentities.TileEntityDragonShulker;
+import net.dragonmounts.inventory.ContainerDragon;
+import net.dragonmounts.inventory.ContainerDragonShulker;
+import net.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
+import net.dragonmounts.objects.tileentities.TileEntityDragonShulker;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;

src/main/java/top/dragonmounts/client/gui/GuiTextPrinter.java → src/main/java/net/dragonmounts/client/gui/GuiTextPrinter.java

@@ -7,7 +7,7 @@
  **    May you find forgiveness for yourself and forgive others.
  **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts.client.gui;
+package net.dragonmounts.client.gui;
 
 import net.minecraft.client.gui.FontRenderer;
 

src/main/java/top/dragonmounts/client/model/DragonCoreModel.java → src/main/java/net/dragonmounts/client/model/DragonCoreModel.java

@@ -1,6 +1,6 @@
-package top.dragonmounts.client.model;
+package net.dragonmounts.client.model;
 
-import top.dragonmounts.client.render.IDragonCoreRenderer;
+import net.dragonmounts.client.render.IDragonCoreRenderer;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.GlStateManager;

src/main/java/top/dragonmounts/client/model/ModelDragonCarriage.java → src/main/java/net/dragonmounts/client/model/ModelDragonCarriage.java

@@ -1,4 +1,4 @@
-package top.dragonmounts.client.model;
+package net.dragonmounts.client.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

src/main/java/top/dragonmounts/client/model/dragon/DragonModel.java → src/main/java/net/dragonmounts/client/model/dragon/DragonModel.java

@@ -8,14 +8,14 @@
  **    May you share freely, never taking more than you give.
  */
 
-package top.dragonmounts.client.model.dragon;
-
-import top.dragonmounts.client.model.dragon.anim.DragonAnimator;
-import top.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
-import top.dragonmounts.objects.entity.entitytameabledragon.breath.DragonHeadPositionHelper;
-import top.dragonmounts.objects.entity.entitytameabledragon.breeds.EnumDragonBreed;
-import top.dragonmounts.objects.entity.entitytameabledragon.helper.SegmentSizePositionRotation;
-import top.dragonmounts.util.math.MathX;
+package net.dragonmounts.client.model.dragon;
+
+import net.dragonmounts.client.model.dragon.anim.DragonAnimator;
+import net.dragonmounts.objects.entity.entitytameabledragon.EntityTameableDragon;
+import net.dragonmounts.objects.entity.entitytameabledragon.breath.DragonHeadPositionHelper;
+import net.dragonmounts.objects.entity.entitytameabledragon.breeds.EnumDragonBreed;
+import net.dragonmounts.objects.entity.entitytameabledragon.helper.SegmentSizePositionRotation;
+import net.dragonmounts.util.math.MathX;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.Entity;

src/main/java/top/dragonmounts/client/model/dragon/DragonModelMode.java → src/main/java/net/dragonmounts/client/model/dragon/DragonModelMode.java

@@ -7,7 +7,7 @@
 **    May you find forgiveness for yourself and forgive others.
 **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts.client.model.dragon;
+package net.dragonmounts.client.model.dragon;
 
 /**
  *

src/main/java/top/dragonmounts/client/model/dragon/ModelPart.java → src/main/java/net/dragonmounts/client/model/dragon/ModelPart.java

@@ -7,9 +7,9 @@
  **    May you find forgiveness for yourself and forgive others.
  **    May you share freely, never taking more than you give.
  */
-package top.dragonmounts.client.model.dragon;
+package net.dragonmounts.client.model.dragon;
 
-import top.dragonmounts.util.math.MathX;
+import net.dragonmounts.util.math.MathX;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.client.renderer.BufferBuilder;

src/main/java/top/dragonmounts/client/model/dragon/ModelPartProxy.java → src/main/java/net/dragonmounts/client/model/dragon/ModelPartProxy.java

@@ -8,7 +8,7 @@
 **    May you share freely, never taking more than you give.
 */
 
-package top.dragonmounts.client.model.dragon;
+package net.dragonmounts.client.model.dragon;
 
 import java.util.ArrayList;
 import java.util.List;