Add Lemurs

build.gradle

@@ -98,6 +98,9 @@ repositories {
         name = "DragonForge"
         url = "https://raw.github.com/dragon-forge/maven/master"
     }
+	maven {
+		url "https://maven.mcmoddev.com/" 
+	}
 }
 
 configurations {
@@ -120,6 +123,7 @@ dependencies {
     provided "codechicken:CodeChickenLib:1.12.2-3.2.2.353:universal"
     deobfCompile "tk.zeitheron.HammerLib:HammerLib-1.12.2:2.0.6.13:deobf"
     deobfCompile "tk.zeitheron.ColoredLux:ColoredLux-1.12.2:12r:deobf"
+	deobfCompile "net.ilexiconn:llibrary:1.7.17-1.12.2"
     // compile against the JEI API but do not include it at runtime
     deobfProvided "mezz.jei:jei_1.12.2:4.15.0.293:api"
     // at runtime, use the full JEI jar

src/main/java/com/crowsofwar/avatar/AvatarInfo.java

@@ -17,7 +17,9 @@
 
 package com.crowsofwar.avatar;
 
-import com.crowsofwar.avatar.util.SemanticVersion;
+import com.crowsofwar.avatar.common.util.SemanticVersion;
+
+import java.util.Locale;
 
 /**
  * Not using semantic versioning. This isn't an API, and I'm too lazy to be backwards-compatible.

src/main/java/com/crowsofwar/avatar/capabilities/CapabilityHelper.java → src/main/java/com/crowsofwar/avatar/api/capabilities/CapabilityHelper.java

@@ -1,4 +1,4 @@
-package com.crowsofwar.avatar.capabilities;
+package com.crowsofwar.avatar.api.capabilities;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.capabilities.Capability;

src/main/java/com/crowsofwar/avatar/capabilities/IAdvancedGliderCapabilityHandler.java → src/main/java/com/crowsofwar/avatar/api/capabilities/IAdvancedGliderCapabilityHandler.java

@@ -1,4 +1,4 @@
-package com.crowsofwar.avatar.capabilities;
+package com.crowsofwar.avatar.api.capabilities;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/com/crowsofwar/avatar/capabilities/IGliderCapabilityHandler.java → src/main/java/com/crowsofwar/avatar/api/capabilities/IGliderCapabilityHandler.java

@@ -1,4 +1,4 @@
-package com.crowsofwar.avatar.capabilities;
+package com.crowsofwar.avatar.api.capabilities;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/com/crowsofwar/avatar/api/capabilities/IPlayerShoulders.java

@@ -0,0 +1,25 @@
+package com.crowsofwar.avatar.api.capabilities;
+
+import net.minecraft.entity.Entity;
+
+import java.util.List;
+
+public interface IPlayerShoulders {
+
+    public boolean getRightShoulder();
+
+    public boolean getLeftShoulder();
+
+    public void setRightShoulder(boolean set);
+
+    public void setLeftShoulder(boolean set);
+
+    public List<Entity> getRiders();
+
+    public void removeRiders(Entity passenger);
+
+    public void removeAllRiders();
+
+    public void addRiders(Entity passenger);
+
+}

src/main/java/com/crowsofwar/avatar/util/helper/GliderHelper.java → src/main/java/com/crowsofwar/avatar/api/helper/GliderHelper.java

@@ -1,9 +1,9 @@
-package com.crowsofwar.avatar.util.helper;
+package com.crowsofwar.avatar.api.helper;
 
 import com.crowsofwar.avatar.AvatarLog;
-import com.crowsofwar.avatar.capabilities.CapabilityHelper;
-import com.crowsofwar.avatar.capabilities.IAdvancedGliderCapabilityHandler;
-import com.crowsofwar.avatar.item.IGlider;
+import com.crowsofwar.avatar.api.capabilities.CapabilityHelper;
+import com.crowsofwar.avatar.api.capabilities.IAdvancedGliderCapabilityHandler;
+import com.crowsofwar.avatar.api.item.IGlider;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 

src/main/java/com/crowsofwar/avatar/item/IGlider.java → src/main/java/com/crowsofwar/avatar/api/item/IGlider.java

@@ -1,4 +1,4 @@
-package com.crowsofwar.avatar.item;
+package com.crowsofwar.avatar.api.item;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBase.java → src/main/java/com/crowsofwar/avatar/api/item/ItemHangGliderBase.java

@@ -1,21 +1,22 @@
-package com.crowsofwar.avatar.item;
+package com.crowsofwar.avatar.api.item;
 
 import com.crowsofwar.avatar.AvatarMod;
-import com.crowsofwar.avatar.bending.bending.air.AbilityAirGust;
-import com.crowsofwar.avatar.bending.bending.air.AbilityAirblade;
-import com.crowsofwar.avatar.bending.bending.air.Airbending;
-import com.crowsofwar.avatar.util.data.BendingData;
-import com.crowsofwar.avatar.util.data.Chi;
-import com.crowsofwar.avatar.entity.EntityAirGust;
-import com.crowsofwar.avatar.entity.EntityAirblade;
-import com.crowsofwar.avatar.util.event.StaffUseEvent;
-import com.crowsofwar.avatar.util.helper.GliderPlayerHelper;
-import com.crowsofwar.avatar.registry.AvatarItem;
-import com.crowsofwar.avatar.network.packets.glider.PacketCUpdateClientTarget;
-import com.crowsofwar.avatar.util.GliderHelper;
+import com.crowsofwar.avatar.common.bending.air.AbilityAirGust;
+import com.crowsofwar.avatar.common.bending.air.AbilityAirblade;
+import com.crowsofwar.avatar.common.bending.air.Airbending;
+import com.crowsofwar.avatar.common.data.BendingData;
+import com.crowsofwar.avatar.common.data.Chi;
+import com.crowsofwar.avatar.common.entity.EntityAirGust;
+import com.crowsofwar.avatar.common.entity.EntityAirblade;
+import com.crowsofwar.avatar.common.event.StaffUseEvent;
+import com.crowsofwar.avatar.common.helper.GliderPlayerHelper;
+import com.crowsofwar.avatar.common.item.AvatarItem;
+import com.crowsofwar.avatar.common.network.packets.glider.PacketCUpdateClientTarget;
+import com.crowsofwar.avatar.common.util.GliderHelper;
 import com.crowsofwar.gorecore.util.Vector;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import net.minecraft.block.material.Material;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -41,10 +42,10 @@
 import java.util.Random;
 
 import static com.crowsofwar.avatar.AvatarInfo.MOD_ID;
-import static com.crowsofwar.avatar.util.helper.GliderHelper.getIsGliderDeployed;
-import static com.crowsofwar.avatar.util.helper.GliderHelper.setIsGliderDeployed;
-import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_AIR_STAFF_COOLDOWN;
-import static com.crowsofwar.avatar.util.data.TickHandlerController.STAFF_GUST_HANDLER;
+import static com.crowsofwar.avatar.api.helper.GliderHelper.getIsGliderDeployed;
+import static com.crowsofwar.avatar.api.helper.GliderHelper.setIsGliderDeployed;
+import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_AIR_STAFF_COOLDOWN;
+import static com.crowsofwar.avatar.common.data.TickHandlerController.STAFF_GUST_HANDLER;
 
 public class ItemHangGliderBase extends ItemSword implements IGlider, AvatarItem {
 

src/main/java/com/crowsofwar/avatar/item/UpgradeItems.java → src/main/java/com/crowsofwar/avatar/api/upgrade/UpgradeItems.java

@@ -1,4 +1,4 @@
-package com.crowsofwar.avatar.item;
+package com.crowsofwar.avatar.api.upgrade;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/com/crowsofwar/avatar/network/AvatarClientProxy.java → src/main/java/com/crowsofwar/avatar/client/AvatarClientProxy.java

@@ -15,12 +15,11 @@
   along with AvatarMod. If not, see <http://www.gnu.org/licenses/>.
 */
 
-package com.crowsofwar.avatar.network;
+package com.crowsofwar.avatar.client;
 
 import com.crowsofwar.avatar.AvatarLog;
 import com.crowsofwar.avatar.AvatarLog.WarningType;
 import com.crowsofwar.avatar.AvatarMod;
-import com.crowsofwar.avatar.client.*;
 import com.crowsofwar.avatar.client.gui.AnalyticsWarningGui;
 import com.crowsofwar.avatar.client.gui.AvatarUiRenderer;
 import com.crowsofwar.avatar.client.gui.GuiBisonChest;
@@ -31,23 +30,25 @@
 import com.crowsofwar.avatar.client.particles.oldsystem.*;
 import com.crowsofwar.avatar.client.render.*;
 import com.crowsofwar.avatar.client.render.iceprison.RenderIcePrison;
-import com.crowsofwar.avatar.client.particle.AvatarParticles;
-import com.crowsofwar.avatar.blocks.tiles.TileBlockTemp;
-import com.crowsofwar.avatar.client.controls.AvatarControl;
-import com.crowsofwar.avatar.client.controls.IControlsHandler;
-import com.crowsofwar.avatar.client.controls.KeybindingWrapper;
-import com.crowsofwar.avatar.util.data.AvatarPlayerData;
-import com.crowsofwar.avatar.entity.*;
-import com.crowsofwar.avatar.entity.mob.EntityFirebender;
-import com.crowsofwar.avatar.entity.mob.*;
-import com.crowsofwar.avatar.client.gui.AvatarGui;
-import com.crowsofwar.avatar.client.gui.AvatarGuiHandler;
-import com.crowsofwar.avatar.network.packets.PacketSRequestData;
-import com.crowsofwar.avatar.network.packets.PacketSSendViewStatus;
-import com.crowsofwar.avatar.client.particle.ClientParticleSpawner;
-import com.crowsofwar.avatar.capabilities.CapabilityHelper;
-import com.crowsofwar.avatar.capabilities.IAdvancedGliderCapabilityHandler;
-import com.crowsofwar.avatar.client.particle.ParticleBuilder.Type;
+import com.crowsofwar.avatar.common.AvatarCommonProxy;
+import com.crowsofwar.avatar.common.AvatarParticles;
+import com.crowsofwar.avatar.common.blocks.tiles.TileBlockTemp;
+import com.crowsofwar.avatar.common.controls.AvatarControl;
+import com.crowsofwar.avatar.common.controls.IControlsHandler;
+import com.crowsofwar.avatar.common.controls.KeybindingWrapper;
+import com.crowsofwar.avatar.common.data.AvatarPlayerData;
+import com.crowsofwar.avatar.common.entity.*;
+import com.crowsofwar.avatar.common.entity.mob.EntityFirebender;
+import com.crowsofwar.avatar.common.entity.mob.*;
+import com.crowsofwar.avatar.common.gui.AvatarGui;
+import com.crowsofwar.avatar.common.gui.AvatarGuiHandler;
+import com.crowsofwar.avatar.common.network.IPacketHandler;
+import com.crowsofwar.avatar.common.network.packets.PacketSRequestData;
+import com.crowsofwar.avatar.common.network.packets.PacketSSendViewStatus;
+import com.crowsofwar.avatar.common.particle.ClientParticleSpawner;
+import com.crowsofwar.avatar.api.capabilities.CapabilityHelper;
+import com.crowsofwar.avatar.api.capabilities.IAdvancedGliderCapabilityHandler;
+import com.crowsofwar.avatar.common.particle.ParticleBuilder.Type;
 import com.crowsofwar.avatar.client.event.GliderRenderHandler;
 import com.crowsofwar.avatar.client.renderer.LayerGlider;
 import com.crowsofwar.gorecore.data.PlayerDataFetcher;
@@ -77,8 +78,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.crowsofwar.avatar.config.ConfigAnalytics.ANALYTICS_CONFIG;
-import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG;
+import static com.crowsofwar.avatar.common.config.ConfigAnalytics.ANALYTICS_CONFIG;
+import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG;
 import static net.minecraftforge.fml.client.registry.RenderingRegistry.registerEntityRenderingHandler;
 
 //@SideOnly(Side.CLIENT)
@@ -182,6 +183,15 @@ public void preInit() {
 		registerEntityRenderingHandler(EntityAirblade.class, RenderNothing::new);
 		registerEntityRenderingHandler(EntityAirBubble.class, RenderAirBubble::new);
 		registerEntityRenderingHandler(EntitySkyBison.class, RenderSkyBison::new);
+
+		if(AvatarMod.llibrary){
+			registerEntityRenderingHandler(EntityFlyingLemur.class, RenderLlibraryLemur::new);
+			registerEntityRenderingHandler(EntityAscendedFlyingLemur.class, RenderAscendedLlibraryLemur::new);
+		}else{
+			registerEntityRenderingHandler(EntityFlyingLemur.class, RenderLemur::new);
+			registerEntityRenderingHandler(EntityAscendedFlyingLemur.class, RenderAscendedLemur::new);
+		}
+
 		registerEntityRenderingHandler(EntityOtterPenguin.class, RenderOtterPenguin::new);
 		registerEntityRenderingHandler(EntityIceShard.class, RenderIceShard::new);
 		registerEntityRenderingHandler(EntityOstrichHorse.class, RenderOstrichHorse::new);

src/main/java/com/crowsofwar/avatar/client/AvatarFovChanger.java

@@ -16,7 +16,7 @@
 */
 package com.crowsofwar.avatar.client;
 
-import com.crowsofwar.avatar.registry.AvatarItems;
+import com.crowsofwar.avatar.common.item.AvatarItems;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.FOVUpdateEvent;

src/main/java/com/crowsofwar/avatar/client/AvatarInventoryOverride.java

@@ -17,8 +17,8 @@
 package com.crowsofwar.avatar.client;
 
 import com.crowsofwar.avatar.AvatarMod;
-import com.crowsofwar.avatar.entity.mob.EntitySkyBison;
-import com.crowsofwar.avatar.network.packets.PacketSBisonInventory;
+import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison;
+import com.crowsofwar.avatar.common.network.packets.PacketSBisonInventory;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/com/crowsofwar/avatar/client/ClientInput.java

@@ -20,20 +20,20 @@
 import com.crowsofwar.avatar.AvatarLog;
 import com.crowsofwar.avatar.AvatarMod;
 import com.crowsofwar.avatar.client.gui.AvatarUiRenderer;
-import com.crowsofwar.avatar.bending.bending.Abilities;
-import com.crowsofwar.avatar.bending.bending.Ability;
-import com.crowsofwar.avatar.bending.bending.BendingStyle;
-import com.crowsofwar.avatar.client.controls.AvatarControl;
-import com.crowsofwar.avatar.client.controls.IControlsHandler;
-import com.crowsofwar.avatar.util.data.Bender;
-import com.crowsofwar.avatar.util.data.BendingData;
-import com.crowsofwar.avatar.util.data.StatusControl;
-import com.crowsofwar.avatar.util.data.ctx.BendingContext;
-import com.crowsofwar.avatar.util.event.BendingCycleEvent;
-import com.crowsofwar.avatar.util.event.BendingUseEvent;
-import com.crowsofwar.avatar.network.packets.*;
-import com.crowsofwar.avatar.util.Raytrace;
-import com.crowsofwar.avatar.util.Raytrace.Result;
+import com.crowsofwar.avatar.common.bending.Abilities;
+import com.crowsofwar.avatar.common.bending.Ability;
+import com.crowsofwar.avatar.common.bending.BendingStyle;
+import com.crowsofwar.avatar.common.controls.AvatarControl;
+import com.crowsofwar.avatar.common.controls.IControlsHandler;
+import com.crowsofwar.avatar.common.data.Bender;
+import com.crowsofwar.avatar.common.data.BendingData;
+import com.crowsofwar.avatar.common.data.StatusControl;
+import com.crowsofwar.avatar.common.data.ctx.BendingContext;
+import com.crowsofwar.avatar.common.event.BendingCycleEvent;
+import com.crowsofwar.avatar.common.event.BendingUseEvent;
+import com.crowsofwar.avatar.common.network.packets.*;
+import com.crowsofwar.avatar.common.util.Raytrace;
+import com.crowsofwar.avatar.common.util.Raytrace.Result;
 import com.crowsofwar.gorecore.format.FormattedMessageProcessor;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.I18n;
@@ -53,9 +53,9 @@
 
 import java.util.*;
 
-import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_DONT_HAVE_BENDING;
-import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG;
-import static com.crowsofwar.avatar.client.controls.AvatarControl.*;
+import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_DONT_HAVE_BENDING;
+import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG;
+import static com.crowsofwar.avatar.common.controls.AvatarControl.*;
 
 /**
  * Large class that manages input on the client-side. After input is received,

src/main/java/com/crowsofwar/avatar/client/ClientKeybindWrapper.java

@@ -18,7 +18,7 @@
 
 import net.minecraft.client.settings.KeyBinding;
 
-import com.crowsofwar.avatar.client.controls.KeybindingWrapper;
+import com.crowsofwar.avatar.common.controls.KeybindingWrapper;
 
 import javax.annotation.Nonnull;
 

src/main/java/com/crowsofwar/avatar/network/IProxy.java → src/main/java/com/crowsofwar/avatar/client/IProxy.java

@@ -1,6 +1,6 @@
-package com.crowsofwar.avatar.network;
+package com.crowsofwar.avatar.client;
 
-import com.crowsofwar.avatar.capabilities.IGliderCapabilityHandler;
+import com.crowsofwar.avatar.api.capabilities.IGliderCapabilityHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;

src/main/java/com/crowsofwar/avatar/client/PacketHandlerClient.java

@@ -20,16 +20,16 @@
 import com.crowsofwar.avatar.AvatarLog;
 import com.crowsofwar.avatar.AvatarLog.WarningType;
 import com.crowsofwar.avatar.AvatarMod;
-import com.crowsofwar.avatar.util.helper.GliderHelper;
+import com.crowsofwar.avatar.api.helper.GliderHelper;
 import com.crowsofwar.avatar.client.gui.AvatarUiRenderer;
 import com.crowsofwar.avatar.client.gui.skills.SkillsGui;
-import com.crowsofwar.avatar.bending.bending.Abilities;
-import com.crowsofwar.avatar.util.data.BendingData;
-import com.crowsofwar.avatar.network.IPacketHandler;
-import com.crowsofwar.avatar.network.packets.*;
-import com.crowsofwar.avatar.network.packets.glider.PacketCClientGliding;
-import com.crowsofwar.avatar.network.packets.glider.PacketCSyncGliderDataToClient;
-import com.crowsofwar.avatar.network.packets.glider.PacketCUpdateClientTarget;
+import com.crowsofwar.avatar.common.bending.Abilities;
+import com.crowsofwar.avatar.common.data.BendingData;
+import com.crowsofwar.avatar.common.network.IPacketHandler;
+import com.crowsofwar.avatar.common.network.packets.*;
+import com.crowsofwar.avatar.common.network.packets.glider.PacketCClientGliding;
+import com.crowsofwar.avatar.common.network.packets.glider.PacketCSyncGliderDataToClient;
+import com.crowsofwar.avatar.common.network.packets.glider.PacketCUpdateClientTarget;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;