diff --git a/build.gradle b/build.gradle index 33087ba493..596b7b6d1f 100644 --- a/build.gradle +++ b/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 diff --git a/src/main/java/com/crowsofwar/avatar/AvatarInfo.java b/src/main/java/com/crowsofwar/avatar/AvatarInfo.java index 7e082512b4..4a049d2b29 100644 --- a/src/main/java/com/crowsofwar/avatar/AvatarInfo.java +++ b/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. diff --git a/src/main/java/com/crowsofwar/avatar/capabilities/CapabilityHelper.java b/src/main/java/com/crowsofwar/avatar/api/capabilities/CapabilityHelper.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/capabilities/CapabilityHelper.java rename to src/main/java/com/crowsofwar/avatar/api/capabilities/CapabilityHelper.java index 695f1fc4fd..8bf0b90ea2 100644 --- a/src/main/java/com/crowsofwar/avatar/capabilities/CapabilityHelper.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/capabilities/IAdvancedGliderCapabilityHandler.java b/src/main/java/com/crowsofwar/avatar/api/capabilities/IAdvancedGliderCapabilityHandler.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/capabilities/IAdvancedGliderCapabilityHandler.java rename to src/main/java/com/crowsofwar/avatar/api/capabilities/IAdvancedGliderCapabilityHandler.java index 7bf2575944..749c83b17c 100644 --- a/src/main/java/com/crowsofwar/avatar/capabilities/IAdvancedGliderCapabilityHandler.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/capabilities/IGliderCapabilityHandler.java b/src/main/java/com/crowsofwar/avatar/api/capabilities/IGliderCapabilityHandler.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/capabilities/IGliderCapabilityHandler.java rename to src/main/java/com/crowsofwar/avatar/api/capabilities/IGliderCapabilityHandler.java index 7116a1a518..a184403892 100644 --- a/src/main/java/com/crowsofwar/avatar/capabilities/IGliderCapabilityHandler.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/api/capabilities/IPlayerShoulders.java b/src/main/java/com/crowsofwar/avatar/api/capabilities/IPlayerShoulders.java new file mode 100644 index 0000000000..696641c4a8 --- /dev/null +++ b/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 getRiders(); + + public void removeRiders(Entity passenger); + + public void removeAllRiders(); + + public void addRiders(Entity passenger); + +} diff --git a/src/main/java/com/crowsofwar/avatar/util/helper/GliderHelper.java b/src/main/java/com/crowsofwar/avatar/api/helper/GliderHelper.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/helper/GliderHelper.java rename to src/main/java/com/crowsofwar/avatar/api/helper/GliderHelper.java index 05d832225c..2281a270d4 100644 --- a/src/main/java/com/crowsofwar/avatar/util/helper/GliderHelper.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/item/IGlider.java b/src/main/java/com/crowsofwar/avatar/api/item/IGlider.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/item/IGlider.java rename to src/main/java/com/crowsofwar/avatar/api/item/IGlider.java index 3815bf5eff..3eef09f36a 100644 --- a/src/main/java/com/crowsofwar/avatar/item/IGlider.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBase.java b/src/main/java/com/crowsofwar/avatar/api/item/ItemHangGliderBase.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBase.java rename to src/main/java/com/crowsofwar/avatar/api/item/ItemHangGliderBase.java index 18fa023b36..268e83faaa 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBase.java +++ b/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 { diff --git a/src/main/java/com/crowsofwar/avatar/item/UpgradeItems.java b/src/main/java/com/crowsofwar/avatar/api/upgrade/UpgradeItems.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/item/UpgradeItems.java rename to src/main/java/com/crowsofwar/avatar/api/upgrade/UpgradeItems.java index 8e5d315192..1bc0f42bdc 100644 --- a/src/main/java/com/crowsofwar/avatar/item/UpgradeItems.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/CloudburstPowerModifier.java b/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/CloudburstPowerModifier.java deleted file mode 100644 index 992bceb84c..0000000000 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/CloudburstPowerModifier.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.crowsofwar.avatar.bending.bending.air.powermods; - -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; - -public class CloudburstPowerModifier extends PowerRatingModifier { - @Override - public double get(BendingContext ctx) { - return -50; - } -} diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/StaffPowerModifier.java b/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/StaffPowerModifier.java deleted file mode 100644 index 52b709986c..0000000000 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/StaffPowerModifier.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.crowsofwar.avatar.bending.bending.air.powermods; - -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; - -public class StaffPowerModifier extends PowerRatingModifier { - @Override - public double get(BendingContext ctx) { - return 40; - } -} diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlFillWaterPouch.java b/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlFillWaterPouch.java deleted file mode 100644 index 760bc87b82..0000000000 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlFillWaterPouch.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.crowsofwar.avatar.bending.bending.water.statctrls; - -public class StatCtrlFillWaterPouch { -} diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarClientProxy.java b/src/main/java/com/crowsofwar/avatar/client/AvatarClientProxy.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/network/AvatarClientProxy.java rename to src/main/java/com/crowsofwar/avatar/client/AvatarClientProxy.java index 628d1b3797..86729d970e 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarClientProxy.java +++ b/src/main/java/com/crowsofwar/avatar/client/AvatarClientProxy.java @@ -15,12 +15,11 @@ along with AvatarMod. If not, see . */ -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); diff --git a/src/main/java/com/crowsofwar/avatar/client/AvatarFovChanger.java b/src/main/java/com/crowsofwar/avatar/client/AvatarFovChanger.java index 9fe8a98075..0c024bde03 100644 --- a/src/main/java/com/crowsofwar/avatar/client/AvatarFovChanger.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/client/AvatarInventoryOverride.java b/src/main/java/com/crowsofwar/avatar/client/AvatarInventoryOverride.java index 7bd1f0b114..0111fb05af 100644 --- a/src/main/java/com/crowsofwar/avatar/client/AvatarInventoryOverride.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/client/ClientInput.java b/src/main/java/com/crowsofwar/avatar/client/ClientInput.java index 544cf5ef37..e162dc233d 100644 --- a/src/main/java/com/crowsofwar/avatar/client/ClientInput.java +++ b/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, diff --git a/src/main/java/com/crowsofwar/avatar/client/ClientKeybindWrapper.java b/src/main/java/com/crowsofwar/avatar/client/ClientKeybindWrapper.java index 396a7db283..a9766ce241 100644 --- a/src/main/java/com/crowsofwar/avatar/client/ClientKeybindWrapper.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/network/IProxy.java b/src/main/java/com/crowsofwar/avatar/client/IProxy.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/network/IProxy.java rename to src/main/java/com/crowsofwar/avatar/client/IProxy.java index 28c118c0cc..864a4f3986 100644 --- a/src/main/java/com/crowsofwar/avatar/network/IProxy.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/client/PacketHandlerClient.java b/src/main/java/com/crowsofwar/avatar/client/PacketHandlerClient.java index d66f7ac34e..619b18300a 100644 --- a/src/main/java/com/crowsofwar/avatar/client/PacketHandlerClient.java +++ b/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; diff --git a/src/main/java/com/crowsofwar/avatar/client/event/GliderRenderHandler.java b/src/main/java/com/crowsofwar/avatar/client/event/GliderRenderHandler.java index aac131a109..b92393d42c 100644 --- a/src/main/java/com/crowsofwar/avatar/client/event/GliderRenderHandler.java +++ b/src/main/java/com/crowsofwar/avatar/client/event/GliderRenderHandler.java @@ -1,12 +1,13 @@ package com.crowsofwar.avatar.client.event; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.helper.GliderHelper; -import com.crowsofwar.avatar.item.IGlider; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.api.item.IGlider; import com.crowsofwar.avatar.client.model.ModelGlider; -import com.crowsofwar.avatar.util.helper.GliderPlayerHelper; +import com.crowsofwar.avatar.common.helper.GliderPlayerHelper; +import com.crowsofwar.avatar.common.helper.MathHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.renderer.GlStateManager; @@ -25,7 +26,7 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; @SideOnly(Side.CLIENT) public class GliderRenderHandler { diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/AnalyticsWarningGui.java b/src/main/java/com/crowsofwar/avatar/client/gui/AnalyticsWarningGui.java index 2225d02183..6d426ae3ba 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/AnalyticsWarningGui.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/AnalyticsWarningGui.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.gui; -import com.crowsofwar.avatar.config.ConfigAnalytics; +import com.crowsofwar.avatar.common.config.ConfigAnalytics; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiMainMenu; import net.minecraft.client.gui.GuiScreen; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiRenderer.java b/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiRenderer.java index bd60ee949f..90163a7406 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiRenderer.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiRenderer.java @@ -19,15 +19,16 @@ import com.crowsofwar.avatar.client.AvatarShaderUtils; import com.crowsofwar.avatar.client.gui.skills.SkillsGui; -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.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.*; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityAirBubble; -import com.crowsofwar.avatar.entity.EntityIcePrison; -import com.crowsofwar.avatar.entity.EntityIceShield; +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.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.*; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; +import com.crowsofwar.avatar.common.entity.EntityIcePrison; +import com.crowsofwar.avatar.common.entity.EntityIceShield; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -53,10 +54,10 @@ import static com.crowsofwar.avatar.client.gui.AvatarUiTextures.BLOCK_BREAK; import static com.crowsofwar.avatar.client.uitools.ScreenInfo.*; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.BUBBLE_CONTRACT; -import static com.crowsofwar.avatar.util.data.StatusControlController.SHIELD_SHATTER; -import static com.crowsofwar.avatar.util.data.TickHandlerController.RENDER_ELEMENT_HANDLER; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.BUBBLE_CONTRACT; +import static com.crowsofwar.avatar.common.data.StatusControlController.SHIELD_SHATTER; +import static com.crowsofwar.avatar.common.data.TickHandlerController.RENDER_ELEMENT_HANDLER; import static net.minecraft.client.renderer.GlStateManager.*; /** diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiTextures.java b/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiTextures.java index d7bbb2bcdf..0dc19795d6 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiTextures.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/AvatarUiTextures.java @@ -17,9 +17,9 @@ package com.crowsofwar.avatar.client.gui; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; import net.minecraft.util.ResourceLocation; import javax.imageio.ImageIO; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/FadeElementListener.java b/src/main/java/com/crowsofwar/avatar/client/gui/FadeElementListener.java index c1693d1c62..43dfba95a1 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/FadeElementListener.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/FadeElementListener.java @@ -1,15 +1,15 @@ package com.crowsofwar.avatar.client.gui; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.event.BendingCycleEvent; -import com.crowsofwar.avatar.util.event.BendingUseEvent; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.event.BendingCycleEvent; +import com.crowsofwar.avatar.common.event.BendingUseEvent; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.RENDER_ELEMENT_HANDLER; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.RENDER_ELEMENT_HANDLER; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class FadeElementListener { diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/GuiBisonChest.java b/src/main/java/com/crowsofwar/avatar/client/gui/GuiBisonChest.java index eb83cc3235..963f7a67a9 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/GuiBisonChest.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/GuiBisonChest.java @@ -17,7 +17,9 @@ package com.crowsofwar.avatar.client.gui; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.gui.AvatarGui; +import com.crowsofwar.avatar.common.gui.ContainerBisonChest; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/RadialMenu.java b/src/main/java/com/crowsofwar/avatar/client/gui/RadialMenu.java index b2786a5911..4c8837e9f1 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/RadialMenu.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/RadialMenu.java @@ -18,14 +18,15 @@ package com.crowsofwar.avatar.client.gui; import com.crowsofwar.avatar.AvatarMod; -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.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.network.packets.PacketSSkillsMenu; +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.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.network.packets.PacketSSkillsMenu; import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.format.FormattedMessageProcessor; import net.minecraft.client.Minecraft; @@ -33,12 +34,13 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.resources.I18n; +import net.minecraft.init.SoundEvents; import net.minecraft.util.text.TextFormatting; import org.apache.commons.lang3.ArrayUtils; import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; import static com.crowsofwar.gorecore.format.FormattedMessage.newChatMessage; public class RadialMenu extends Gui { diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/RadialSegment.java b/src/main/java/com/crowsofwar/avatar/client/gui/RadialSegment.java index b9556a8b9f..0cb9b608fb 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/RadialSegment.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/RadialSegment.java @@ -17,8 +17,9 @@ package com.crowsofwar.avatar.client.gui; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.gui.MenuTheme; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/RenderElementHandler.java b/src/main/java/com/crowsofwar/avatar/client/gui/RenderElementHandler.java index c19113859e..f1d73ca2b2 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/RenderElementHandler.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/RenderElementHandler.java @@ -1,9 +1,10 @@ package com.crowsofwar.avatar.client.gui; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.TickHandlerController; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; public class RenderElementHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/AbilityCard.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/AbilityCard.java index 69b83fee39..1f352d750e 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/AbilityCard.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/AbilityCard.java @@ -18,7 +18,7 @@ import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.*; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; import net.minecraft.client.renderer.GlStateManager; import static com.crowsofwar.avatar.client.gui.AvatarUiTextures.getAbilityTexture; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityIcon.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityIcon.java index 9c55c7b25a..f4abf6e67b 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityIcon.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityIcon.java @@ -18,8 +18,8 @@ import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.ComponentImage; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.client.Minecraft; /** diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityKeybind.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityKeybind.java index 870f18b43c..8e9f6e28fa 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityKeybind.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityKeybind.java @@ -17,15 +17,15 @@ package com.crowsofwar.avatar.client.gui.skills; import com.crowsofwar.avatar.client.uitools.UiComponent; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.config.ConfigClient; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.config.ConfigClient; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.KeyBinding; import org.lwjgl.input.Keyboard; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityTree.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityTree.java index 955e7de05d..555182c424 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityTree.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentAbilityTree.java @@ -19,9 +19,9 @@ import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.Measurement; import com.crowsofwar.avatar.client.uitools.UiComponent; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; import net.minecraft.client.resources.I18n; import java.util.Arrays; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentBendingTab.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentBendingTab.java index cc1a421b67..ee2c83f684 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentBendingTab.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/ComponentBendingTab.java @@ -19,8 +19,8 @@ import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.UiComponent; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.network.packets.PacketSSkillsMenu; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.network.packets.PacketSSkillsMenu; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/GetBendingGui.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/GetBendingGui.java index 9fd104acbe..2be8a212e6 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/GetBendingGui.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/GetBendingGui.java @@ -19,10 +19,10 @@ import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.*; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.client.gui.AvatarGui; -import com.crowsofwar.avatar.client.gui.ContainerGetBending; -import com.crowsofwar.avatar.network.packets.PacketSUnlockBending; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.gui.AvatarGui; +import com.crowsofwar.avatar.common.gui.ContainerGetBending; +import com.crowsofwar.avatar.common.network.packets.PacketSUnlockBending; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiContainer; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/SkillsGui.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/SkillsGui.java index aff66cff29..d60b91876e 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/SkillsGui.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/SkillsGui.java @@ -19,13 +19,13 @@ import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.*; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.client.gui.AvatarGui; -import com.crowsofwar.avatar.client.gui.ContainerSkillsGui; -import com.crowsofwar.avatar.network.packets.PacketSUseScroll; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.gui.AvatarGui; +import com.crowsofwar.avatar.common.gui.ContainerSkillsGui; +import com.crowsofwar.avatar.common.network.packets.PacketSUseScroll; import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.format.FormattedMessageProcessor; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/skills/WindowAbility.java b/src/main/java/com/crowsofwar/avatar/client/gui/skills/WindowAbility.java index 13d7b62a64..b743721a90 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/skills/WindowAbility.java +++ b/src/main/java/com/crowsofwar/avatar/client/gui/skills/WindowAbility.java @@ -19,10 +19,10 @@ import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.gui.AvatarUiTextures; import com.crowsofwar.avatar.client.uitools.*; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.network.packets.PacketSUseScroll; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.network.packets.PacketSUseScroll; import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.format.FormattedMessageProcessor; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/crowsofwar/avatar/client/model/ModelGlider.java b/src/main/java/com/crowsofwar/avatar/client/model/ModelGlider.java index 8f78882232..78e5b196e0 100644 --- a/src/main/java/com/crowsofwar/avatar/client/model/ModelGlider.java +++ b/src/main/java/com/crowsofwar/avatar/client/model/ModelGlider.java @@ -1,11 +1,14 @@ package com.crowsofwar.avatar.client.model; -import com.crowsofwar.avatar.util.helper.GliderPlayerHelper; +import com.crowsofwar.avatar.common.helper.GliderPlayerHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.util.ResourceLocation; + +import static com.crowsofwar.avatar.AvatarInfo.MOD_ID; /** * ModelGlider - DavieDoo diff --git a/src/main/java/com/crowsofwar/avatar/client/particles/newparticles/ParticleBeam.java b/src/main/java/com/crowsofwar/avatar/client/particles/newparticles/ParticleBeam.java index 64703d574f..7e56e3248a 100644 --- a/src/main/java/com/crowsofwar/avatar/client/particles/newparticles/ParticleBeam.java +++ b/src/main/java/com/crowsofwar/avatar/client/particles/newparticles/ParticleBeam.java @@ -6,6 +6,8 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; //@SideOnly(Side.CLIENT) diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelEarthspikes.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelEarthspikes.java index 76a9d749d4..e862752659 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/ModelEarthspikes.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelEarthspikes.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityEarthspike; +import com.crowsofwar.avatar.common.entity.EntityEarthspike; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelFlyingBison.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelFlyingBison.java index d7c2765895..57d1d389b1 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/ModelFlyingBison.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelFlyingBison.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.block.Block; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelLemur.java new file mode 100644 index 0000000000..51ca014fc4 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelLemur.java @@ -0,0 +1,1549 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.common.entity.mob.EntityAscendedFlyingLemur; +import com.crowsofwar.avatar.common.entity.mob.EntityFlyingLemur; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.model.ModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.math.MathHelper; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + +/** + * @author Korog3 + */ + +public class ModelLemur extends ModelBase { + public ModelRenderer Body; + public ModelRenderer BodyLower; + public ModelRenderer UpperBody; + public ModelRenderer ArmRight; + public ModelRenderer ArmLeft; + public ModelRenderer Neck; + public ModelRenderer BodyLowerBack; + public ModelRenderer BodyLowerFront; + public ModelRenderer BodyLowerSideRight; + public ModelRenderer BodyLowerSideLeft; + public ModelRenderer LegRight; + public ModelRenderer LegLeft; + public ModelRenderer Tail_start; + public ModelRenderer BodyLDetail; + public ModelRenderer BodyLDetail1; + public ModelRenderer BodyLDetail2; + public ModelRenderer BodyLDetail4; + public ModelRenderer LegDetailRight; + public ModelRenderer LegDetailRight1; + public ModelRenderer LegRightLower; + public ModelRenderer LegRightLowerDetail; + public ModelRenderer LegRightLowerDetail1; + public ModelRenderer LegRightFoot; + public ModelRenderer LegRightFootDetail; + public ModelRenderer LegRightFootDetail1; + public ModelRenderer LegRightFootDetail2; + public ModelRenderer LegDetailLeft; + public ModelRenderer LegDetaiLeft1; + public ModelRenderer LegLeftLower; + public ModelRenderer LegLeftLowerDetail; + public ModelRenderer LegLeftLowerDetail1; + public ModelRenderer LegLeftFoot; + public ModelRenderer LegLeftFootDetail; + public ModelRenderer LegLeftFootDetail1; + public ModelRenderer LegLeftFootDetail2; + public ModelRenderer Tail_mid1; + public ModelRenderer Tail_mid2; + public ModelRenderer Tail_mid3; + public ModelRenderer Tail_mid4; + public ModelRenderer Tail_end; + public ModelRenderer BodyDetailFront; + public ModelRenderer BodyDetailBack; + public ModelRenderer BodyDetailSideRight; + public ModelRenderer BodyDetailSideLeft; + public ModelRenderer neckDetail; + public ModelRenderer neckDetail2; + public ModelRenderer neckDetail3; + public ModelRenderer neckDetail4; + public ModelRenderer ArmRightDetail; + public ModelRenderer ArmRightDetail1; + public ModelRenderer ArmRightDetail11; + public ModelRenderer ArmRightDetail12; + public ModelRenderer ArmRightLower; + public ModelRenderer Right_Wing; + public ModelRenderer ArmRightLowerDetail; + public ModelRenderer ArmRightLowerDetail1; + public ModelRenderer ArmRightHand; + public ModelRenderer ArmRightFingerMid; + public ModelRenderer ArmRightFingerback; + public ModelRenderer ArmRightFingerfront; + public ModelRenderer ArmRightFingersBig; + public ModelRenderer Right_Wing_Overlay; + public ModelRenderer ArmLeftDetail; + public ModelRenderer ArmLeftDetail1; + public ModelRenderer ArmLeftDetail11; + public ModelRenderer ArmLeftDetail12; + public ModelRenderer ArmLeftLower; + public ModelRenderer Left_Wing; + public ModelRenderer ArmLeftLowerDetail; + public ModelRenderer ArmLeftLowerDetail1; + public ModelRenderer ArmLeftHand; + public ModelRenderer ArmLeftFingerMid; + public ModelRenderer ArmLeftFingerback; + public ModelRenderer ArmLeftFingerfront; + public ModelRenderer ArmLeftFingersBig; + public ModelRenderer Left_Wing_Overlay; + public ModelRenderer theHead; + public ModelRenderer theHeadDetail; + public ModelRenderer theHeadDetail1; + public ModelRenderer theHeadDetail2; + public ModelRenderer headtop; + public ModelRenderer headBack; + public ModelRenderer headBack1; + public ModelRenderer theHeadDetail7999; + public ModelRenderer headfrontdetaila1; + public ModelRenderer headfrontdetaila1_1; + public ModelRenderer FF1; + public ModelRenderer EarRight; + public ModelRenderer EarLeft; + public ModelRenderer theHeadDetaile; + public ModelRenderer theHeadDetailh; + public ModelRenderer theHeadDetail1e; + public ModelRenderer theHeadDetail1h; + public ModelRenderer theHeadDetail2e; + public ModelRenderer theHeadDetail2h; + public ModelRenderer headBack2; + public ModelRenderer headBack113; + public ModelRenderer headBack11; + public ModelRenderer headBack111; + public ModelRenderer theHeadDetail2e768; + public ModelRenderer theHeadDetail2h789; + public ModelRenderer headfrontdetaila4; + public ModelRenderer headfrontdetaila5; + public ModelRenderer headfrontdetaila4_1; + public ModelRenderer headfrontdetaila5_1; + public ModelRenderer FF2; + public ModelRenderer FF3; + public ModelRenderer chek; + public ModelRenderer chek1; + public ModelRenderer FF4; + public ModelRenderer EarR1; + public ModelRenderer EarRB1; + public ModelRenderer EarR2; + public ModelRenderer EarM2; + public ModelRenderer EarR3; + public ModelRenderer EarM5; + public ModelRenderer EarRB2; + public ModelRenderer EarM1; + public ModelRenderer EarRB3; + public ModelRenderer EarRB2Detail; + public ModelRenderer EarM3; + public ModelRenderer EarRB2Detaildetail; + public ModelRenderer EarL1; + public ModelRenderer EarLB1; + public ModelRenderer EarL2; + public ModelRenderer EarL2_1; + public ModelRenderer EarL3; + public ModelRenderer EarL5; + public ModelRenderer EarLB2; + public ModelRenderer EarlM1; + public ModelRenderer EarLB3; + public ModelRenderer EarLB2Detail; + public ModelRenderer EarML3; + public ModelRenderer EarLB2Detaildetail; + + private State state = State.STANDING; + + public ModelLemur() { + this.textureWidth = 160; + this.textureHeight = 64; + this.BodyLowerBack = new ModelRenderer(this, 24, 0); + this.BodyLowerBack.setRotationPoint(0.0F, 0.0F, 2.0F); + this.BodyLowerBack.addBox(-1.5F, 0.0F, -2.0F, 3, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerBack, -0.12217304763960307F, 0.0F, 0.0F); + this.BodyDetailFront = new ModelRenderer(this, 8, 9); + this.BodyDetailFront.setRotationPoint(0.0F, 0.0F, -2.0F); + this.BodyDetailFront.addBox(-1.5F, -2.0F, 0.0F, 3, 2, 1, 0.0F); + this.setRotateAngle(BodyDetailFront, -0.5235987755982988F, 0.0F, 0.0F); + this.Right_Wing = new ModelRenderer(this, 92, 0); + this.Right_Wing.setRotationPoint(0.0F, -3.5F, 0.0F); + this.Right_Wing.addBox(0.0F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.setRotateAngle(Right_Wing, -0.2792526803190927F, 0.0F, 0.02617993877991494F); + this.BodyLDetail = new ModelRenderer(this, 35, 11); + this.BodyLDetail.setRotationPoint(-2.5F, 0.0F, -2.0F); + this.BodyLDetail.addBox(0.0F, 0.0F, 0.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail, 0.12217304763960307F, 0.0F, -0.13788101090755206F); + this.EarRB2Detail = new ModelRenderer(this, 30, 37); + this.EarRB2Detail.setRotationPoint(-1.0F, 2.0F, 4.0F); + this.EarRB2Detail.addBox(0.0F, -1.0F, 0.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarRB2Detail, 0.389033890269536F, 0.0F, 0.0F); + this.Body = new ModelRenderer(this, 0, 0); + this.Body.setRotationPoint(0.0F, 7.5F, 0.0F); + this.Body.addBox(-2.5F, -5.0F, -2.0F, 5, 5, 4, 0.0F); + this.neckDetail = new ModelRenderer(this, 18, 3); + this.neckDetail.setRotationPoint(-2.0F, -0.0F, -1.5F); + this.neckDetail.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail, -0.3839724354387525F, 0.7853981633974483F, 0.0F); + this.neckDetail3 = new ModelRenderer(this, 18, 6); + this.neckDetail3.setRotationPoint(2.0F, 0.0F, 1.5F); + this.neckDetail3.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail3, -0.3839724354387525F, -2.356194490192345F, 0.0F); + this.ArmRight = new ModelRenderer(this, 0, 27); + this.ArmRight.setRotationPoint(2.5F, -5.0F, 0.0F); + this.ArmRight.addBox(0.0F, 0.0F, -1.01F, 1, 8, 1, 0.0F); + this.setRotateAngle(ArmRight, 0.0F, -0.17453292519943295F, -0.17453292519943295F); + this.headtop = new ModelRenderer(this, 66, 0); + this.headtop.setRotationPoint(0.0F, -6.42F, 0.0F); + this.headtop.addBox(-1.5F, 0.0F, -1.5F, 3, 1, 3, 0.0F); + this.EarL2 = new ModelRenderer(this, 118, 10); + this.EarL2.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL2.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarL2, 0.5235987755982988F, 0.0F, 0.0F); + this.ArmLeftFingerback = new ModelRenderer(this, 43, 13); + this.ArmLeftFingerback.setRotationPoint(0.5F, 0.5F, 0.5F); + this.ArmLeftFingerback.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerback, 0.17453292519943295F, 0.5235987755982988F, -0.2617993877991494F); + this.theHeadDetailh = new ModelRenderer(this, 54, 12); + this.theHeadDetailh.setRotationPoint(3.0F, 0.0F, 0.0F); + this.theHeadDetailh.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetailh, 0.0F, 0.0F, -0.6981317007977318F); + this.headfrontdetaila4_1 = new ModelRenderer(this, 66, 44); + this.headfrontdetaila4_1.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headfrontdetaila4_1.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila4_1, 0.7365289443416071F, 0.0F, 0.0F); + this.ArmRightFingerfront = new ModelRenderer(this, 43, 13); + this.ArmRightFingerfront.setRotationPoint(0.5F, 0.5F, 0.5F); + this.ArmRightFingerfront.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerfront, 0.17453292519943295F, 0.5235987755982988F, -0.2617993877991494F); + this.EarLB3 = new ModelRenderer(this, 114, 46); + this.EarLB3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarLB3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F); + this.setRotateAngle(EarLB3, -0.1223475805648025F, 0.3490658503988659F, 0.0F); + this.EarR3 = new ModelRenderer(this, 6, 36); + this.EarR3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR3.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarR3, 0.4363323129985824F, 0.0F, 0.0F); + this.headBack2 = new ModelRenderer(this, 66, 8); + this.headBack2.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headBack2.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack2, 0.7312929565856241F, 0.0F, 0.0F); + this.Neck = new ModelRenderer(this, 8, 12); + this.Neck.setRotationPoint(0.0F, -5.75F, 0.0F); + this.Neck.addBox(-1.5F, -2.0F, -1.0F, 3, 1, 2, 0.0F); + this.theHeadDetail1e = new ModelRenderer(this, 78, 20); + this.theHeadDetail1e.setRotationPoint(-3.0F, 0.0F, 0.0F); + this.theHeadDetail1e.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1e, 0.0F, 0.0F, 0.9599310885968813F); + this.LegRightLowerDetail1 = new ModelRenderer(this, 34, 10); + this.LegRightLowerDetail1.setRotationPoint(0.0F, -0.3F, 0.1F); + this.LegRightLowerDetail1.addBox(-0.5F, 0.0F, 0.0F, 1, 4, 1, 0.0F); + this.setRotateAngle(LegRightLowerDetail1, -0.2399827721492203F, 0.0F, 0.0F); + this.EarRB2Detaildetail = new ModelRenderer(this, 30, 45); + this.EarRB2Detaildetail.setRotationPoint(0.0F, -1.0F, 2.5F); + this.EarRB2Detaildetail.addBox(0.0F, 0.0F, -2.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarRB2Detaildetail, -0.4557054676957194F, 0.0F, 0.0F); + this.EarLB2Detaildetail = new ModelRenderer(this, 112, 61); + this.EarLB2Detaildetail.setRotationPoint(0.0F, -1.0F, 2.5F); + this.EarLB2Detaildetail.addBox(0.0F, 0.0F, -2.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarLB2Detaildetail, -0.4557054676957194F, 0.0F, 0.0F); + this.LegLeftLowerDetail = new ModelRenderer(this, 37, 9); + this.LegLeftLowerDetail.setRotationPoint(0.0F, -0.53F, -0.88F); + this.LegLeftLowerDetail.addBox(-0.5F, 0.0F, 0.0F, 1, 5, 1, 0.0F); + this.BodyDetailSideLeft = new ModelRenderer(this, 15, 15); + this.BodyDetailSideLeft.setRotationPoint(2.5F, 0.0F, 0.0F); + this.BodyDetailSideLeft.addBox(-1.0F, -2.0F, -1.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(BodyDetailSideLeft, 0.0F, 0.0F, -0.5235987755982988F); + this.EarM2 = new ModelRenderer(this, 8, 41); + this.EarM2.setRotationPoint(1.0F, -1.0F, 0.0F); + this.EarM2.addBox(-1.0F, -3.0F, 0.0F, 1, 3, 4, 0.0F); + this.EarL1 = new ModelRenderer(this, 116, 5); + this.EarL1.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL1.addBox(-1.0F, -1.0F, 0.0F, 2, 1, 4, 0.0F); + this.setRotateAngle(EarL1, 0.6108652381980153F, 0.0F, 0.0F); + this.headBack1 = new ModelRenderer(this, 54, 16); + this.headBack1.setRotationPoint(-1.5F, 0.0F, 1.5F); + this.headBack1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack1, 0.9599310885968813F, -0.7853981633974483F, 0.0F); + this.Tail_start = new ModelRenderer(this, 60, 59); + this.Tail_start.setRotationPoint(0.0F, 5.5F, 1.0F); + this.Tail_start.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_start, 0.22183134792847928F, 0.0F, 0.0F); + this.FF3 = new ModelRenderer(this, 71, 60); + this.FF3.setRotationPoint(0.0F, 3.0F, -1.0F); + this.FF3.addBox(-0.5F, 0.0F, 0.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(FF3, 1.4486232791552935F, 0.0F, 0.0F); + this.BodyLDetail4 = new ModelRenderer(this, 43, 0); + this.BodyLDetail4.setRotationPoint(-2.5F, 0.0F, 2.0F); + this.BodyLDetail4.addBox(0.0F, 0.0F, -1.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail4, -0.12217304763960307F, 0.0F, -0.13788101090755206F); + this.BodyLowerSideRight = new ModelRenderer(this, 37, 0); + this.BodyLowerSideRight.setRotationPoint(-2.5F, 0.0F, 0.0F); + this.BodyLowerSideRight.addBox(0.0F, 0.0F, -1.0F, 1, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerSideRight, 0.0F, 0.0F, -0.13962634015954636F); + this.headfrontdetaila1_1 = new ModelRenderer(this, 54, 28); + this.headfrontdetaila1_1.setRotationPoint(1.5F, 0.0F, -1.5F); + this.headfrontdetaila1_1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila1_1, 0.9599310885968813F, 2.356194490192345F, 0.0F); + this.ArmRightDetail1 = new ModelRenderer(this, 32, 28); + this.ArmRightDetail1.setRotationPoint(1.75F, 1.0F, 0.0F); + this.ArmRightDetail1.addBox(-1.0F, 0.0F, -1.0F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail1, 0.0F, 0.0F, 0.1117010721276371F); + this.LegLeftLower = new ModelRenderer(this, 52, 62); + this.LegLeftLower.setRotationPoint(0.5F, 5.2F, 0.0F); + this.LegLeftLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(LegLeftLower, 0.3490658503988659F, 0.0F, 0.0F); + this.BodyDetailBack = new ModelRenderer(this, 8, 9); + this.BodyDetailBack.setRotationPoint(0.0F, 0.0F, 2.0F); + this.BodyDetailBack.addBox(-1.5F, -2.0F, -1.0F, 3, 2, 1, 0.0F); + this.setRotateAngle(BodyDetailBack, 0.5235987755982988F, 0.0F, 0.0F); + this.LegRightLower = new ModelRenderer(this, 52, 62); + this.LegRightLower.setRotationPoint(-0.5F, 5.2F, 0.0F); + this.LegRightLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(LegRightLower, 0.3490658503988659F, 0.0F, 0.0F); + this.LegRightLowerDetail = new ModelRenderer(this, 34, 9); + this.LegRightLowerDetail.setRotationPoint(0.0F, -0.53F, -0.88F); + this.LegRightLowerDetail.addBox(-0.5F, 0.0F, 0.0F, 1, 5, 1, 0.0F); + this.EarLB1 = new ModelRenderer(this, 116, 34); + this.EarLB1.setRotationPoint(1.0F, -0.2F, -0.4F); + this.EarLB1.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarLB1, 1.2217304763960306F, 0.0F, 0.0F); + this.EarRB2 = new ModelRenderer(this, 16, 36); + this.EarRB2.setRotationPoint(0.0F, 0.0F, 3.6F); + this.EarRB2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarRB2, -0.4363323129985824F, 0.3490658503988659F, 0.0F); + this.EarRight = new ModelRenderer(this, 0, 39); + this.EarRight.setRotationPoint(-1.0F, -6.0F, 1.0F); + this.EarRight.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarRight, -0.2617993877991494F, -0.6108652381980153F, 0.0F); + this.theHeadDetail1 = new ModelRenderer(this, 78, 16); + this.theHeadDetail1.setRotationPoint(-1.5F, 0.0F, -1.5F); + this.theHeadDetail1.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1, 0.0F, 0.0F, 0.7853981633974483F); + this.headfrontdetaila4 = new ModelRenderer(this, 66, 36); + this.headfrontdetaila4.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headfrontdetaila4.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila4, 0.7312929565856241F, 0.0F, 0.0F); + this.ArmLeftFingerMid = new ModelRenderer(this, 43, 13); + this.ArmLeftFingerMid.setRotationPoint(0.0F, 0.5F, 0.5F); + this.ArmLeftFingerMid.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerMid, 0.3490658503988659F, 0.0F, 0.0F); + this.ArmLeftLower = new ModelRenderer(this, 52, 62); + this.ArmLeftLower.setRotationPoint(-0.5F, 8.0F, -0.5F); + this.ArmLeftLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftLower, -0.5235987755982988F, 0.0F, 0.0F); + this.theHeadDetail2h789 = new ModelRenderer(this, 54, 0); + this.theHeadDetail2h789.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2h789.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2h789, 0.6981317007977318F, 0.0F, 0.0F); + this.EarRB1 = new ModelRenderer(this, 21, 46); + this.EarRB1.setRotationPoint(-1.0F, -0.2F, -0.4F); + this.EarRB1.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarRB1, 1.2217304763960306F, 0.0F, 0.0F); + this.theHeadDetail2e = new ModelRenderer(this, 78, 32); + this.theHeadDetail2e.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2e.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2e, 0.9599310885968813F, 0.0F, 0.0F); + this.EarL2_1 = new ModelRenderer(this, 118, 20); + this.EarL2_1.setRotationPoint(0.0F, -1.0F, 0.0F); + this.EarL2_1.addBox(-1.0F, -3.0F, 0.0F, 1, 3, 4, 0.0F); + this.headBack11 = new ModelRenderer(this, 66, 16); + this.headBack11.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headBack11.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack11, 0.7312929565856241F, 0.0F, 0.0F); + this.theHeadDetaile = new ModelRenderer(this, 78, 8); + this.theHeadDetaile.setRotationPoint(3.0F, 0.0F, -1.5F); + this.theHeadDetaile.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetaile, 0.0F, 0.0F, -0.9599310885968813F); + this.EarL5 = new ModelRenderer(this, 116, 27); + this.EarL5.setRotationPoint(0.0F, -1.8F, 3.0F); + this.EarL5.addBox(-1.02F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.setRotateAngle(EarL5, 0.49497537586559187F, 0.0F, 0.0F); + this.ArmRightFingerMid = new ModelRenderer(this, 43, 13); + this.ArmRightFingerMid.setRotationPoint(0.0F, 0.5F, 0.5F); + this.ArmRightFingerMid.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerMid, 0.3490658503988659F, 0.0F, 0.0F); + this.Left_Wing_Overlay = new ModelRenderer(this, 136, 0); + this.Left_Wing_Overlay.mirror = true; + this.Left_Wing_Overlay.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Left_Wing_Overlay.addBox(0.02F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.headBack111 = new ModelRenderer(this, 79, 43); + this.headBack111.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headBack111.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headBack111, 0.5916666164260777F, 0.0F, 0.0F); + this.LegRightFootDetail = new ModelRenderer(this, 34, 11); + this.LegRightFootDetail.setRotationPoint(-0.8F, 0.0F, 0.0F); + this.LegRightFootDetail.addBox(0.5F, 0.0F, -3.2F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFootDetail, 0.0F, -0.4363323129985824F, 0.17453292519943295F); + this.BodyLDetail1 = new ModelRenderer(this, 35, 11); + this.BodyLDetail1.mirror = true; + this.BodyLDetail1.setRotationPoint(2.5F, 0.0F, -2.0F); + this.BodyLDetail1.addBox(-1.0F, 0.0F, 0.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail1, 0.12217304763960307F, 0.0F, 0.13788101090755206F); + this.ArmLeftFingersBig = new ModelRenderer(this, 0, 2); + this.ArmLeftFingersBig.setRotationPoint(-0.5F, 0.5F, 0.0F); + this.ArmLeftFingersBig.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftFingersBig, -0.4363323129985824F, 0.0F, 0.3839724354387525F); + this.ArmRightHand = new ModelRenderer(this, 0, 2); + this.ArmRightHand.mirror = true; + this.ArmRightHand.setRotationPoint(0.0F, 6.0F, 0.0F); + this.ArmRightHand.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightHand, -0.296705972839036F, 1.5707963267948966F, 0.0F); + this.theHead = new ModelRenderer(this, 78, 0); + this.theHead.setRotationPoint(0.0F, -2.0F, -0.15F); + this.theHead.addBox(-1.5F, -1.0F, -1.5F, 3, 1, 3, 0.0F); + this.LegLeft = new ModelRenderer(this, 22, 27); + this.LegLeft.setRotationPoint(1.5F, 5.9F, 0.0F); + this.LegLeft.addBox(0.02F, 2.0F, -1.02F, 1, 3, 2, 0.0F); + this.setRotateAngle(LegLeft, -0.2617993877991494F, -0.2617993877991494F, -0.08726646259971647F); + this.LegDetailRight1 = new ModelRenderer(this, 16, 32); + this.LegDetailRight1.setRotationPoint(-1.0F, 2.0F, 0.0F); + this.LegDetailRight1.addBox(0.0F, -2.0F, -1.01F, 1, 2, 2, 0.0F); + this.setRotateAngle(LegDetailRight1, 0.0F, 0.0F, 0.3804817769347638F); + this.LegDetailLeft = new ModelRenderer(this, 25, 20); + this.LegDetailLeft.setRotationPoint(0.2F, -0.2F, 0.0F); + this.LegDetailLeft.addBox(-1.0F, 0.0F, -1.0F, 1, 5, 2, 0.0F); + this.setRotateAngle(LegDetailLeft, 0.0F, 0.0F, -0.15707963267948966F); + this.Tail_mid4 = new ModelRenderer(this, 60, 59); + this.Tail_mid4.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid4.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid4, 0.5248205060746949F, 0.0F, -0.035430183815484885F); + this.LegLeftLowerDetail1 = new ModelRenderer(this, 25, 11); + this.LegLeftLowerDetail1.setRotationPoint(0.0F, -0.3F, 0.1F); + this.LegLeftLowerDetail1.addBox(-0.5F, 0.0F, 0.0F, 1, 4, 1, 0.0F); + this.setRotateAngle(LegLeftLowerDetail1, -0.2399827721492203F, 0.0F, 0.0F); + this.ArmLeftDetail11 = new ModelRenderer(this, 12, 28); + this.ArmLeftDetail11.mirror = true; + this.ArmLeftDetail11.setRotationPoint(-1.75F, 1.0F, 1.0F); + this.ArmLeftDetail11.addBox(0.01F, 0.0F, -1.0F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail11, -0.14486232791552936F, 0.0F, -0.1117010721276371F); + this.EarR2 = new ModelRenderer(this, 0, 49); + this.EarR2.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR2.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarR2, 0.5235987755982988F, 0.0F, 0.0F); + this.EarlM1 = new ModelRenderer(this, 102, 58); + this.EarlM1.setRotationPoint(-1.0F, 1.0F, 0.8F); + this.EarlM1.addBox(0.0F, -2.0F, 0.0F, 1, 2, 4, 0.0F); + this.setRotateAngle(EarlM1, -1.1370820076743058F, -0.08970992355250852F, 0.17453292519943295F); + this.theHeadDetail2 = new ModelRenderer(this, 78, 28); + this.theHeadDetail2.setRotationPoint(-1.5F, 0.0F, 1.5F); + this.theHeadDetail2.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2, 0.7853981633974483F, 0.0F, 0.0F); + this.neckDetail2 = new ModelRenderer(this, 18, 3); + this.neckDetail2.setRotationPoint(2.0F, 0.0F, -1.5F); + this.neckDetail2.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail2, -0.3839724354387525F, -0.7853981633974483F, 0.0F); + this.FF1 = new ModelRenderer(this, 83, 59); + this.FF1.setRotationPoint(0.0F, -3.3F, -4.0F); + this.FF1.addBox(-0.5F, 0.0F, -1.0F, 1, 3, 2, 0.0F); + this.setRotateAngle(FF1, 0.3490658503988659F, 0.0F, 0.0F); + this.BodyLowerSideLeft = new ModelRenderer(this, 37, 0); + this.BodyLowerSideLeft.mirror = true; + this.BodyLowerSideLeft.setRotationPoint(2.5F, 0.0F, 0.0F); + this.BodyLowerSideLeft.addBox(-1.0F, 0.0F, -1.0F, 1, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerSideLeft, 0.0F, 0.0F, 0.13962634015954636F); + this.LegLeftFootDetail = new ModelRenderer(this, 34, 9); + this.LegLeftFootDetail.setRotationPoint(-0.8F, 0.0F, 0.0F); + this.LegLeftFootDetail.addBox(0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFootDetail, 0.0F, -0.4363323129985824F, 0.17453292519943295F); + this.Left_Wing = new ModelRenderer(this, 92, 0); + this.Left_Wing.mirror = true; + this.Left_Wing.setRotationPoint(-1.0F, -3.5F, 0.0F); + this.Left_Wing.addBox(0.0F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.setRotateAngle(Left_Wing, -0.2792526803190927F, 0.0F, -0.02617993877991494F); + this.EarR1 = new ModelRenderer(this, 0, 44); + this.EarR1.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR1.addBox(-1.0F, -1.0F, 0.0F, 2, 1, 4, 0.0F); + this.setRotateAngle(EarR1, 0.6108652381980153F, 0.0F, 0.0F); + this.ArmRightFingersBig = new ModelRenderer(this, 0, 2); + this.ArmRightFingersBig.setRotationPoint(0.5F, 0.5F, 0.0F); + this.ArmRightFingersBig.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightFingersBig, -0.4363323129985824F, 0.0F, -0.3839724354387525F); + this.FF2 = new ModelRenderer(this, 77, 60); + this.FF2.setRotationPoint(0.0F, 0.5F, -1.0F); + this.FF2.addBox(-0.5F, -2.0F, 0.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(FF2, -1.48352986419518F, 0.0F, 0.0F); + this.LegLeftFoot = new ModelRenderer(this, 26, 11); + this.LegLeftFoot.setRotationPoint(0.0F, 4.5F, 0.0F); + this.LegLeftFoot.addBox(-0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFoot, 0.0F, -0.17453292519943295F, 0.08726646259971647F); + this.theHeadDetail1h = new ModelRenderer(this, 54, 4); + this.theHeadDetail1h.mirror = true; + this.theHeadDetail1h.setRotationPoint(-3.0F, 0.0F, 0.0F); + this.theHeadDetail1h.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1h, 0.0F, 0.0F, 0.6981317007977318F); + this.FF4 = new ModelRenderer(this, 90, 62); + this.FF4.setRotationPoint(-0.13F, 0.6F, -1.01F); + this.FF4.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); + this.EarL3 = new ModelRenderer(this, 118, 15); + this.EarL3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL3.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarL3, 0.4363323129985824F, 0.0F, 0.0F); + this.UpperBody = new ModelRenderer(this, 14, 0); + this.UpperBody.setRotationPoint(0.0F, -5.0F, 0.0F); + this.UpperBody.addBox(-1.5F, -1.74F, -1.0F, 3, 1, 2, 0.0F); + this.BodyDetailSideRight = new ModelRenderer(this, 9, 15); + this.BodyDetailSideRight.setRotationPoint(-2.5F, 0.0F, 0.0F); + this.BodyDetailSideRight.addBox(0.0F, -2.0F, -1.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(BodyDetailSideRight, 0.0F, 0.0F, 0.5235987755982988F); + this.headBack113 = new ModelRenderer(this, 79, 40); + this.headBack113.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headBack113.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headBack113, 0.5916666164260777F, 0.0F, 0.0F); + this.headfrontdetaila5_1 = new ModelRenderer(this, 79, 49); + this.headfrontdetaila5_1.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headfrontdetaila5_1.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headfrontdetaila5_1, 0.5916666164260777F, 0.0F, 0.0F); + this.ArmRightLowerDetail1 = new ModelRenderer(this, 40, 29); + this.ArmRightLowerDetail1.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightLowerDetail1.addBox(-0.51F, 0.0F, -0.23F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmRightLowerDetail1, -0.04014257279586957F, 0.0F, 0.0F); + this.ArmLeft = new ModelRenderer(this, 0, 27); + this.ArmLeft.mirror = true; + this.ArmLeft.setRotationPoint(-2.5F, -5.0F, 0.0F); + this.ArmLeft.addBox(-1.02F, 0.0F, -1.02F, 1, 8, 1, 0.0F); + this.setRotateAngle(ArmLeft, 0.0F, 0.17453292519943295F, 0.17453292519943295F); + this.LegDetailRight = new ModelRenderer(this, 19, 20); + this.LegDetailRight.setRotationPoint(-0.2F, -0.2F, 0.0F); + this.LegDetailRight.addBox(0.0F, 0.0F, -1.0F, 1, 5, 2, 0.0F); + this.setRotateAngle(LegDetailRight, 0.0F, 0.0F, 0.15707963267948966F); + this.ArmLeftLowerDetail1 = new ModelRenderer(this, 40, 29); + this.ArmLeftLowerDetail1.mirror = true; + this.ArmLeftLowerDetail1.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftLowerDetail1.addBox(-0.5F, 0.0F, -0.25F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmLeftLowerDetail1, -0.04014257279586957F, 0.0F, 0.0F); + this.headfrontdetaila5 = new ModelRenderer(this, 79, 46); + this.headfrontdetaila5.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headfrontdetaila5.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headfrontdetaila5, 0.5916666164260777F, 0.0F, 0.0F); + this.EarM1 = new ModelRenderer(this, 10, 50); + this.EarM1.setRotationPoint(1.0F, 1.0F, 0.8F); + this.EarM1.addBox(-1.0F, -2.0F, 0.0F, 1, 2, 4, 0.0F); + this.setRotateAngle(EarM1, -1.1370820076743058F, 0.08970992355250852F, -0.17453292519943295F); + this.Tail_end = new ModelRenderer(this, 56, 59); + this.Tail_end.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_end.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_end, -0.39025562074593206F, 0.0F, 0.01727875959474386F); + this.chek = new ModelRenderer(this, 65, 60); + this.chek.setRotationPoint(0.5F, 0.0F, -1.0F); + this.chek.addBox(0.0F, 0.01F, 0.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(chek, 0.0F, -1.186823891356144F, 0.0F); + this.ArmRightDetail12 = new ModelRenderer(this, 0, 18); + this.ArmRightDetail12.setRotationPoint(0.0F, 0.9F, 1.0F); + this.ArmRightDetail12.addBox(0.0F, 0.0F, -1.01F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail12, -0.14486232791552936F, 0.0F, 0.0F); + this.LegRightFootDetail1 = new ModelRenderer(this, 34, 11); + this.LegRightFootDetail1.setRotationPoint(0.8F, 0.0F, 0.0F); + this.LegRightFootDetail1.addBox(-1.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFootDetail1, 0.0F, 0.4363323129985824F, -0.17453292519943295F); + this.BodyLower = new ModelRenderer(this, 52, 62); + this.BodyLower.setRotationPoint(0.0F, 0.0F, 0.0F); + this.BodyLower.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.ArmLeftLowerDetail = new ModelRenderer(this, 35, 21); + this.ArmLeftLowerDetail.mirror = true; + this.ArmLeftLowerDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftLowerDetail.addBox(-0.52F, 0.0F, -0.75F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmLeftLowerDetail, 0.04014257279586957F, 0.0F, 0.0F); + this.ArmRightDetail11 = new ModelRenderer(this, 12, 28); + this.ArmRightDetail11.setRotationPoint(1.75F, 1.0F, 1.0F); + this.ArmRightDetail11.addBox(-0.99F, 0.0F, -0.99F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail11, -0.14486232791552936F, 0.0F, 0.1117010721276371F); + this.headBack = new ModelRenderer(this, 54, 24); + this.headBack.setRotationPoint(1.5F, 0.0F, 1.5F); + this.headBack.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack, 0.9599310885968813F, 0.7853981633974483F, 0.0F); + this.Tail_mid3 = new ModelRenderer(this, 60, 59); + this.Tail_mid3.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid3.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid3, 0.942128730226539F, 0.0F, -0.015184364492350668F); + this.chek1 = new ModelRenderer(this, 65, 56); + this.chek1.setRotationPoint(-0.5F, 0.0F, -1.0F); + this.chek1.addBox(-2.0F, 0.01F, 0.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(chek1, 0.0F, 1.186823891356144F, 0.0F); + this.ArmLeftDetail12 = new ModelRenderer(this, 0, 18); + this.ArmLeftDetail12.mirror = true; + this.ArmLeftDetail12.setRotationPoint(0.0F, 0.9F, 1.0F); + this.ArmLeftDetail12.addBox(-1.0F, 0.0F, -1.02F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail12, -0.14486232791552936F, 0.0F, 0.0F); + this.EarM3 = new ModelRenderer(this, 36, 36); + this.EarM3.setRotationPoint(0.0F, 0.0F, 0.0F); + this.EarM3.addBox(0.0F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.EarML3 = new ModelRenderer(this, 116, 53); + this.EarML3.setRotationPoint(-1.0F, 0.0F, 0.0F); + this.EarML3.addBox(0.0F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.Tail_mid1 = new ModelRenderer(this, 60, 59); + this.Tail_mid1.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid1.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid1, 0.8609709200088027F, 0.0F, 0.04834562028024293F); + this.LegRightFoot = new ModelRenderer(this, 34, 8); + this.LegRightFoot.setRotationPoint(0.0F, 4.5F, 0.0F); + this.LegRightFoot.addBox(-0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFoot, -0.0F, 0.17453292519943295F, -0.08726646259971647F); + this.ArmLeftFingerfront = new ModelRenderer(this, 43, 13); + this.ArmLeftFingerfront.setRotationPoint(-0.5F, 0.5F, 0.5F); + this.ArmLeftFingerfront.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerfront, 0.17453292519943295F, -0.5235987755982988F, 0.2617993877991494F); + this.ArmRightDetail = new ModelRenderer(this, 8, 23); + this.ArmRightDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightDetail.addBox(0.0F, 0.0F, -1.02F, 2, 1, 2, 0.0F); + this.setRotateAngle(ArmRightDetail, 0.0F, 0.0F, 0.5235987755982988F); + this.headfrontdetaila1 = new ModelRenderer(this, 54, 20); + this.headfrontdetaila1.setRotationPoint(-1.5F, 0.0F, -1.5F); + this.headfrontdetaila1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila1, 0.9599310885968813F, -2.356194490192345F, 0.0F); + this.ArmRightFingerback = new ModelRenderer(this, 43, 13); + this.ArmRightFingerback.setRotationPoint(-0.5F, 0.5F, 0.5F); + this.ArmRightFingerback.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerback, 0.17453292519943295F, -0.5235987755982988F, 0.2617993877991494F); + this.Tail_mid2 = new ModelRenderer(this, 60, 59); + this.Tail_mid2.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid2.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid2, 0.7670722062515078F, 0.0F, 0.0F); + this.ArmRightLower = new ModelRenderer(this, 52, 62); + this.ArmRightLower.setRotationPoint(0.5F, 8.0F, -0.5F); + this.ArmRightLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightLower, -0.5235987755982988F, 0.0F, 0.0F); + this.EarRB3 = new ModelRenderer(this, 22, 36); + this.EarRB3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarRB3.addBox(-1.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F); + this.setRotateAngle(EarRB3, -0.1223475805648025F, -0.3490658503988659F, 0.0F); + this.theHeadDetail7999 = new ModelRenderer(this, 66, 20); + this.theHeadDetail7999.setRotationPoint(1.5F, 0.0F, -1.5F); + this.theHeadDetail7999.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail7999, 0.7853981633974483F, 3.141592653589793F, 0.0F); + this.LegLeftFootDetail2 = new ModelRenderer(this, 37, 11); + this.LegLeftFootDetail2.setRotationPoint(0.0F, 0.0F, -0.5F); + this.LegLeftFootDetail2.addBox(-2.0F, 0.0F, 0.0F, 2, 1, 1, 0.0F); + this.setRotateAngle(LegLeftFootDetail2, 0.13962634015954636F, -0.40142572795869574F, -0.5462880558742251F); + this.theHeadDetail2h = new ModelRenderer(this, 54, 8); + this.theHeadDetail2h.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2h.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2h, 0.6981317007977318F, 0.0F, 0.0F); + this.EarLB2Detail = new ModelRenderer(this, 120, 61); + this.EarLB2Detail.setRotationPoint(-1.0F, 2.0F, 4.0F); + this.EarLB2Detail.addBox(0.0F, -1.0F, 0.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarLB2Detail, 0.389033890269536F, 0.0F, 0.0F); + this.ArmRightLowerDetail = new ModelRenderer(this, 35, 21); + this.ArmRightLowerDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightLowerDetail.addBox(-0.5F, 0.0F, -0.77F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmRightLowerDetail, 0.04014257279586957F, 0.0F, 0.0F); + this.Right_Wing_Overlay = new ModelRenderer(this, 136, 0); + this.Right_Wing_Overlay.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Right_Wing_Overlay.addBox(-0.02F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.EarM5 = new ModelRenderer(this, 13, 43); + this.EarM5.setRotationPoint(0.0F, -1.8F, 3.0F); + this.EarM5.addBox(-0.98F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.setRotateAngle(EarM5, 0.49497537586559187F, 0.0F, 0.0F); + this.ArmLeftDetail1 = new ModelRenderer(this, 32, 28); + this.ArmLeftDetail1.mirror = true; + this.ArmLeftDetail1.setRotationPoint(-1.75F, 1.0F, 0.0F); + this.ArmLeftDetail1.addBox(0.0F, 0.0F, -0.98F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail1, 0.0F, 0.0F, -0.1117010721276371F); + this.BodyLDetail2 = new ModelRenderer(this, 43, 0); + this.BodyLDetail2.setRotationPoint(2.5F, 0.0F, 2.0F); + this.BodyLDetail2.addBox(-1.0F, 0.0F, -1.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail2, -0.12217304763960307F, 0.0F, 0.13788101090755206F); + this.theHeadDetail = new ModelRenderer(this, 78, 4); + this.theHeadDetail.setRotationPoint(1.5F, 0.0F, 0.0F); + this.theHeadDetail.addBox(0.0F, -1.0F, -1.5F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail, 0.0F, 0.0F, -0.7853981633974483F); + this.BodyLowerFront = new ModelRenderer(this, 33, 8); + this.BodyLowerFront.setRotationPoint(0.0F, 0.0F, -2.0F); + this.BodyLowerFront.addBox(-1.5F, 0.0F, 0.0F, 3, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerFront, 0.12217304763960307F, 0.0F, 0.0F); + this.theHeadDetail2e768 = new ModelRenderer(this, 66, 24); + this.theHeadDetail2e768.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2e768.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2e768, 0.9599310885968813F, 0.0F, 0.0F); + this.ArmLeftDetail = new ModelRenderer(this, 8, 23); + this.ArmLeftDetail.mirror = true; + this.ArmLeftDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftDetail.addBox(-2.0F, 0.0F, -1.03F, 2, 1, 2, 0.0F); + this.setRotateAngle(ArmLeftDetail, 0.0F, 0.0F, -0.5235987755982988F); + this.LegDetaiLeft1 = new ModelRenderer(this, 22, 32); + this.LegDetaiLeft1.setRotationPoint(1.0F, 2.0F, 0.0F); + this.LegDetaiLeft1.addBox(-1.0F, -2.0F, -1.01F, 1, 2, 2, 0.0F); + this.setRotateAngle(LegDetaiLeft1, 0.0F, 0.0F, -0.3804817769347638F); + this.ArmLeftHand = new ModelRenderer(this, 0, 2); + this.ArmLeftHand.setRotationPoint(0.0F, 6.0F, 0.0F); + this.ArmLeftHand.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftHand, -0.296656372197416F, -1.5707963267948966F, 0.0F); + this.LegRight = new ModelRenderer(this, 16, 27); + this.LegRight.setRotationPoint(-1.5F, 5.9F, 0.0F); + this.LegRight.addBox(-1.02F, 2.0F, -1.02F, 1, 3, 2, 0.0F); + this.setRotateAngle(LegRight, -0.2617993877991494F, 0.2617993877991494F, 0.08726646259971647F); + this.EarLB2 = new ModelRenderer(this, 116, 40); + this.EarLB2.setRotationPoint(0.0F, 0.0F, 3.6F); + this.EarLB2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarLB2, -0.4363323129985824F, -0.3490658503988659F, 0.0F); + this.neckDetail4 = new ModelRenderer(this, 18, 6); + this.neckDetail4.setRotationPoint(-2.0F, 0.0F, 1.5F); + this.neckDetail4.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail4, -0.3839724354387525F, 2.356194490192345F, 0.0F); + this.LegRightFootDetail2 = new ModelRenderer(this, 37, 11); + this.LegRightFootDetail2.setRotationPoint(0.0F, 0.0F, -0.5F); + this.LegRightFootDetail2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 1, 0.0F); + this.setRotateAngle(LegRightFootDetail2, -0.13962634015954636F, 0.40142572795869574F, 0.5462880558742251F); + this.LegLeftFootDetail1 = new ModelRenderer(this, 34, 10); + this.LegLeftFootDetail1.setRotationPoint(0.8F, 0.0F, 0.0F); + this.LegLeftFootDetail1.addBox(-1.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFootDetail1, 0.0F, 0.4363323129985824F, -0.17453292519943295F); + this.EarLeft = new ModelRenderer(this, 118, 0); + this.EarLeft.setRotationPoint(1.0F, -6.0F, 1.0F); + this.EarLeft.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarLeft, -0.2617993877991494F, 0.4363323129985824F, 0.0F); + this.BodyLower.addChild(this.BodyLowerBack); + this.UpperBody.addChild(this.BodyDetailFront); + this.ArmRight.addChild(this.Right_Wing); + this.BodyLower.addChild(this.BodyLDetail); + this.EarRB2.addChild(this.EarRB2Detail); + this.UpperBody.addChild(this.neckDetail); + this.UpperBody.addChild(this.neckDetail3); + this.Body.addChild(this.ArmRight); + this.theHead.addChild(this.headtop); + this.EarL1.addChild(this.EarL2); + this.ArmLeftHand.addChild(this.ArmLeftFingerback); + this.theHeadDetaile.addChild(this.theHeadDetailh); + this.headfrontdetaila1_1.addChild(this.headfrontdetaila4_1); + this.ArmRightHand.addChild(this.ArmRightFingerfront); + this.EarLB2.addChild(this.EarLB3); + this.EarR2.addChild(this.EarR3); + this.headBack.addChild(this.headBack2); + this.Body.addChild(this.Neck); + this.theHeadDetail1.addChild(this.theHeadDetail1e); + this.LegRightLower.addChild(this.LegRightLowerDetail1); + this.EarRB2Detail.addChild(this.EarRB2Detaildetail); + this.EarLB2Detail.addChild(this.EarLB2Detaildetail); + this.LegLeftLower.addChild(this.LegLeftLowerDetail); + this.UpperBody.addChild(this.BodyDetailSideLeft); + this.EarR1.addChild(this.EarM2); + this.EarLeft.addChild(this.EarL1); + this.theHead.addChild(this.headBack1); + this.BodyLower.addChild(this.Tail_start); + this.FF1.addChild(this.FF3); + this.BodyLower.addChild(this.BodyLDetail4); + this.BodyLower.addChild(this.BodyLowerSideRight); + this.theHead.addChild(this.headfrontdetaila1_1); + this.ArmRight.addChild(this.ArmRightDetail1); + this.LegLeft.addChild(this.LegLeftLower); + this.UpperBody.addChild(this.BodyDetailBack); + this.LegRight.addChild(this.LegRightLower); + this.LegRightLower.addChild(this.LegRightLowerDetail); + this.EarLeft.addChild(this.EarLB1); + this.EarRB1.addChild(this.EarRB2); + this.theHead.addChild(this.EarRight); + this.theHead.addChild(this.theHeadDetail1); + this.headfrontdetaila1.addChild(this.headfrontdetaila4); + this.ArmLeftHand.addChild(this.ArmLeftFingerMid); + this.ArmLeft.addChild(this.ArmLeftLower); + this.theHeadDetail2e768.addChild(this.theHeadDetail2h789); + this.EarRight.addChild(this.EarRB1); + this.theHeadDetail2.addChild(this.theHeadDetail2e); + this.EarL1.addChild(this.EarL2_1); + this.headBack1.addChild(this.headBack11); + this.theHeadDetail.addChild(this.theHeadDetaile); + this.EarL2_1.addChild(this.EarL5); + this.ArmRightHand.addChild(this.ArmRightFingerMid); + this.Left_Wing.addChild(this.Left_Wing_Overlay); + this.headBack11.addChild(this.headBack111); + this.LegRightFoot.addChild(this.LegRightFootDetail); + this.BodyLower.addChild(this.BodyLDetail1); + this.ArmLeftHand.addChild(this.ArmLeftFingersBig); + this.ArmRightLower.addChild(this.ArmRightHand); + this.Neck.addChild(this.theHead); + this.BodyLower.addChild(this.LegLeft); + this.LegRight.addChild(this.LegDetailRight1); + this.LegLeft.addChild(this.LegDetailLeft); + this.Tail_mid3.addChild(this.Tail_mid4); + this.LegLeftLower.addChild(this.LegLeftLowerDetail1); + this.ArmLeft.addChild(this.ArmLeftDetail11); + this.EarR1.addChild(this.EarR2); + this.EarLB1.addChild(this.EarlM1); + this.theHead.addChild(this.theHeadDetail2); + this.UpperBody.addChild(this.neckDetail2); + this.theHead.addChild(this.FF1); + this.BodyLower.addChild(this.BodyLowerSideLeft); + this.LegLeftFoot.addChild(this.LegLeftFootDetail); + this.ArmLeft.addChild(this.Left_Wing); + this.EarRight.addChild(this.EarR1); + this.ArmRightHand.addChild(this.ArmRightFingersBig); + this.FF1.addChild(this.FF2); + this.LegLeftLower.addChild(this.LegLeftFoot); + this.theHeadDetail1e.addChild(this.theHeadDetail1h); + this.FF1.addChild(this.FF4); + this.EarL2.addChild(this.EarL3); + this.Body.addChild(this.UpperBody); + this.UpperBody.addChild(this.BodyDetailSideRight); + this.headBack2.addChild(this.headBack113); + this.headfrontdetaila4_1.addChild(this.headfrontdetaila5_1); + this.ArmRightLower.addChild(this.ArmRightLowerDetail1); + this.Body.addChild(this.ArmLeft); + this.LegRight.addChild(this.LegDetailRight); + this.ArmLeftLower.addChild(this.ArmLeftLowerDetail1); + this.headfrontdetaila4.addChild(this.headfrontdetaila5); + this.EarRB1.addChild(this.EarM1); + this.Tail_mid4.addChild(this.Tail_end); + this.FF1.addChild(this.chek); + this.ArmRight.addChild(this.ArmRightDetail12); + this.LegRightFoot.addChild(this.LegRightFootDetail1); + this.Body.addChild(this.BodyLower); + this.ArmLeftLower.addChild(this.ArmLeftLowerDetail); + this.ArmRight.addChild(this.ArmRightDetail11); + this.theHead.addChild(this.headBack); + this.Tail_mid2.addChild(this.Tail_mid3); + this.FF1.addChild(this.chek1); + this.ArmLeft.addChild(this.ArmLeftDetail12); + this.EarRB3.addChild(this.EarM3); + this.EarLB3.addChild(this.EarML3); + this.Tail_start.addChild(this.Tail_mid1); + this.LegRightLower.addChild(this.LegRightFoot); + this.ArmLeftHand.addChild(this.ArmLeftFingerfront); + this.ArmRight.addChild(this.ArmRightDetail); + this.theHead.addChild(this.headfrontdetaila1); + this.ArmRightHand.addChild(this.ArmRightFingerback); + this.Tail_mid1.addChild(this.Tail_mid2); + this.ArmRight.addChild(this.ArmRightLower); + this.EarRB2.addChild(this.EarRB3); + this.theHead.addChild(this.theHeadDetail7999); + this.LegLeftFoot.addChild(this.LegLeftFootDetail2); + this.theHeadDetail2e.addChild(this.theHeadDetail2h); + this.EarLB2.addChild(this.EarLB2Detail); + this.ArmRightLower.addChild(this.ArmRightLowerDetail); + this.Right_Wing.addChild(this.Right_Wing_Overlay); + this.EarM2.addChild(this.EarM5); + this.ArmLeft.addChild(this.ArmLeftDetail1); + this.BodyLower.addChild(this.BodyLDetail2); + this.theHead.addChild(this.theHeadDetail); + this.BodyLower.addChild(this.BodyLowerFront); + this.theHeadDetail7999.addChild(this.theHeadDetail2e768); + this.ArmLeft.addChild(this.ArmLeftDetail); + this.LegLeft.addChild(this.LegDetaiLeft1); + this.ArmLeftLower.addChild(this.ArmLeftHand); + this.BodyLower.addChild(this.LegRight); + this.EarLB1.addChild(this.EarLB2); + this.UpperBody.addChild(this.neckDetail4); + this.LegRightFoot.addChild(this.LegRightFootDetail2); + this.LegLeftFoot.addChild(this.LegLeftFootDetail1); + this.theHead.addChild(this.EarLeft); + } + + @Override + public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + super.render(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); + + if (this.isChild) { + GL11.glPushMatrix(); + GL11.glTranslatef(0F, 1.5F-1.5F*0.35F, 0F); + GL11.glScalef(0.35F, 0.35F, 0.35F); + this.Body.render(scale); + GL11.glPopMatrix(); + } + else { + GL11.glPushMatrix(); + GL11.glTranslatef(0F, 1.5F-1.5F*0.5F, 0F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + this.Body.render(scale); + GL11.glPopMatrix(); + } + } + + public void setRotateAngle(ModelRenderer ModelRenderer, float x, float y, float z) { + ModelRenderer.rotateAngleX = x; + ModelRenderer.rotateAngleY = y; + ModelRenderer.rotateAngleZ = z; + } + + public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + + /* + this.Left_Wing.setScale(0, 0, 0); + this.Right_Wing.setScale(0, 0, 0); + */ + if (entitylivingbaseIn instanceof EntityFlyingLemur){ + + EntityFlyingLemur lemur = (EntityFlyingLemur)entitylivingbaseIn; + + boolean gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner()); + + if (lemur.isPartying()) { + + this.state = State.PARTY; + //TODO + this.Body.rotateAngleY = -1.5F; + this.Body.rotateAngleX = 0.3F; + this.BodyLower.rotateAngleX = -0.3f; + this.Neck.rotateAngleX = -0.3F; + + this.ArmLeft.rotateAngleZ = -0.3f; + this.ArmRight.rotateAngleZ = 0.3f; + + this.LegRight.rotateAngleZ = -0.1f; + this.LegLeft.rotateAngleZ = 0.1f; + this.LegRight.rotateAngleY = -0.2f; + this.LegLeft.rotateAngleY = 0.2f; + this.LegRight.rotateAngleX = -0.35f; + this.LegLeft.rotateAngleX = -0.35f; + this.LegRightLower.rotateAngleX = 1.25f; + this.LegLeftLower.rotateAngleX = 1.25f; + + this.LegLeftFoot.rotateAngleY = -0.4f; + this.LegRightFoot.rotateAngleY = 0.4f; + + this.LegLeftFoot.rotateAngleZ = -0.1f; + this.LegRightFoot.rotateAngleZ = 0.1f; + this.LegLeftFoot.rotateAngleX = -0.8f; + this.LegRightFoot.rotateAngleX = -0.8f; + + + this.Tail_start.rotateAngleX = 0.2F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 1.25F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + /* + this.Tail_mid3.rotateAngleZ = -1F; + this.Tail_mid4.rotateAngleZ = -0.75F; + this.Tail_end.rotateAngleZ = -0.5F; + */ + this.ArmLeftHand.rotateAngleY = -3.5F; + this.ArmRightHand.rotateAngleY = 3.5F; + + } + else if (lemur.isSitting() && !lemur.isPartying()) { + this.state = State.SITTING; + this.Body.offsetY = 0.5F; + this.BodyLower.rotateAngleX = 0.35F; + + this.LegRight.rotateAngleX = -2.6f; + this.LegRightLower.rotateAngleX = 2.0f; + this.LegRight.rotateAngleZ = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + this.LegLeft.rotateAngleX = -2.6f; + this.LegLeftLower.rotateAngleX = 2.0f; + this.LegLeft.rotateAngleZ = 0.5F; + this.LegLeft.rotateAngleY = -0.5F; + + this.ArmRight.rotateAngleY = 0.7F; + this.ArmLeft.rotateAngleY = -0.7F; + + this.ArmLeftLower.rotateAngleX = -0.5F; + this.ArmRightLower.rotateAngleX = -0.5F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmRightLower.rotateAngleY = 0.6F; + this.ArmLeftLower.rotateAngleY = -0.6F; + + this.ArmLeftHand.rotateAngleX = 1.6F; + this.ArmRightHand.rotateAngleX = 1.6F; + + this.ArmLeftHand.rotateAngleY = -1.5F; + this.ArmRightHand.rotateAngleY = 1.5F; + } + else if (lemur.getLeftShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = State.ONLEFTSHOULDER; + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = 0.1F; + this.Body.rotateAngleZ = 0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = 1.1F; + } + else { + this.Body.offsetX = 0.8F; + } + + } + else if (lemur.getRightShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = State.ONRIGHTSHOULDER; + + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = -0.1F; + this.Body.rotateAngleZ = -0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = -1.1F; + } + else { + this.Body.offsetX = -0.8F; + } + + } + else if (lemur.getLeftShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = State.ELYTRALEFTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = 1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.getRightShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = State.ELYTRARIGHTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = -1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.isFlying() && !lemur.isLemurRiding()) + { + this.state = State.FLYING; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + } + else if (lemur.speed > 0.25f && !lemur.isLemurRiding()) + { + this.state = State.SPRINTING; + this.Body.rotateAngleX = 1.5F; + this.Body.offsetY = 0.25F; + this.BodyLower.rotateAngleX = -0.35F; + + this.ArmRight.rotateAngleX = -1.75F; + this.ArmLeft.rotateAngleX = -1.75F; + this.ArmRight.rotateAngleY = 0.1F; + this.ArmLeft.rotateAngleY = -0.1F; + this.ArmLeftLower.rotateAngleY = 0.4F; + this.ArmRightLower.rotateAngleY = -0.4F; + this.ArmRightHand.rotateAngleY = 2.6F; + this.ArmLeftHand.rotateAngleY = -2.6F; + + this.LegLeft.rotateAngleX = -1.5F; + this.LegRight.rotateAngleX = -1.5F; + this.LegLeft.rotateAngleY = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0.1F; + this.Tail_mid4.rotateAngleX = 0.1F; + this.Tail_end.rotateAngleX = 0.1F; + + } + else if (lemur.speed > 0.1F && lemur.speed < 0.25F && !lemur.isLemurRiding()) + { + this.state = State.WALKING; + } + else { + this.state = State.STANDING; + } + } + //TODO + if (entitylivingbaseIn instanceof EntityAscendedFlyingLemur){ + + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur)entitylivingbaseIn; + + if (lemur.isPartying()) { + this.state = State.PARTY; + //TODO + this.Body.rotateAngleY = -1.5F; + this.Body.rotateAngleX = 0.3F; + this.BodyLower.rotateAngleX = -0.3f; + this.Neck.rotateAngleX = -0.3F; + + this.ArmLeft.rotateAngleZ = -0.3f; + this.ArmRight.rotateAngleZ = 0.3f; + + this.LegRight.rotateAngleZ = -0.1f; + this.LegLeft.rotateAngleZ = 0.1f; + this.LegRight.rotateAngleY = -0.2f; + this.LegLeft.rotateAngleY = 0.2f; + this.LegRight.rotateAngleX = -0.35f; + this.LegLeft.rotateAngleX = -0.35f; + this.LegRightLower.rotateAngleX = 1.25f; + this.LegLeftLower.rotateAngleX = 1.25f; + + this.LegLeftFoot.rotateAngleY = -0.4f; + this.LegRightFoot.rotateAngleY = 0.4f; + + this.LegLeftFoot.rotateAngleZ = -0.1f; + this.LegRightFoot.rotateAngleZ = 0.1f; + this.LegLeftFoot.rotateAngleX = -0.8f; + this.LegRightFoot.rotateAngleX = -0.8f; + + + this.Tail_start.rotateAngleX = 0.2F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 1.25F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + /* + this.Tail_mid3.rotateAngleZ = -1F; + this.Tail_mid4.rotateAngleZ = -0.75F; + this.Tail_end.rotateAngleZ = -0.5F; + */ + this.ArmLeftHand.rotateAngleY = -3.5F; + this.ArmRightHand.rotateAngleY = 3.5F; + + } + else if (lemur.isSitting() && !lemur.isPartying()) { + this.state = State.SITTING; + this.Body.offsetY = 0.5F; + this.BodyLower.rotateAngleX = 0.35F; + + this.LegRight.rotateAngleX = -2.6f; + this.LegRightLower.rotateAngleX = 2.0f; + this.LegRight.rotateAngleZ = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + this.LegLeft.rotateAngleX = -2.6f; + this.LegLeftLower.rotateAngleX = 2.0f; + this.LegLeft.rotateAngleZ = 0.5F; + this.LegLeft.rotateAngleY = -0.5F; + + this.ArmRight.rotateAngleY = 0.7F; + this.ArmLeft.rotateAngleY = -0.7F; + + this.ArmLeftLower.rotateAngleX = -0.5F; + this.ArmRightLower.rotateAngleX = -0.5F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmRightLower.rotateAngleY = 0.6F; + this.ArmLeftLower.rotateAngleY = -0.6F; + + this.ArmLeftHand.rotateAngleX = 1.6F; + this.ArmRightHand.rotateAngleX = 1.6F; + + this.ArmLeftHand.rotateAngleY = -1.5F; + this.ArmRightHand.rotateAngleY = 1.5F; + } + else if (lemur.getLeftShoulder() && !lemur.getOwner().isElytraFlying()) { + this.state = State.ONLEFTSHOULDER; + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = 0.1F; + this.Body.rotateAngleZ = 0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = 1.1F; + } + else { + this.Body.offsetX = 0.8F; + } + + } + else if (lemur.getRightShoulder() && !lemur.getOwner().isElytraFlying()) { + this.state = State.ONRIGHTSHOULDER; + + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = -0.1F; + this.Body.rotateAngleZ = -0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = -1.1F; + } + else { + this.Body.offsetX = -0.8F; + } + + } + else if (lemur.getLeftShoulder() && lemur.getOwner().isElytraFlying()) { + this.state = State.ELYTRALEFTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = 1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.getRightShoulder() && lemur.getOwner().isElytraFlying()) { + this.state = State.ELYTRARIGHTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = -1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.isFlying() && !lemur.isLemurRiding()) + { + this.state = State.FLYING; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + //this.Left_Wing.setScale(1, 1, 1); + //this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + } + else if (lemur.speed > 0.25f && !lemur.isLemurRiding()) + { + this.state = State.SPRINTING; + this.Body.rotateAngleX = 1.5F; + this.Body.offsetY = 0.25F; + this.BodyLower.rotateAngleX = -0.35F; + + this.ArmRight.rotateAngleX = -1.75F; + this.ArmLeft.rotateAngleX = -1.75F; + this.ArmRight.rotateAngleY = 0.1F; + this.ArmLeft.rotateAngleY = -0.1F; + this.ArmLeftLower.rotateAngleY = 0.4F; + this.ArmRightLower.rotateAngleY = -0.4F; + this.ArmRightHand.rotateAngleY = 2.6F; + this.ArmLeftHand.rotateAngleY = -2.6F; + + this.LegLeft.rotateAngleX = -1.5F; + this.LegRight.rotateAngleX = -1.5F; + this.LegLeft.rotateAngleY = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0.1F; + this.Tail_mid4.rotateAngleX = 0.1F; + this.Tail_end.rotateAngleX = 0.1F; + + } + else if (lemur.speed > 0.1F && lemur.speed < 0.25F && !lemur.isLemurRiding()) + { + this.state = State.WALKING; + } + else { + this.state = State.STANDING; + } + } + } + + + @Override + public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { + super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); + //TODO + this.theHead.rotateAngleY = netHeadYaw * 0.017453292F; + this.theHead.rotateAngleX = headPitch * 0.017453292F; + this.ArmLeft.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount; + this.ArmRight.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount; + this.ArmLeft.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F + (float)Math.PI) * 1.4F * limbSwingAmount; + this.ArmRight.rotateAngleX = MathHelper.cos(limbSwing * 0.6662F) * 1.4F * limbSwingAmount; + + } + + @SideOnly(Side.CLIENT) + static enum State { + FLYING, + SPRINTING, + SITTING, + STANDING, + WALKING, + ONRIGHTSHOULDER, + ONLEFTSHOULDER, + ELYTRARIGHTSHOULDER, + ELYTRALEFTSHOULDER, + PARTY; + } +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelLlibraryLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelLlibraryLemur.java new file mode 100644 index 0000000000..94fc103211 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelLlibraryLemur.java @@ -0,0 +1,1752 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.common.entity.mob.EntityAscendedFlyingLemur; +import com.crowsofwar.avatar.common.entity.mob.EntityFlyingLemur; +import net.ilexiconn.llibrary.client.model.ModelAnimator; +import net.ilexiconn.llibrary.client.model.tools.AdvancedModelBase; +import net.ilexiconn.llibrary.client.model.tools.AdvancedModelRenderer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + +/** + * @author Korog3 + */ + +public class ModelLlibraryLemur extends AdvancedModelBase { + public AdvancedModelRenderer Body; + public AdvancedModelRenderer BodyLower; + public AdvancedModelRenderer UpperBody; + public AdvancedModelRenderer ArmRight; + public AdvancedModelRenderer ArmLeft; + public AdvancedModelRenderer Neck; + public AdvancedModelRenderer BodyLowerBack; + public AdvancedModelRenderer BodyLowerFront; + public AdvancedModelRenderer BodyLowerSideRight; + public AdvancedModelRenderer BodyLowerSideLeft; + public AdvancedModelRenderer LegRight; + public AdvancedModelRenderer LegLeft; + public AdvancedModelRenderer Tail_start; + public AdvancedModelRenderer BodyLDetail; + public AdvancedModelRenderer BodyLDetail1; + public AdvancedModelRenderer BodyLDetail2; + public AdvancedModelRenderer BodyLDetail4; + public AdvancedModelRenderer LegDetailRight; + public AdvancedModelRenderer LegDetailRight1; + public AdvancedModelRenderer LegRightLower; + public AdvancedModelRenderer LegRightLowerDetail; + public AdvancedModelRenderer LegRightLowerDetail1; + public AdvancedModelRenderer LegRightFoot; + public AdvancedModelRenderer LegRightFootDetail; + public AdvancedModelRenderer LegRightFootDetail1; + public AdvancedModelRenderer LegRightFootDetail2; + public AdvancedModelRenderer LegDetailLeft; + public AdvancedModelRenderer LegDetaiLeft1; + public AdvancedModelRenderer LegLeftLower; + public AdvancedModelRenderer LegLeftLowerDetail; + public AdvancedModelRenderer LegLeftLowerDetail1; + public AdvancedModelRenderer LegLeftFoot; + public AdvancedModelRenderer LegLeftFootDetail; + public AdvancedModelRenderer LegLeftFootDetail1; + public AdvancedModelRenderer LegLeftFootDetail2; + public AdvancedModelRenderer Tail_mid1; + public AdvancedModelRenderer Tail_mid2; + public AdvancedModelRenderer Tail_mid3; + public AdvancedModelRenderer Tail_mid4; + public AdvancedModelRenderer Tail_end; + public AdvancedModelRenderer BodyDetailFront; + public AdvancedModelRenderer BodyDetailBack; + public AdvancedModelRenderer BodyDetailSideRight; + public AdvancedModelRenderer BodyDetailSideLeft; + public AdvancedModelRenderer neckDetail; + public AdvancedModelRenderer neckDetail2; + public AdvancedModelRenderer neckDetail3; + public AdvancedModelRenderer neckDetail4; + public AdvancedModelRenderer ArmRightDetail; + public AdvancedModelRenderer ArmRightDetail1; + public AdvancedModelRenderer ArmRightDetail11; + public AdvancedModelRenderer ArmRightDetail12; + public AdvancedModelRenderer ArmRightLower; + public AdvancedModelRenderer Right_Wing; + public AdvancedModelRenderer ArmRightLowerDetail; + public AdvancedModelRenderer ArmRightLowerDetail1; + public AdvancedModelRenderer ArmRightHand; + public AdvancedModelRenderer ArmRightFingerMid; + public AdvancedModelRenderer ArmRightFingerback; + public AdvancedModelRenderer ArmRightFingerfront; + public AdvancedModelRenderer ArmRightFingersBig; + public AdvancedModelRenderer Right_Wing_Overlay; + public AdvancedModelRenderer ArmLeftDetail; + public AdvancedModelRenderer ArmLeftDetail1; + public AdvancedModelRenderer ArmLeftDetail11; + public AdvancedModelRenderer ArmLeftDetail12; + public AdvancedModelRenderer ArmLeftLower; + public AdvancedModelRenderer Left_Wing; + public AdvancedModelRenderer ArmLeftLowerDetail; + public AdvancedModelRenderer ArmLeftLowerDetail1; + public AdvancedModelRenderer ArmLeftHand; + public AdvancedModelRenderer ArmLeftFingerMid; + public AdvancedModelRenderer ArmLeftFingerback; + public AdvancedModelRenderer ArmLeftFingerfront; + public AdvancedModelRenderer ArmLeftFingersBig; + public AdvancedModelRenderer Left_Wing_Overlay; + public AdvancedModelRenderer theHead; + public AdvancedModelRenderer theHeadDetail; + public AdvancedModelRenderer theHeadDetail1; + public AdvancedModelRenderer theHeadDetail2; + public AdvancedModelRenderer headtop; + public AdvancedModelRenderer headBack; + public AdvancedModelRenderer headBack1; + public AdvancedModelRenderer theHeadDetail7999; + public AdvancedModelRenderer headfrontdetaila1; + public AdvancedModelRenderer headfrontdetaila1_1; + public AdvancedModelRenderer FF1; + public AdvancedModelRenderer EarRight; + public AdvancedModelRenderer EarLeft; + public AdvancedModelRenderer theHeadDetaile; + public AdvancedModelRenderer theHeadDetailh; + public AdvancedModelRenderer theHeadDetail1e; + public AdvancedModelRenderer theHeadDetail1h; + public AdvancedModelRenderer theHeadDetail2e; + public AdvancedModelRenderer theHeadDetail2h; + public AdvancedModelRenderer headBack2; + public AdvancedModelRenderer headBack113; + public AdvancedModelRenderer headBack11; + public AdvancedModelRenderer headBack111; + public AdvancedModelRenderer theHeadDetail2e768; + public AdvancedModelRenderer theHeadDetail2h789; + public AdvancedModelRenderer headfrontdetaila4; + public AdvancedModelRenderer headfrontdetaila5; + public AdvancedModelRenderer headfrontdetaila4_1; + public AdvancedModelRenderer headfrontdetaila5_1; + public AdvancedModelRenderer FF2; + public AdvancedModelRenderer FF3; + public AdvancedModelRenderer chek; + public AdvancedModelRenderer chek1; + public AdvancedModelRenderer FF4; + public AdvancedModelRenderer EarR1; + public AdvancedModelRenderer EarRB1; + public AdvancedModelRenderer EarR2; + public AdvancedModelRenderer EarM2; + public AdvancedModelRenderer EarR3; + public AdvancedModelRenderer EarM5; + public AdvancedModelRenderer EarRB2; + public AdvancedModelRenderer EarM1; + public AdvancedModelRenderer EarRB3; + public AdvancedModelRenderer EarRB2Detail; + public AdvancedModelRenderer EarM3; + public AdvancedModelRenderer EarRB2Detaildetail; + public AdvancedModelRenderer EarL1; + public AdvancedModelRenderer EarLB1; + public AdvancedModelRenderer EarL2; + public AdvancedModelRenderer EarL2_1; + public AdvancedModelRenderer EarL3; + public AdvancedModelRenderer EarL5; + public AdvancedModelRenderer EarLB2; + public AdvancedModelRenderer EarlM1; + public AdvancedModelRenderer EarLB3; + public AdvancedModelRenderer EarLB2Detail; + public AdvancedModelRenderer EarML3; + public AdvancedModelRenderer EarLB2Detaildetail; + + private ModelAnimator animator; + private State state = State.STANDING; + + public ModelLlibraryLemur() { + this.textureWidth = 160; + this.textureHeight = 64; + this.BodyLowerBack = new AdvancedModelRenderer(this, 24, 0); + this.BodyLowerBack.setRotationPoint(0.0F, 0.0F, 2.0F); + this.BodyLowerBack.addBox(-1.5F, 0.0F, -2.0F, 3, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerBack, -0.12217304763960307F, 0.0F, 0.0F); + this.BodyDetailFront = new AdvancedModelRenderer(this, 8, 9); + this.BodyDetailFront.setRotationPoint(0.0F, 0.0F, -2.0F); + this.BodyDetailFront.addBox(-1.5F, -2.0F, 0.0F, 3, 2, 1, 0.0F); + this.setRotateAngle(BodyDetailFront, -0.5235987755982988F, 0.0F, 0.0F); + this.Right_Wing = new AdvancedModelRenderer(this, 92, 0); + this.Right_Wing.setRotationPoint(0.0F, -3.5F, 0.0F); + this.Right_Wing.addBox(0.0F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.setRotateAngle(Right_Wing, -0.2792526803190927F, 0.0F, 0.02617993877991494F); + this.BodyLDetail = new AdvancedModelRenderer(this, 35, 11); + this.BodyLDetail.setRotationPoint(-2.5F, 0.0F, -2.0F); + this.BodyLDetail.addBox(0.0F, 0.0F, 0.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail, 0.12217304763960307F, 0.0F, -0.13788101090755206F); + this.EarRB2Detail = new AdvancedModelRenderer(this, 30, 37); + this.EarRB2Detail.setRotationPoint(-1.0F, 2.0F, 4.0F); + this.EarRB2Detail.addBox(0.0F, -1.0F, 0.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarRB2Detail, 0.389033890269536F, 0.0F, 0.0F); + this.Body = new AdvancedModelRenderer(this, 0, 0); + this.Body.setRotationPoint(0.0F, 7.5F, 0.0F); + this.Body.addBox(-2.5F, -5.0F, -2.0F, 5, 5, 4, 0.0F); + this.neckDetail = new AdvancedModelRenderer(this, 18, 3); + this.neckDetail.setRotationPoint(-2.0F, -0.0F, -1.5F); + this.neckDetail.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail, -0.3839724354387525F, 0.7853981633974483F, 0.0F); + this.neckDetail3 = new AdvancedModelRenderer(this, 18, 6); + this.neckDetail3.setRotationPoint(2.0F, 0.0F, 1.5F); + this.neckDetail3.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail3, -0.3839724354387525F, -2.356194490192345F, 0.0F); + this.ArmRight = new AdvancedModelRenderer(this, 0, 27); + this.ArmRight.setRotationPoint(2.5F, -5.0F, 0.0F); + this.ArmRight.addBox(0.0F, 0.0F, -1.01F, 1, 8, 1, 0.0F); + this.setRotateAngle(ArmRight, 0.0F, -0.17453292519943295F, -0.17453292519943295F); + this.headtop = new AdvancedModelRenderer(this, 66, 0); + this.headtop.setRotationPoint(0.0F, -6.42F, 0.0F); + this.headtop.addBox(-1.5F, 0.0F, -1.5F, 3, 1, 3, 0.0F); + this.EarL2 = new AdvancedModelRenderer(this, 118, 10); + this.EarL2.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL2.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarL2, 0.5235987755982988F, 0.0F, 0.0F); + this.ArmLeftFingerback = new AdvancedModelRenderer(this, 43, 13); + this.ArmLeftFingerback.setRotationPoint(0.5F, 0.5F, 0.5F); + this.ArmLeftFingerback.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerback, 0.17453292519943295F, 0.5235987755982988F, -0.2617993877991494F); + this.theHeadDetailh = new AdvancedModelRenderer(this, 54, 12); + this.theHeadDetailh.setRotationPoint(3.0F, 0.0F, 0.0F); + this.theHeadDetailh.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetailh, 0.0F, 0.0F, -0.6981317007977318F); + this.headfrontdetaila4_1 = new AdvancedModelRenderer(this, 66, 44); + this.headfrontdetaila4_1.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headfrontdetaila4_1.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila4_1, 0.7365289443416071F, 0.0F, 0.0F); + this.ArmRightFingerfront = new AdvancedModelRenderer(this, 43, 13); + this.ArmRightFingerfront.setRotationPoint(0.5F, 0.5F, 0.5F); + this.ArmRightFingerfront.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerfront, 0.17453292519943295F, 0.5235987755982988F, -0.2617993877991494F); + this.EarLB3 = new AdvancedModelRenderer(this, 114, 46); + this.EarLB3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarLB3.addBox(0.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F); + this.setRotateAngle(EarLB3, -0.1223475805648025F, 0.3490658503988659F, 0.0F); + this.EarR3 = new AdvancedModelRenderer(this, 6, 36); + this.EarR3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR3.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarR3, 0.4363323129985824F, 0.0F, 0.0F); + this.headBack2 = new AdvancedModelRenderer(this, 66, 8); + this.headBack2.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headBack2.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack2, 0.7312929565856241F, 0.0F, 0.0F); + this.Neck = new AdvancedModelRenderer(this, 8, 12); + this.Neck.setRotationPoint(0.0F, -5.75F, 0.0F); + this.Neck.addBox(-1.5F, -2.0F, -1.0F, 3, 1, 2, 0.0F); + this.theHeadDetail1e = new AdvancedModelRenderer(this, 78, 20); + this.theHeadDetail1e.setRotationPoint(-3.0F, 0.0F, 0.0F); + this.theHeadDetail1e.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1e, 0.0F, 0.0F, 0.9599310885968813F); + this.LegRightLowerDetail1 = new AdvancedModelRenderer(this, 34, 10); + this.LegRightLowerDetail1.setRotationPoint(0.0F, -0.3F, 0.1F); + this.LegRightLowerDetail1.addBox(-0.5F, 0.0F, 0.0F, 1, 4, 1, 0.0F); + this.setRotateAngle(LegRightLowerDetail1, -0.2399827721492203F, 0.0F, 0.0F); + this.EarRB2Detaildetail = new AdvancedModelRenderer(this, 30, 45); + this.EarRB2Detaildetail.setRotationPoint(0.0F, -1.0F, 2.5F); + this.EarRB2Detaildetail.addBox(0.0F, 0.0F, -2.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarRB2Detaildetail, -0.4557054676957194F, 0.0F, 0.0F); + this.EarLB2Detaildetail = new AdvancedModelRenderer(this, 112, 61); + this.EarLB2Detaildetail.setRotationPoint(0.0F, -1.0F, 2.5F); + this.EarLB2Detaildetail.addBox(0.0F, 0.0F, -2.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarLB2Detaildetail, -0.4557054676957194F, 0.0F, 0.0F); + this.LegLeftLowerDetail = new AdvancedModelRenderer(this, 37, 9); + this.LegLeftLowerDetail.setRotationPoint(0.0F, -0.53F, -0.88F); + this.LegLeftLowerDetail.addBox(-0.5F, 0.0F, 0.0F, 1, 5, 1, 0.0F); + this.BodyDetailSideLeft = new AdvancedModelRenderer(this, 15, 15); + this.BodyDetailSideLeft.setRotationPoint(2.5F, 0.0F, 0.0F); + this.BodyDetailSideLeft.addBox(-1.0F, -2.0F, -1.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(BodyDetailSideLeft, 0.0F, 0.0F, -0.5235987755982988F); + this.EarM2 = new AdvancedModelRenderer(this, 8, 41); + this.EarM2.setRotationPoint(1.0F, -1.0F, 0.0F); + this.EarM2.addBox(-1.0F, -3.0F, 0.0F, 1, 3, 4, 0.0F); + this.EarL1 = new AdvancedModelRenderer(this, 116, 5); + this.EarL1.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL1.addBox(-1.0F, -1.0F, 0.0F, 2, 1, 4, 0.0F); + this.setRotateAngle(EarL1, 0.6108652381980153F, 0.0F, 0.0F); + this.headBack1 = new AdvancedModelRenderer(this, 54, 16); + this.headBack1.setRotationPoint(-1.5F, 0.0F, 1.5F); + this.headBack1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack1, 0.9599310885968813F, -0.7853981633974483F, 0.0F); + this.Tail_start = new AdvancedModelRenderer(this, 60, 59); + this.Tail_start.setRotationPoint(0.0F, 5.5F, 1.0F); + this.Tail_start.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_start, 0.22183134792847928F, 0.0F, 0.0F); + this.FF3 = new AdvancedModelRenderer(this, 71, 60); + this.FF3.setRotationPoint(0.0F, 3.0F, -1.0F); + this.FF3.addBox(-0.5F, 0.0F, 0.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(FF3, 1.4486232791552935F, 0.0F, 0.0F); + this.BodyLDetail4 = new AdvancedModelRenderer(this, 43, 0); + this.BodyLDetail4.setRotationPoint(-2.5F, 0.0F, 2.0F); + this.BodyLDetail4.addBox(0.0F, 0.0F, -1.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail4, -0.12217304763960307F, 0.0F, -0.13788101090755206F); + this.BodyLowerSideRight = new AdvancedModelRenderer(this, 37, 0); + this.BodyLowerSideRight.setRotationPoint(-2.5F, 0.0F, 0.0F); + this.BodyLowerSideRight.addBox(0.0F, 0.0F, -1.0F, 1, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerSideRight, 0.0F, 0.0F, -0.13962634015954636F); + this.headfrontdetaila1_1 = new AdvancedModelRenderer(this, 54, 28); + this.headfrontdetaila1_1.setRotationPoint(1.5F, 0.0F, -1.5F); + this.headfrontdetaila1_1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila1_1, 0.9599310885968813F, 2.356194490192345F, 0.0F); + this.ArmRightDetail1 = new AdvancedModelRenderer(this, 32, 28); + this.ArmRightDetail1.setRotationPoint(1.75F, 1.0F, 0.0F); + this.ArmRightDetail1.addBox(-1.0F, 0.0F, -1.0F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail1, 0.0F, 0.0F, 0.1117010721276371F); + this.LegLeftLower = new AdvancedModelRenderer(this, 52, 62); + this.LegLeftLower.setRotationPoint(0.5F, 5.2F, 0.0F); + this.LegLeftLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(LegLeftLower, 0.3490658503988659F, 0.0F, 0.0F); + this.BodyDetailBack = new AdvancedModelRenderer(this, 8, 9); + this.BodyDetailBack.setRotationPoint(0.0F, 0.0F, 2.0F); + this.BodyDetailBack.addBox(-1.5F, -2.0F, -1.0F, 3, 2, 1, 0.0F); + this.setRotateAngle(BodyDetailBack, 0.5235987755982988F, 0.0F, 0.0F); + this.LegRightLower = new AdvancedModelRenderer(this, 52, 62); + this.LegRightLower.setRotationPoint(-0.5F, 5.2F, 0.0F); + this.LegRightLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(LegRightLower, 0.3490658503988659F, 0.0F, 0.0F); + this.LegRightLowerDetail = new AdvancedModelRenderer(this, 34, 9); + this.LegRightLowerDetail.setRotationPoint(0.0F, -0.53F, -0.88F); + this.LegRightLowerDetail.addBox(-0.5F, 0.0F, 0.0F, 1, 5, 1, 0.0F); + this.EarLB1 = new AdvancedModelRenderer(this, 116, 34); + this.EarLB1.setRotationPoint(1.0F, -0.2F, -0.4F); + this.EarLB1.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarLB1, 1.2217304763960306F, 0.0F, 0.0F); + this.EarRB2 = new AdvancedModelRenderer(this, 16, 36); + this.EarRB2.setRotationPoint(0.0F, 0.0F, 3.6F); + this.EarRB2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarRB2, -0.4363323129985824F, 0.3490658503988659F, 0.0F); + this.EarRight = new AdvancedModelRenderer(this, 0, 39); + this.EarRight.setRotationPoint(-1.0F, -6.0F, 1.0F); + this.EarRight.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarRight, -0.2617993877991494F, -0.6108652381980153F, 0.0F); + this.theHeadDetail1 = new AdvancedModelRenderer(this, 78, 16); + this.theHeadDetail1.setRotationPoint(-1.5F, 0.0F, -1.5F); + this.theHeadDetail1.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1, 0.0F, 0.0F, 0.7853981633974483F); + this.headfrontdetaila4 = new AdvancedModelRenderer(this, 66, 36); + this.headfrontdetaila4.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headfrontdetaila4.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila4, 0.7312929565856241F, 0.0F, 0.0F); + this.ArmLeftFingerMid = new AdvancedModelRenderer(this, 43, 13); + this.ArmLeftFingerMid.setRotationPoint(0.0F, 0.5F, 0.5F); + this.ArmLeftFingerMid.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerMid, 0.3490658503988659F, 0.0F, 0.0F); + this.ArmLeftLower = new AdvancedModelRenderer(this, 52, 62); + this.ArmLeftLower.setRotationPoint(-0.5F, 8.0F, -0.5F); + this.ArmLeftLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftLower, -0.5235987755982988F, 0.0F, 0.0F); + this.theHeadDetail2h789 = new AdvancedModelRenderer(this, 54, 0); + this.theHeadDetail2h789.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2h789.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2h789, 0.6981317007977318F, 0.0F, 0.0F); + this.EarRB1 = new AdvancedModelRenderer(this, 21, 46); + this.EarRB1.setRotationPoint(-1.0F, -0.2F, -0.4F); + this.EarRB1.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarRB1, 1.2217304763960306F, 0.0F, 0.0F); + this.theHeadDetail2e = new AdvancedModelRenderer(this, 78, 32); + this.theHeadDetail2e.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2e.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2e, 0.9599310885968813F, 0.0F, 0.0F); + this.EarL2_1 = new AdvancedModelRenderer(this, 118, 20); + this.EarL2_1.setRotationPoint(0.0F, -1.0F, 0.0F); + this.EarL2_1.addBox(-1.0F, -3.0F, 0.0F, 1, 3, 4, 0.0F); + this.headBack11 = new AdvancedModelRenderer(this, 66, 16); + this.headBack11.setRotationPoint(0.0F, 0.0F, 2.6F); + this.headBack11.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack11, 0.7312929565856241F, 0.0F, 0.0F); + this.theHeadDetaile = new AdvancedModelRenderer(this, 78, 8); + this.theHeadDetaile.setRotationPoint(3.0F, 0.0F, -1.5F); + this.theHeadDetaile.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetaile, 0.0F, 0.0F, -0.9599310885968813F); + this.EarL5 = new AdvancedModelRenderer(this, 116, 27); + this.EarL5.setRotationPoint(0.0F, -1.8F, 3.0F); + this.EarL5.addBox(-1.02F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.setRotateAngle(EarL5, 0.49497537586559187F, 0.0F, 0.0F); + this.ArmRightFingerMid = new AdvancedModelRenderer(this, 43, 13); + this.ArmRightFingerMid.setRotationPoint(0.0F, 0.5F, 0.5F); + this.ArmRightFingerMid.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerMid, 0.3490658503988659F, 0.0F, 0.0F); + this.Left_Wing_Overlay = new AdvancedModelRenderer(this, 136, 0); + this.Left_Wing_Overlay.mirror = true; + this.Left_Wing_Overlay.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Left_Wing_Overlay.addBox(0.02F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.headBack111 = new AdvancedModelRenderer(this, 79, 43); + this.headBack111.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headBack111.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headBack111, 0.5916666164260777F, 0.0F, 0.0F); + this.LegRightFootDetail = new AdvancedModelRenderer(this, 34, 11); + this.LegRightFootDetail.setRotationPoint(-0.8F, 0.0F, 0.0F); + this.LegRightFootDetail.addBox(0.5F, 0.0F, -3.2F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFootDetail, 0.0F, -0.4363323129985824F, 0.17453292519943295F); + this.BodyLDetail1 = new AdvancedModelRenderer(this, 35, 11); + this.BodyLDetail1.mirror = true; + this.BodyLDetail1.setRotationPoint(2.5F, 0.0F, -2.0F); + this.BodyLDetail1.addBox(-1.0F, 0.0F, 0.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail1, 0.12217304763960307F, 0.0F, 0.13788101090755206F); + this.ArmLeftFingersBig = new AdvancedModelRenderer(this, 0, 2); + this.ArmLeftFingersBig.setRotationPoint(-0.5F, 0.5F, 0.0F); + this.ArmLeftFingersBig.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftFingersBig, -0.4363323129985824F, 0.0F, 0.3839724354387525F); + this.ArmRightHand = new AdvancedModelRenderer(this, 0, 2); + this.ArmRightHand.mirror = true; + this.ArmRightHand.setRotationPoint(0.0F, 6.0F, 0.0F); + this.ArmRightHand.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightHand, -0.296705972839036F, 1.5707963267948966F, 0.0F); + this.theHead = new AdvancedModelRenderer(this, 78, 0); + this.theHead.setRotationPoint(0.0F, -2.0F, -0.15F); + this.theHead.addBox(-1.5F, -1.0F, -1.5F, 3, 1, 3, 0.0F); + this.LegLeft = new AdvancedModelRenderer(this, 22, 27); + this.LegLeft.setRotationPoint(1.5F, 5.9F, 0.0F); + this.LegLeft.addBox(0.02F, 2.0F, -1.02F, 1, 3, 2, 0.0F); + this.setRotateAngle(LegLeft, -0.2617993877991494F, -0.2617993877991494F, -0.08726646259971647F); + this.LegDetailRight1 = new AdvancedModelRenderer(this, 16, 32); + this.LegDetailRight1.setRotationPoint(-1.0F, 2.0F, 0.0F); + this.LegDetailRight1.addBox(0.0F, -2.0F, -1.01F, 1, 2, 2, 0.0F); + this.setRotateAngle(LegDetailRight1, 0.0F, 0.0F, 0.3804817769347638F); + this.LegDetailLeft = new AdvancedModelRenderer(this, 25, 20); + this.LegDetailLeft.setRotationPoint(0.2F, -0.2F, 0.0F); + this.LegDetailLeft.addBox(-1.0F, 0.0F, -1.0F, 1, 5, 2, 0.0F); + this.setRotateAngle(LegDetailLeft, 0.0F, 0.0F, -0.15707963267948966F); + this.Tail_mid4 = new AdvancedModelRenderer(this, 60, 59); + this.Tail_mid4.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid4.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid4, 0.5248205060746949F, 0.0F, -0.035430183815484885F); + this.LegLeftLowerDetail1 = new AdvancedModelRenderer(this, 25, 11); + this.LegLeftLowerDetail1.setRotationPoint(0.0F, -0.3F, 0.1F); + this.LegLeftLowerDetail1.addBox(-0.5F, 0.0F, 0.0F, 1, 4, 1, 0.0F); + this.setRotateAngle(LegLeftLowerDetail1, -0.2399827721492203F, 0.0F, 0.0F); + this.ArmLeftDetail11 = new AdvancedModelRenderer(this, 12, 28); + this.ArmLeftDetail11.mirror = true; + this.ArmLeftDetail11.setRotationPoint(-1.75F, 1.0F, 1.0F); + this.ArmLeftDetail11.addBox(0.01F, 0.0F, -1.0F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail11, -0.14486232791552936F, 0.0F, -0.1117010721276371F); + this.EarR2 = new AdvancedModelRenderer(this, 0, 49); + this.EarR2.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR2.addBox(-1.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarR2, 0.5235987755982988F, 0.0F, 0.0F); + this.EarlM1 = new AdvancedModelRenderer(this, 102, 58); + this.EarlM1.setRotationPoint(-1.0F, 1.0F, 0.8F); + this.EarlM1.addBox(0.0F, -2.0F, 0.0F, 1, 2, 4, 0.0F); + this.setRotateAngle(EarlM1, -1.1370820076743058F, -0.08970992355250852F, 0.17453292519943295F); + this.theHeadDetail2 = new AdvancedModelRenderer(this, 78, 28); + this.theHeadDetail2.setRotationPoint(-1.5F, 0.0F, 1.5F); + this.theHeadDetail2.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2, 0.7853981633974483F, 0.0F, 0.0F); + this.neckDetail2 = new AdvancedModelRenderer(this, 18, 3); + this.neckDetail2.setRotationPoint(2.0F, 0.0F, -1.5F); + this.neckDetail2.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail2, -0.3839724354387525F, -0.7853981633974483F, 0.0F); + this.FF1 = new AdvancedModelRenderer(this, 83, 59); + this.FF1.setRotationPoint(0.0F, -3.3F, -4.0F); + this.FF1.addBox(-0.5F, 0.0F, -1.0F, 1, 3, 2, 0.0F); + this.setRotateAngle(FF1, 0.3490658503988659F, 0.0F, 0.0F); + this.BodyLowerSideLeft = new AdvancedModelRenderer(this, 37, 0); + this.BodyLowerSideLeft.mirror = true; + this.BodyLowerSideLeft.setRotationPoint(2.5F, 0.0F, 0.0F); + this.BodyLowerSideLeft.addBox(-1.0F, 0.0F, -1.0F, 1, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerSideLeft, 0.0F, 0.0F, 0.13962634015954636F); + this.LegLeftFootDetail = new AdvancedModelRenderer(this, 34, 9); + this.LegLeftFootDetail.setRotationPoint(-0.8F, 0.0F, 0.0F); + this.LegLeftFootDetail.addBox(0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFootDetail, 0.0F, -0.4363323129985824F, 0.17453292519943295F); + this.Left_Wing = new AdvancedModelRenderer(this, 92, 0); + this.Left_Wing.mirror = true; + this.Left_Wing.setRotationPoint(-1.0F, -3.5F, 0.0F); + this.Left_Wing.addBox(0.0F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.setRotateAngle(Left_Wing, -0.2792526803190927F, 0.0F, -0.02617993877991494F); + this.EarR1 = new AdvancedModelRenderer(this, 0, 44); + this.EarR1.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarR1.addBox(-1.0F, -1.0F, 0.0F, 2, 1, 4, 0.0F); + this.setRotateAngle(EarR1, 0.6108652381980153F, 0.0F, 0.0F); + this.ArmRightFingersBig = new AdvancedModelRenderer(this, 0, 2); + this.ArmRightFingersBig.setRotationPoint(0.5F, 0.5F, 0.0F); + this.ArmRightFingersBig.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightFingersBig, -0.4363323129985824F, 0.0F, -0.3839724354387525F); + this.FF2 = new AdvancedModelRenderer(this, 77, 60); + this.FF2.setRotationPoint(0.0F, 0.5F, -1.0F); + this.FF2.addBox(-0.5F, -2.0F, 0.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(FF2, -1.48352986419518F, 0.0F, 0.0F); + this.LegLeftFoot = new AdvancedModelRenderer(this, 26, 11); + this.LegLeftFoot.setRotationPoint(0.0F, 4.5F, 0.0F); + this.LegLeftFoot.addBox(-0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFoot, 0.0F, -0.17453292519943295F, 0.08726646259971647F); + this.theHeadDetail1h = new AdvancedModelRenderer(this, 54, 4); + this.theHeadDetail1h.mirror = true; + this.theHeadDetail1h.setRotationPoint(-3.0F, 0.0F, 0.0F); + this.theHeadDetail1h.addBox(-3.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail1h, 0.0F, 0.0F, 0.6981317007977318F); + this.FF4 = new AdvancedModelRenderer(this, 90, 62); + this.FF4.setRotationPoint(-0.13F, 0.6F, -1.01F); + this.FF4.addBox(0.0F, 0.0F, 0.0F, 1, 1, 1, 0.0F); + this.EarL3 = new AdvancedModelRenderer(this, 118, 15); + this.EarL3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarL3.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarL3, 0.4363323129985824F, 0.0F, 0.0F); + this.UpperBody = new AdvancedModelRenderer(this, 14, 0); + this.UpperBody.setRotationPoint(0.0F, -5.0F, 0.0F); + this.UpperBody.addBox(-1.5F, -1.74F, -1.0F, 3, 1, 2, 0.0F); + this.BodyDetailSideRight = new AdvancedModelRenderer(this, 9, 15); + this.BodyDetailSideRight.setRotationPoint(-2.5F, 0.0F, 0.0F); + this.BodyDetailSideRight.addBox(0.0F, -2.0F, -1.0F, 1, 2, 2, 0.0F); + this.setRotateAngle(BodyDetailSideRight, 0.0F, 0.0F, 0.5235987755982988F); + this.headBack113 = new AdvancedModelRenderer(this, 79, 40); + this.headBack113.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headBack113.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headBack113, 0.5916666164260777F, 0.0F, 0.0F); + this.headfrontdetaila5_1 = new AdvancedModelRenderer(this, 79, 49); + this.headfrontdetaila5_1.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headfrontdetaila5_1.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headfrontdetaila5_1, 0.5916666164260777F, 0.0F, 0.0F); + this.ArmRightLowerDetail1 = new AdvancedModelRenderer(this, 40, 29); + this.ArmRightLowerDetail1.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightLowerDetail1.addBox(-0.51F, 0.0F, -0.23F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmRightLowerDetail1, -0.04014257279586957F, 0.0F, 0.0F); + this.ArmLeft = new AdvancedModelRenderer(this, 0, 27); + this.ArmLeft.mirror = true; + this.ArmLeft.setRotationPoint(-2.5F, -5.0F, 0.0F); + this.ArmLeft.addBox(-1.02F, 0.0F, -1.02F, 1, 8, 1, 0.0F); + this.setRotateAngle(ArmLeft, 0.0F, 0.17453292519943295F, 0.17453292519943295F); + this.LegDetailRight = new AdvancedModelRenderer(this, 19, 20); + this.LegDetailRight.setRotationPoint(-0.2F, -0.2F, 0.0F); + this.LegDetailRight.addBox(0.0F, 0.0F, -1.0F, 1, 5, 2, 0.0F); + this.setRotateAngle(LegDetailRight, 0.0F, 0.0F, 0.15707963267948966F); + this.ArmLeftLowerDetail1 = new AdvancedModelRenderer(this, 40, 29); + this.ArmLeftLowerDetail1.mirror = true; + this.ArmLeftLowerDetail1.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftLowerDetail1.addBox(-0.5F, 0.0F, -0.25F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmLeftLowerDetail1, -0.04014257279586957F, 0.0F, 0.0F); + this.headfrontdetaila5 = new AdvancedModelRenderer(this, 79, 46); + this.headfrontdetaila5.setRotationPoint(0.0F, 0.0F, 3.0F); + this.headfrontdetaila5.addBox(-1.5F, -1.0F, 0.0F, 3, 1, 2, 0.0F); + this.setRotateAngle(headfrontdetaila5, 0.5916666164260777F, 0.0F, 0.0F); + this.EarM1 = new AdvancedModelRenderer(this, 10, 50); + this.EarM1.setRotationPoint(1.0F, 1.0F, 0.8F); + this.EarM1.addBox(-1.0F, -2.0F, 0.0F, 1, 2, 4, 0.0F); + this.setRotateAngle(EarM1, -1.1370820076743058F, 0.08970992355250852F, -0.17453292519943295F); + this.Tail_end = new AdvancedModelRenderer(this, 56, 59); + this.Tail_end.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_end.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_end, -0.39025562074593206F, 0.0F, 0.01727875959474386F); + this.chek = new AdvancedModelRenderer(this, 65, 60); + this.chek.setRotationPoint(0.5F, 0.0F, -1.0F); + this.chek.addBox(0.0F, 0.01F, 0.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(chek, 0.0F, -1.186823891356144F, 0.0F); + this.ArmRightDetail12 = new AdvancedModelRenderer(this, 0, 18); + this.ArmRightDetail12.setRotationPoint(0.0F, 0.9F, 1.0F); + this.ArmRightDetail12.addBox(0.0F, 0.0F, -1.01F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail12, -0.14486232791552936F, 0.0F, 0.0F); + this.LegRightFootDetail1 = new AdvancedModelRenderer(this, 34, 11); + this.LegRightFootDetail1.setRotationPoint(0.8F, 0.0F, 0.0F); + this.LegRightFootDetail1.addBox(-1.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFootDetail1, 0.0F, 0.4363323129985824F, -0.17453292519943295F); + this.BodyLower = new AdvancedModelRenderer(this, 52, 62); + this.BodyLower.setRotationPoint(0.0F, 0.0F, 0.0F); + this.BodyLower.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.ArmLeftLowerDetail = new AdvancedModelRenderer(this, 35, 21); + this.ArmLeftLowerDetail.mirror = true; + this.ArmLeftLowerDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftLowerDetail.addBox(-0.52F, 0.0F, -0.75F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmLeftLowerDetail, 0.04014257279586957F, 0.0F, 0.0F); + this.ArmRightDetail11 = new AdvancedModelRenderer(this, 12, 28); + this.ArmRightDetail11.setRotationPoint(1.75F, 1.0F, 1.0F); + this.ArmRightDetail11.addBox(-0.99F, 0.0F, -0.99F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmRightDetail11, -0.14486232791552936F, 0.0F, 0.1117010721276371F); + this.headBack = new AdvancedModelRenderer(this, 54, 24); + this.headBack.setRotationPoint(1.5F, 0.0F, 1.5F); + this.headBack.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headBack, 0.9599310885968813F, 0.7853981633974483F, 0.0F); + this.Tail_mid3 = new AdvancedModelRenderer(this, 60, 59); + this.Tail_mid3.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid3.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid3, 0.942128730226539F, 0.0F, -0.015184364492350668F); + this.chek1 = new AdvancedModelRenderer(this, 65, 56); + this.chek1.setRotationPoint(-0.5F, 0.0F, -1.0F); + this.chek1.addBox(-2.0F, 0.01F, 0.0F, 2, 3, 1, 0.0F); + this.setRotateAngle(chek1, 0.0F, 1.186823891356144F, 0.0F); + this.ArmLeftDetail12 = new AdvancedModelRenderer(this, 0, 18); + this.ArmLeftDetail12.mirror = true; + this.ArmLeftDetail12.setRotationPoint(0.0F, 0.9F, 1.0F); + this.ArmLeftDetail12.addBox(-1.0F, 0.0F, -1.02F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail12, -0.14486232791552936F, 0.0F, 0.0F); + this.EarM3 = new AdvancedModelRenderer(this, 36, 36); + this.EarM3.setRotationPoint(0.0F, 0.0F, 0.0F); + this.EarM3.addBox(0.0F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.EarML3 = new AdvancedModelRenderer(this, 116, 53); + this.EarML3.setRotationPoint(-1.0F, 0.0F, 0.0F); + this.EarML3.addBox(0.0F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.Tail_mid1 = new AdvancedModelRenderer(this, 60, 59); + this.Tail_mid1.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid1.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid1, 0.8609709200088027F, 0.0F, 0.04834562028024293F); + this.LegRightFoot = new AdvancedModelRenderer(this, 34, 8); + this.LegRightFoot.setRotationPoint(0.0F, 4.5F, 0.0F); + this.LegRightFoot.addBox(-0.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegRightFoot, -0.0F, 0.17453292519943295F, -0.08726646259971647F); + this.ArmLeftFingerfront = new AdvancedModelRenderer(this, 43, 13); + this.ArmLeftFingerfront.setRotationPoint(-0.5F, 0.5F, 0.5F); + this.ArmLeftFingerfront.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmLeftFingerfront, 0.17453292519943295F, -0.5235987755982988F, 0.2617993877991494F); + this.ArmRightDetail = new AdvancedModelRenderer(this, 8, 23); + this.ArmRightDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightDetail.addBox(0.0F, 0.0F, -1.02F, 2, 1, 2, 0.0F); + this.setRotateAngle(ArmRightDetail, 0.0F, 0.0F, 0.5235987755982988F); + this.headfrontdetaila1 = new AdvancedModelRenderer(this, 54, 20); + this.headfrontdetaila1.setRotationPoint(-1.5F, 0.0F, -1.5F); + this.headfrontdetaila1.addBox(-1.5F, -1.0F, -0.4F, 3, 1, 3, 0.0F); + this.setRotateAngle(headfrontdetaila1, 0.9599310885968813F, -2.356194490192345F, 0.0F); + this.ArmRightFingerback = new AdvancedModelRenderer(this, 43, 13); + this.ArmRightFingerback.setRotationPoint(-0.5F, 0.5F, 0.5F); + this.ArmRightFingerback.addBox(-0.5F, 0.0F, -1.0F, 1, 2, 1, 0.0F); + this.setRotateAngle(ArmRightFingerback, 0.17453292519943295F, -0.5235987755982988F, 0.2617993877991494F); + this.Tail_mid2 = new AdvancedModelRenderer(this, 60, 59); + this.Tail_mid2.setRotationPoint(0.0F, 4.0F, 0.0F); + this.Tail_mid2.addBox(-0.5F, 0.0F, -0.5F, 1, 4, 1, 0.0F); + this.setRotateAngle(Tail_mid2, 0.7670722062515078F, 0.0F, 0.0F); + this.ArmRightLower = new AdvancedModelRenderer(this, 52, 62); + this.ArmRightLower.setRotationPoint(0.5F, 8.0F, -0.5F); + this.ArmRightLower.addBox(-0.5F, -0.5F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmRightLower, -0.5235987755982988F, 0.0F, 0.0F); + this.EarRB3 = new AdvancedModelRenderer(this, 22, 36); + this.EarRB3.setRotationPoint(0.0F, 0.0F, 4.0F); + this.EarRB3.addBox(-1.0F, 0.0F, 0.0F, 1, 1, 6, 0.0F); + this.setRotateAngle(EarRB3, -0.1223475805648025F, -0.3490658503988659F, 0.0F); + this.theHeadDetail7999 = new AdvancedModelRenderer(this, 66, 20); + this.theHeadDetail7999.setRotationPoint(1.5F, 0.0F, -1.5F); + this.theHeadDetail7999.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail7999, 0.7853981633974483F, 3.141592653589793F, 0.0F); + this.LegLeftFootDetail2 = new AdvancedModelRenderer(this, 37, 11); + this.LegLeftFootDetail2.setRotationPoint(0.0F, 0.0F, -0.5F); + this.LegLeftFootDetail2.addBox(-2.0F, 0.0F, 0.0F, 2, 1, 1, 0.0F); + this.setRotateAngle(LegLeftFootDetail2, 0.13962634015954636F, -0.40142572795869574F, -0.5462880558742251F); + this.theHeadDetail2h = new AdvancedModelRenderer(this, 54, 8); + this.theHeadDetail2h.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2h.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2h, 0.6981317007977318F, 0.0F, 0.0F); + this.EarLB2Detail = new AdvancedModelRenderer(this, 120, 61); + this.EarLB2Detail.setRotationPoint(-1.0F, 2.0F, 4.0F); + this.EarLB2Detail.addBox(0.0F, -1.0F, 0.0F, 2, 1, 2, 0.0F); + this.setRotateAngle(EarLB2Detail, 0.389033890269536F, 0.0F, 0.0F); + this.ArmRightLowerDetail = new AdvancedModelRenderer(this, 35, 21); + this.ArmRightLowerDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmRightLowerDetail.addBox(-0.5F, 0.0F, -0.77F, 1, 6, 1, 0.0F); + this.setRotateAngle(ArmRightLowerDetail, 0.04014257279586957F, 0.0F, 0.0F); + this.Right_Wing_Overlay = new AdvancedModelRenderer(this, 136, 0); + this.Right_Wing_Overlay.setRotationPoint(0.0F, 0.0F, 0.0F); + this.Right_Wing_Overlay.addBox(-0.02F, 0.0F, 0.0F, 1, 30, 11, 0.0F); + this.EarM5 = new AdvancedModelRenderer(this, 13, 43); + this.EarM5.setRotationPoint(0.0F, -1.8F, 3.0F); + this.EarM5.addBox(-0.98F, 0.0F, 0.0F, 1, 2, 5, 0.0F); + this.setRotateAngle(EarM5, 0.49497537586559187F, 0.0F, 0.0F); + this.ArmLeftDetail1 = new AdvancedModelRenderer(this, 32, 28); + this.ArmLeftDetail1.mirror = true; + this.ArmLeftDetail1.setRotationPoint(-1.75F, 1.0F, 0.0F); + this.ArmLeftDetail1.addBox(0.0F, 0.0F, -0.98F, 1, 7, 1, 0.0F); + this.setRotateAngle(ArmLeftDetail1, 0.0F, 0.0F, -0.1117010721276371F); + this.BodyLDetail2 = new AdvancedModelRenderer(this, 43, 0); + this.BodyLDetail2.setRotationPoint(2.5F, 0.0F, 2.0F); + this.BodyLDetail2.addBox(-1.0F, 0.0F, -1.0F, 1, 6, 1, 0.0F); + this.setRotateAngle(BodyLDetail2, -0.12217304763960307F, 0.0F, 0.13788101090755206F); + this.theHeadDetail = new AdvancedModelRenderer(this, 78, 4); + this.theHeadDetail.setRotationPoint(1.5F, 0.0F, 0.0F); + this.theHeadDetail.addBox(0.0F, -1.0F, -1.5F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail, 0.0F, 0.0F, -0.7853981633974483F); + this.BodyLowerFront = new AdvancedModelRenderer(this, 33, 8); + this.BodyLowerFront.setRotationPoint(0.0F, 0.0F, -2.0F); + this.BodyLowerFront.addBox(-1.5F, 0.0F, 0.0F, 3, 6, 2, 0.0F); + this.setRotateAngle(BodyLowerFront, 0.12217304763960307F, 0.0F, 0.0F); + this.theHeadDetail2e768 = new AdvancedModelRenderer(this, 66, 24); + this.theHeadDetail2e768.setRotationPoint(0.0F, 0.0F, 3.0F); + this.theHeadDetail2e768.addBox(0.0F, -1.0F, 0.0F, 3, 1, 3, 0.0F); + this.setRotateAngle(theHeadDetail2e768, 0.9599310885968813F, 0.0F, 0.0F); + this.ArmLeftDetail = new AdvancedModelRenderer(this, 8, 23); + this.ArmLeftDetail.mirror = true; + this.ArmLeftDetail.setRotationPoint(0.0F, 0.0F, 0.0F); + this.ArmLeftDetail.addBox(-2.0F, 0.0F, -1.03F, 2, 1, 2, 0.0F); + this.setRotateAngle(ArmLeftDetail, 0.0F, 0.0F, -0.5235987755982988F); + this.LegDetaiLeft1 = new AdvancedModelRenderer(this, 22, 32); + this.LegDetaiLeft1.setRotationPoint(1.0F, 2.0F, 0.0F); + this.LegDetaiLeft1.addBox(-1.0F, -2.0F, -1.01F, 1, 2, 2, 0.0F); + this.setRotateAngle(LegDetaiLeft1, 0.0F, 0.0F, -0.3804817769347638F); + this.ArmLeftHand = new AdvancedModelRenderer(this, 0, 2); + this.ArmLeftHand.setRotationPoint(0.0F, 6.0F, 0.0F); + this.ArmLeftHand.addBox(-0.5F, 0.0F, -0.5F, 1, 1, 1, 0.0F); + this.setRotateAngle(ArmLeftHand, -0.296656372197416F, -1.5707963267948966F, 0.0F); + this.LegRight = new AdvancedModelRenderer(this, 16, 27); + this.LegRight.setRotationPoint(-1.5F, 5.9F, 0.0F); + this.LegRight.addBox(-1.02F, 2.0F, -1.02F, 1, 3, 2, 0.0F); + this.setRotateAngle(LegRight, -0.2617993877991494F, 0.2617993877991494F, 0.08726646259971647F); + this.EarLB2 = new AdvancedModelRenderer(this, 116, 40); + this.EarLB2.setRotationPoint(0.0F, 0.0F, 3.6F); + this.EarLB2.addBox(-1.0F, 0.0F, 0.0F, 2, 2, 4, 0.0F); + this.setRotateAngle(EarLB2, -0.4363323129985824F, -0.3490658503988659F, 0.0F); + this.neckDetail4 = new AdvancedModelRenderer(this, 18, 6); + this.neckDetail4.setRotationPoint(-2.0F, 0.0F, 1.5F); + this.neckDetail4.addBox(-0.9F, -2.0F, 0.0F, 2, 2, 1, 0.0F); + this.setRotateAngle(neckDetail4, -0.3839724354387525F, 2.356194490192345F, 0.0F); + this.LegRightFootDetail2 = new AdvancedModelRenderer(this, 37, 11); + this.LegRightFootDetail2.setRotationPoint(0.0F, 0.0F, -0.5F); + this.LegRightFootDetail2.addBox(0.0F, 0.0F, 0.0F, 2, 1, 1, 0.0F); + this.setRotateAngle(LegRightFootDetail2, -0.13962634015954636F, 0.40142572795869574F, 0.5462880558742251F); + this.LegLeftFootDetail1 = new AdvancedModelRenderer(this, 34, 10); + this.LegLeftFootDetail1.setRotationPoint(0.8F, 0.0F, 0.0F); + this.LegLeftFootDetail1.addBox(-1.5F, 0.0F, -3.0F, 1, 1, 3, 0.0F); + this.setRotateAngle(LegLeftFootDetail1, 0.0F, 0.4363323129985824F, -0.17453292519943295F); + this.EarLeft = new AdvancedModelRenderer(this, 118, 0); + this.EarLeft.setRotationPoint(1.0F, -6.0F, 1.0F); + this.EarLeft.addBox(0.0F, -1.0F, 0.0F, 1, 1, 4, 0.0F); + this.setRotateAngle(EarLeft, -0.2617993877991494F, 0.4363323129985824F, 0.0F); + this.BodyLower.addChild(this.BodyLowerBack); + this.UpperBody.addChild(this.BodyDetailFront); + this.ArmRight.addChild(this.Right_Wing); + this.BodyLower.addChild(this.BodyLDetail); + this.EarRB2.addChild(this.EarRB2Detail); + this.UpperBody.addChild(this.neckDetail); + this.UpperBody.addChild(this.neckDetail3); + this.Body.addChild(this.ArmRight); + this.theHead.addChild(this.headtop); + this.EarL1.addChild(this.EarL2); + this.ArmLeftHand.addChild(this.ArmLeftFingerback); + this.theHeadDetaile.addChild(this.theHeadDetailh); + this.headfrontdetaila1_1.addChild(this.headfrontdetaila4_1); + this.ArmRightHand.addChild(this.ArmRightFingerfront); + this.EarLB2.addChild(this.EarLB3); + this.EarR2.addChild(this.EarR3); + this.headBack.addChild(this.headBack2); + this.Body.addChild(this.Neck); + this.theHeadDetail1.addChild(this.theHeadDetail1e); + this.LegRightLower.addChild(this.LegRightLowerDetail1); + this.EarRB2Detail.addChild(this.EarRB2Detaildetail); + this.EarLB2Detail.addChild(this.EarLB2Detaildetail); + this.LegLeftLower.addChild(this.LegLeftLowerDetail); + this.UpperBody.addChild(this.BodyDetailSideLeft); + this.EarR1.addChild(this.EarM2); + this.EarLeft.addChild(this.EarL1); + this.theHead.addChild(this.headBack1); + this.BodyLower.addChild(this.Tail_start); + this.FF1.addChild(this.FF3); + this.BodyLower.addChild(this.BodyLDetail4); + this.BodyLower.addChild(this.BodyLowerSideRight); + this.theHead.addChild(this.headfrontdetaila1_1); + this.ArmRight.addChild(this.ArmRightDetail1); + this.LegLeft.addChild(this.LegLeftLower); + this.UpperBody.addChild(this.BodyDetailBack); + this.LegRight.addChild(this.LegRightLower); + this.LegRightLower.addChild(this.LegRightLowerDetail); + this.EarLeft.addChild(this.EarLB1); + this.EarRB1.addChild(this.EarRB2); + this.theHead.addChild(this.EarRight); + this.theHead.addChild(this.theHeadDetail1); + this.headfrontdetaila1.addChild(this.headfrontdetaila4); + this.ArmLeftHand.addChild(this.ArmLeftFingerMid); + this.ArmLeft.addChild(this.ArmLeftLower); + this.theHeadDetail2e768.addChild(this.theHeadDetail2h789); + this.EarRight.addChild(this.EarRB1); + this.theHeadDetail2.addChild(this.theHeadDetail2e); + this.EarL1.addChild(this.EarL2_1); + this.headBack1.addChild(this.headBack11); + this.theHeadDetail.addChild(this.theHeadDetaile); + this.EarL2_1.addChild(this.EarL5); + this.ArmRightHand.addChild(this.ArmRightFingerMid); + this.Left_Wing.addChild(this.Left_Wing_Overlay); + this.headBack11.addChild(this.headBack111); + this.LegRightFoot.addChild(this.LegRightFootDetail); + this.BodyLower.addChild(this.BodyLDetail1); + this.ArmLeftHand.addChild(this.ArmLeftFingersBig); + this.ArmRightLower.addChild(this.ArmRightHand); + this.Neck.addChild(this.theHead); + this.BodyLower.addChild(this.LegLeft); + this.LegRight.addChild(this.LegDetailRight1); + this.LegLeft.addChild(this.LegDetailLeft); + this.Tail_mid3.addChild(this.Tail_mid4); + this.LegLeftLower.addChild(this.LegLeftLowerDetail1); + this.ArmLeft.addChild(this.ArmLeftDetail11); + this.EarR1.addChild(this.EarR2); + this.EarLB1.addChild(this.EarlM1); + this.theHead.addChild(this.theHeadDetail2); + this.UpperBody.addChild(this.neckDetail2); + this.theHead.addChild(this.FF1); + this.BodyLower.addChild(this.BodyLowerSideLeft); + this.LegLeftFoot.addChild(this.LegLeftFootDetail); + this.ArmLeft.addChild(this.Left_Wing); + this.EarRight.addChild(this.EarR1); + this.ArmRightHand.addChild(this.ArmRightFingersBig); + this.FF1.addChild(this.FF2); + this.LegLeftLower.addChild(this.LegLeftFoot); + this.theHeadDetail1e.addChild(this.theHeadDetail1h); + this.FF1.addChild(this.FF4); + this.EarL2.addChild(this.EarL3); + this.Body.addChild(this.UpperBody); + this.UpperBody.addChild(this.BodyDetailSideRight); + this.headBack2.addChild(this.headBack113); + this.headfrontdetaila4_1.addChild(this.headfrontdetaila5_1); + this.ArmRightLower.addChild(this.ArmRightLowerDetail1); + this.Body.addChild(this.ArmLeft); + this.LegRight.addChild(this.LegDetailRight); + this.ArmLeftLower.addChild(this.ArmLeftLowerDetail1); + this.headfrontdetaila4.addChild(this.headfrontdetaila5); + this.EarRB1.addChild(this.EarM1); + this.Tail_mid4.addChild(this.Tail_end); + this.FF1.addChild(this.chek); + this.ArmRight.addChild(this.ArmRightDetail12); + this.LegRightFoot.addChild(this.LegRightFootDetail1); + this.Body.addChild(this.BodyLower); + this.ArmLeftLower.addChild(this.ArmLeftLowerDetail); + this.ArmRight.addChild(this.ArmRightDetail11); + this.theHead.addChild(this.headBack); + this.Tail_mid2.addChild(this.Tail_mid3); + this.FF1.addChild(this.chek1); + this.ArmLeft.addChild(this.ArmLeftDetail12); + this.EarRB3.addChild(this.EarM3); + this.EarLB3.addChild(this.EarML3); + this.Tail_start.addChild(this.Tail_mid1); + this.LegRightLower.addChild(this.LegRightFoot); + this.ArmLeftHand.addChild(this.ArmLeftFingerfront); + this.ArmRight.addChild(this.ArmRightDetail); + this.theHead.addChild(this.headfrontdetaila1); + this.ArmRightHand.addChild(this.ArmRightFingerback); + this.Tail_mid1.addChild(this.Tail_mid2); + this.ArmRight.addChild(this.ArmRightLower); + this.EarRB2.addChild(this.EarRB3); + this.theHead.addChild(this.theHeadDetail7999); + this.LegLeftFoot.addChild(this.LegLeftFootDetail2); + this.theHeadDetail2e.addChild(this.theHeadDetail2h); + this.EarLB2.addChild(this.EarLB2Detail); + this.ArmRightLower.addChild(this.ArmRightLowerDetail); + this.Right_Wing.addChild(this.Right_Wing_Overlay); + this.EarM2.addChild(this.EarM5); + this.ArmLeft.addChild(this.ArmLeftDetail1); + this.BodyLower.addChild(this.BodyLDetail2); + this.theHead.addChild(this.theHeadDetail); + this.BodyLower.addChild(this.BodyLowerFront); + this.theHeadDetail7999.addChild(this.theHeadDetail2e768); + this.ArmLeft.addChild(this.ArmLeftDetail); + this.LegLeft.addChild(this.LegDetaiLeft1); + this.ArmLeftLower.addChild(this.ArmLeftHand); + this.BodyLower.addChild(this.LegRight); + this.EarLB1.addChild(this.EarLB2); + this.UpperBody.addChild(this.neckDetail4); + this.LegRightFoot.addChild(this.LegRightFootDetail2); + this.LegLeftFoot.addChild(this.LegLeftFootDetail1); + this.theHead.addChild(this.EarLeft); + this.Left_Wing.setShouldScaleChildren(true); + this.Right_Wing.setShouldScaleChildren(true); + animator = ModelAnimator.create(); + this.updateDefaultPose(); + } + + @Override + public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) { + super.render(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale); + + if (this.isChild) + { + GL11.glPushMatrix(); + GL11.glTranslatef(0F, 1.5F-1.5F*0.35F, 0F); + GL11.glScalef(0.35F, 0.35F, 0.35F); + this.Body.render(scale); + GL11.glPopMatrix(); + } + else + { + GL11.glPushMatrix(); + GL11.glTranslatef(0F, 1.5F-1.5F*0.5F, 0F); + GL11.glScalef(0.5F, 0.5F, 0.5F); + this.Body.render(scale); + GL11.glPopMatrix(); + } + } + + public void setRotateAngle(AdvancedModelRenderer AdvancedAdvancedModelRenderer, float x, float y, float z) { + AdvancedAdvancedModelRenderer.rotateAngleX = x; + AdvancedAdvancedModelRenderer.rotateAngleY = y; + AdvancedAdvancedModelRenderer.rotateAngleZ = z; + } + + public void setLivingAnimations(EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTickTime) { + this.resetToDefaultPose(); + + this.Left_Wing.setScale(0, 0, 0); + this.Right_Wing.setScale(0, 0, 0); + + if (entitylivingbaseIn instanceof EntityFlyingLemur){ + + EntityFlyingLemur lemur = (EntityFlyingLemur)entitylivingbaseIn; + boolean gliding = false; + if(lemur.getOwner() != null) { + gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner()); + } + + if (lemur.isPartying()) { + this.state = ModelLlibraryLemur.State.PARTY; + this.Body.rotateAngleY = -1.5F; + this.Body.rotateAngleX = 0.3F; + this.BodyLower.rotateAngleX = -0.3f; + this.Neck.rotateAngleX = -0.3F; + + this.ArmLeft.rotateAngleZ = -0.3f; + this.ArmRight.rotateAngleZ = 0.3f; + + this.LegRight.rotateAngleZ = -0.1f; + this.LegLeft.rotateAngleZ = 0.1f; + this.LegRight.rotateAngleY = -0.2f; + this.LegLeft.rotateAngleY = 0.2f; + this.LegRight.rotateAngleX = -0.35f; + this.LegLeft.rotateAngleX = -0.35f; + this.LegRightLower.rotateAngleX = 1.25f; + this.LegLeftLower.rotateAngleX = 1.25f; + + this.LegLeftFoot.rotateAngleY = -0.4f; + this.LegRightFoot.rotateAngleY = 0.4f; + + this.LegLeftFoot.rotateAngleZ = -0.1f; + this.LegRightFoot.rotateAngleZ = 0.1f; + this.LegLeftFoot.rotateAngleX = -0.8f; + this.LegRightFoot.rotateAngleX = -0.8f; + + + this.Tail_start.rotateAngleX = 0.2F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 1.25F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.ArmLeftHand.rotateAngleY = -3.5F; + this.ArmRightHand.rotateAngleY = 3.5F; + + } + else if (lemur.isSitting() && !lemur.isPartying()) { + this.state = ModelLlibraryLemur.State.SITTING; + this.Body.offsetY = 0.5F; + this.BodyLower.rotateAngleX = 0.35F; + + this.LegRight.rotateAngleX = -2.6f; + this.LegRightLower.rotateAngleX = 2.0f; + this.LegRight.rotateAngleZ = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + this.LegLeft.rotateAngleX = -2.6f; + this.LegLeftLower.rotateAngleX = 2.0f; + this.LegLeft.rotateAngleZ = 0.5F; + this.LegLeft.rotateAngleY = -0.5F; + + this.ArmRight.rotateAngleY = 0.7F; + this.ArmLeft.rotateAngleY = -0.7F; + + this.ArmLeftLower.rotateAngleX = -0.5F; + this.ArmRightLower.rotateAngleX = -0.5F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmRightLower.rotateAngleY = 0.6F; + this.ArmLeftLower.rotateAngleY = -0.6F; + + this.ArmLeftHand.rotateAngleX = 1.6F; + this.ArmRightHand.rotateAngleX = 1.6F; + + this.ArmLeftHand.rotateAngleY = -1.5F; + this.ArmRightHand.rotateAngleY = 1.5F; + } + else if (lemur.getLeftShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = ModelLlibraryLemur.State.ONLEFTSHOULDER; + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = 0.1F; + this.Body.rotateAngleZ = 0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = 1.1F; + } + else { + this.Body.offsetX = 0.8F; + } + + } + else if (lemur.getRightShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = ModelLlibraryLemur.State.ONRIGHTSHOULDER; + + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = -0.1F; + this.Body.rotateAngleZ = -0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = -1.1F; + } + else { + this.Body.offsetX = -0.8F; + } + + } + else if (lemur.getLeftShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = ModelLlibraryLemur.State.ELYTRALEFTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = 1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.getRightShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = ModelLlibraryLemur.State.ELYTRARIGHTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = -1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.speed > 0.17f && !lemur.isLemurRiding() && !lemur.isFlying()) + { + this.state = ModelLlibraryLemur.State.SPRINTING; + this.Body.rotateAngleX = 1.5F; + this.Body.offsetY = 0.25F; + this.BodyLower.rotateAngleX = -0.35F; + + this.ArmRight.rotateAngleX = -1.75F; + this.ArmLeft.rotateAngleX = -1.75F; + this.ArmRight.rotateAngleY = 0.1F; + this.ArmLeft.rotateAngleY = -0.1F; + this.ArmLeftLower.rotateAngleY = 0.4F; + this.ArmRightLower.rotateAngleY = -0.4F; + this.ArmRightHand.rotateAngleY = 2.6F; + this.ArmLeftHand.rotateAngleY = -2.6F; + + this.LegLeft.rotateAngleX = -1.5F; + this.LegRight.rotateAngleX = -1.5F; + this.LegLeft.rotateAngleY = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0.1F; + this.Tail_mid4.rotateAngleX = 0.1F; + this.Tail_end.rotateAngleX = 0.1F; + + } + else if (lemur.speed >= 0.05F && lemur.speed <= 0.17F && !lemur.isLemurRiding() && !lemur.isFlying()) + { + this.state = ModelLlibraryLemur.State.WALKING; + } + else if (!lemur.isFlying()) { + this.state = ModelLlibraryLemur.State.STANDING; + } + else if (lemur.isFlying() && !lemur.isLemurRiding()) + { + this.state = ModelLlibraryLemur.State.FLYING; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + } + } + //TODO + if (entitylivingbaseIn instanceof EntityAscendedFlyingLemur){ + + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur)entitylivingbaseIn; + + boolean gliding = false; + if(lemur.getOwner() != null) { + gliding = GliderHelper.getIsGliderDeployed((EntityPlayer) lemur.getOwner()); + } + + if (lemur.isPartying()) { + this.state = ModelLlibraryLemur.State.PARTY; + this.Body.rotateAngleY = -1.5F; + this.Body.rotateAngleX = 0.3F; + this.BodyLower.rotateAngleX = -0.3f; + this.Neck.rotateAngleX = -0.3F; + + this.ArmLeft.rotateAngleZ = -0.3f; + this.ArmRight.rotateAngleZ = 0.3f; + + this.LegRight.rotateAngleZ = -0.1f; + this.LegLeft.rotateAngleZ = 0.1f; + this.LegRight.rotateAngleY = -0.2f; + this.LegLeft.rotateAngleY = 0.2f; + this.LegRight.rotateAngleX = -0.35f; + this.LegLeft.rotateAngleX = -0.35f; + this.LegRightLower.rotateAngleX = 1.25f; + this.LegLeftLower.rotateAngleX = 1.25f; + + this.LegLeftFoot.rotateAngleY = -0.4f; + this.LegRightFoot.rotateAngleY = 0.4f; + + this.LegLeftFoot.rotateAngleZ = -0.1f; + this.LegRightFoot.rotateAngleZ = 0.1f; + this.LegLeftFoot.rotateAngleX = -0.8f; + this.LegRightFoot.rotateAngleX = -0.8f; + + + this.Tail_start.rotateAngleX = 0.2F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 1.25F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.ArmLeftHand.rotateAngleY = -3.5F; + this.ArmRightHand.rotateAngleY = 3.5F; + + } + else if (lemur.isSitting() && !lemur.isPartying()) { + this.state = ModelLlibraryLemur.State.SITTING; + this.Body.offsetY = 0.5F; + this.BodyLower.rotateAngleX = 0.35F; + + this.LegRight.rotateAngleX = -2.6f; + this.LegRightLower.rotateAngleX = 2.0f; + this.LegRight.rotateAngleZ = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + this.LegLeft.rotateAngleX = -2.6f; + this.LegLeftLower.rotateAngleX = 2.0f; + this.LegLeft.rotateAngleZ = 0.5F; + this.LegLeft.rotateAngleY = -0.5F; + + this.ArmRight.rotateAngleY = 0.7F; + this.ArmLeft.rotateAngleY = -0.7F; + + this.ArmLeftLower.rotateAngleX = -0.5F; + this.ArmRightLower.rotateAngleX = -0.5F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmRightLower.rotateAngleY = 0.6F; + this.ArmLeftLower.rotateAngleY = -0.6F; + + this.ArmLeftHand.rotateAngleX = 1.6F; + this.ArmRightHand.rotateAngleX = 1.6F; + + this.ArmLeftHand.rotateAngleY = -1.5F; + this.ArmRightHand.rotateAngleY = 1.5F; + } + else if (lemur.getLeftShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = ModelLlibraryLemur.State.ONLEFTSHOULDER; + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = 0.1F; + this.Body.rotateAngleZ = 0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = 1.1F; + } + else { + this.Body.offsetX = 0.8F; + } + + } + else if (lemur.getRightShoulder() && !lemur.getOwner().isElytraFlying() && !gliding) { + this.state = ModelLlibraryLemur.State.ONRIGHTSHOULDER; + + this.Body.rotateAngleX = 0.35F; + this.Body.rotateAngleY = -0.1F; + this.Body.rotateAngleZ = -0.15F; + + this.BodyLower.rotateAngleX = -0.35F; + + this.LegLeft.rotateAngleX = -2.60F; + this.LegRight.rotateAngleX = -2.60F; + this.LegLeftLower.rotateAngleX = 2.8f; + this.LegRightLower.rotateAngleX = 2.8f; + + this.LegLeftLower.rotateAngleZ = -0.45f; + this.LegRightLower.rotateAngleZ = 0.45f; + this.LegLeft.rotateAngleZ = 0.2F; + this.LegLeft.rotateAngleY = -0.2F; + this.LegRight.rotateAngleZ = -0.2F; + this.LegRight.rotateAngleY = 0.2F; + + + this.ArmRight.rotateAngleX = -0.6F; + this.ArmLeft.rotateAngleX = -0.6F; + this.ArmRight.rotateAngleZ = 0.2F; + this.ArmLeft.rotateAngleZ = -0.2F; + + this.ArmLeftLower.rotateAngleX = -0.35F; + this.ArmRightLower.rotateAngleX = -0.35F; + + this.ArmRightLower.rotateAngleZ = 0.35F; + this.ArmLeftLower.rotateAngleZ = -0.35F; + + this.ArmLeftHand.rotateAngleX = -0.7F; + this.ArmRightHand.rotateAngleX = -0.7F; + + + this.ArmLeftHand.rotateAngleZ = 1F; + this.ArmRightHand.rotateAngleZ = -1F; + + this.ArmRightHand.rotateAngleY = 3.5F; + this.ArmLeftHand.rotateAngleY = -3.5F; + + this.Body.offsetZ = 0.2F; + + if(lemur.getOwner().isSneaking()) + { + this.Body.offsetY = 2.4F; + } + else + { + this.Body.offsetY = 2.0F; + } + + if(lemur.isChild()) { + this.Body.offsetX = -1.1F; + } + else { + this.Body.offsetX = -0.8F; + } + + } + else if (lemur.getLeftShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = ModelLlibraryLemur.State.ELYTRALEFTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = 1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.getRightShoulder() && lemur.getOwner().isElytraFlying() || gliding) { + this.state = ModelLlibraryLemur.State.ELYTRARIGHTSHOULDER; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + + this.Body.offsetX = -1.8F; + this.Body.offsetY = 1.5F; + } + else if (lemur.speed > 0.17f && !lemur.isLemurRiding() && !lemur.isFlying()) + { + this.state = ModelLlibraryLemur.State.SPRINTING; + this.Body.rotateAngleX = 1.5F; + this.Body.offsetY = 0.25F; + this.BodyLower.rotateAngleX = -0.35F; + + this.ArmRight.rotateAngleX = -1.75F; + this.ArmLeft.rotateAngleX = -1.75F; + this.ArmRight.rotateAngleY = 0.1F; + this.ArmLeft.rotateAngleY = -0.1F; + this.ArmLeftLower.rotateAngleY = 0.4F; + this.ArmRightLower.rotateAngleY = -0.4F; + this.ArmRightHand.rotateAngleY = 2.6F; + this.ArmLeftHand.rotateAngleY = -2.6F; + + this.LegLeft.rotateAngleX = -1.5F; + this.LegRight.rotateAngleX = -1.5F; + this.LegLeft.rotateAngleY = -0.5F; + this.LegRight.rotateAngleY = 0.5F; + + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0.1F; + this.Tail_mid4.rotateAngleX = 0.1F; + this.Tail_end.rotateAngleX = 0.1F; + + } + else if (lemur.speed >= 0.05F && lemur.speed <= 0.17F && !lemur.isLemurRiding() && !lemur.isFlying()) + { + this.state = ModelLlibraryLemur.State.WALKING; + } + else if (!lemur.isFlying()) { + this.state = ModelLlibraryLemur.State.STANDING; + } + else if (lemur.isFlying() && !lemur.isLemurRiding()) + { + this.state = ModelLlibraryLemur.State.FLYING; + + this.Body.rotateAngleX = 1.5F; + this.ArmRight.rotateAngleX = -1.5F; + this.ArmRight.rotateAngleY = -1.6F; + this.ArmRight.rotateAngleZ = -0.05F; + this.ArmLeft.rotateAngleX = -1.5F; + this.ArmLeft.rotateAngleY = 1.6F; + this.ArmLeft.rotateAngleZ = 0.05F; + + this.Tail_start.rotateAngleX = 0F; + this.Tail_mid1.rotateAngleX = 0F; + this.Tail_mid2.rotateAngleX = 0F; + this.Tail_mid3.rotateAngleX = 0F; + this.Tail_mid4.rotateAngleX = 0F; + this.Tail_end.rotateAngleX = 0F; + this.Left_Wing.setScale(1, 1, 1); + this.Right_Wing.setScale(1, 1, 1); + + this.LegRightFoot.rotateAngleX = 1.5F; + this.LegLeftFoot.rotateAngleX = 1.5F; + + this.EarRight.rotateAngleX = -0.45F; + this.EarLeft.rotateAngleX = -0.45F; + } + + } + } + + + @Override + public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) { + super.setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scaleFactor, entityIn); + + float f = entityIn.ticksExisted; + float f1 = 0.5f; + float globalspeed = 1f; + float globalheight = 1f; + float globalDegree = 1f; + + if(this.state == State.FLYING){ + this.theHead.rotateAngleY =netHeadYaw * 0.007F; + this.theHead.rotateAngleX =headPitch * 0.017453292F - 1.5F; + swing(ArmRight, 0.75F * globalspeed, 1F * globalDegree, false, 1, 0, f, f1); + swing(ArmLeft, 0.75F * globalspeed, 1F * globalDegree, true, 1, 0, f, f1); + walk(LegLeft,0.5F * globalspeed, 0.2F * globalDegree, true, 1, 0, f, f1); + walk(LegRight,0.5F * globalspeed, 0.2F * globalDegree, false, 1, 0, f, f1); + walk(Tail_start, 0.5F * globalspeed, 0.1F * globalDegree, false, 1.5F, 0, f, f1); + flap(Tail_start, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid2, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid3, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid4, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_end, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + + flap(EarRight, 0.5F * globalspeed, 0.1F * globalDegree, false, 1.5F, 0, f, f1); + flap(EarLeft, 0.5F * globalspeed, 0.1F * globalDegree, false, 0, 0, f, f1); + walk(EarRight,0.5F * globalspeed, 0.2F * globalDegree, true, 1, 0, f, f1); + walk(EarLeft,0.5F * globalspeed, 0.2F * globalDegree, false, 1, 0, f, f1); + + }else if(this.state == State.SITTING) { + + this.theHead.rotateAngleY =netHeadYaw * 0.017453292F; + this.theHead.rotateAngleX =headPitch * 0.017453292F; + bob(Body, 0.2F * globalspeed, 0.2F * globalheight, true, f, f1); + flap(Tail_start, 0.15F * globalspeed, 0.45F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.15F * globalspeed, 0.45F * globalDegree, false, 1F, 0, f, f1); + flap(Tail_mid2, 0.15F * globalspeed, 0.45F * globalDegree, false, 2F, 0, f, f1); + flap(Tail_mid3, 0.15F * globalspeed, 0.45F * globalDegree, false, 3F, 0, f, f1); + flap(Tail_mid4, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.5F, 0, f, f1); + flap(Tail_end, 0.15F * globalspeed, 0.45F * globalDegree, false, 4F, 0, f, f1); + + flap(EarRight, 0.15F * globalspeed, 0.3F * globalDegree, false, -1.5F, -1F, f, f1); + flap(EarLeft, 0.15F * globalspeed, 0.3F * globalDegree, false, 1.5F, 1F, f, f1); + + }else if(this.state == State.SPRINTING){ + + this.theHead.rotateAngleY =netHeadYaw * 0.007F; + this.theHead.rotateAngleX =headPitch * 0.017453292F - 1.4F; + bob(Body, 0.5F * globalspeed, 5F * globalheight, false, f, f1); + walk(Body, 0.5F * globalspeed, 0.4F * globalDegree, false, 0F, 0.3F, f, f1); + walk(BodyLower, 0.5F * globalspeed, 0.5F * globalDegree, false, 1.5F, -0.75f, f, f1); + walk(LegRight, 0.5F * globalspeed, 1.75F * globalDegree, false, 1.5F, 0, f, f1); + walk(LegLeft, 0.5F * globalspeed, 1.75F * globalDegree, false, 1.5F, 0, f, f1); + walk(LegRightLower, 0.5F * globalspeed, 1F * globalDegree, false, -0.5F, 1.5F, f, f1); + walk(LegLeftLower, 0.5F * globalspeed, 1F * globalDegree, false, -0.5F, 1.5F, f, f1); + walk(Tail_start, 0.5F * globalspeed, 1F * globalDegree, true, 0, -1.5F, f, f1); + walk(ArmRight, 0.5F * globalspeed, 1.75F * globalDegree, false, 3.5F, -0.25f, f, f1); + walk(ArmLeft, 0.5F * globalspeed, 1.75F * globalDegree, false, 3.5F, -0.25f, f, f1); + walk(ArmRightLower, 0.5F * globalspeed, 1F * globalDegree, false, 3.5F, -1.5f, f, f1); + walk(ArmLeftLower, 0.5F * globalspeed, 1F * globalDegree, false, 3.5F, -1.5f, f, f1); + walk(ArmLeftHand, 0.5F * globalspeed, 1.2F * globalDegree, false, 3.5F, 1.25f, f, f1); + walk(ArmRightHand, 0.5F * globalspeed, 1.2F * globalDegree, false, 3.5F, 1.25f, f, f1); + flap(EarRight, 0.5F * globalspeed, 0.8F * globalDegree, false, 0, 0, f, f1); + flap(EarLeft, 0.5F * globalspeed, 0.8F * globalDegree, true, 0, 0, f, f1); + + }else if(this.state == State.STANDING) { + + this.theHead.rotateAngleY =netHeadYaw *0.017453292F; + this.theHead.rotateAngleX =headPitch * 0.017453292F; + + bob(Body, 0.1F * globalspeed, 0.3F * globalheight, false, f, f1); + flap(ArmRight, 0.1F * globalspeed, 0.2F * globalDegree, true, 0, -0.05f, f, f1); + flap(ArmLeft, 0.1F * globalspeed, 0.2F * globalDegree, false, 0, -0.05f, f, f1); + + walk(Tail_mid2, 0.075F * globalspeed, 0.15F * globalDegree, true, 10, 0, f, f1); + flap(Tail_start, 0.15F * globalspeed, 0.45F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.15F * globalspeed, 0.45F * globalDegree, false, 1F, 0, f, f1); + flap(Tail_mid2, 0.15F * globalspeed, 0.45F * globalDegree, false, 2F, 0, f, f1); + flap(Tail_mid3, 0.15F * globalspeed, 0.45F * globalDegree, false, 3F, 0, f, f1); + flap(Tail_mid4, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.5F, 0, f, f1); + flap(Tail_end, 0.15F * globalspeed, 0.45F * globalDegree, false, 4F, 0, f, f1); + flap(EarRight, 0.15F * globalspeed, 0.3F * globalDegree, false, -1.5F, -1F, f, f1); + flap(EarLeft, 0.15F * globalspeed, 0.3F * globalDegree, false, 1.5F, 1F, f, f1); + + }else if(this.state == State.WALKING) { + + this.theHead.rotateAngleY =netHeadYaw *0.017453292F; + this.theHead.rotateAngleX =headPitch * 0.017453292F; + + bob(Body, 0.3F * globalspeed, 0.3F * globalheight, false, f, f1); + + walk(ArmRight,0.3F * globalspeed, 0.45F * globalheight, false, 0, 0.5f, f, f1); + walk(ArmLeft,0.3F * globalspeed, 0.45F * globalheight, true, 0, -0.5f, f, f1); + + walk(ArmRightLower,0.3F * globalspeed, 0.45F * globalheight, false, 0, 0.5f, f, f1); + walk(ArmLeftLower,0.3F * globalspeed, 0.45F * globalheight, true, 0, -0.5f, f, f1); + + walk(LegRight,0.3F * globalspeed, 0.45F * globalheight, false, 0,0, f, f1); + walk(LegLeft,0.3F * globalspeed, 0.45F * globalheight, true, 0,0, f, f1); + + walk(LegRightLower,0.3F * globalspeed, 0.45F * globalheight, false, 0, 0.5F, f, f1); + walk(LegLeftLower,0.3F * globalspeed, 0.45F * globalheight, true, 0, -0.5F, f, f1); + + flap(ArmRight, 0.1F * globalspeed, 0.2F * globalDegree, true, 0, -0.05f, f, f1); + flap(ArmLeft, 0.1F * globalspeed, 0.2F * globalDegree, false, 0, -0.05f, f, f1); + walk(Tail_mid2, 0.075F * globalspeed, 0.15F * globalDegree, true, 10, 0, f, f1); + flap(Tail_start, 0.15F * globalspeed, 0.45F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.15F * globalspeed, 0.45F * globalDegree, false, 1F, 0, f, f1); + flap(Tail_mid2, 0.15F * globalspeed, 0.45F * globalDegree, false, 2F, 0, f, f1); + flap(Tail_mid3, 0.15F * globalspeed, 0.45F * globalDegree, false, 3F, 0, f, f1); + flap(Tail_mid4, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.5F, 0, f, f1); + flap(Tail_end, 0.15F * globalspeed, 0.45F * globalDegree, false, 4F, 0, f, f1); + flap(EarRight, 0.15F * globalspeed, 0.3F * globalDegree, false, -1.5F, -1F, f, f1); + flap(EarLeft, 0.15F * globalspeed, 0.3F * globalDegree, false, 1.5F, 1F, f, f1); + + } else if(this.state == State.ONRIGHTSHOULDER) { + + + flap(Tail_start, 0.15F * globalspeed, 0.45F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.15F * globalspeed, 0.45F * globalDegree, false, 1F, 0, f, f1); + walk(Tail_mid1, 0.15F * globalspeed, 0.15F * globalDegree, true, 1f, 0, f, f1); + flap(Tail_mid2, 0.15F * globalspeed, 0.45F * globalDegree, false, 2F, 0, f, f1); + flap(Tail_mid3, 0.15F * globalspeed, 0.45F * globalDegree, false, 3F, 0, f, f1); + flap(Tail_mid4, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.5F, 0, f, f1); + walk(Tail_mid4, 0.15F * globalspeed, 0.15F * globalDegree, true, 4f, 0, f, f1); + flap(Tail_end, 0.15F * globalspeed, 0.45F * globalDegree, false, 4F, 0, f, f1); + flap(EarRight, 0.15F * globalspeed, 0.3F * globalDegree, false, -1.5F, -1F, f, f1); + flap(EarLeft, 0.15F * globalspeed, 0.3F * globalDegree, false, 1.5F, 1F, f, f1); + + } + else if(this.state == State.ONLEFTSHOULDER) { + + flap(Tail_start, 0.15F * globalspeed, 0.45F * globalDegree, false, 0.1F, 0, f, f1); + flap(Tail_mid1, 0.15F * globalspeed, 0.45F * globalDegree, false, 1.1F, 0, f, f1); + flap(Tail_mid2, 0.15F * globalspeed, 0.45F * globalDegree, false, 2.1F, 0, f, f1); + flap(Tail_mid3, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.1F, 0, f, f1); + flap(Tail_mid4, 0.15F * globalspeed, 0.45F * globalDegree, false, 3.6F, 0, f, f1); + flap(Tail_end, 0.15F * globalspeed, 0.45F * globalDegree, false, 4.1F, 0, f, f1); + flap(EarRight, 0.15F * globalspeed, 0.3F * globalDegree, false, -1.6F, -1F, f, f1); + flap(EarLeft, 0.15F * globalspeed, 0.3F * globalDegree, false, 1.6F, 1F, f, f1); + + } + else if(this.state == State.ELYTRALEFTSHOULDER) { //LEFT + + this.theHead.rotateAngleY =netHeadYaw * 0.007F; + this.theHead.rotateAngleX =headPitch * 0.017453292F - 1.5F; + swing(ArmRight, 0.2F * globalspeed, 0.7F * globalDegree, false, 1.5F, 0, f, f1); + swing(ArmLeft, 0.2F * globalspeed, 0.7F * globalDegree, true, 1.5F, 0, f, f1); + walk(LegLeft,0.1F * globalspeed, 0.2F * globalDegree, true, 1.5F, 0, f, f1); + walk(LegRight,0.1F * globalspeed, 0.2F * globalDegree, false, 1.5F, 0, f, f1); + walk(Tail_start, 0.1F * globalspeed, 0.1F * globalDegree, false, 2F, 0, f, f1); + flap(Tail_start, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + flap(Tail_mid1, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + flap(Tail_mid2, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + flap(Tail_mid3, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + flap(Tail_mid4, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + flap(Tail_end, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.5F, 0, f, f1); + + flap(EarRight, 0.1F * globalspeed, 0.1F * globalDegree, false, 1.7F, 0, f, f1); + flap(EarLeft, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + walk(EarRight,0.1F * globalspeed, 0.2F * globalDegree, true, 1.2F, 0, f, f1); + walk(EarLeft,0.1F * globalspeed, 0.2F * globalDegree, false, 1.2F, 0, f, f1); + } + else if(this.state == State.ELYTRARIGHTSHOULDER) { //RIGHT + + this.theHead.rotateAngleY =netHeadYaw * 0.007F; + this.theHead.rotateAngleX =headPitch * 0.017453292F - 1.5F; + swing(ArmRight, 0.2F * globalspeed, 0.7F * globalDegree, false, 1.2F, 0, f, f1); + swing(ArmLeft, 0.2F * globalspeed, 0.7F * globalDegree, true, 1.2F, 0, f, f1); + walk(LegLeft,0.1F * globalspeed, 0.2F * globalDegree, true, 1.2F, 0, f, f1); + walk(LegRight,0.1F * globalspeed, 0.2F * globalDegree, false, 1.2F, 0, f, f1); + walk(Tail_start, 0.1F * globalspeed, 0.1F * globalDegree, false, 1.7F, 0, f, f1); + flap(Tail_start, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + flap(Tail_mid1, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + flap(Tail_mid2, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + flap(Tail_mid3, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + flap(Tail_mid4, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + flap(Tail_end, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + + flap(EarRight, 0.1F * globalspeed, 0.1F * globalDegree, false, 1.7F, 0, f, f1); + flap(EarLeft, 0.1F * globalspeed, 0.1F * globalDegree, false, 0.2F, 0, f, f1); + walk(EarRight,0.1F * globalspeed, 0.2F * globalDegree, true, 1.2F, 0, f, f1); + walk(EarLeft,0.1F * globalspeed, 0.2F * globalDegree, false, 1.2F, 0, f, f1); + } + else if(this.state == State.PARTY) { //RIGHT + globalspeed = 2f; + bob(Body, 0.35F * globalspeed, -0.75F * globalheight, false, f, f1); + bob(BodyLower, 0.15F * globalspeed, 0.55F * globalheight, false, f, f1); + bob(theHead, 0.35F * globalspeed, -1.0F * globalheight, false, f, f1); + + walk(ArmRight, 0.7F * globalspeed, 1.25F * globalDegree, true, 1, 2.5F, f, f1); + walk(ArmLeft, 0.7F * globalspeed, 1.25F * globalDegree, false, 1, -2.5F, f, f1); + walk(ArmRightLower, 0.7F * globalspeed, 0.7F * globalDegree, true, 0.5F, 0, f, f1); + walk(ArmLeftLower, 0.7F * globalspeed, 0.7F * globalDegree, false, 0.5F, 0, f, f1); + walk(ArmRightHand, 0.7F * globalspeed, 2F * globalDegree, true, 0.1F, 0, f, f1); + walk(ArmLeftHand, 0.7F * globalspeed, 2F * globalDegree, false, -0.1F, 0, f, f1); + swing(theHead, 0.35F * globalspeed, 0.5F * globalDegree, false, 0, 3.0F, f, f1); + swing(Tail_start, 0.35F * globalspeed, 0.5F * globalDegree, false, 0, 0, f, f1); + flap(Tail_start, 0.35F * globalspeed, 0.5F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid1, 0.35F * globalspeed, 1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid2, 0.35F * globalspeed, 1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid3, 0.35F * globalspeed, 1F * globalDegree, false, 0, 0, f, f1); + flap(Tail_mid4, 0.35F * globalspeed, 1.5F * globalDegree, false, 0, 0, f, f1); + flap(Tail_end, 0.35F * globalspeed, 2.5F * globalDegree, false, 0, 0, f, f1); + + flap(EarRight, 0.17F * globalspeed, 0.3F * globalDegree, false, -1.5F, -1F, f, f1); + flap(EarLeft, 0.17F * globalspeed, 0.3F * globalDegree, false, 1.5F, 1F, f, f1); + + } + + + } + + @SideOnly(Side.CLIENT) + static enum State { + FLYING, + SPRINTING, + SITTING, + STANDING, + WALKING, + ONRIGHTSHOULDER, + ONLEFTSHOULDER, + ELYTRARIGHTSHOULDER, + ELYTRALEFTSHOULDER, + PARTY; + } +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelOtterPenguin.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelOtterPenguin.java index 24f5328551..d054cd64a6 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/ModelOtterPenguin.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelOtterPenguin.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.mob.EntityOtterPenguin; +import com.crowsofwar.avatar.common.entity.mob.EntityOtterPenguin; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/ModelSandstorm.java b/src/main/java/com/crowsofwar/avatar/client/render/ModelSandstorm.java index fd4c878b47..2cffd5af92 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/ModelSandstorm.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/ModelSandstorm.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntitySandstorm; +import com.crowsofwar.avatar.common.entity.EntitySandstorm; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBlade.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBlade.java index 76a84a0950..73182dc1d4 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBlade.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBlade.java @@ -1,9 +1,10 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityAirblade; +import com.crowsofwar.avatar.common.entity.EntityAirblade; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBubble.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBubble.java index 2a7bc7b6ec..fd6e884ae9 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBubble.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirBubble.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityAirBubble; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; @@ -30,7 +30,7 @@ import org.joml.Vector4f; import org.lwjgl.opengl.GL11; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; import static net.minecraft.client.renderer.GlStateManager.*; /** diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirGust.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirGust.java index ab5597bdda..74432ec027 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderAirGust.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAirGust.java @@ -1,9 +1,13 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityAirGust; +import com.crowsofwar.avatar.common.entity.EntityAirGust; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.World; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderArc.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderArc.java index cae0f2d541..ec04acf5a1 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderArc.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderArc.java @@ -17,8 +17,8 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.ControlPoint; -import com.crowsofwar.avatar.entity.EntityArc; +import com.crowsofwar.avatar.common.entity.ControlPoint; +import com.crowsofwar.avatar.common.entity.EntityArc; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLemur.java new file mode 100644 index 0000000000..dd452dda78 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLemur.java @@ -0,0 +1,48 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.AvatarInfo; +import com.crowsofwar.avatar.common.entity.mob.EntityAscendedFlyingLemur; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * @author Korog3 + */ +@SideOnly(Side.CLIENT) +public class RenderAscendedLemur extends RenderLiving{ + + + public static final ResourceLocation[] TEXTURES = new ResourceLocation[] { new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur.png"), new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur2.png") }; + + + public RenderAscendedLemur(RenderManager manager) { + super(manager, new ModelLemur(), 0.20F); + + } + + @Override + protected ResourceLocation getEntityTexture(EntityAscendedFlyingLemur entity) { + return TEXTURES[entity.getVariant()]; + } + + @Override + protected void applyRotations(EntityAscendedFlyingLemur entityLiving, float p_77043_2_, float rotationYaw, float partialTicks) { + super.applyRotations(entityLiving, p_77043_2_, rotationYaw, partialTicks); + } + + public static class RenderFactory implements IRenderFactory { + + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderAscendedLemur(manager); + } + + } + + +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLlibraryLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLlibraryLemur.java new file mode 100644 index 0000000000..2ec21cd70a --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAscendedLlibraryLemur.java @@ -0,0 +1,48 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.AvatarInfo; +import com.crowsofwar.avatar.common.entity.mob.EntityAscendedFlyingLemur; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * @author Korog3 + */ +@SideOnly(Side.CLIENT) +public class RenderAscendedLlibraryLemur extends RenderLiving{ + + + public static final ResourceLocation[] TEXTURES = new ResourceLocation[] { new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur.png"), new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur2.png") }; + + + public RenderAscendedLlibraryLemur(RenderManager manager) { + super(manager, new ModelLlibraryLemur(), 0.20F); + + } + + @Override + protected ResourceLocation getEntityTexture(EntityAscendedFlyingLemur entity) { + return TEXTURES[entity.getVariant()]; + } + + @Override + protected void applyRotations(EntityAscendedFlyingLemur entityLiving, float p_77043_2_, float rotationYaw, float partialTicks) { + super.applyRotations(entityLiving, p_77043_2_, rotationYaw, partialTicks); + } + + public static class RenderFactory implements IRenderFactory { + + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderAscendedLlibraryLemur(manager); + } + + } + + +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderAvatarLightning.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderAvatarLightning.java index 3483b74811..a110e30a4d 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderAvatarLightning.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderAvatarLightning.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityAvatarLightning; +import com.crowsofwar.avatar.common.entity.EntityAvatarLightning; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderCloudburst.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderCloudburst.java index 6e3269f322..015437286f 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderCloudburst.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderCloudburst.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; @@ -16,7 +16,7 @@ import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; import static net.minecraft.client.renderer.GlStateManager.*; import static net.minecraft.util.math.MathHelper.cos; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikeSpawner.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikeSpawner.java index 55d29ce69c..88be259ff5 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikeSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikeSpawner.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityEarthspikeSpawner; +import com.crowsofwar.avatar.common.entity.EntityEarthspikeSpawner; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikes.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikes.java index fe308c5bae..44cf8ba2e0 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikes.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderEarthspikes.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityEarthspike; +import com.crowsofwar.avatar.common.entity.EntityEarthspike; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderFireball.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderFireball.java index 7ba7ebe6f8..7b4e12b509 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderFireball.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderFireball.java @@ -16,13 +16,15 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityFireball; +import com.crowsofwar.avatar.common.entity.EntityFireball; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.Vec3d; import org.joml.Matrix4f; import org.joml.Vector4f; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderFlames.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderFlames.java index 026945e047..0929d1137a 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderFlames.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderFlames.java @@ -17,13 +17,17 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.entity.EntityFlames; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.entity.EntityFlames; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.World; import java.util.Random; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderFlamethrower.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderFlamethrower.java index 667a50595e..f7bfdf9b9d 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderFlamethrower.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderFlamethrower.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityFlame; +import com.crowsofwar.avatar.common.entity.EntityFlame; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderFloatingBlock.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderFloatingBlock.java index 50c89c707d..77c8e27e7a 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderFloatingBlock.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderFloatingBlock.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityFloatingBlock; +import com.crowsofwar.avatar.common.entity.EntityFloatingBlock; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderHumanBender.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderHumanBender.java index a0da1abaab..7191d5dcf2 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderHumanBender.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderHumanBender.java @@ -16,12 +16,19 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.mob.EntityHumanBender; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.mob.EntityHumanBender; +import com.crowsofwar.avatar.common.util.Raytrace; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; +import static com.crowsofwar.avatar.common.data.TickHandlerController.FLAMETHROWER; + /** * @author CrowsOfWar */ diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShard.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShard.java index 73196af854..91a2a120f7 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShard.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShard.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityIceShard; +import com.crowsofwar.avatar.common.entity.EntityIceShard; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShield.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShield.java index 53c517c0c5..0cd02968d3 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShield.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderIceShield.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityIceShield; +import com.crowsofwar.avatar.common.entity.EntityIceShield; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLemur.java new file mode 100644 index 0000000000..e8444c3f1d --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLemur.java @@ -0,0 +1,50 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.AvatarInfo; +import com.crowsofwar.avatar.common.entity.mob.EntityFlyingLemur; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * @author Korog3 + */ + +@SideOnly(Side.CLIENT) +public class RenderLemur extends RenderLiving{ + + + + + public static final ResourceLocation[] TEXTURES = new ResourceLocation[] { new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur.png"), new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur2.png") }; + + public RenderLemur(RenderManager manager) { + super(manager, new ModelLemur(), 0.2F); + } + + @Override + protected ResourceLocation getEntityTexture(EntityFlyingLemur entity) { + return TEXTURES[entity.getVariant()]; + } + + @Override + protected void applyRotations(EntityFlyingLemur entityLiving, float p_77043_2_, float rotationYaw, float partialTicks) { + super.applyRotations(entityLiving, p_77043_2_, rotationYaw, partialTicks); + } + + + + public static class RenderFactory implements IRenderFactory { + + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderLemur(manager); + } + + } + +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightCylinder.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightCylinder.java index e04c4f2efa..80ec1ef58d 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightCylinder.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightCylinder.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityLightCylinder; +import com.crowsofwar.avatar.common.entity.EntityLightCylinder; import com.crowsofwar.gorecore.util.Vector; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightOrb.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightOrb.java index d5ad440371..1de5b6cc46 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightOrb.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightOrb.java @@ -5,8 +5,13 @@ import codechicken.lib.render.CCRenderState; import codechicken.lib.render.OBJParser; import codechicken.lib.texture.TextureUtils; -import com.crowsofwar.avatar.bending.bending.fire.AbilityFlameStrike; -import com.crowsofwar.avatar.entity.EntityLightOrb; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.fire.AbilityFireball; +import com.crowsofwar.avatar.common.bending.fire.AbilityFlameStrike; +import com.crowsofwar.avatar.common.bending.fire.AbilityFlamethrower; +import com.crowsofwar.avatar.common.entity.EntityFireball; +import com.crowsofwar.avatar.common.entity.EntityLightOrb; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; @@ -15,6 +20,8 @@ import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.world.World; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningArc.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningArc.java index 6e4f6846a1..79d9d527e4 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningArc.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningArc.java @@ -17,9 +17,9 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityLightningArc; -import com.crowsofwar.avatar.client.particle.ClientParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.entity.EntityLightningArc; +import com.crowsofwar.avatar.common.particle.ClientParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpawner.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpawner.java index c69e661251..52d7eadea1 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpawner.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityLightningSpawner; +import com.crowsofwar.avatar.common.entity.EntityLightningSpawner; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpear.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpear.java index b6ec953fa2..5bbc4aed0e 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpear.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLightningSpear.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityLightningSpear; +import com.crowsofwar.avatar.common.entity.EntityLightningSpear; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderLlibraryLemur.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderLlibraryLemur.java new file mode 100644 index 0000000000..d5d84d0469 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderLlibraryLemur.java @@ -0,0 +1,47 @@ +package com.crowsofwar.avatar.client.render; + +import com.crowsofwar.avatar.AvatarInfo; +import com.crowsofwar.avatar.common.entity.mob.EntityFlyingLemur; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderLiving; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.client.registry.IRenderFactory; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +/** + * @author Korog3 + */ + +@SideOnly(Side.CLIENT) +public class RenderLlibraryLemur extends RenderLiving{ + + public static final ResourceLocation[] TEXTURES = new ResourceLocation[] { new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur.png"), new ResourceLocation(AvatarInfo.MOD_ID+":textures/mob/lemur2.png") }; + + public RenderLlibraryLemur(RenderManager manager) { + super(manager, new ModelLlibraryLemur(), 0.2F); + } + + @Override + protected ResourceLocation getEntityTexture(EntityFlyingLemur entity) { + return TEXTURES[entity.getVariant()]; + } + + @Override + protected void applyRotations(EntityFlyingLemur entityLiving, float p_77043_2_, float rotationYaw, float partialTicks) { + super.applyRotations(entityLiving, p_77043_2_, rotationYaw, partialTicks); + } + + + + public static class RenderFactory implements IRenderFactory { + + @Override + public Render createRenderFor(RenderManager manager) { + return new RenderLlibraryLemur(manager); + } + + } + +} diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderOstrichHorse.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderOstrichHorse.java index cca36e9ae6..c53ad1fe7e 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderOstrichHorse.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderOstrichHorse.java @@ -20,8 +20,8 @@ import com.crowsofwar.avatar.client.render.ostrich.ModelOstrichHorsePlate; import com.crowsofwar.avatar.client.render.ostrich.ModelOstrichHorseWild; import com.crowsofwar.avatar.client.render.ostrich.ModelOstrichHorseWoven; -import com.crowsofwar.avatar.entity.mob.EntityOstrichHorse; -import com.crowsofwar.avatar.item.ItemOstrichEquipment; +import com.crowsofwar.avatar.common.entity.mob.EntityOstrichHorse; +import com.crowsofwar.avatar.common.item.ItemOstrichEquipment; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderOtterPenguin.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderOtterPenguin.java index bfba2b0ae2..f162d154c6 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderOtterPenguin.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderOtterPenguin.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.mob.EntityOtterPenguin; +import com.crowsofwar.avatar.common.entity.mob.EntityOtterPenguin; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderRavine.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderRavine.java index 6bbce023d2..8d95941455 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderRavine.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderRavine.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityRavine; +import com.crowsofwar.avatar.common.entity.EntityRavine; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderSandPrison.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderSandPrison.java index f12ac88ba1..0e7e669d35 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderSandPrison.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderSandPrison.java @@ -16,7 +16,7 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntitySandPrison; +import com.crowsofwar.avatar.common.entity.EntitySandPrison; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderSandstorm.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderSandstorm.java index 4fbe02a4c4..1d742e8f7b 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderSandstorm.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderSandstorm.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntitySandstorm; +import com.crowsofwar.avatar.common.entity.EntitySandstorm; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderShockwave.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderShockwave.java index 0543bda4b9..30284c8e15 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderShockwave.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderShockwave.java @@ -1,8 +1,10 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityShockwave; +import com.crowsofwar.avatar.common.entity.EntityShockwave; +import com.crowsofwar.gorecore.util.Vector; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ResourceLocation; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderSkyBison.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderSkyBison.java index 7c1074fe96..5f67cfd2c5 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderSkyBison.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderSkyBison.java @@ -16,7 +16,8 @@ */ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderSlipstreamInvisibility.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderSlipstreamInvisibility.java index 3772cbcae9..ed0e98b549 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderSlipstreamInvisibility.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderSlipstreamInvisibility.java @@ -1,9 +1,10 @@ package com.crowsofwar.avatar.client.render; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.air.powermods.SlipstreamPowerModifier; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.client.renderer.LayerGlider; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.air.powermods.SlipstreamPowerModifier; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderTempBlock.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderTempBlock.java index 636425210a..5b84ebd4eb 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderTempBlock.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderTempBlock.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.blocks.tiles.TileBlockTemp; +import com.crowsofwar.avatar.common.blocks.tiles.TileBlockTemp; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderWallSegment.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderWallSegment.java index 4d99fb9e85..a12febfa5f 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderWallSegment.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderWallSegment.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BlockRendererDispatcher; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterArc.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterArc.java index 0e1dc8f56f..94d0e7f500 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterArc.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterArc.java @@ -17,9 +17,9 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.ControlPoint; -import com.crowsofwar.avatar.entity.EntityArc; -import com.crowsofwar.avatar.entity.EntityWaterArc; +import com.crowsofwar.avatar.common.entity.ControlPoint; +import com.crowsofwar.avatar.common.entity.EntityArc; +import com.crowsofwar.avatar.common.entity.EntityWaterArc; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterBubble.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterBubble.java index 87f904cdd6..8ead2dbca4 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterBubble.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterBubble.java @@ -17,7 +17,7 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.EntityWaterBubble; +import com.crowsofwar.avatar.common.entity.EntityWaterBubble; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterCannon.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterCannon.java index 015237db23..818176ea8e 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterCannon.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderWaterCannon.java @@ -1,8 +1,10 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.entity.ControlPoint; -import com.crowsofwar.avatar.entity.EntityArc; -import com.crowsofwar.avatar.entity.EntityWaterCannon; +import com.crowsofwar.avatar.common.entity.ControlPoint; +import com.crowsofwar.avatar.common.entity.EntityArc; +import com.crowsofwar.avatar.common.entity.EntityWaterCannon; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; @@ -10,6 +12,10 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import static com.crowsofwar.gorecore.util.Vector.getEyePos; +import static java.lang.Math.cos; +import static java.lang.Math.sin; + public class RenderWaterCannon extends RenderArc { private static final ResourceLocation TEXTURE = new ResourceLocation("minecraft", "textures/blocks/water_overlay.png"); diff --git a/src/main/java/com/crowsofwar/avatar/client/render/RenderWave.java b/src/main/java/com/crowsofwar/avatar/client/render/RenderWave.java index 5694d8a2f1..2936d89537 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/RenderWave.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/RenderWave.java @@ -17,9 +17,9 @@ package com.crowsofwar.avatar.client.render; -import com.crowsofwar.avatar.bending.bending.water.AbilityCreateWave; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.entity.EntityWave; +import com.crowsofwar.avatar.common.bending.water.AbilityCreateWave; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.entity.EntityWave; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/client/render/iceprison/RenderIcePrison.java b/src/main/java/com/crowsofwar/avatar/client/render/iceprison/RenderIcePrison.java index 502e281557..bc90d216ee 100644 --- a/src/main/java/com/crowsofwar/avatar/client/render/iceprison/RenderIcePrison.java +++ b/src/main/java/com/crowsofwar/avatar/client/render/iceprison/RenderIcePrison.java @@ -1,6 +1,6 @@ package com.crowsofwar.avatar.client.render.iceprison; -import com.crowsofwar.avatar.entity.EntityIcePrison; +import com.crowsofwar.avatar.common.entity.EntityIcePrison; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; diff --git a/src/main/java/com/crowsofwar/avatar/client/renderer/LayerGlider.java b/src/main/java/com/crowsofwar/avatar/client/renderer/LayerGlider.java index 925aa02597..2cf038fe44 100644 --- a/src/main/java/com/crowsofwar/avatar/client/renderer/LayerGlider.java +++ b/src/main/java/com/crowsofwar/avatar/client/renderer/LayerGlider.java @@ -1,9 +1,10 @@ package com.crowsofwar.avatar.client.renderer; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.util.helper.GliderHelper; -import com.crowsofwar.avatar.item.IGlider; +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.api.item.IGlider; import com.crowsofwar.avatar.client.model.ModelGlider; +import com.crowsofwar.avatar.common.config.ConfigGlider; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.GlStateManager; @@ -15,7 +16,7 @@ import javax.annotation.Nonnull; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; public class LayerGlider implements LayerRenderer { diff --git a/src/main/java/com/crowsofwar/avatar/client/sounds/SoundsHandler.java b/src/main/java/com/crowsofwar/avatar/client/sounds/SoundsHandler.java new file mode 100644 index 0000000000..513be55196 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/client/sounds/SoundsHandler.java @@ -0,0 +1,30 @@ +package com.crowsofwar.avatar.client.sounds; + + +import com.crowsofwar.avatar.AvatarInfo; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.SoundEvent; +import net.minecraftforge.fml.common.registry.ForgeRegistries; + +public class SoundsHandler +{ + public static SoundEvent ENTITY_FLYINGLEMUR_AMBIENT,ENTITY_FLYINGLEMUR_HURT,ENTITY_FLYINGLEMUR_DEATH; + + public static void registerSounds() + { + + ENTITY_FLYINGLEMUR_AMBIENT = registerSound("entity.momo.ambient"); + ENTITY_FLYINGLEMUR_HURT = registerSound("entity.momo.hurt"); + ENTITY_FLYINGLEMUR_DEATH = registerSound("entity.momo.death"); + + } + + private static SoundEvent registerSound(String name) + { + ResourceLocation location = new ResourceLocation(AvatarInfo.MOD_ID, name); + SoundEvent event = new SoundEvent(location); + event.setRegistryName(name); + ForgeRegistries.SOUND_EVENTS.register(event); + return event; + } +} diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarAnnouncements.java b/src/main/java/com/crowsofwar/avatar/common/AvatarAnnouncements.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/network/AvatarAnnouncements.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarAnnouncements.java index d047095db4..cee8c9729c 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarAnnouncements.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarAnnouncements.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; import com.crowsofwar.avatar.AvatarLog; diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarChatMessages.java b/src/main/java/com/crowsofwar/avatar/common/AvatarChatMessages.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/network/AvatarChatMessages.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarChatMessages.java index 9e818803a6..96b7ce5c63 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarChatMessages.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarChatMessages.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common; import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.format.MessageConfiguration; diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarCommonProxy.java b/src/main/java/com/crowsofwar/avatar/common/AvatarCommonProxy.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/network/AvatarCommonProxy.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarCommonProxy.java index a1b0e183bc..9da10377af 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarCommonProxy.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarCommonProxy.java @@ -15,15 +15,16 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.particles.newparticles.ParticleAvatar; -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.client.gui.AvatarGui; -import com.crowsofwar.avatar.capabilities.IAdvancedGliderCapabilityHandler; +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.gui.AvatarGui; +import com.crowsofwar.avatar.common.network.IPacketHandler; +import com.crowsofwar.avatar.api.capabilities.IAdvancedGliderCapabilityHandler; import com.crowsofwar.gorecore.data.PlayerDataFetcher; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -95,7 +96,7 @@ default void registerParticles() { /** * Creates a new particle of the specified type from the appropriate particle factory. Does not actually spawn the - * particle; use {@link com.crowsofwar.avatar.client.particle.ParticleBuilder ParticleBuilder} to spawn particles. + * particle; use {@link com.crowsofwar.avatar.common.particle.ParticleBuilder ParticleBuilder} to spawn particles. */ default ParticleAvatar createParticle(ResourceLocation type, World world, double x, double y, double z) { return null; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarEntityDeath.java b/src/main/java/com/crowsofwar/avatar/common/AvatarEntityDeath.java similarity index 77% rename from src/main/java/com/crowsofwar/avatar/util/AvatarEntityDeath.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarEntityDeath.java index 53d4f30e68..df6fd190a0 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarEntityDeath.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarEntityDeath.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/crowsofwar/avatar/client/particle/AvatarParticles.java b/src/main/java/com/crowsofwar/avatar/common/AvatarParticles.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/client/particle/AvatarParticles.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarParticles.java index 8bcd6e7924..738393dd5f 100644 --- a/src/main/java/com/crowsofwar/avatar/client/particle/AvatarParticles.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarParticles.java @@ -15,15 +15,16 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.particle; +package com.crowsofwar.avatar.common; +import com.google.common.collect.Maps; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.common.util.EnumHelper; import java.util.HashMap; import java.util.Map; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; /** * Manages registration of custom particles diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarPlayerDeath.java b/src/main/java/com/crowsofwar/avatar/common/AvatarPlayerDeath.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/util/AvatarPlayerDeath.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarPlayerDeath.java index dcca298106..cde29c02be 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarPlayerDeath.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarPlayerDeath.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarPlayerTick.java b/src/main/java/com/crowsofwar/avatar/common/AvatarPlayerTick.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/util/AvatarPlayerTick.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarPlayerTick.java index 1d9dc442e7..98f5efcbb9 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarPlayerTick.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarPlayerTick.java @@ -15,18 +15,19 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.event.AbilityUnlockEvent; -import com.crowsofwar.avatar.util.event.AbilityUseEvent; -import com.crowsofwar.avatar.util.event.ElementUnlockEvent; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.event.AbilityUnlockEvent; +import com.crowsofwar.avatar.common.event.AbilityUseEvent; +import com.crowsofwar.avatar.common.event.ElementUnlockEvent; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.MinecraftForge; @@ -41,7 +42,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class AvatarPlayerTick { diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarScrollDrops.java b/src/main/java/com/crowsofwar/avatar/common/AvatarScrollDrops.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/AvatarScrollDrops.java rename to src/main/java/com/crowsofwar/avatar/common/AvatarScrollDrops.java index 107b865b5a..9076dd011c 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarScrollDrops.java +++ b/src/main/java/com/crowsofwar/avatar/common/AvatarScrollDrops.java @@ -14,11 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; @@ -29,7 +30,7 @@ import java.util.List; import java.util.Objects; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class AvatarScrollDrops { diff --git a/src/main/java/com/crowsofwar/avatar/util/BisonInventoryPreventDismount.java b/src/main/java/com/crowsofwar/avatar/common/BisonInventoryPreventDismount.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/BisonInventoryPreventDismount.java rename to src/main/java/com/crowsofwar/avatar/common/BisonInventoryPreventDismount.java index 08b64c8034..d9b4705787 100644 --- a/src/main/java/com/crowsofwar/avatar/util/BisonInventoryPreventDismount.java +++ b/src/main/java/com/crowsofwar/avatar/common/BisonInventoryPreventDismount.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; -import com.crowsofwar.avatar.client.gui.ContainerBisonChest; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.gui.ContainerBisonChest; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.EntityMountEvent; diff --git a/src/main/java/com/crowsofwar/avatar/util/BisonLeftClickHandler.java b/src/main/java/com/crowsofwar/avatar/common/BisonLeftClickHandler.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/BisonLeftClickHandler.java rename to src/main/java/com/crowsofwar/avatar/common/BisonLeftClickHandler.java index 993b562ae9..adcafd1dbd 100644 --- a/src/main/java/com/crowsofwar/avatar/util/BisonLeftClickHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/BisonLeftClickHandler.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; diff --git a/src/main/java/com/crowsofwar/avatar/util/DamagePerformancePenalty.java b/src/main/java/com/crowsofwar/avatar/common/DamagePerformancePenalty.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/util/DamagePerformancePenalty.java rename to src/main/java/com/crowsofwar/avatar/common/DamagePerformancePenalty.java index 96fd22e941..2eaf660032 100644 --- a/src/main/java/com/crowsofwar/avatar/util/DamagePerformancePenalty.java +++ b/src/main/java/com/crowsofwar/avatar/common/DamagePerformancePenalty.java @@ -1,8 +1,7 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.living.LivingHurtEvent; @@ -12,7 +11,7 @@ /** * Applies a performance penalty when players take damage. * - * @see BattlePerformanceScore + * @see com.crowsofwar.avatar.common.bending.BattlePerformanceScore */ @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class DamagePerformancePenalty { diff --git a/src/main/java/com/crowsofwar/avatar/util/FallAbsorptionHandler.java b/src/main/java/com/crowsofwar/avatar/common/FallAbsorptionHandler.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/util/FallAbsorptionHandler.java rename to src/main/java/com/crowsofwar/avatar/common/FallAbsorptionHandler.java index 3a7d7a373e..13c90b69e5 100644 --- a/src/main/java/com/crowsofwar/avatar/util/FallAbsorptionHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/FallAbsorptionHandler.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.MiscData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.MiscData; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/com/crowsofwar/avatar/util/GliderInfo.java b/src/main/java/com/crowsofwar/avatar/common/GliderInfo.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/GliderInfo.java rename to src/main/java/com/crowsofwar/avatar/common/GliderInfo.java index 22ee00e8d7..7503f5899b 100644 --- a/src/main/java/com/crowsofwar/avatar/util/GliderInfo.java +++ b/src/main/java/com/crowsofwar/avatar/common/GliderInfo.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; public class GliderInfo { public static final String NETWORK_CHANNEL = "avatarmod"; diff --git a/src/main/java/com/crowsofwar/avatar/util/HumanBenderSpawner.java b/src/main/java/com/crowsofwar/avatar/common/HumanBenderSpawner.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/util/HumanBenderSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/HumanBenderSpawner.java index ecea9daed4..fc79838aee 100644 --- a/src/main/java/com/crowsofwar/avatar/util/HumanBenderSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/HumanBenderSpawner.java @@ -14,12 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.mob.EntityAirbender; -import com.crowsofwar.avatar.entity.mob.EntityFirebender; -import com.crowsofwar.avatar.entity.mob.EntityHumanBender; +import com.crowsofwar.avatar.common.entity.mob.EntityAirbender; +import com.crowsofwar.avatar.common.entity.mob.EntityFirebender; +import com.crowsofwar.avatar.common.entity.mob.EntityHumanBender; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.util.math.AxisAlignedBB; @@ -36,7 +37,7 @@ import java.util.Map; import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/util/IceActionCanceller.java b/src/main/java/com/crowsofwar/avatar/common/IceActionCanceller.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/util/IceActionCanceller.java rename to src/main/java/com/crowsofwar/avatar/common/IceActionCanceller.java index e58a09cbd7..862a1b1e61 100644 --- a/src/main/java/com/crowsofwar/avatar/util/IceActionCanceller.java +++ b/src/main/java/com/crowsofwar/avatar/common/IceActionCanceller.java @@ -14,12 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.EntityIcePrison; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.EntityIcePrison; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; @@ -29,7 +30,7 @@ import java.util.Objects; -import static com.crowsofwar.avatar.util.data.StatusControlController.SHIELD_SHATTER; +import static com.crowsofwar.avatar.common.data.StatusControlController.SHIELD_SHATTER; /** * Cancels any actions done when a player is in an ice prison or ice shield diff --git a/src/main/java/com/crowsofwar/avatar/util/PlayerScrollShareHandler.java b/src/main/java/com/crowsofwar/avatar/common/PlayerScrollShareHandler.java similarity index 76% rename from src/main/java/com/crowsofwar/avatar/util/PlayerScrollShareHandler.java rename to src/main/java/com/crowsofwar/avatar/common/PlayerScrollShareHandler.java index 9ee9fc3f63..3231c68657 100644 --- a/src/main/java/com/crowsofwar/avatar/util/PlayerScrollShareHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/PlayerScrollShareHandler.java @@ -1,11 +1,12 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.analytics.AnalyticEvent; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.item.scroll.ItemScroll; -import com.crowsofwar.avatar.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.analytics.AnalyticEvent; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/util/QueuedAbilityExecutionHandler.java b/src/main/java/com/crowsofwar/avatar/common/QueuedAbilityExecutionHandler.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/QueuedAbilityExecutionHandler.java rename to src/main/java/com/crowsofwar/avatar/common/QueuedAbilityExecutionHandler.java index 5990006a67..45acdbeb21 100644 --- a/src/main/java/com/crowsofwar/avatar/util/QueuedAbilityExecutionHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/QueuedAbilityExecutionHandler.java @@ -1,9 +1,10 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.util.Raytrace; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/crowsofwar/avatar/util/ShieldAbsorptionHandler.java b/src/main/java/com/crowsofwar/avatar/common/ShieldAbsorptionHandler.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/util/ShieldAbsorptionHandler.java rename to src/main/java/com/crowsofwar/avatar/common/ShieldAbsorptionHandler.java index 3d34d97186..af5642fe1d 100644 --- a/src/main/java/com/crowsofwar/avatar/util/ShieldAbsorptionHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/ShieldAbsorptionHandler.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityShield; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityShield; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundCategory; diff --git a/src/main/java/com/crowsofwar/avatar/util/SleepChiRegenHandler.java b/src/main/java/com/crowsofwar/avatar/common/SleepChiRegenHandler.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/util/SleepChiRegenHandler.java rename to src/main/java/com/crowsofwar/avatar/common/SleepChiRegenHandler.java index 914118acc8..46a9c61152 100644 --- a/src/main/java/com/crowsofwar/avatar/util/SleepChiRegenHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/SleepChiRegenHandler.java @@ -14,21 +14,21 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.Chi; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Chi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.PlayerWakeUpEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigChi.CHI_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigChi.CHI_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class SleepChiRegenHandler { diff --git a/src/main/java/com/crowsofwar/avatar/util/TemporaryWaterHandler.java b/src/main/java/com/crowsofwar/avatar/common/TemporaryWaterHandler.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/util/TemporaryWaterHandler.java rename to src/main/java/com/crowsofwar/avatar/common/TemporaryWaterHandler.java index 7db29f0a17..4c2c5a634e 100644 --- a/src/main/java/com/crowsofwar/avatar/util/TemporaryWaterHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/TemporaryWaterHandler.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.AvatarWorldData; -import com.crowsofwar.avatar.util.data.TemporaryWaterLocation; +import com.crowsofwar.avatar.common.data.AvatarWorldData; +import com.crowsofwar.avatar.common.data.TemporaryWaterLocation; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/crowsofwar/avatar/util/TransferConfirmHandler.java b/src/main/java/com/crowsofwar/avatar/common/TransferConfirmHandler.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/util/TransferConfirmHandler.java rename to src/main/java/com/crowsofwar/avatar/common/TransferConfirmHandler.java index 0affc5723e..5d1a474ee9 100644 --- a/src/main/java/com/crowsofwar/avatar/util/TransferConfirmHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/TransferConfirmHandler.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; /** * Manages information and handling of current bison transfers diff --git a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvent.java b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvent.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvent.java rename to src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvent.java index 141a9c764c..8da364880f 100644 --- a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvent.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.analytics; +package com.crowsofwar.avatar.common.analytics; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvents.java b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvents.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvents.java rename to src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvents.java index 7990717466..9509bdf931 100644 --- a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticEvents.java +++ b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticEvents.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.analytics; +package com.crowsofwar.avatar.common.analytics; import net.minecraft.util.DamageSource; diff --git a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsManager.java b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsManager.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsManager.java rename to src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsManager.java index 527f5cfe5e..9224d93cec 100644 --- a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsManager.java +++ b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsManager.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.analytics; +package com.crowsofwar.avatar.common.analytics; import com.crowsofwar.avatar.AvatarInfo; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsUtils.java b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsUtils.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsUtils.java rename to src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsUtils.java index b688b38e38..636467d52f 100644 --- a/src/main/java/com/crowsofwar/avatar/util/analytics/AnalyticsUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/analytics/AnalyticsUtils.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.analytics; +package com.crowsofwar.avatar.common.analytics; -import com.crowsofwar.avatar.config.ConfigAnalytics; +import com.crowsofwar.avatar.common.config.ConfigAnalytics; import java.io.OutputStream; import java.net.HttpURLConnection; diff --git a/src/main/java/com/crowsofwar/avatar/util/analytics/AvatarAnalytics.java b/src/main/java/com/crowsofwar/avatar/common/analytics/AvatarAnalytics.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/analytics/AvatarAnalytics.java rename to src/main/java/com/crowsofwar/avatar/common/analytics/AvatarAnalytics.java index ae56421562..9135c69a76 100644 --- a/src/main/java/com/crowsofwar/avatar/util/analytics/AvatarAnalytics.java +++ b/src/main/java/com/crowsofwar/avatar/common/analytics/AvatarAnalytics.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.util.analytics; +package com.crowsofwar.avatar.common.analytics; import com.crowsofwar.avatar.AvatarInfo; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.network.AvatarServerProxy; +import com.crowsofwar.avatar.server.AvatarServerProxy; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/Abilities.java b/src/main/java/com/crowsofwar/avatar/common/bending/Abilities.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/bending/bending/Abilities.java rename to src/main/java/com/crowsofwar/avatar/common/bending/Abilities.java index a44780df49..1abd83d339 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/Abilities.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/Abilities.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -import com.crowsofwar.avatar.util.data.Bender; +import com.crowsofwar.avatar.common.data.Bender; import net.minecraft.entity.EntityLiving; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/Ability.java b/src/main/java/com/crowsofwar/avatar/common/bending/Ability.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/Ability.java rename to src/main/java/com/crowsofwar/avatar/common/bending/Ability.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BattlePerformanceScore.java b/src/main/java/com/crowsofwar/avatar/common/bending/BattlePerformanceScore.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BattlePerformanceScore.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BattlePerformanceScore.java index 60857597f1..cf9d2801ac 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BattlePerformanceScore.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BattlePerformanceScore.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.DataCategory; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.DataCategory; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingAi.java b/src/main/java/com/crowsofwar/avatar/common/bending/BendingAi.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BendingAi.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BendingAi.java index 81ac993d6f..59c282db44 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingAi.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BendingAi.java @@ -14,18 +14,18 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -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.Raytrace; +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.util.Raytrace; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import static com.crowsofwar.avatar.bending.bending.BendingAi.AbilityType.PROJECTILE; +import static com.crowsofwar.avatar.common.bending.BendingAi.AbilityType.PROJECTILE; /** * Represents behavior needed for use of an ability by a mob. When most diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingAiMelee.java b/src/main/java/com/crowsofwar/avatar/common/bending/BendingAiMelee.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BendingAiMelee.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BendingAiMelee.java index 8bd284998a..b6ba7367f1 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingAiMelee.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BendingAiMelee.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -import com.crowsofwar.avatar.util.data.Bender; +import com.crowsofwar.avatar.common.data.Bender; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyle.java b/src/main/java/com/crowsofwar/avatar/common/bending/BendingStyle.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyle.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BendingStyle.java index 333691ffab..bde488a9dd 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyle.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BendingStyle.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; import com.crowsofwar.gorecore.util.GoreCoreNBTInterfaces.CreateFromNBT; import com.crowsofwar.gorecore.util.GoreCoreNBTInterfaces.ReadableWritable; import com.crowsofwar.gorecore.util.GoreCoreNBTInterfaces.WriteToNBT; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyles.java b/src/main/java/com/crowsofwar/avatar/common/bending/BendingStyles.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyles.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BendingStyles.java index 571c202a30..f9d7bc46f1 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BendingStyles.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BendingStyles.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; import javax.annotation.Nullable; import java.util.*; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/BuffPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/BuffPowerModifier.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/bending/bending/BuffPowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/BuffPowerModifier.java index d26b8ce5cb..efed809f2b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/BuffPowerModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/BuffPowerModifier.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -import com.crowsofwar.avatar.config.ConfigClient; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.Vision; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.config.ConfigClient; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.Vision; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; /** * "Buff abilities", abilities which apply temporary bending and other boosts, diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/DefaultAbilityAi.java b/src/main/java/com/crowsofwar/avatar/common/bending/DefaultAbilityAi.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/bending/bending/DefaultAbilityAi.java rename to src/main/java/com/crowsofwar/avatar/common/bending/DefaultAbilityAi.java index ed2fb3dc2c..f849c2b887 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/DefaultAbilityAi.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/DefaultAbilityAi.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; -import com.crowsofwar.avatar.util.data.Bender; +import com.crowsofwar.avatar.common.data.Bender; import net.minecraft.entity.EntityLiving; /** diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/WallJumpEvents.java b/src/main/java/com/crowsofwar/avatar/common/bending/WallJumpEvents.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/WallJumpEvents.java rename to src/main/java/com/crowsofwar/avatar/common/bending/WallJumpEvents.java index 8e48858593..24619a896e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/WallJumpEvents.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/WallJumpEvents.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending; +package com.crowsofwar.avatar.common.bending; import com.crowsofwar.avatar.AvatarInfo; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.MiscData; -import com.crowsofwar.avatar.network.packets.PacketSWallJump; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.MiscData; +import com.crowsofwar.avatar.common.network.packets.PacketSWallJump; import com.crowsofwar.gorecore.GoreCore; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBubble.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBubble.java index c5abc8e726..58ce183c8f 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBubble.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityAirBubble; +package com.crowsofwar.avatar.common.bending.air; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Items; @@ -29,11 +29,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath.FIRST; -import static com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath.SECOND; -import static com.crowsofwar.avatar.util.data.StatusControlController.BUBBLE_CONTRACT; -import static com.crowsofwar.avatar.util.data.StatusControlController.BUBBLE_EXPAND; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath.FIRST; +import static com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath.SECOND; +import static com.crowsofwar.avatar.common.data.StatusControlController.BUBBLE_CONTRACT; +import static com.crowsofwar.avatar.common.data.StatusControlController.BUBBLE_EXPAND; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBurst.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBurst.java similarity index 72% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBurst.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBurst.java index 76ac0e7cf8..1b85be98ce 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirBurst.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirBurst.java @@ -1,18 +1,18 @@ -package com.crowsofwar.avatar.bending.bending.air; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +package com.crowsofwar.avatar.common.bending.air; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.CHARGE_AIR_BURST; -import static com.crowsofwar.avatar.util.data.StatusControlController.RELEASE_AIR_BURST; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.CHARGE_AIR_BURST; +import static com.crowsofwar.avatar.common.data.StatusControlController.RELEASE_AIR_BURST; public class AbilityAirBurst extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirGust.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirGust.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirGust.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirGust.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirJump.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirJump.java similarity index 74% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirJump.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirJump.java index ea04a708b9..929961434a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirJump.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirJump.java @@ -15,15 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.util.Raytrace; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; import net.minecraft.util.math.AxisAlignedBB; @@ -31,10 +31,10 @@ import java.util.List; -import static com.crowsofwar.avatar.bending.bending.air.statctrls.StatCtrlAirJump.timesJumped; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.AIR_JUMP; -import static com.crowsofwar.avatar.util.data.TickHandlerController.AIR_PARTICLE_SPAWNER; +import static com.crowsofwar.avatar.common.bending.air.statctrls.StatCtrlAirJump.timesJumped; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.AIR_JUMP; +import static com.crowsofwar.avatar.common.data.TickHandlerController.AIR_PARTICLE_SPAWNER; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirblade.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirblade.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityAirblade.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityAirblade.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityCloudBurst.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityCloudBurst.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityCloudBurst.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityCloudBurst.java index 52c7cc596f..e8774bfdf0 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilityCloudBurst.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilityCloudBurst.java @@ -1,21 +1,21 @@ -package com.crowsofwar.avatar.bending.bending.air; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityCloudBall; -import com.crowsofwar.avatar.entity.data.CloudburstBehavior; +package com.crowsofwar.avatar.common.bending.air; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.entity.data.CloudburstBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_CLOUDBURST; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_CLOUDBURST; import static com.crowsofwar.gorecore.util.Vector.getEyePos; import static com.crowsofwar.gorecore.util.Vector.getLookRectangular; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilitySlipstream.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AbilitySlipstream.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AbilitySlipstream.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AbilitySlipstream.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBubble.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBubble.java index 19a81cda73..0879cc4b61 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBubble.java @@ -14,18 +14,18 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityAirBubble; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; import net.minecraft.entity.EntityLiving; import java.util.Random; -import static com.crowsofwar.avatar.util.data.StatusControlController.BUBBLE_EXPAND; +import static com.crowsofwar.avatar.common.data.StatusControlController.BUBBLE_EXPAND; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBurst.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBurst.java similarity index 70% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBurst.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBurst.java index 0985aa686f..e55ef9e5cd 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirBurst.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirBurst.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandlerController; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandlerController; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirGust.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirGust.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirGust.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirGust.java index 808fdbea3e..1928cc80cc 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirGust.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirGust.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirblade.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirblade.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirblade.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirblade.java index 16e0883f2e..50981848f4 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiAirblade.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiAirblade.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiCloudBall.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiCloudBall.java similarity index 77% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/AiCloudBall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/AiCloudBall.java index ee95e3c078..1fef20bafa 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/AiCloudBall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/AiCloudBall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.air; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityCloudBall; -import com.crowsofwar.avatar.entity.data.CloudburstBehavior; +package com.crowsofwar.avatar.common.bending.air; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.entity.data.CloudburstBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_CLOUDBURST; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_CLOUDBURST; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.toDegrees; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/Airbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/Airbending.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/Airbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/Airbending.java index f5b3b27f6e..0c535b27a9 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/Airbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/Airbending.java @@ -15,12 +15,14 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +package com.crowsofwar.avatar.common.bending.air; + +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.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/FallDamageHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/FallDamageHandler.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/FallDamageHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/FallDamageHandler.java index 402be4fbf1..f9800d47b3 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/FallDamageHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/FallDamageHandler.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.air; +package com.crowsofwar.avatar.common.bending.air; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.DamageSource; @@ -11,7 +11,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirJumpPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirJumpPowerModifier.java similarity index 60% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirJumpPowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirJumpPowerModifier.java index 57dc16c53c..025a552829 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirJumpPowerModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirJumpPowerModifier.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.air.powermods; +package com.crowsofwar.avatar.common.bending.air.powermods; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirbendingPerformanceChiBonus.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirbendingPerformanceChiBonus.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirbendingPerformanceChiBonus.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirbendingPerformanceChiBonus.java index 4fee740eeb..faea9366ab 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/AirbendingPerformanceChiBonus.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/AirbendingPerformanceChiBonus.java @@ -1,21 +1,20 @@ -package com.crowsofwar.avatar.bending.bending.air.powermods; +package com.crowsofwar.avatar.common.bending.air.powermods; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.Chi; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Chi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.TickEvent; -import static com.crowsofwar.avatar.config.ConfigChi.CHI_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigChi.CHI_CONFIG; /** - * Grants airbenders a bonus where {@link BattlePerformanceScore doing well in combat} + * Grants airbenders a bonus where {@link com.crowsofwar.avatar.common.bending.BattlePerformanceScore doing well in combat} * grants them faster chi regeneration. * * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/CloudburstPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/CloudburstPowerModifier.java new file mode 100644 index 0000000000..d61d8e2902 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/CloudburstPowerModifier.java @@ -0,0 +1,11 @@ +package com.crowsofwar.avatar.common.bending.air.powermods; + +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; + +public class CloudburstPowerModifier extends PowerRatingModifier { + @Override + public double get(BendingContext ctx) { + return -50; + } +} diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/SlipstreamPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/SlipstreamPowerModifier.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/powermods/SlipstreamPowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/SlipstreamPowerModifier.java diff --git a/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/StaffPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/StaffPowerModifier.java new file mode 100644 index 0000000000..b3029fa687 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/powermods/StaffPowerModifier.java @@ -0,0 +1,11 @@ +package com.crowsofwar.avatar.common.bending.air.powermods; + +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; + +public class StaffPowerModifier extends PowerRatingModifier { + @Override + public double get(BendingContext ctx) { + return 40; + } +} diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlAirJump.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlAirJump.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlAirJump.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlAirJump.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleContract.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleContract.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleContract.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleContract.java index 13a0f94362..4bb7454ac6 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleContract.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleContract.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air.statctrls; +package com.crowsofwar.avatar.common.bending.air.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityAirBubble; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; import net.minecraft.entity.EntityLivingBase; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleExpand.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleExpand.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleExpand.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleExpand.java index 9c7a8c6ebf..607ba28fea 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlBubbleExpand.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlBubbleExpand.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air.statctrls; +package com.crowsofwar.avatar.common.bending.air.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityAirBubble; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityAirBubble; import net.minecraft.entity.EntityLivingBase; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlSetAirburstCharging.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlSetAirburstCharging.java similarity index 67% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlSetAirburstCharging.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlSetAirburstCharging.java index a57a63b877..7137eea887 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlSetAirburstCharging.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlSetAirburstCharging.java @@ -15,22 +15,22 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air.statctrls; +package com.crowsofwar.avatar.common.bending.air.statctrls; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -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.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; -import static com.crowsofwar.avatar.bending.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_UP; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.StatusControlController.RELEASE_AIR_BURST; -import static com.crowsofwar.avatar.util.data.StatusControlController.SHOOT_AIR_BURST; -import static com.crowsofwar.avatar.util.data.TickHandlerController.AIRBURST_CHARGE_HANDLER; +import static com.crowsofwar.avatar.common.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_UP; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControlController.RELEASE_AIR_BURST; +import static com.crowsofwar.avatar.common.data.StatusControlController.SHOOT_AIR_BURST; +import static com.crowsofwar.avatar.common.data.TickHandlerController.AIRBURST_CHARGE_HANDLER; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlShootAirburst.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlShootAirburst.java similarity index 63% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlShootAirburst.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlShootAirburst.java index 41b1642316..53b8eb5596 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlShootAirburst.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlShootAirburst.java @@ -1,15 +1,15 @@ -package com.crowsofwar.avatar.bending.bending.air.statctrls; +package com.crowsofwar.avatar.common.bending.air.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.TickHandlerController; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.TickHandlerController; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; -import static com.crowsofwar.avatar.bending.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; -import static com.crowsofwar.avatar.util.data.StatusControlController.RELEASE_AIR_BURST; +import static com.crowsofwar.avatar.common.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; +import static com.crowsofwar.avatar.common.data.StatusControlController.RELEASE_AIR_BURST; public class StatCtrlShootAirburst extends StatusControl { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlThrowCloudBall.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlThrowCloudBall.java similarity index 70% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlThrowCloudBall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlThrowCloudBall.java index 97f2f82c5d..17b6ae7b9e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/statctrls/StatCtrlThrowCloudBall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/statctrls/StatCtrlThrowCloudBall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.air.statctrls; - -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityCloudBall; -import com.crowsofwar.avatar.entity.data.CloudburstBehavior; +package com.crowsofwar.avatar.common.bending.air.statctrls; + +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.entity.data.CloudburstBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_LEFT_CLICK; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_LEFT_CLICK; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; public class StatCtrlThrowCloudBall extends StatusControl { public StatCtrlThrowCloudBall() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirBurstHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirBurstHandler.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirBurstHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirBurstHandler.java index 22f5c04ac0..1c4a74c824 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirBurstHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirBurstHandler.java @@ -1,19 +1,19 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; - -import com.crowsofwar.avatar.bending.bending.air.AbilityAirBurst; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.*; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.OffensiveBehaviour; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; + +import com.crowsofwar.avatar.common.bending.air.AbilityAirBurst; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.*; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.OffensiveBehaviour; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -33,10 +33,10 @@ import java.util.List; import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.RELEASE_AIR_BURST; -import static com.crowsofwar.avatar.util.data.StatusControlController.SHOOT_AIR_BURST; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.RELEASE_AIR_BURST; +import static com.crowsofwar.avatar.common.data.StatusControlController.SHOOT_AIR_BURST; public class AirBurstHandler extends TickHandler { public static final UUID AIRBURST_MOVEMENT_MODIFIER_ID = UUID.fromString diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirDodgeHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirDodgeHandler.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirDodgeHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirDodgeHandler.java index fe45b3e3a1..bcc3bd09b5 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirDodgeHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirDodgeHandler.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; //@Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirParticleSpawner.java similarity index 77% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirParticleSpawner.java index d8037f7da0..2779bca08c 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirParticleSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirParticleSpawner.java @@ -14,17 +14,17 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirStatusControlHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirStatusControlHandler.java similarity index 63% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirStatusControlHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirStatusControlHandler.java index 2c4e440d65..9e4c0e11be 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/AirStatusControlHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/AirStatusControlHandler.java @@ -1,14 +1,14 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_CLOUDBURST; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_CLOUDBURST; public class AirStatusControlHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/ShootAirBurstHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/ShootAirBurstHandler.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/ShootAirBurstHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/ShootAirBurstHandler.java index e279223c9c..b44c059739 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/ShootAirBurstHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/ShootAirBurstHandler.java @@ -1,18 +1,18 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; - -import com.crowsofwar.avatar.bending.bending.air.AbilityAirBurst; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityAirGust; -import com.crowsofwar.avatar.entity.EntityOffensive; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.OffensiveBehaviour; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; + +import com.crowsofwar.avatar.common.bending.air.AbilityAirBurst; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityAirGust; +import com.crowsofwar.avatar.common.entity.EntityOffensive; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.OffensiveBehaviour; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -24,11 +24,11 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import static com.crowsofwar.avatar.bending.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.CHARGE_AIR_BURST; -import static com.crowsofwar.avatar.util.data.TickHandlerController.AIRBURST_CHARGE_HANDLER; +import static com.crowsofwar.avatar.common.bending.air.tickhandlers.AirBurstHandler.AIRBURST_MOVEMENT_MODIFIER_ID; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.CHARGE_AIR_BURST; +import static com.crowsofwar.avatar.common.data.TickHandlerController.AIRBURST_CHARGE_HANDLER; public class ShootAirBurstHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SlipstreamAirWalkHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SlipstreamAirWalkHandler.java similarity index 72% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SlipstreamAirWalkHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SlipstreamAirWalkHandler.java index 4b387abe03..01f4c1f76c 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SlipstreamAirWalkHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SlipstreamAirWalkHandler.java @@ -1,13 +1,13 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.air.powermods.SlipstreamPowerModifier; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.Chi; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.air.powermods.SlipstreamPowerModifier; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Chi; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SmashGroundHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SmashGroundHandler.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SmashGroundHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SmashGroundHandler.java index 5c7ddead90..aa49de945b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/SmashGroundHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/SmashGroundHandler.java @@ -14,22 +14,22 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.AbilityAirJump; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityOffensive; -import com.crowsofwar.avatar.entity.EntityShockwave; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.OffensiveBehaviour; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.AbilityAirJump; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityOffensive; +import com.crowsofwar.avatar.common.entity.EntityShockwave; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.OffensiveBehaviour; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/StaffGustCooldown.java b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/StaffGustCooldown.java similarity index 56% rename from src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/StaffGustCooldown.java rename to src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/StaffGustCooldown.java index c04a0942ce..db824d3eb2 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/air/tickhandlers/StaffGustCooldown.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/air/tickhandlers/StaffGustCooldown.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.air.tickhandlers; +package com.crowsofwar.avatar.common.bending.air.tickhandlers; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class StaffGustCooldown extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosion.java b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosion.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosion.java rename to src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosion.java index a516060430..7a8258e38c 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosion.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosion.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.combustion; +package com.crowsofwar.avatar.common.bending.combustion; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class AbilityExplosion extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosivePillar.java b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosivePillar.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosivePillar.java rename to src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosivePillar.java index 54590f7cca..ef8b56c573 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/AbilityExplosivePillar.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/AbilityExplosivePillar.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.combustion; +package com.crowsofwar.avatar.common.bending.combustion; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityExplosionSpawner; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityExplosionSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class AbilityExplosivePillar extends Ability { public AbilityExplosivePillar() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/Combustionbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/Combustionbending.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/combustion/Combustionbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/combustion/Combustionbending.java index 5fd426e68e..a941d86632 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/combustion/Combustionbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/combustion/Combustionbending.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.combustion; +package com.crowsofwar.avatar.common.bending.combustion; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/dev/LightningDeflectHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/dev/LightningDeflectHandler.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/dev/LightningDeflectHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/dev/LightningDeflectHandler.java index debb175b33..bb14dde647 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/dev/LightningDeflectHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/dev/LightningDeflectHandler.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.dev; +package com.crowsofwar.avatar.common.bending.dev; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.entity.EntityLightningArc; +import com.crowsofwar.avatar.common.entity.EntityLightningArc; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthControl.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthControl.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthControl.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthControl.java index 2ac7ff487f..25ecbfc83c 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthControl.java @@ -15,15 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityFloatingBlock; -import com.crowsofwar.avatar.entity.data.FloatingBlockBehavior; +package com.crowsofwar.avatar.common.bending.earth; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityFloatingBlock; +import com.crowsofwar.avatar.common.entity.data.FloatingBlockBehavior; import com.crowsofwar.gorecore.util.Vector; import com.crowsofwar.gorecore.util.VectorI; import net.minecraft.block.Block; @@ -40,10 +40,10 @@ import java.util.List; import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.PLACE_BLOCK; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_BLOCK; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.PLACE_BLOCK; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_BLOCK; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthRedirect.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthRedirect.java similarity index 75% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthRedirect.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthRedirect.java index 934cbcca78..9fbe88c7c3 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthRedirect.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthRedirect.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; public class AbilityEarthRedirect extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthSpear.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthSpear.java similarity index 52% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthSpear.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthSpear.java index 2f57b23124..31d30a762b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthSpear.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; public class AbilityEarthSpear extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthspikes.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthspikes.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthspikes.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthspikes.java index 4c9c2d5006..332492f349 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityEarthspikes.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityEarthspikes.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityEarthspikeSpawner; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityEarthspikeSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class AbilityEarthspikes extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityMining.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityMining.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityMining.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityMining.java index fc72550b06..4ed2a709aa 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityMining.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityMining.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.AvatarWorldData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ScheduledDestroyBlock; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +package com.crowsofwar.avatar.common.bending.earth; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.AvatarWorldData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ScheduledDestroyBlock; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.block.BlockOre; @@ -36,10 +36,10 @@ import java.util.*; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath.FIRST; -import static com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath.SECOND; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath.FIRST; +import static com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath.SECOND; import static net.minecraft.init.Blocks.AIR; /** diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRavine.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRavine.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRavine.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRavine.java index c32077675c..626606eb97 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRavine.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRavine.java @@ -15,20 +15,20 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityRavine; +package com.crowsofwar.avatar.common.bending.earth; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityRavine; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRestore.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRestore.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRestore.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRestore.java index 19e807d105..6fe7fd475e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityRestore.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityRestore.java @@ -1,19 +1,19 @@ -package com.crowsofwar.avatar.bending.bending.earth; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.earth.powermods.RestorePowerModifier; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +package com.crowsofwar.avatar.common.bending.earth; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.earth.powermods.RestorePowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.RESTORE_PARTICLE_SPAWNER; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.RESTORE_PARTICLE_SPAWNER; public class AbilityRestore extends Ability { public AbilityRestore() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityWall.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/AbilityWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/AbilityWall.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/Earthbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/Earthbending.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/Earthbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/Earthbending.java index 2e3c9e9ad4..272dbad979 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/Earthbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/Earthbending.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingEvents.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingEvents.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingEvents.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingEvents.java index af4bd4ad1c..b3987ff1cf 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingEvents.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingEvents.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.util.data.AvatarWorldData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ScheduledDestroyBlock; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.data.AvatarWorldData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ScheduledDestroyBlock; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -36,7 +36,7 @@ import java.util.Iterator; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingJingModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingJingModifier.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingJingModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingJingModifier.java index 6f77f4409e..39a6623fd3 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingJingModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingJingModifier.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.EntityMob; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingPerformanceBonus.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingPerformanceBonus.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingPerformanceBonus.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingPerformanceBonus.java index 90909251f9..19c167137a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/EarthbendingPerformanceBonus.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/EarthbendingPerformanceBonus.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.earth; +package com.crowsofwar.avatar.common.bending.earth; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/powermods/RestorePowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/powermods/RestorePowerModifier.java similarity index 67% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/powermods/RestorePowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/powermods/RestorePowerModifier.java index 2c67ae5fb7..07cd3d9fbf 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/powermods/RestorePowerModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/powermods/RestorePowerModifier.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.earth.powermods; +package com.crowsofwar.avatar.common.bending.earth.powermods; -import com.crowsofwar.avatar.bending.bending.BuffPowerModifier; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.Vision; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.bending.BuffPowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Vision; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class RestorePowerModifier extends BuffPowerModifier { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlDropWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlDropWall.java similarity index 66% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlDropWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlDropWall.java index 4174a322b7..44a6f35d93 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlDropWall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlDropWall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.entity.data.WallBehavior; +package com.crowsofwar.avatar.common.bending.earth.statctrls; + +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.data.WallBehavior; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import java.util.List; -import static com.crowsofwar.avatar.util.data.StatusControlController.*; +import static com.crowsofwar.avatar.common.data.StatusControlController.*; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceBlock.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceBlock.java similarity index 74% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceBlock.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceBlock.java index cca6e851ab..1ea1732dea 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceBlock.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceBlock.java @@ -15,18 +15,18 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.bending.bending.earth.AbilityEarthControl; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -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.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityFloatingBlock; -import com.crowsofwar.avatar.entity.data.FloatingBlockBehavior; +package com.crowsofwar.avatar.common.bending.earth.statctrls; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.bending.earth.AbilityEarthControl; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +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.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityFloatingBlock; +import com.crowsofwar.avatar.common.entity.data.FloatingBlockBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.block.BlockSnow; @@ -38,10 +38,10 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_BLOCK; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_BLOCK; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceWall.java similarity index 73% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceWall.java index 919b95bff9..7d37a82c48 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPlaceWall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPlaceWall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.entity.data.WallBehavior; +package com.crowsofwar.avatar.common.bending.earth.statctrls; + +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.data.WallBehavior; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import java.util.List; -import static com.crowsofwar.avatar.util.data.StatusControlController.*; +import static com.crowsofwar.avatar.common.data.StatusControlController.*; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPullWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPullWall.java similarity index 73% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPullWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPullWall.java index 7e6d3752e9..96536fd99b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPullWall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPullWall.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.entity.data.WallBehavior; +package com.crowsofwar.avatar.common.bending.earth.statctrls; + +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.data.WallBehavior; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPushWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPushWall.java similarity index 70% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPushWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPushWall.java index ecc78ca030..817fcc86fe 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlPushWall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlPushWall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.entity.data.WallBehavior; +package com.crowsofwar.avatar.common.bending.earth.statctrls; + +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.data.WallBehavior; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import java.util.List; -import static com.crowsofwar.avatar.util.data.StatusControlController.PLACE_WALL; +import static com.crowsofwar.avatar.common.data.StatusControlController.PLACE_WALL; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlShootWall.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlShootWall.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlShootWall.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlShootWall.java index 5ebacfd19c..837d5554a5 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlShootWall.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlShootWall.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.earth.statctrls; +package com.crowsofwar.avatar.common.bending.earth.statctrls; import akka.japi.Pair; -import com.crowsofwar.avatar.bending.bending.earth.AbilityWall; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityFloatingBlock; -import com.crowsofwar.avatar.entity.EntityWall; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.entity.data.FloatingBlockBehavior; -import com.crowsofwar.avatar.util.AvatarUtils; -import com.crowsofwar.avatar.util.Raytrace; -import com.crowsofwar.avatar.util.Raytrace.Result; +import com.crowsofwar.avatar.common.bending.earth.AbilityWall; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityFloatingBlock; +import com.crowsofwar.avatar.common.entity.EntityWall; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.entity.data.FloatingBlockBehavior; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.Raytrace; +import com.crowsofwar.avatar.common.util.Raytrace.Result; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -24,7 +24,7 @@ import java.util.HashSet; import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlThrowBlock.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlThrowBlock.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/statctrls/StatCtrlThrowBlock.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/statctrls/StatCtrlThrowBlock.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/tickhandlers/RestoreParticleHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/earth/tickhandlers/RestoreParticleHandler.java similarity index 76% rename from src/main/java/com/crowsofwar/avatar/bending/bending/earth/tickhandlers/RestoreParticleHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/earth/tickhandlers/RestoreParticleHandler.java index 6d02fa0543..c850e432dd 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/earth/tickhandlers/RestoreParticleHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/earth/tickhandlers/RestoreParticleHandler.java @@ -1,12 +1,12 @@ -package com.crowsofwar.avatar.bending.bending.earth.tickhandlers; +package com.crowsofwar.avatar.common.bending.earth.tickhandlers; -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.EnumParticleTypes; @@ -15,7 +15,7 @@ import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigClient.CLIENT_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG; public class RestoreParticleHandler extends TickHandler { private final ParticleSpawner particles; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireJump.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireJump.java similarity index 55% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireJump.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireJump.java index 56303da99c..1d39759aa9 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireJump.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireJump.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.fire; - -import com.crowsofwar.avatar.bending.bending.Ability; -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.AbilityContext; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.util.Raytrace; - -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.FIRE_JUMP; -import static com.crowsofwar.avatar.util.data.TickHandlerController.FIRE_PARTICLE_SPAWNER; +package com.crowsofwar.avatar.common.bending.fire; + +import com.crowsofwar.avatar.common.bending.Ability; +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.AbilityContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.util.Raytrace; + +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.FIRE_JUMP; +import static com.crowsofwar.avatar.common.data.TickHandlerController.FIRE_PARTICLE_SPAWNER; public class AbilityFireJump extends Ability { public AbilityFireJump() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireRedirect.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireRedirect.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireRedirect.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireRedirect.java index 1b0a6dc4a5..c8c61ecf94 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireRedirect.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireRedirect.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; public class AbilityFireRedirect extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireShot.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireShot.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireShot.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireShot.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireball.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireball.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFireball.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFireball.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFlameStrike.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFlameStrike.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFlameStrike.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFlameStrike.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFlamethrower.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFlamethrower.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityFlamethrower.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityFlamethrower.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityImmolate.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityImmolate.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilityImmolate.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilityImmolate.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilitySwirlingInferno.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilitySwirlingInferno.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilitySwirlingInferno.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilitySwirlingInferno.java index 9af35bc5f5..bd3f903d53 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AbilitySwirlingInferno.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AbilitySwirlingInferno.java @@ -1,22 +1,22 @@ -package com.crowsofwar.avatar.bending.bending.fire; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityFireball; -import com.crowsofwar.avatar.entity.data.FireballBehavior; +package com.crowsofwar.avatar.common.bending.fire; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityFireball; +import com.crowsofwar.avatar.common.entity.data.FireballBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_FIREBALL; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_FIREBALL; import static com.crowsofwar.gorecore.util.Vector.getEyePos; import static com.crowsofwar.gorecore.util.Vector.getLookRectangular; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireShot.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireShot.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireShot.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireShot.java index 4c85a9b52f..85ed5cbc1a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireShot.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireShot.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireball.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireball.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireball.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireball.java index 9e178526fc..4ce661682b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFireball.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFireball.java @@ -14,20 +14,20 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityFireball; -import com.crowsofwar.avatar.entity.data.FireballBehavior; +package com.crowsofwar.avatar.common.bending.fire; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityFireball; +import com.crowsofwar.avatar.common.entity.data.FireballBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_FIREBALL; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_FIREBALL; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.toDegrees; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlameStrike.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlameStrike.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlameStrike.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlameStrike.java index 0f1a4c9cc8..5e3e845cae 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlameStrike.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlameStrike.java @@ -14,17 +14,17 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.AvatarUtils.normalizeAngle; +import static com.crowsofwar.avatar.common.util.AvatarUtils.normalizeAngle; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.abs; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlamethrower.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlamethrower.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlamethrower.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlamethrower.java index 7c64ed82d4..333c2dd5aa 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/AiFlamethrower.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/AiFlamethrower.java @@ -14,20 +14,20 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.data.StatusControlController.START_FLAMETHROW; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_FLAMETHROW; -import static com.crowsofwar.avatar.util.data.TickHandlerController.FLAMETHROWER; +import static com.crowsofwar.avatar.common.data.StatusControlController.START_FLAMETHROW; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_FLAMETHROW; +import static com.crowsofwar.avatar.common.data.TickHandlerController.FLAMETHROWER; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.toDegrees; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirePassiveHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FirePassiveHandler.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirePassiveHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/FirePassiveHandler.java index e68e46147e..bbfe5cdcd2 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirePassiveHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FirePassiveHandler.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class FirePassiveHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireSmashGroundHandlerBig.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FireSmashGroundHandlerBig.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireSmashGroundHandlerBig.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/FireSmashGroundHandlerBig.java index 8df2e0fd85..15eba08047 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireSmashGroundHandlerBig.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FireSmashGroundHandlerBig.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.SmashGroundHandler; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.SmashGroundHandler; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireStatusControlHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FireStatusControlHandler.java similarity index 64% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireStatusControlHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/FireStatusControlHandler.java index 5ba53ad97a..4ce455cffb 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FireStatusControlHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FireStatusControlHandler.java @@ -1,14 +1,14 @@ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityFireball; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityFireball; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_FIREBALL; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_FIREBALL; public class FireStatusControlHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/Firebending.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/Firebending.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/Firebending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/Firebending.java index a5b9e58d42..0fdccbfced 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/Firebending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/Firebending.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirebendingPerformanceHealthRegen.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FirebendingPerformanceHealthRegen.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirebendingPerformanceHealthRegen.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/FirebendingPerformanceHealthRegen.java index 648d6acbe4..678d200550 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/FirebendingPerformanceHealthRegen.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/FirebendingPerformanceHealthRegen.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.fire; +package com.crowsofwar.avatar.common.bending.fire; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolateParticleHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolateParticleHandler.java new file mode 100644 index 0000000000..eb10140a69 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolateParticleHandler.java @@ -0,0 +1,62 @@ +package com.crowsofwar.avatar.common.bending.fire; + +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.gorecore.util.Vector; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.world.World; + +import java.util.Random; + + +public class ImmolateParticleHandler extends TickHandler { + private final ParticleSpawner particles; + + public ImmolateParticleHandler(int id) { + super(id); + particles = new NetworkParticleSpawner(); + } + + @Override + public boolean tick(BendingContext ctx) { + EntityLivingBase entity = ctx.getBenderEntity(); + BendingData data = ctx.getData(); + AbilityData aD = data.getAbilityData("immolate"); + World world = ctx.getWorld(); + int duration = data.getTickHandlerDuration(this); + int immolateDuration = aD.getLevel() > 0 ? 60 + 40 * aD.getLevel() : 40; + //The particles take a while to disappear after the ability finishes- so you decrease the time the particles can spawn + Random rand = new Random(); + double r = rand.nextDouble(); + if (!world.isRemote) { + for (int i = 0; i < 12 + Math.max(aD.getLevel(), 1) * 4; i++) { + int random = rand.nextInt(2) + 1; + r = random == 1 ? r : r * -1; + Vector location = Vector.toRectangular(Math.toRadians(entity.rotationYaw + (i * 30) + (r * 2)), 0).times(aD.getLevel() < 1 ? 0.5 : aD.getLevel() * 0.5).withY(entity.getEyeHeight() - 0.7); + particles.spawnParticles(world, AvatarParticles.getParticleFlames(), 1, 1, location.plus(Vector.getEntityPos(entity)), + new Vector(0.8, 4, 0.8), true); + } + } + else { + for (int i = 0; i < 12 + Math.max(aD.getLevel(), 1) * 4; i++) { + int random = rand.nextInt(2) + 1; + r = random == 1 ? r : r * -1; + Vector location = Vector.toRectangular(Math.toRadians(entity.rotationYaw + (i * 30) + (r * 2)), 0).times(aD.getLevel() < 1 ? 0.5 : aD.getLevel() * 0.5).withY(entity.getEyeHeight() - 0.7); + //Temporary solution to colour fading: randomising the colour between crimson and orangey-yellow for each particle. + ParticleBuilder.create(ParticleBuilder.Type.FLASH).pos(location.plus(Vector.getEntityPos(entity)).toMinecraft()).time(4 + AvatarUtils.getRandomNumberInRange(1, 4)). + vel(world.rand.nextGaussian() / 40, world.rand.nextDouble() / 2, world.rand.nextGaussian() / 40) + .clr(235 + AvatarUtils.getRandomNumberInRange(1, 20), 30 + AvatarUtils.getRandomNumberInRange(1, 60), 5) + .element(new Firebending()).spawn(world); + } + } + return duration >= immolateDuration; + } +} + diff --git a/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolatePowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolatePowerModifier.java new file mode 100644 index 0000000000..20ada18cb9 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/ImmolatePowerModifier.java @@ -0,0 +1,94 @@ +package com.crowsofwar.avatar.common.bending.fire; + +import com.crowsofwar.avatar.common.bending.BuffPowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Vision; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.projectile.EntityArrow; +import net.minecraft.entity.projectile.EntityThrowable; +import net.minecraft.util.math.AxisAlignedBB; + +import java.util.List; + +public class ImmolatePowerModifier extends BuffPowerModifier { + + @Override + public double get(BendingContext ctx) { + + BendingData data = ctx.getData(); + AbilityData abilityData = data.getAbilityData("immolate"); + + double modifier = 20; + if (abilityData.getLevel() >= 1) { + modifier = 25; + } + if (abilityData.getLevel() == 3) { + modifier = 40; + } + if (abilityData.isMasterPath(AbilityData.AbilityTreePath.SECOND)) { + modifier = 60; + } + return modifier; + + } + + @Override + public boolean onUpdate(BendingContext ctx) { + + EntityLivingBase entity = ctx.getBenderEntity(); + AbilityData abilityData = AbilityData.get(entity, "immolate"); + + // Intermittently light on fire + if (entity.ticksExisted % 20 == 0) { + double chance = 0.3; + if (abilityData.isMasterPath(AbilityData.AbilityTreePath.SECOND)) { + chance = 0.6; + } + + // 30% chance per second to be lit on fire + if (Math.random() < chance && !abilityData.isMasterPath(AbilityData.AbilityTreePath.FIRST)) { + entity.setFire(2); + } + } + if (abilityData.isMasterPath(AbilityData.AbilityTreePath.SECOND)) { + AxisAlignedBB box = new AxisAlignedBB(entity.posX - 2, entity.posY, entity.posZ - 2, entity.posX + 2, entity.posY + 3, entity.posZ + 2); + List targets = entity.world.getEntitiesWithinAABB(Entity.class, box); + if (!entity.world.isRemote) { + if (!targets.isEmpty()) { + for (Entity e : targets) { + if (e != entity || (e instanceof AvatarEntity && ((AvatarEntity) e).getOwner() != e)) { + e.setFire(5); + if (e instanceof EntityThrowable || e instanceof EntityItem) { + e.setFire(1); + e.setDead(); + } + if (e instanceof EntityArrow) { + e.setFire(1); + e.setDead(); + } + } + } + } + } + } + + return super.onUpdate(ctx); + } + + @Override + protected Vision[] getVisions() { + return new Vision[]{Vision.IMMOLATE_WEAK, Vision.IMMOLATE_MEDIUM, Vision.IMMOLATE_POWERFUL}; + } + + @Override + protected String getAbilityName() { + return new AbilityImmolate().getName(); + } + +} + diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/powermods/FireDevourPowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/powermods/FireDevourPowerModifier.java similarity index 58% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/powermods/FireDevourPowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/powermods/FireDevourPowerModifier.java index e09c189053..843402b39f 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/powermods/FireDevourPowerModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/powermods/FireDevourPowerModifier.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.fire.powermods; +package com.crowsofwar.avatar.common.bending.fire.powermods; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class FireDevourPowerModifier extends PowerRatingModifier { private double powerRating; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeFlameStrike.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeFlameStrike.java similarity index 55% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeFlameStrike.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeFlameStrike.java index 049a23de23..921a89efb0 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeFlameStrike.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeFlameStrike.java @@ -1,14 +1,14 @@ -package com.crowsofwar.avatar.bending.bending.fire.statctrls; +package com.crowsofwar.avatar.common.bending.fire.statctrls; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.util.EnumHand; -import static com.crowsofwar.avatar.client.controls.AvatarControl.*; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_MAIN; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_OFF; +import static com.crowsofwar.avatar.common.controls.AvatarControl.*; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_MAIN; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_OFF; public class StatCtrlChargeFlameStrike extends StatusControl { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeInferno.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeInferno.java similarity index 58% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeInferno.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeInferno.java index e7fe09fed9..2b6710e2a1 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlChargeInferno.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlChargeInferno.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.fire.statctrls; +package com.crowsofwar.avatar.common.bending.fire.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class StatCtrlChargeInferno extends StatusControl { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlFireJump.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlFireJump.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlFireJump.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlFireJump.java index 3c3521d7b0..640440457d 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlFireJump.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlFireJump.java @@ -1,18 +1,18 @@ -package com.crowsofwar.avatar.bending.bending.fire.statctrls; - -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.config.ConfigSkills; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -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.entity.AvatarEntity; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.bending.fire.statctrls; + +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.config.ConfigSkills; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +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.entity.AvatarEntity; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -33,8 +33,8 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.*; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.*; public class StatCtrlFireJump extends StatusControl { public StatCtrlFireJump() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlFlameStrike.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlFlameStrike.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlFlameStrike.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlFlameStrike.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlSetFlamethrowing.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlSetFlamethrowing.java similarity index 64% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlSetFlamethrowing.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlSetFlamethrowing.java index 2dd5367f1f..f63c82928f 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlSetFlamethrowing.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlSetFlamethrowing.java @@ -15,27 +15,27 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire.statctrls; +package com.crowsofwar.avatar.common.bending.fire.statctrls; -import com.crowsofwar.avatar.bending.bending.fire.AbilityFlamethrower; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.bending.bending.fire.tickhandlers.FlamethrowerUpdateTick; -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.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightOrb; +import com.crowsofwar.avatar.common.bending.fire.AbilityFlamethrower; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.bending.fire.tickhandlers.FlamethrowerUpdateTick; +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.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightOrb; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import static com.crowsofwar.avatar.bending.bending.fire.tickhandlers.FlamethrowerUpdateTick.FLAMETHROWER_MOVEMENT_MODIFIER_ID; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_UP; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_FLAMETHROW; -import static com.crowsofwar.avatar.util.data.TickHandlerController.FLAMETHROWER; +import static com.crowsofwar.avatar.common.bending.fire.tickhandlers.FlamethrowerUpdateTick.FLAMETHROWER_MOVEMENT_MODIFIER_ID; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_UP; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_FLAMETHROW; +import static com.crowsofwar.avatar.common.data.TickHandlerController.FLAMETHROWER; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlThrowFireball.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlThrowFireball.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/statctrls/StatCtrlThrowFireball.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/statctrls/StatCtrlThrowFireball.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java similarity index 59% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java index 1d2a00d898..142de67512 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/ChargeFlameStrikeHandler.java @@ -1,14 +1,14 @@ -package com.crowsofwar.avatar.bending.bending.fire.tickhandlers; +package com.crowsofwar.avatar.common.bending.fire.tickhandlers; -import com.crowsofwar.avatar.bending.bending.fire.statctrls.StatCtrlFlameStrike; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.bending.fire.statctrls.StatCtrlFlameStrike; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import java.util.UUID; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_MAIN; -import static com.crowsofwar.avatar.util.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_OFF; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_MAIN; +import static com.crowsofwar.avatar.common.data.StatusControlController.STOP_CHARGE_FLAME_STRIKE_OFF; public class ChargeFlameStrikeHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FireParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FireParticleSpawner.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FireParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FireParticleSpawner.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FireSmashGroundHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FireSmashGroundHandler.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FireSmashGroundHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FireSmashGroundHandler.java index 53e83b997c..3e0c5ccbe9 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FireSmashGroundHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FireSmashGroundHandler.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.fire.tickhandlers; - -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.SmashGroundHandler; -import com.crowsofwar.avatar.bending.bending.fire.AbilityFireJump; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; +package com.crowsofwar.avatar.common.bending.fire.tickhandlers; + +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.SmashGroundHandler; +import com.crowsofwar.avatar.common.bending.fire.AbilityFireJump; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FlameStrikeHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FlameStrikeHandler.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FlameStrikeHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FlameStrikeHandler.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FlamethrowerUpdateTick.java b/src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FlamethrowerUpdateTick.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/bending/bending/fire/tickhandlers/FlamethrowerUpdateTick.java rename to src/main/java/com/crowsofwar/avatar/common/bending/fire/tickhandlers/FlamethrowerUpdateTick.java diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIceBurst.java b/src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIceBurst.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIceBurst.java rename to src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIceBurst.java index 9ded5abcf9..5bd6ec98b6 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIceBurst.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIceBurst.java @@ -14,20 +14,20 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.ice; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityIceShield; +package com.crowsofwar.avatar.common.bending.ice; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityIceShield; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.SHIELD_SHATTER; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.SHIELD_SHATTER; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIcePrison.java b/src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIcePrison.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIcePrison.java rename to src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIcePrison.java index a2b654e36f..ac314b16d5 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/AbilityIcePrison.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/ice/AbilityIcePrison.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.ice; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.config.ConfigStats; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityIcePrison; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.ice; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.config.ConfigStats; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityIcePrison; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,7 +32,7 @@ import java.util.List; import java.util.function.Predicate; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/Icebending.java b/src/main/java/com/crowsofwar/avatar/common/bending/ice/Icebending.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/bending/bending/ice/Icebending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/ice/Icebending.java index b6767cbe22..f837f395af 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/Icebending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/ice/Icebending.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.ice; +package com.crowsofwar.avatar.common.bending.ice; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/StatCtrlShieldShatter.java b/src/main/java/com/crowsofwar/avatar/common/bending/ice/StatCtrlShieldShatter.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/bending/bending/ice/StatCtrlShieldShatter.java rename to src/main/java/com/crowsofwar/avatar/common/bending/ice/StatCtrlShieldShatter.java index 23264a523e..6ed96d8be1 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/ice/StatCtrlShieldShatter.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/ice/StatCtrlShieldShatter.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.ice; +package com.crowsofwar.avatar.common.bending.ice; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityIceShield; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityIceShield; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningArc.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningArc.java similarity index 65% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningArc.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningArc.java index 0f10477cb4..f8cf1a9309 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningArc.java @@ -1,12 +1,12 @@ -package com.crowsofwar.avatar.bending.bending.lightning; +package com.crowsofwar.avatar.common.bending.lightning; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.LIGHTNING_CHARGE; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.LIGHTNING_CHARGE; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRaze.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRaze.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRaze.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRaze.java index 64573ecbac..3885b32f12 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRaze.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRaze.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.lightning; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityLightningSpawner; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.lightning; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityLightningSpawner; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; import static com.crowsofwar.gorecore.util.Vector.getEyePos; import static com.crowsofwar.gorecore.util.Vector.getLookRectangular; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRedirect.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRedirect.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRedirect.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRedirect.java index 6bf15eceaf..a3b1e4d358 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningRedirect.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningRedirect.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.lightning; +package com.crowsofwar.avatar.common.bending.lightning; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningSpear.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningSpear.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningSpear.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningSpear.java index 8415cab298..9b393f5fdb 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AbilityLightningSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AbilityLightningSpear.java @@ -14,24 +14,24 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.lightning; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityLightningSpear; -import com.crowsofwar.avatar.entity.data.LightningSpearBehavior; +package com.crowsofwar.avatar.common.bending.lightning; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityLightningSpear; +import com.crowsofwar.avatar.common.entity.data.LightningSpearBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_LIGHTNINGSPEAR; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_LIGHTNINGSPEAR; import static com.crowsofwar.gorecore.util.Vector.getEyePos; import static com.crowsofwar.gorecore.util.Vector.getLookRectangular; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AiLightningSpear.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AiLightningSpear.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AiLightningSpear.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/AiLightningSpear.java index 1c0b97eb1a..0374a9f519 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/AiLightningSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/AiLightningSpear.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.lightning; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightningSpear; -import com.crowsofwar.avatar.entity.data.LightningSpearBehavior; +package com.crowsofwar.avatar.common.bending.lightning; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightningSpear; +import com.crowsofwar.avatar.common.entity.data.LightningSpearBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_LIGHTNINGSPEAR; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_LIGHTNINGSPEAR; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.toDegrees; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningChargeHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningChargeHandler.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningChargeHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningChargeHandler.java index a92942312e..0917fa2519 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningChargeHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningChargeHandler.java @@ -1,13 +1,13 @@ -package com.crowsofwar.avatar.bending.bending.lightning; - -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntityLightningArc; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +package com.crowsofwar.avatar.common.bending.lightning; + +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntityLightningArc; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningCreateHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningCreateHandler.java similarity index 66% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningCreateHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningCreateHandler.java index c2210b8f1a..71323fd03a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningCreateHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningCreateHandler.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.lightning; +package com.crowsofwar.avatar.common.bending.lightning; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningRedirectHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningRedirectHandler.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningRedirectHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningRedirectHandler.java index f8fb2a0860..afb750019a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/LightningRedirectHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/LightningRedirectHandler.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.lightning; +package com.crowsofwar.avatar.common.bending.lightning; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BenderInfo; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BenderInfo; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; import org.joml.SimplexNoise; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/Lightningbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/Lightningbending.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/Lightningbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/Lightningbending.java index 45620d6dbd..f5f4ee9384 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/Lightningbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/Lightningbending.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.lightning; +package com.crowsofwar.avatar.common.bending.lightning; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/StatCtrlThrowLightningSpear.java b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/StatCtrlThrowLightningSpear.java similarity index 66% rename from src/main/java/com/crowsofwar/avatar/bending/bending/lightning/StatCtrlThrowLightningSpear.java rename to src/main/java/com/crowsofwar/avatar/common/bending/lightning/StatCtrlThrowLightningSpear.java index 619d428a70..c89301497e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/lightning/StatCtrlThrowLightningSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/lightning/StatCtrlThrowLightningSpear.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bending.lightning; - -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightningSpear; -import com.crowsofwar.avatar.entity.data.LightningSpearBehavior; +package com.crowsofwar.avatar.common.bending.lightning; + +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightningSpear; +import com.crowsofwar.avatar.common.entity.data.LightningSpearBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_LEFT_CLICK; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_LEFT_CLICK; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.LEFT_OF_CROSSHAIR; public class StatCtrlThrowLightningSpear extends StatusControl { public StatCtrlThrowLightningSpear() { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandPrison.java b/src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandPrison.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandPrison.java rename to src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandPrison.java index 2817f585d9..efeb4fb350 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandPrison.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandPrison.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.bending.bending.sand; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.config.ConfigStats; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntitySandPrison; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.sand; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.config.ConfigStats; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntitySandPrison; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -18,7 +18,7 @@ import java.util.List; import java.util.function.Predicate; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandstorm.java b/src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandstorm.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandstorm.java rename to src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandstorm.java index 4b19188816..154049898d 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/AbilitySandstorm.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/sand/AbilitySandstorm.java @@ -1,16 +1,16 @@ -package com.crowsofwar.avatar.bending.bending.sand; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.config.ConfigStats; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntitySandstorm; +package com.crowsofwar.avatar.common.bending.sand; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.config.ConfigStats; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntitySandstorm; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; -import static com.crowsofwar.avatar.util.data.StatusControlController.SANDSTORM_REDIRECT; +import static com.crowsofwar.avatar.common.data.StatusControlController.SANDSTORM_REDIRECT; public class AbilitySandstorm extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/Sandbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/sand/Sandbending.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/sand/Sandbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/sand/Sandbending.java index 1cf1eb97e0..f01c9255ae 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/Sandbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/sand/Sandbending.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.sand; +package com.crowsofwar.avatar.common.bending.sand; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; import net.minecraft.init.SoundEvents; import net.minecraft.util.SoundEvent; import net.minecraft.util.text.TextFormatting; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/StatCtrlSandstormRedirect.java b/src/main/java/com/crowsofwar/avatar/common/bending/sand/StatCtrlSandstormRedirect.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/bending/bending/sand/StatCtrlSandstormRedirect.java rename to src/main/java/com/crowsofwar/avatar/common/bending/sand/StatCtrlSandstormRedirect.java index dfd518b011..b9cdb82ab0 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/sand/StatCtrlSandstormRedirect.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/sand/StatCtrlSandstormRedirect.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.sand; +package com.crowsofwar.avatar.common.bending.sand; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.EntitySandstorm; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.EntitySandstorm; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityBubbleBlitz.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityBubbleBlitz.java similarity index 69% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityBubbleBlitz.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityBubbleBlitz.java index d2b9ec4ef3..fe4b28908e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityBubbleBlitz.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityBubbleBlitz.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; public class AbilityBubbleBlitz extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCleanse.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCleanse.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCleanse.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCleanse.java index b065aa03e2..5cf597682b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCleanse.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCleanse.java @@ -1,12 +1,12 @@ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.water.tickhandlers.CleansePowerModifier; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.water.tickhandlers.CleansePowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -24,8 +24,8 @@ import java.util.function.BiPredicate; import java.util.function.Consumer; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; import static java.lang.Math.toRadians; public class AbilityCleanse extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCreateWave.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCreateWave.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCreateWave.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCreateWave.java index 4be08218ea..accc6c3719 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityCreateWave.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityCreateWave.java @@ -15,15 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.EntityWave; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.EntityWave; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import com.crowsofwar.gorecore.util.VectorI; import net.minecraft.block.state.IBlockState; @@ -32,7 +32,7 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class AbilityCreateWave extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterArc.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterArc.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterArc.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterArc.java index 823dcc8056..0c0d06d1ee 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterArc.java @@ -15,18 +15,18 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterArc; -import com.crowsofwar.avatar.entity.data.WaterArcBehavior; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterArc; +import com.crowsofwar.avatar.common.entity.data.WaterArcBehavior; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLiving; @@ -38,9 +38,9 @@ import java.util.function.BiPredicate; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_WATER; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_WATER; import static com.crowsofwar.gorecore.util.Vector.getLookRectangular; import static java.lang.Math.toRadians; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBlast.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBlast.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBlast.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBlast.java index 208c6e3185..67fb05b51b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBlast.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBlast.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -16,9 +16,9 @@ import java.util.function.BiPredicate; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.WATER_CHARGE; -import static com.crowsofwar.avatar.util.data.TickHandlerController.WATER_PARTICLE_SPAWNER; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.WATER_CHARGE; +import static com.crowsofwar.avatar.common.data.TickHandlerController.WATER_PARTICLE_SPAWNER; import static java.lang.Math.toRadians; public class AbilityWaterBlast extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBubble.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBubble.java index 26cc236a7a..3885681d8a 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterBubble.java @@ -15,17 +15,17 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterBubble; -import com.crowsofwar.avatar.entity.data.WaterBubbleBehavior; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterBubble; +import com.crowsofwar.avatar.common.entity.data.WaterBubbleBehavior; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -35,9 +35,9 @@ import java.util.function.BiPredicate; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.LOB_BUBBLE; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.LOB_BUBBLE; import static java.lang.Math.toRadians; /** diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterRedirect.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterRedirect.java similarity index 75% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterRedirect.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterRedirect.java index 1e72f9a1f5..650d80ec04 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterRedirect.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterRedirect.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; public class AbilityWaterRedirect extends Ability { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterSkate.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterSkate.java similarity index 74% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterSkate.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterSkate.java index 0ab0c4afb1..619c866636 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AbilityWaterSkate.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AbilityWaterSkate.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; -import static com.crowsofwar.avatar.util.data.StatusControlController.SKATING_START; -import static com.crowsofwar.avatar.util.data.TickHandlerController.WATER_SKATE; +import static com.crowsofwar.avatar.common.data.StatusControlController.SKATING_START; +import static com.crowsofwar.avatar.common.data.TickHandlerController.WATER_SKATE; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWaterArc.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AiWaterArc.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWaterArc.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AiWaterArc.java index ae59eabab3..73dc26f12b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWaterArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AiWaterArc.java @@ -14,20 +14,20 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterArc; -import com.crowsofwar.avatar.entity.data.WaterArcBehavior; +package com.crowsofwar.avatar.common.bending.water; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterArc; +import com.crowsofwar.avatar.common.entity.data.WaterArcBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_WATER; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_WATER; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.getRotationTo; import static java.lang.Math.toDegrees; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWave.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/AiWave.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWave.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/AiWave.java index b8da4d0c28..5d0fc253ff 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/AiWave.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/AiWave.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingAi; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingAi; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import com.crowsofwar.gorecore.util.VectorI; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterPassives.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/WaterPassives.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterPassives.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/WaterPassives.java index 5650138f29..e1fb840f1b 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterPassives.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/WaterPassives.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) public class WaterPassives { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/Waterbending.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/Waterbending.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/Waterbending.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/Waterbending.java index 1be0858b88..f6366fc779 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/Waterbending.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/Waterbending.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.client.gui.BendingMenuInfo; -import com.crowsofwar.avatar.client.gui.MenuTheme; -import com.crowsofwar.avatar.client.gui.MenuTheme.ThemeColor; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.gui.BendingMenuInfo; +import com.crowsofwar.avatar.common.gui.MenuTheme; +import com.crowsofwar.avatar.common.gui.MenuTheme.ThemeColor; import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.SoundEvent; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterbendingPerformanceBonus.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/WaterbendingPerformanceBonus.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterbendingPerformanceBonus.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/WaterbendingPerformanceBonus.java index 20a42daaf3..6c15472f29 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/WaterbendingPerformanceBonus.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/WaterbendingPerformanceBonus.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.water; +package com.crowsofwar.avatar.common.bending.water; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.BendingData; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeBubble.java similarity index 67% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeBubble.java index df7f3a7f17..9a897b0e0e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeBubble.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterBubble; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterBubble; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeWaterBlast.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeWaterBlast.java similarity index 64% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeWaterBlast.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeWaterBlast.java index f7051c3e31..f9208c26bb 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlChargeWaterBlast.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlChargeWaterBlast.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class StatCtrlChargeWaterBlast extends StatusControl { diff --git a/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlFillWaterPouch.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlFillWaterPouch.java new file mode 100644 index 0000000000..5b6a229dd4 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlFillWaterPouch.java @@ -0,0 +1,4 @@ +package com.crowsofwar.avatar.common.bending.water.statctrls; + +public class StatCtrlFillWaterPouch { +} diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlLobBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlLobBubble.java similarity index 69% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlLobBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlLobBubble.java index a36c058543..cb37303da5 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlLobBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlLobBubble.java @@ -15,21 +15,21 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -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.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterBubble; -import com.crowsofwar.avatar.entity.data.WaterBubbleBehavior; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +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.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterBubble; +import com.crowsofwar.avatar.common.entity.data.WaterBubbleBehavior; import com.crowsofwar.gorecore.util.Vector; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_RIGHT_CLICK_DOWN; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.RIGHT_OF_CROSSHAIR; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateJump.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateJump.java similarity index 69% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateJump.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateJump.java index 33bffb4d0b..5d3c4b1876 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateJump.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateJump.java @@ -14,21 +14,21 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -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.AvatarUtils; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +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.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; -import static com.crowsofwar.avatar.client.controls.AvatarControl.CONTROL_JUMP; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.BELOW_CROSSHAIR; -import static com.crowsofwar.avatar.util.data.TickHandlerController.SMASH_GROUND_WATER; -import static com.crowsofwar.avatar.util.data.TickHandlerController.WATER_SKATE; +import static com.crowsofwar.avatar.common.controls.AvatarControl.CONTROL_JUMP; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.BELOW_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.TickHandlerController.SMASH_GROUND_WATER; +import static com.crowsofwar.avatar.common.data.TickHandlerController.WATER_SKATE; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateStart.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateStart.java similarity index 73% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateStart.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateStart.java index a044705567..7c822e78c2 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlSkateStart.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlSkateStart.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; -import static com.crowsofwar.avatar.util.data.StatusControl.CrosshairPosition.BELOW_CROSSHAIR; +import static com.crowsofwar.avatar.common.data.StatusControl.CrosshairPosition.BELOW_CROSSHAIR; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowBubble.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowBubble.java similarity index 57% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowBubble.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowBubble.java index 8703128fab..215032d75d 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowBubble.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.bending.bending.water.statctrls; +package com.crowsofwar.avatar.common.bending.water.statctrls; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class StatCtrlThrowBubble extends StatusControl { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowWater.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowWater.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowWater.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowWater.java index 8798477a09..5903bce455 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/statctrls/StatCtrlThrowWater.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/statctrls/StatCtrlThrowWater.java @@ -15,16 +15,16 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water.statctrls; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.AbilityData; -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.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityWaterArc; -import com.crowsofwar.avatar.entity.data.WaterArcBehavior; +package com.crowsofwar.avatar.common.bending.water.statctrls; + +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.AbilityData; +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.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityWaterArc; +import com.crowsofwar.avatar.common.entity.data.WaterArcBehavior; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/CleansePowerModifier.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/CleansePowerModifier.java similarity index 67% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/CleansePowerModifier.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/CleansePowerModifier.java index d335fc9412..e22a9ae9d0 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/CleansePowerModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/CleansePowerModifier.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; -import com.crowsofwar.avatar.bending.bending.BuffPowerModifier; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.Vision; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.bending.BuffPowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.Vision; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class CleansePowerModifier extends BuffPowerModifier { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterArcComboHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterArcComboHandler.java similarity index 56% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterArcComboHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterArcComboHandler.java index 053ca1c1ae..5a9f2cacbf 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterArcComboHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterArcComboHandler.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; public class WaterArcComboHandler extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterChargeHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterChargeHandler.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterChargeHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterChargeHandler.java index 804c329248..a521a837cb 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterChargeHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterChargeHandler.java @@ -1,18 +1,18 @@ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; - -import com.crowsofwar.avatar.bending.bending.water.AbilityWaterBlast; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightCylinder; -import com.crowsofwar.avatar.entity.EntityWaterCannon; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.LightCylinderBehaviour; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; + +import com.crowsofwar.avatar.common.bending.water.AbilityWaterBlast; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightCylinder; +import com.crowsofwar.avatar.common.entity.EntityWaterCannon; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.LightCylinderBehaviour; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; @@ -28,8 +28,8 @@ import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class WaterChargeHandler extends TickHandler { public static final UUID MOVEMENT_MODIFIER_ID = UUID.fromString("87a0458a-38ea-4d7a-be3b-0fee10217aa6"); diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterParticleSpawner.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterParticleSpawner.java index 240b2291f7..ca021ecb1e 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterParticleSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterParticleSpawner.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.AvatarEntity; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.AvatarEntity; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -17,7 +17,7 @@ import java.util.List; -import static com.crowsofwar.avatar.util.data.TickHandlerController.WATER_CHARGE; +import static com.crowsofwar.avatar.common.data.TickHandlerController.WATER_CHARGE; public class WaterParticleSpawner extends TickHandler { diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSkateHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSkateHandler.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSkateHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSkateHandler.java index 7642b70f7d..1a0b861d31 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSkateHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSkateHandler.java @@ -14,17 +14,17 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; - -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.client.particle.ParticleSpawner; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; + +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.particle.ParticleSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; @@ -40,10 +40,10 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.SKATING_JUMP; -import static com.crowsofwar.avatar.util.data.StatusControlController.SKATING_START; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.SKATING_JUMP; +import static com.crowsofwar.avatar.common.data.StatusControlController.SKATING_START; import static com.crowsofwar.gorecore.util.Vector.toRectangular; import static java.lang.Math.toRadians; import static net.minecraft.init.Blocks.WATER; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSmashHandler.java b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSmashHandler.java similarity index 69% rename from src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSmashHandler.java rename to src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSmashHandler.java index 58bf476d15..7e5ddeae92 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bending/water/tickhandlers/WaterSmashHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/bending/water/tickhandlers/WaterSmashHandler.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.bending.bending.water.tickhandlers; +package com.crowsofwar.avatar.common.bending.water.tickhandlers; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.SmashGroundHandler; -import com.crowsofwar.avatar.bending.bending.water.AbilityWaterSkate; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.SmashGroundHandler; +import com.crowsofwar.avatar.common.bending.water.AbilityWaterSkate; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; import net.minecraft.init.SoundEvents; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/com/crowsofwar/avatar/blocks/AvatarBlocks.java b/src/main/java/com/crowsofwar/avatar/common/blocks/AvatarBlocks.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/blocks/AvatarBlocks.java rename to src/main/java/com/crowsofwar/avatar/common/blocks/AvatarBlocks.java index 15b72b755f..d780dd4433 100644 --- a/src/main/java/com/crowsofwar/avatar/blocks/AvatarBlocks.java +++ b/src/main/java/com/crowsofwar/avatar/common/blocks/AvatarBlocks.java @@ -14,11 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.blocks; +package com.crowsofwar.avatar.common.blocks; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.blocks.tiles.TileBlockTemp; +import com.crowsofwar.avatar.common.blocks.tiles.TileBlockTemp; import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/crowsofwar/avatar/blocks/BlockTemp.java b/src/main/java/com/crowsofwar/avatar/common/blocks/BlockTemp.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/blocks/BlockTemp.java rename to src/main/java/com/crowsofwar/avatar/common/blocks/BlockTemp.java index fcf9143a83..19b0c177e2 100644 --- a/src/main/java/com/crowsofwar/avatar/blocks/BlockTemp.java +++ b/src/main/java/com/crowsofwar/avatar/common/blocks/BlockTemp.java @@ -1,7 +1,8 @@ -package com.crowsofwar.avatar.blocks; +package com.crowsofwar.avatar.common.blocks; -import com.crowsofwar.avatar.blocks.tiles.TileBlockTemp; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.AvatarMod; +import com.crowsofwar.avatar.common.blocks.tiles.TileBlockTemp; +import com.crowsofwar.avatar.common.item.AvatarItems; import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/crowsofwar/avatar/blocks/BlockUtils.java b/src/main/java/com/crowsofwar/avatar/common/blocks/BlockUtils.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/blocks/BlockUtils.java rename to src/main/java/com/crowsofwar/avatar/common/blocks/BlockUtils.java index c643de65b1..8be2ca1c56 100644 --- a/src/main/java/com/crowsofwar/avatar/blocks/BlockUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/blocks/BlockUtils.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.blocks; +package com.crowsofwar.avatar.common.blocks; import net.minecraft.block.BlockLiquid; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/crowsofwar/avatar/blocks/CloudBlock.java b/src/main/java/com/crowsofwar/avatar/common/blocks/CloudBlock.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/blocks/CloudBlock.java rename to src/main/java/com/crowsofwar/avatar/common/blocks/CloudBlock.java diff --git a/src/main/java/com/crowsofwar/avatar/blocks/tiles/TileBlockTemp.java b/src/main/java/com/crowsofwar/avatar/common/blocks/tiles/TileBlockTemp.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/blocks/tiles/TileBlockTemp.java rename to src/main/java/com/crowsofwar/avatar/common/blocks/tiles/TileBlockTemp.java index c058328e7d..d268855d77 100644 --- a/src/main/java/com/crowsofwar/avatar/blocks/tiles/TileBlockTemp.java +++ b/src/main/java/com/crowsofwar/avatar/common/blocks/tiles/TileBlockTemp.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.blocks.tiles; +package com.crowsofwar.avatar.common.blocks.tiles; import net.minecraft.block.state.IBlockState; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/crowsofwar/avatar/common/capabilities/CapabilityPlayerShoulders.java b/src/main/java/com/crowsofwar/avatar/common/capabilities/CapabilityPlayerShoulders.java new file mode 100644 index 0000000000..16b413a4dd --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/capabilities/CapabilityPlayerShoulders.java @@ -0,0 +1,33 @@ +package com.crowsofwar.avatar.common.capabilities; + +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import net.minecraft.nbt.NBTBase; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.CapabilityInject; +import net.minecraftforge.common.capabilities.CapabilityManager; + +public class CapabilityPlayerShoulders { + + @CapabilityInject(IPlayerShoulders.class) + public static Capability TEST_HANDLER = null; + + public static void register() + { + CapabilityManager.INSTANCE.register(IPlayerShoulders.class, new Capability.IStorage() + { + + @Override + public NBTBase writeNBT(Capability capability, IPlayerShoulders instance, EnumFacing side) { + return null; + } + + @Override + public void readNBT(Capability capability, IPlayerShoulders instance, EnumFacing side, NBTBase base) + { + + } + + }, PlayerShouldersHandler::new); + } +} diff --git a/src/main/java/com/crowsofwar/avatar/capabilities/GliderCapabilityImplementation.java b/src/main/java/com/crowsofwar/avatar/common/capabilities/GliderCapabilityImplementation.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/capabilities/GliderCapabilityImplementation.java rename to src/main/java/com/crowsofwar/avatar/common/capabilities/GliderCapabilityImplementation.java index 007e6845f3..0917fa632c 100644 --- a/src/main/java/com/crowsofwar/avatar/capabilities/GliderCapabilityImplementation.java +++ b/src/main/java/com/crowsofwar/avatar/common/capabilities/GliderCapabilityImplementation.java @@ -1,8 +1,9 @@ -package com.crowsofwar.avatar.capabilities; +package com.crowsofwar.avatar.common.capabilities; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.network.packets.glider.PacketCSyncGliderDataToClient; +import com.crowsofwar.avatar.api.capabilities.IAdvancedGliderCapabilityHandler; +import com.crowsofwar.avatar.common.network.packets.glider.PacketCSyncGliderDataToClient; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -13,7 +14,7 @@ import net.minecraftforge.common.capabilities.ICapabilitySerializable; import static com.crowsofwar.avatar.AvatarInfo.MOD_ID; -import static com.crowsofwar.avatar.capabilities.CapabilityHelper.GLIDER_CAPABILITY; +import static com.crowsofwar.avatar.api.capabilities.CapabilityHelper.GLIDER_CAPABILITY; public final class GliderCapabilityImplementation { diff --git a/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShoulderProvider.java b/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShoulderProvider.java new file mode 100644 index 0000000000..8da4b59ce3 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShoulderProvider.java @@ -0,0 +1,22 @@ +package com.crowsofwar.avatar.common.capabilities; + +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ICapabilityProvider; + +public class PlayerShoulderProvider implements ICapabilityProvider { + + private IPlayerShoulders instance = CapabilityPlayerShoulders.TEST_HANDLER.getDefaultInstance(); + + @Override + public boolean hasCapability(Capability capability, EnumFacing facing) { + return capability == CapabilityPlayerShoulders.TEST_HANDLER; + } + + @Override + public T getCapability(Capability capability, EnumFacing facing) { + return capability == CapabilityPlayerShoulders.TEST_HANDLER ? CapabilityPlayerShoulders.TEST_HANDLER. cast(this.instance) : null; + } + +} diff --git a/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShouldersHandler.java b/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShouldersHandler.java new file mode 100644 index 0000000000..5dbdab5125 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/capabilities/PlayerShouldersHandler.java @@ -0,0 +1,64 @@ +package com.crowsofwar.avatar.common.capabilities; + +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import com.google.common.collect.Lists; +import net.minecraft.entity.Entity; + +import java.util.Collections; +import java.util.List; + +public class PlayerShouldersHandler implements IPlayerShoulders { + + private boolean rightshoulder; + private boolean leftshoulder; + private boolean isriding = false; + + private final List riders; + + public PlayerShouldersHandler() { + this.riders = Lists.newArrayList(); + } + + @Override + public List getRiders() { + return (List)(this.riders.isEmpty() ? Collections.emptyList() : Lists.newArrayList(this.riders)); + } + + @Override + public void removeRiders(Entity passenger) { + this.riders.remove(passenger); + } + + @Override + public void addRiders(Entity passenger) { + this.riders.add(passenger); + } + + @Override + public boolean getRightShoulder() { + return this.rightshoulder; + } + + @Override + public boolean getLeftShoulder() { + + return this.leftshoulder; + } + + @Override + public void setRightShoulder(boolean set) { + this.rightshoulder = set; + } + + @Override + public void setLeftShoulder(boolean set) { + this.leftshoulder = set; + } + + @Override + public void removeAllRiders() { + this.riders.clear(); + + } + +} diff --git a/src/main/java/com/crowsofwar/avatar/util/command/ArgumentAbility.java b/src/main/java/com/crowsofwar/avatar/common/command/ArgumentAbility.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/util/command/ArgumentAbility.java rename to src/main/java/com/crowsofwar/avatar/common/command/ArgumentAbility.java index 4e08ca1500..d1bbe572c1 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/ArgumentAbility.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/ArgumentAbility.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; import com.crowsofwar.gorecore.tree.IArgument; import com.crowsofwar.gorecore.tree.TreeCommandException; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/ArgumentBendingController.java b/src/main/java/com/crowsofwar/avatar/common/command/ArgumentBendingController.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/util/command/ArgumentBendingController.java rename to src/main/java/com/crowsofwar/avatar/common/command/ArgumentBendingController.java index f764564727..7f661b0b08 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/ArgumentBendingController.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/ArgumentBendingController.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; import com.crowsofwar.gorecore.tree.IArgument; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/AvatarCommand.java b/src/main/java/com/crowsofwar/avatar/common/command/AvatarCommand.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/command/AvatarCommand.java rename to src/main/java/com/crowsofwar/avatar/common/command/AvatarCommand.java index 292856fb75..533de62641 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/AvatarCommand.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/AvatarCommand.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.network.AvatarChatMessages; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; +import com.crowsofwar.avatar.common.AvatarChatMessages; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; import com.crowsofwar.gorecore.tree.ICommandNode; import com.crowsofwar.gorecore.tree.ITypeConverter; import com.crowsofwar.gorecore.tree.NodeBranch; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeAbilityGet.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeAbilityGet.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeAbilityGet.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeAbilityGet.java index 320b8dc3c9..70e1109eae 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeAbilityGet.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeAbilityGet.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.network.AvatarChatMessages; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.AvatarChatMessages; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.tree.*; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeAbilitySet.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeAbilitySet.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeAbilitySet.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeAbilitySet.java index 4bb7a7a70d..aa089d2cf6 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeAbilitySet.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeAbilitySet.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.network.AvatarChatMessages; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.AvatarChatMessages; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.tree.*; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingAdd.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingAdd.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeBendingAdd.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeBendingAdd.java index 70c9316403..37fdf45f69 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingAdd.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingAdd.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.event.ElementUnlockEvent; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.event.ElementUnlockEvent; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.tree.*; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +29,7 @@ import java.util.List; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; public class NodeBendingAdd extends NodeFunctional { diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingList.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingList.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeBendingList.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeBendingList.java index 9d7e29bff2..a04519e2d0 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingList.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingList.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.network.AvatarChatMessages; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.AvatarChatMessages; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.data.BendingData; import com.crowsofwar.gorecore.tree.*; import net.minecraft.command.ICommandSender; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingRemove.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingRemove.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeBendingRemove.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeBendingRemove.java index 62cd63e01d..ad713d4f85 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeBendingRemove.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeBendingRemove.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.event.ElementRemoveEvent; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.event.ElementRemoveEvent; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.tree.*; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +29,7 @@ import java.util.List; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; public class NodeBendingRemove extends NodeFunctional { diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeConfig.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeConfig.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeConfig.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeConfig.java index 76e1ef6288..5948264fa3 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeConfig.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeConfig.java @@ -15,16 +15,16 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; +package com.crowsofwar.avatar.common.command; -import com.crowsofwar.avatar.config.*; +import com.crowsofwar.avatar.common.config.*; import com.crowsofwar.gorecore.config.ConfigurationException; import com.crowsofwar.gorecore.tree.*; import net.minecraft.command.ICommandSender; import java.util.List; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/util/command/NodeXpSet.java b/src/main/java/com/crowsofwar/avatar/common/command/NodeXpSet.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/util/command/NodeXpSet.java rename to src/main/java/com/crowsofwar/avatar/common/command/NodeXpSet.java index ef786a7cca..40da8a8159 100644 --- a/src/main/java/com/crowsofwar/avatar/util/command/NodeXpSet.java +++ b/src/main/java/com/crowsofwar/avatar/common/command/NodeXpSet.java @@ -14,22 +14,22 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.command; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.event.AbilityLevelEvent; -import com.crowsofwar.avatar.util.event.AbilityUnlockEvent; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +package com.crowsofwar.avatar.common.command; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.event.AbilityLevelEvent; +import com.crowsofwar.avatar.common.event.AbilityUnlockEvent; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.tree.*; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.common.MinecraftForge; import java.util.List; -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_XPSET_SUCCESS; +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_XPSET_SUCCESS; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/config/AbilityProperties.java b/src/main/java/com/crowsofwar/avatar/common/config/AbilityProperties.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/config/AbilityProperties.java rename to src/main/java/com/crowsofwar/avatar/common/config/AbilityProperties.java diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigAnalytics.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigAnalytics.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/config/ConfigAnalytics.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigAnalytics.java index 6e39d5c52b..c393379e4a 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigAnalytics.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigAnalytics.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.gorecore.config.ConfigLoader; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigChi.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigChi.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/config/ConfigChi.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigChi.java index cc1f5f6d73..5f324da14f 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigChi.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigChi.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import com.crowsofwar.gorecore.config.ConfigLoader; import com.crowsofwar.gorecore.config.Load; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigClient.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigClient.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/config/ConfigClient.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigClient.java index baf967b8f8..1f4cdf65d3 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigClient.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigClient.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; import com.crowsofwar.gorecore.config.ConfigLoader; import com.crowsofwar.gorecore.config.Load; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigGlider.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigGlider.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/config/ConfigGlider.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigGlider.java index 4f87a1d654..046ac40937 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigGlider.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigGlider.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import com.crowsofwar.gorecore.config.ConfigLoader; import com.crowsofwar.gorecore.config.Load; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigMobs.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigMobs.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/config/ConfigMobs.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigMobs.java index 020c2a9e18..1a2f7314d6 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigMobs.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigMobs.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import akka.japi.Pair; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import com.crowsofwar.gorecore.config.ConfigLoader; import com.crowsofwar.gorecore.config.Load; import com.google.common.collect.ArrayListMultimap; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigSkills.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigSkills.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/config/ConfigSkills.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigSkills.java index 91a8262558..c85899f96e 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigSkills.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigSkills.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import com.crowsofwar.gorecore.config.ConfigLoader; import com.crowsofwar.gorecore.config.Load; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigStats.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigStats.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/config/ConfigStats.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigStats.java index 406b8f7d7c..82bff14176 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigStats.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigStats.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; diff --git a/src/main/java/com/crowsofwar/avatar/config/ConfigurableProperty.java b/src/main/java/com/crowsofwar/avatar/common/config/ConfigurableProperty.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/config/ConfigurableProperty.java rename to src/main/java/com/crowsofwar/avatar/common/config/ConfigurableProperty.java index 67fbe6995e..194f0e7b14 100644 --- a/src/main/java/com/crowsofwar/avatar/config/ConfigurableProperty.java +++ b/src/main/java/com/crowsofwar/avatar/common/config/ConfigurableProperty.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.config; +package com.crowsofwar.avatar.common.config; /** * Represents a Configuration entry. It has a String key and a changeable value. diff --git a/src/main/java/com/crowsofwar/avatar/client/controls/AvatarControl.java b/src/main/java/com/crowsofwar/avatar/common/controls/AvatarControl.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/client/controls/AvatarControl.java rename to src/main/java/com/crowsofwar/avatar/common/controls/AvatarControl.java index a02f3105b7..629f903fc9 100644 --- a/src/main/java/com/crowsofwar/avatar/client/controls/AvatarControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/controls/AvatarControl.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.controls; +package com.crowsofwar.avatar.common.controls; import com.crowsofwar.avatar.AvatarMod; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/crowsofwar/avatar/client/controls/IControlsHandler.java b/src/main/java/com/crowsofwar/avatar/common/controls/IControlsHandler.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/client/controls/IControlsHandler.java rename to src/main/java/com/crowsofwar/avatar/common/controls/IControlsHandler.java index 18af311af3..18bba824bd 100644 --- a/src/main/java/com/crowsofwar/avatar/client/controls/IControlsHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/controls/IControlsHandler.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.controls; +package com.crowsofwar.avatar.common.controls; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/client/controls/KeybindingWrapper.java b/src/main/java/com/crowsofwar/avatar/common/controls/KeybindingWrapper.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/client/controls/KeybindingWrapper.java rename to src/main/java/com/crowsofwar/avatar/common/controls/KeybindingWrapper.java index f14752860f..13b5ad9ace 100644 --- a/src/main/java/com/crowsofwar/avatar/client/controls/KeybindingWrapper.java +++ b/src/main/java/com/crowsofwar/avatar/common/controls/KeybindingWrapper.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.controls; +package com.crowsofwar.avatar.common.controls; /** * Wrapper class so vanilla KeyBindings don't crash on the server side diff --git a/src/main/java/com/crowsofwar/avatar/util/damageutils/AvatarDamageSource.java b/src/main/java/com/crowsofwar/avatar/common/damageutils/AvatarDamageSource.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/damageutils/AvatarDamageSource.java rename to src/main/java/com/crowsofwar/avatar/common/damageutils/AvatarDamageSource.java index 2c428aff35..15af082d09 100644 --- a/src/main/java/com/crowsofwar/avatar/util/damageutils/AvatarDamageSource.java +++ b/src/main/java/com/crowsofwar/avatar/common/damageutils/AvatarDamageSource.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.damageutils; +package com.crowsofwar.avatar.common.damageutils; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; @@ -27,6 +27,7 @@ import net.minecraft.init.MobEffects; import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; +import net.minecraft.util.EntityDamageSource; import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/crowsofwar/avatar/util/damageutils/DamageUtils.java b/src/main/java/com/crowsofwar/avatar/common/damageutils/DamageUtils.java similarity index 77% rename from src/main/java/com/crowsofwar/avatar/util/damageutils/DamageUtils.java rename to src/main/java/com/crowsofwar/avatar/common/damageutils/DamageUtils.java index ee4cbcfe9b..0003b63e44 100644 --- a/src/main/java/com/crowsofwar/avatar/util/damageutils/DamageUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/damageutils/DamageUtils.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.util.damageutils; +package com.crowsofwar.avatar.common.damageutils; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityShield; -import com.crowsofwar.avatar.entity.IShieldEntity; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityShield; +import com.crowsofwar.avatar.common.entity.IShieldEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.boss.EntityDragon; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/AbilityData.java b/src/main/java/com/crowsofwar/avatar/common/data/AbilityData.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/data/AbilityData.java rename to src/main/java/com/crowsofwar/avatar/common/data/AbilityData.java index 2f45bf6d3f..b7d5ae7c34 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/AbilityData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/AbilityData.java @@ -15,14 +15,16 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; +import akka.japi.Pair; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.PacketBuffer; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/AvatarPlayerData.java b/src/main/java/com/crowsofwar/avatar/common/data/AvatarPlayerData.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/data/AvatarPlayerData.java rename to src/main/java/com/crowsofwar/avatar/common/data/AvatarPlayerData.java index 6edbf4a4bf..ff7e0f0c9d 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/AvatarPlayerData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/AvatarPlayerData.java @@ -15,16 +15,17 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.network.packets.PacketCPlayerData; +import com.crowsofwar.avatar.common.network.packets.PacketCPlayerData; import com.crowsofwar.gorecore.data.*; import net.minecraft.entity.EntityTracker; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.WorldServer; +import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; import java.util.*; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/AvatarWorldData.java b/src/main/java/com/crowsofwar/avatar/common/data/AvatarWorldData.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/data/AvatarWorldData.java rename to src/main/java/com/crowsofwar/avatar/common/data/AvatarWorldData.java index 6fb1d4d328..167d2fa370 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/AvatarWorldData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/AvatarWorldData.java @@ -15,9 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.gorecore.data.PlayerData; import com.crowsofwar.gorecore.data.WorldDataPlayers; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/Bender.java b/src/main/java/com/crowsofwar/avatar/common/data/Bender.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/util/data/Bender.java rename to src/main/java/com/crowsofwar/avatar/common/data/Bender.java diff --git a/src/main/java/com/crowsofwar/avatar/util/data/BenderEntityComponent.java b/src/main/java/com/crowsofwar/avatar/common/data/BenderEntityComponent.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/data/BenderEntityComponent.java rename to src/main/java/com/crowsofwar/avatar/common/data/BenderEntityComponent.java index 2a7294c664..29dfa01e3c 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/BenderEntityComponent.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/BenderEntityComponent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfo.java b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfo.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/util/data/BenderInfo.java rename to src/main/java/com/crowsofwar/avatar/common/data/BenderInfo.java index 7b6f74f7a6..1701cf2830 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfo.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfo.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.data.ctx.NoBenderInfo; +import com.crowsofwar.avatar.common.data.ctx.NoBenderInfo; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfoEntity.java b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfoEntity.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/data/BenderInfoEntity.java rename to src/main/java/com/crowsofwar/avatar/common/data/BenderInfoEntity.java index 351e538567..5f3b05a975 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfoEntity.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfoEntity.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfoPlayer.java b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfoPlayer.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/data/BenderInfoPlayer.java rename to src/main/java/com/crowsofwar/avatar/common/data/BenderInfoPlayer.java index 07afe5cbd6..7f8c68ab55 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/BenderInfoPlayer.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/BenderInfoPlayer.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import com.crowsofwar.gorecore.util.AccountUUIDs; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/BendingData.java b/src/main/java/com/crowsofwar/avatar/common/data/BendingData.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/data/BendingData.java rename to src/main/java/com/crowsofwar/avatar/common/data/BendingData.java index 1212ec8d9e..fca39b4611 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/BendingData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/BendingData.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.bending.bending.*; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.bending.*; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; @@ -32,7 +32,7 @@ import java.util.function.Function; import java.util.stream.Collectors; -import static com.crowsofwar.avatar.config.ConfigChi.CHI_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigChi.CHI_CONFIG; import static com.crowsofwar.gorecore.util.GoreCoreNBTUtil.nestedCompound; /** diff --git a/src/main/java/com/crowsofwar/avatar/util/data/CachedEntity.java b/src/main/java/com/crowsofwar/avatar/common/data/CachedEntity.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/data/CachedEntity.java rename to src/main/java/com/crowsofwar/avatar/common/data/CachedEntity.java index 1682da982c..b5955a83da 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/CachedEntity.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/CachedEntity.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import com.crowsofwar.gorecore.util.AccountUUIDs; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/Chi.java b/src/main/java/com/crowsofwar/avatar/common/data/Chi.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/data/Chi.java rename to src/main/java/com/crowsofwar/avatar/common/data/Chi.java index 06fb12fce4..ac37fcdc2c 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/Chi.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/Chi.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/DataCategory.java b/src/main/java/com/crowsofwar/avatar/common/data/DataCategory.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/data/DataCategory.java rename to src/main/java/com/crowsofwar/avatar/common/data/DataCategory.java index 3aec0de0ec..27a88523d7 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/DataCategory.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/DataCategory.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.network.DataTransmitter; -import com.crowsofwar.avatar.network.DataTransmitters; +import com.crowsofwar.avatar.common.network.DataTransmitter; +import com.crowsofwar.avatar.common.network.DataTransmitters; import io.netty.buffer.ByteBuf; import java.util.function.BiConsumer; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/LightningRedirectionData.java b/src/main/java/com/crowsofwar/avatar/common/data/LightningRedirectionData.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/util/data/LightningRedirectionData.java rename to src/main/java/com/crowsofwar/avatar/common/data/LightningRedirectionData.java index 42ae09ac18..dd87f6e549 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/LightningRedirectionData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/LightningRedirectionData.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.entity.EntityLightningArc; +import com.crowsofwar.avatar.common.entity.EntityLightningArc; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/com/crowsofwar/avatar/util/data/MiscData.java b/src/main/java/com/crowsofwar/avatar/common/data/MiscData.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/util/data/MiscData.java rename to src/main/java/com/crowsofwar/avatar/common/data/MiscData.java index 48f7062bb1..b65416fd7d 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/MiscData.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/MiscData.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.data.ctx.NoBenderInfo; +import com.crowsofwar.avatar.common.data.ctx.NoBenderInfo; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/PowerRatingManager.java b/src/main/java/com/crowsofwar/avatar/common/data/PowerRatingManager.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/util/data/PowerRatingManager.java rename to src/main/java/com/crowsofwar/avatar/common/data/PowerRatingManager.java index d15bdf581b..36a12384be 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/PowerRatingManager.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/PowerRatingManager.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.util.math.MathHelper; import java.util.HashSet; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/PowerRatingModifier.java b/src/main/java/com/crowsofwar/avatar/common/data/PowerRatingModifier.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/util/data/PowerRatingModifier.java rename to src/main/java/com/crowsofwar/avatar/common/data/PowerRatingModifier.java index 00a1cce3ce..9b5e05afd4 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/PowerRatingModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/PowerRatingModifier.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/util/data/PreAlpha5SaveConverter.java b/src/main/java/com/crowsofwar/avatar/common/data/PreAlpha5SaveConverter.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/util/data/PreAlpha5SaveConverter.java rename to src/main/java/com/crowsofwar/avatar/common/data/PreAlpha5SaveConverter.java index 3ec6c8c1f9..789ff92f07 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/PreAlpha5SaveConverter.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/PreAlpha5SaveConverter.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.bending.water.Waterbending; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/SandstormMovementHandler.java b/src/main/java/com/crowsofwar/avatar/common/data/SandstormMovementHandler.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/data/SandstormMovementHandler.java rename to src/main/java/com/crowsofwar/avatar/common/data/SandstormMovementHandler.java index 9634ebe9eb..0cf8bb3368 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/SandstormMovementHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/SandstormMovementHandler.java @@ -1,7 +1,8 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.entity.EntitySandstorm; +import com.crowsofwar.avatar.common.entity.EntitySandstorm; import com.crowsofwar.gorecore.util.Vector; +import net.minecraft.client.Minecraft; import javax.annotation.Nullable; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/ScheduledDestroyBlock.java b/src/main/java/com/crowsofwar/avatar/common/data/ScheduledDestroyBlock.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/data/ScheduledDestroyBlock.java rename to src/main/java/com/crowsofwar/avatar/common/data/ScheduledDestroyBlock.java index 4a0809fc61..07596901ab 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/ScheduledDestroyBlock.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/ScheduledDestroyBlock.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/StatusControl.java b/src/main/java/com/crowsofwar/avatar/common/data/StatusControl.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/util/data/StatusControl.java rename to src/main/java/com/crowsofwar/avatar/common/data/StatusControl.java index 823d25c18f..53a6ea4296 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/StatusControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/StatusControl.java @@ -15,16 +15,25 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; - -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.data; + +import com.crowsofwar.avatar.common.bending.air.statctrls.*; +import com.crowsofwar.avatar.common.bending.earth.*; +import com.crowsofwar.avatar.common.bending.fire.statctrls.*; +import com.crowsofwar.avatar.common.bending.ice.StatCtrlShieldShatter; +import com.crowsofwar.avatar.common.bending.lightning.StatCtrlThrowLightningSpear; +import com.crowsofwar.avatar.common.bending.sand.StatCtrlSandstormRedirect; +import com.crowsofwar.avatar.common.bending.water.*; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.util.Raytrace; +import net.minecraft.util.EnumHand; import java.util.ArrayList; +import java.util.List; -import static com.crowsofwar.avatar.util.data.StatusControlController.allControls; -import static com.crowsofwar.avatar.util.data.StatusControlController.nextId; +import static com.crowsofwar.avatar.common.data.StatusControlController.allControls; +import static com.crowsofwar.avatar.common.data.StatusControlController.nextId; /** * Describes a temporary effect where a callback listener is added to a control diff --git a/src/main/java/com/crowsofwar/avatar/util/data/StatusControlController.java b/src/main/java/com/crowsofwar/avatar/common/data/StatusControlController.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/util/data/StatusControlController.java rename to src/main/java/com/crowsofwar/avatar/common/data/StatusControlController.java index 5f292d26c3..ca070f6600 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/StatusControlController.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/StatusControlController.java @@ -1,12 +1,12 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.bending.bending.air.statctrls.*; -import com.crowsofwar.avatar.bending.bending.earth.statctrls.*; -import com.crowsofwar.avatar.bending.bending.fire.statctrls.*; -import com.crowsofwar.avatar.bending.bending.ice.StatCtrlShieldShatter; -import com.crowsofwar.avatar.bending.bending.lightning.StatCtrlThrowLightningSpear; -import com.crowsofwar.avatar.bending.bending.sand.StatCtrlSandstormRedirect; -import com.crowsofwar.avatar.bending.bending.water.statctrls.*; +import com.crowsofwar.avatar.common.bending.air.statctrls.*; +import com.crowsofwar.avatar.common.bending.earth.statctrls.*; +import com.crowsofwar.avatar.common.bending.fire.statctrls.*; +import com.crowsofwar.avatar.common.bending.ice.StatCtrlShieldShatter; +import com.crowsofwar.avatar.common.bending.lightning.StatCtrlThrowLightningSpear; +import com.crowsofwar.avatar.common.bending.sand.StatCtrlSandstormRedirect; +import com.crowsofwar.avatar.common.bending.water.statctrls.*; import net.minecraft.util.EnumHand; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/TemporaryWaterLocation.java b/src/main/java/com/crowsofwar/avatar/common/data/TemporaryWaterLocation.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/data/TemporaryWaterLocation.java rename to src/main/java/com/crowsofwar/avatar/common/data/TemporaryWaterLocation.java index 50bd0fc4a7..5dafe14867 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/TemporaryWaterLocation.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/TemporaryWaterLocation.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/TickHandler.java b/src/main/java/com/crowsofwar/avatar/common/data/TickHandler.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/util/data/TickHandler.java rename to src/main/java/com/crowsofwar/avatar/common/data/TickHandler.java index 0b6e557d4d..04e022dbaf 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/TickHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/TickHandler.java @@ -14,10 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import io.netty.buffer.ByteBuf; +import net.minecraft.entity.EntityLivingBase; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/util/data/TickHandlerController.java b/src/main/java/com/crowsofwar/avatar/common/data/TickHandlerController.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/util/data/TickHandlerController.java rename to src/main/java/com/crowsofwar/avatar/common/data/TickHandlerController.java index 5dd4581cd6..64e6abe5a8 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/TickHandlerController.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/TickHandlerController.java @@ -1,14 +1,14 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import com.crowsofwar.avatar.client.gui.RenderElementHandler; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.*; -import com.crowsofwar.avatar.bending.bending.earth.tickhandlers.RestoreParticleHandler; -import com.crowsofwar.avatar.bending.bending.fire.*; -import com.crowsofwar.avatar.bending.bending.fire.tickhandlers.*; -import com.crowsofwar.avatar.bending.bending.lightning.LightningCreateHandler; -import com.crowsofwar.avatar.bending.bending.lightning.LightningRedirectHandler; -import com.crowsofwar.avatar.bending.bending.water.tickhandlers.*; -import com.crowsofwar.avatar.entity.mob.BisonSummonHandler; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.*; +import com.crowsofwar.avatar.common.bending.earth.tickhandlers.RestoreParticleHandler; +import com.crowsofwar.avatar.common.bending.fire.*; +import com.crowsofwar.avatar.common.bending.fire.tickhandlers.*; +import com.crowsofwar.avatar.common.bending.lightning.LightningCreateHandler; +import com.crowsofwar.avatar.common.bending.lightning.LightningRedirectHandler; +import com.crowsofwar.avatar.common.bending.water.tickhandlers.*; +import com.crowsofwar.avatar.common.entity.mob.BisonSummonHandler; import io.netty.buffer.ByteBuf; import java.util.HashMap; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/Vision.java b/src/main/java/com/crowsofwar/avatar/common/data/Vision.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/util/data/Vision.java rename to src/main/java/com/crowsofwar/avatar/common/data/Vision.java index b973b3e4d0..1d48e5d778 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/Vision.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/Vision.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/WallJumpManager.java b/src/main/java/com/crowsofwar/avatar/common/data/WallJumpManager.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/util/data/WallJumpManager.java rename to src/main/java/com/crowsofwar/avatar/common/data/WallJumpManager.java index 7a1c5c3560..62b4b54925 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/WallJumpManager.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/WallJumpManager.java @@ -1,11 +1,12 @@ -package com.crowsofwar.avatar.util.data; +package com.crowsofwar.avatar.common.data; -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.client.particle.NetworkParticleSpawner; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.particle.NetworkParticleSpawner; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; @@ -15,8 +16,8 @@ import javax.annotation.Nullable; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.FIRE_PARTICLE_SPAWNER; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.FIRE_PARTICLE_SPAWNER; /** * Contains all wall jump related logic for a Bender. These methods would normally be in the diff --git a/src/main/java/com/crowsofwar/avatar/util/data/ctx/AbilityContext.java b/src/main/java/com/crowsofwar/avatar/common/data/ctx/AbilityContext.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/util/data/ctx/AbilityContext.java rename to src/main/java/com/crowsofwar/avatar/common/data/ctx/AbilityContext.java index 1935fdbb21..feaae43f4f 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/ctx/AbilityContext.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/ctx/AbilityContext.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data.ctx; +package com.crowsofwar.avatar.common.data.ctx; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.Raytrace.Result; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.util.Raytrace.Result; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/com/crowsofwar/avatar/util/data/ctx/BendingContext.java b/src/main/java/com/crowsofwar/avatar/common/data/ctx/BendingContext.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/data/ctx/BendingContext.java rename to src/main/java/com/crowsofwar/avatar/common/data/ctx/BendingContext.java index 6cee8dd811..0c079a46be 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/ctx/BendingContext.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/ctx/BendingContext.java @@ -15,12 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data.ctx; +package com.crowsofwar.avatar.common.data.ctx; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import com.crowsofwar.gorecore.util.VectorI; import net.minecraft.block.Block; @@ -36,7 +36,7 @@ import javax.annotation.Nullable; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * Information when something is executed. Only is used server-side. diff --git a/src/main/java/com/crowsofwar/avatar/util/data/ctx/NoBenderInfo.java b/src/main/java/com/crowsofwar/avatar/common/data/ctx/NoBenderInfo.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/util/data/ctx/NoBenderInfo.java rename to src/main/java/com/crowsofwar/avatar/common/data/ctx/NoBenderInfo.java index 2dba1e4efd..c19ab6658f 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/ctx/NoBenderInfo.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/ctx/NoBenderInfo.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data.ctx; +package com.crowsofwar.avatar.common.data.ctx; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BenderInfo; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BenderInfo; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/util/data/ctx/PlayerBender.java b/src/main/java/com/crowsofwar/avatar/common/data/ctx/PlayerBender.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/util/data/ctx/PlayerBender.java rename to src/main/java/com/crowsofwar/avatar/common/data/ctx/PlayerBender.java index ee80ac7e07..70b66e48fc 100644 --- a/src/main/java/com/crowsofwar/avatar/util/data/ctx/PlayerBender.java +++ b/src/main/java/com/crowsofwar/avatar/common/data/ctx/PlayerBender.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util.data.ctx; +package com.crowsofwar.avatar.common.data.ctx; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.*; @@ -22,19 +22,19 @@ import com.crowsofwar.avatar.AvatarMod; import com.crowsofwar.avatar.client.gui.AvatarUiRenderer; -import com.crowsofwar.avatar.util.analytics.*; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.lightning.Lightningbending; -import com.crowsofwar.avatar.util.data.*; -import com.crowsofwar.avatar.entity.EntityLightningArc; -import com.crowsofwar.avatar.entity.mob.EntityBender; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.network.packets.*; -import com.crowsofwar.avatar.util.Raytrace; - -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_LIGHTNING_REDIRECT_SUCCESS; -import static com.crowsofwar.avatar.config.ConfigChi.CHI_CONFIG; -import static com.crowsofwar.avatar.util.data.TickHandlerController.LIGHTNING_REDIRECT; +import com.crowsofwar.avatar.common.analytics.*; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.lightning.Lightningbending; +import com.crowsofwar.avatar.common.data.*; +import com.crowsofwar.avatar.common.entity.EntityLightningArc; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.network.packets.*; +import com.crowsofwar.avatar.common.util.Raytrace; + +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_LIGHTNING_REDIRECT_SUCCESS; +import static com.crowsofwar.avatar.common.config.ConfigChi.CHI_CONFIG; +import static com.crowsofwar.avatar.common.data.TickHandlerController.LIGHTNING_REDIRECT; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/AvatarEntity.java b/src/main/java/com/crowsofwar/avatar/common/entity/AvatarEntity.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/AvatarEntity.java rename to src/main/java/com/crowsofwar/avatar/common/entity/AvatarEntity.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/AvatarEntityItem.java b/src/main/java/com/crowsofwar/avatar/common/entity/AvatarEntityItem.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/AvatarEntityItem.java rename to src/main/java/com/crowsofwar/avatar/common/entity/AvatarEntityItem.java index ca820d70e4..fbbb5abd10 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/AvatarEntityItem.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/AvatarEntityItem.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ControlPoint.java b/src/main/java/com/crowsofwar/avatar/common/entity/ControlPoint.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/ControlPoint.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ControlPoint.java index c4f18e6919..652376d7c8 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ControlPoint.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ControlPoint.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityAirBubble.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAirBubble.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/EntityAirBubble.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityAirBubble.java index 9950d0756b..49b2958749 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityAirBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAirBubble.java @@ -14,16 +14,16 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -50,8 +50,8 @@ import java.util.List; import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; /** diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityAirGust.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAirGust.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityAirGust.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityAirGust.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityAirblade.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAirblade.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/entity/EntityAirblade.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityAirblade.java index 7812387fac..bc62bdd480 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityAirblade.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAirblade.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.AbilityAirblade; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.AbilityAirblade; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -38,7 +38,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityArc.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityArc.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/entity/EntityArc.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityArc.java index 89275c48dd..f06a8cb0dd 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityArc.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityAvatarLightning.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAvatarLightning.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/EntityAvatarLightning.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityAvatarLightning.java index 546da7a577..cace969451 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityAvatarLightning.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityAvatarLightning.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.bending.bending.lightning.AbilityLightningRaze; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.bending.lightning.AbilityLightningRaze; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; import com.zeitheron.hammercore.api.lighting.ColoredLight; import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.block.material.Material; @@ -27,8 +27,8 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @SuppressWarnings("EntityConstructor") @Mod.EventBusSubscriber(modid = AvatarInfo.MOD_ID) diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityCloudBall.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityCloudBall.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/EntityCloudBall.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityCloudBall.java index f9639383cd..6cba629844 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityCloudBall.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityCloudBall.java @@ -1,19 +1,19 @@ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.air.powermods.CloudburstPowerModifier; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.CloudburstBehavior; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.air.powermods.CloudburstPowerModifier; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.CloudburstBehavior; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -36,7 +36,7 @@ import java.util.Objects; import java.util.UUID; -import static com.crowsofwar.avatar.util.data.TickHandlerController.AIR_STATCTRL_HANDLER; +import static com.crowsofwar.avatar.common.data.TickHandlerController.AIR_STATCTRL_HANDLER; public class EntityCloudBall extends EntityOffensive { diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthSpear.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthSpear.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/entity/EntityEarthSpear.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthSpear.java index 58511614ad..65252a6f1e 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthSpear.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthspike.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspike.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/entity/EntityEarthspike.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspike.java index 47184b4de8..6994fb0d66 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthspike.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspike.java @@ -15,13 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.bending.bending.earth.AbilityEarthspikes; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.bending.earth.AbilityEarthspikes; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.zeitheron.hammercore.api.lighting.ColoredLight; +import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; @@ -36,11 +38,12 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthspikeSpawner.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspikeSpawner.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/entity/EntityEarthspikeSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspikeSpawner.java index 95a357d900..ef9ceed82a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityEarthspikeSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityEarthspikeSpawner.java @@ -1,9 +1,11 @@ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.config.ConfigStats; -import com.crowsofwar.avatar.entity.data.EarthspikesBehavior; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.config.ConfigStats; +import com.crowsofwar.avatar.common.entity.data.EarthspikesBehavior; +import com.zeitheron.hammercore.api.lighting.ColoredLight; +import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityExplosionSpawner.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityExplosionSpawner.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/entity/EntityExplosionSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityExplosionSpawner.java index 0298066ebf..a351a9b832 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityExplosionSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityExplosionSpawner.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -11,7 +11,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class EntityExplosionSpawner extends AvatarEntity { diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityFireball.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityFireball.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityFireball.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityFireball.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityFlame.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityFlame.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/entity/EntityFlame.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityFlame.java index ecc7774a95..1b7581ef5e 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityFlame.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityFlame.java @@ -1,13 +1,15 @@ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.blocks.BlockTemp; -import com.crowsofwar.avatar.blocks.BlockUtils; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.AvatarUtils; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.fire.AbilityFireShot; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.blocks.BlockTemp; +import com.crowsofwar.avatar.common.blocks.BlockUtils; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import com.zeitheron.hammercore.api.lighting.ColoredLight; import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; @@ -26,7 +28,7 @@ import javax.annotation.Nullable; import java.util.Objects; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; @Optional.Interface(iface = "com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity", modid = "hammercore") public class EntityFlame extends EntityOffensive implements IGlowingEntity, ICustomHitbox { diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityFlames.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityFlames.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityFlames.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityFlames.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityFloatingBlock.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityFloatingBlock.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityFloatingBlock.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityFloatingBlock.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityIcePrison.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIcePrison.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/EntityIcePrison.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityIcePrison.java index a92a6e7f1a..10b543b7e3 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityIcePrison.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIcePrison.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.ice.Icebending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.entity.data.SyncedEntity; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.ice.Icebending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.data.SyncedEntity; import com.google.common.base.Optional; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -42,7 +42,7 @@ import java.util.List; import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityIceShard.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShard.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/entity/EntityIceShard.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShard.java index 54392392b8..12051578ef 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityIceShard.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShard.java @@ -14,11 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; +import com.zeitheron.hammercore.api.lighting.ColoredLight; +import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.entity.Entity; import net.minecraft.entity.MoverType; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +29,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityIceShield.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShield.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/EntityIceShield.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShield.java index 8b02d57550..2f6f627748 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityIceShield.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityIceShield.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControlController; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,8 +32,8 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityLightCylinder.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightCylinder.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/EntityLightCylinder.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityLightCylinder.java index 5403d938fe..79f33700e3 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityLightCylinder.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightCylinder.java @@ -1,9 +1,11 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.entity.data.LightCylinderBehaviour; +import com.crowsofwar.avatar.common.entity.data.LightCylinderBehaviour; +import com.crowsofwar.gorecore.util.Vector; import com.zeitheron.hammercore.api.lighting.ColoredLight; import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; +import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; import net.minecraft.network.datasync.DataSerializers; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityLightOrb.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightOrb.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/EntityLightOrb.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityLightOrb.java index ec1e9390e6..c39b905ec0 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityLightOrb.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightOrb.java @@ -1,7 +1,8 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.LightOrbBehavior; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.LightOrbBehavior; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.zeitheron.hammercore.api.lighting.ColoredLight; import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningArc.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningArc.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/entity/EntityLightningArc.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningArc.java index 8987e8d1c7..827c0eae8a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningArc.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.bending.bending.lightning.AbilityLightningArc; -import com.crowsofwar.avatar.bending.bending.lightning.Lightningbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.data.LightningFloodFill; -import com.crowsofwar.avatar.util.AvatarDataSerializers; -import com.crowsofwar.avatar.util.AvatarUtils; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.bending.lightning.AbilityLightningArc; +import com.crowsofwar.avatar.common.bending.lightning.Lightningbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.data.LightningFloodFill; +import com.crowsofwar.avatar.common.util.AvatarDataSerializers; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import com.zeitheron.hammercore.api.lighting.ColoredLight; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Objects; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; /** diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpawner.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpawner.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpawner.java index 7f6e0fc6bf..df69905c0f 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpawner.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import com.crowsofwar.gorecore.util.Vector; import com.zeitheron.hammercore.api.lighting.ColoredLight; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpear.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpear.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpear.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpear.java index 6e975af026..ce1c14383a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityLightningSpear.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityLightningSpear.java @@ -14,17 +14,17 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.damageutils.DamageUtils; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.LightningFloodFill; -import com.crowsofwar.avatar.entity.data.LightningSpearBehavior; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.damageutils.DamageUtils; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.LightningFloodFill; +import com.crowsofwar.avatar.common.entity.data.LightningSpearBehavior; import com.crowsofwar.gorecore.util.Vector; import com.zeitheron.hammercore.api.lighting.ColoredLight; import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; @@ -45,7 +45,7 @@ import java.util.Objects; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityOffensive.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityOffensive.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityOffensive.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityOffensive.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityRavine.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityRavine.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityRavine.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityRavine.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntitySandPrison.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntitySandPrison.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/EntitySandPrison.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntitySandPrison.java index 524eb8ddc0..8f40d9327b 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntitySandPrison.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntitySandPrison.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public LSandnse along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.bending.bending.sand.Sandbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.entity.data.SyncedEntity; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.bending.sand.Sandbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.data.SyncedEntity; import com.google.common.base.Optional; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntitySandstorm.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntitySandstorm.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/EntitySandstorm.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntitySandstorm.java index 1de40e432f..e56885176c 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntitySandstorm.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntitySandstorm.java @@ -1,14 +1,16 @@ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.config.ConfigSkills; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.SandstormMovementHandler; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.config.ConfigSkills; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.SandstormMovementHandler; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; +import com.zeitheron.hammercore.api.lighting.ColoredLight; +import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -22,12 +24,13 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import javax.annotation.Nullable; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class EntitySandstorm extends AvatarEntity { diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityShield.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityShield.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/entity/EntityShield.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityShield.java index 553793cef3..c1d7b51aaa 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityShield.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityShield.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityShockwave.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityShockwave.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/EntityShockwave.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityShockwave.java index 0090293db8..1721665cd9 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityShockwave.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityShockwave.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.client.particle.AvatarParticles; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.entity.data.ShockwaveBehaviour; +import com.crowsofwar.avatar.common.AvatarParticles; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.entity.data.ShockwaveBehaviour; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWall.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWall.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWall.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWall.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWallSegment.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWallSegment.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWallSegment.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWallSegment.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterArc.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterArc.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWaterArc.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterArc.java index a6dc3f106c..dc19442894 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterArc.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterArc.java @@ -15,17 +15,17 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.water.AbilityWaterArc; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.entity.data.WaterArcBehavior; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.water.AbilityWaterArc; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.entity.data.WaterArcBehavior; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; @@ -46,7 +46,7 @@ import java.util.Objects; import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class EntityWaterArc extends EntityArc implements IShieldEntity { diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterBubble.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterBubble.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWaterBubble.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterBubble.java index 42431426da..1e62f25460 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterBubble.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterBubble.java @@ -15,17 +15,22 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; - -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.bending.bending.lightning.Lightningbending; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.entity.data.Behavior; -import com.crowsofwar.avatar.entity.data.WaterBubbleBehavior; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity; + +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.bending.lightning.Lightningbending; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.entity.data.Behavior; +import com.crowsofwar.avatar.common.entity.data.WaterBubbleBehavior; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; +import com.zeitheron.hammercore.api.lighting.ColoredLight; +import com.zeitheron.hammercore.api.lighting.impl.IGlowingEntity; import net.minecraft.block.BlockFarmland; import net.minecraft.block.BlockLiquid; import net.minecraft.block.state.IBlockState; @@ -41,7 +46,9 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import net.minecraftforge.fml.common.Optional; +import java.util.Objects; import java.util.Random; /** diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterCannon.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterCannon.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWaterCannon.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterCannon.java index 52656db842..1f241617bd 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityWaterCannon.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWaterCannon.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.client.particle.ParticleBuilder; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.SoundEvents; diff --git a/src/main/java/com/crowsofwar/avatar/entity/EntityWave.java b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWave.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/EntityWave.java rename to src/main/java/com/crowsofwar/avatar/common/entity/EntityWave.java index 9201dd7685..fb09ddaa2a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/EntityWave.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/EntityWave.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.AbilityData; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.AbilityData; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -32,8 +32,8 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigSkills.SKILLS_CONFIG; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigSkills.SKILLS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; public class EntityWave extends AvatarEntity { diff --git a/src/main/java/com/crowsofwar/avatar/entity/ICustomHitbox.java b/src/main/java/com/crowsofwar/avatar/common/entity/ICustomHitbox.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/entity/ICustomHitbox.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ICustomHitbox.java index 54993335d8..c17a674468 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ICustomHitbox.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ICustomHitbox.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; import net.minecraft.util.math.Vec3d; diff --git a/src/main/java/com/crowsofwar/avatar/entity/IOffensiveEntity.java b/src/main/java/com/crowsofwar/avatar/common/entity/IOffensiveEntity.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/IOffensiveEntity.java rename to src/main/java/com/crowsofwar/avatar/common/entity/IOffensiveEntity.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/IShieldEntity.java b/src/main/java/com/crowsofwar/avatar/common/entity/IShieldEntity.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/entity/IShieldEntity.java rename to src/main/java/com/crowsofwar/avatar/common/entity/IShieldEntity.java index 67614c757a..d4accdc0dc 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/IShieldEntity.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/IShieldEntity.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity; +package com.crowsofwar.avatar.common.entity; //For projectile entities that can shield you public interface IShieldEntity { diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIAttackMobs.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIAttackMobs.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIAttackMobs.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIAttackMobs.java index 0a3acc93ec..d9f0b9140e 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIAttackMobs.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIAttackMobs.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.monster.EntityMob; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIBenderDefendVillage.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIBenderDefendVillage.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIBenderDefendVillage.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIBenderDefendVillage.java index e2bfd7655c..a226532eee 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAIBenderDefendVillage.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAIBenderDefendVillage.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntityBender; +import com.crowsofwar.avatar.common.entity.mob.EntityBender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; import net.minecraft.entity.monster.EntityCreeper; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonBreeding.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonBreeding.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonBreeding.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonBreeding.java index 2607a08e3a..b4d5222bcd 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonBreeding.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonBreeding.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.data.AnimalCondition; -import com.crowsofwar.avatar.entity.data.BisonSpawnData; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.data.AnimalCondition; +import com.crowsofwar.avatar.common.entity.data.BisonSpawnData; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.item.EntityXPOrb; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Random; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonDefendOwner.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonDefendOwner.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonDefendOwner.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonDefendOwner.java index 73837652d5..ce2a513dcb 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonDefendOwner.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonDefendOwner.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonEatGrass.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonEatGrass.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonEatGrass.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonEatGrass.java index 69739b19af..799ce8b586 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonEatGrass.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonEatGrass.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.block.Block; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityMoveHelper; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowAttacker.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowAttacker.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowAttacker.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowAttacker.java index fb6d22bc3a..fbcf36f223 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowAttacker.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowAttacker.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowOwner.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowOwner.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowOwner.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowOwner.java index f9661021d8..3943dd5628 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonFollowOwner.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonFollowOwner.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonHelpOwnerTarget.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonHelpOwnerTarget.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonHelpOwnerTarget.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonHelpOwnerTarget.java index 4b61b759d5..9d3d352054 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonHelpOwnerTarget.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonHelpOwnerTarget.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonLand.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonLand.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonLand.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonLand.java index 50682271b7..5cd703199a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonLand.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonLand.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.entity.ai.EntityAIBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonSit.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonSit.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonSit.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonSit.java index fc4533bd61..b00623aba7 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonSit.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonSit.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.util.EnumFacing; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonTempt.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonTempt.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonTempt.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonTempt.java index f9d8198f81..731d096245 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonTempt.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonTempt.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityMoveHelper.Action; import net.minecraft.entity.player.EntityPlayer; @@ -25,7 +25,7 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; import static net.minecraft.item.ItemStack.EMPTY; /** diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonWander.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonWander.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonWander.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonWander.java index 7ce02bba78..b6ffd9212b 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiBisonWander.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiBisonWander.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityMoveHelper; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiGiveScroll.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiGiveScroll.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiGiveScroll.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiGiveScroll.java index bef608cc48..fb5bb74265 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiGiveScroll.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiGiveScroll.java @@ -14,12 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiKeepDistance.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiKeepDistance.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiKeepDistance.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiKeepDistance.java index c1565ea9c5..f657fee047 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiKeepDistance.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiKeepDistance.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiUseStaff.java b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiUseStaff.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiUseStaff.java rename to src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiUseStaff.java index de3e2bdf43..adfb257a31 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/ai/EntityAiUseStaff.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/ai/EntityAiUseStaff.java @@ -1,8 +1,12 @@ -package com.crowsofwar.avatar.entity.ai; +package com.crowsofwar.avatar.common.entity.ai; -import com.crowsofwar.avatar.entity.mob.EntityHumanBender; +import com.crowsofwar.avatar.common.entity.mob.EntityHumanBender; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; +import net.minecraft.entity.monster.EntityZombie; +import net.minecraft.util.math.AxisAlignedBB; + +import java.util.List; public class EntityAiUseStaff extends EntityAIBase { diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/AnimalCondition.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/AnimalCondition.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/data/AnimalCondition.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/AnimalCondition.java index 48461997b4..11691b6fb0 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/AnimalCondition.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/AnimalCondition.java @@ -14,13 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; import net.minecraft.entity.EntityCreature; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.datasync.DataParameter; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/Behavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/Behavior.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/data/Behavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/Behavior.java index 9669ebf85d..1aa2cab610 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/Behavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/Behavior.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; import com.crowsofwar.avatar.AvatarLog; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/BisonSpawnData.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/BisonSpawnData.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/data/BisonSpawnData.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/BisonSpawnData.java index 772f6c4b01..ea9692c0de 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/BisonSpawnData.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/BisonSpawnData.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; import net.minecraft.entity.IEntityLivingData; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/CloudburstBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/CloudburstBehavior.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/entity/data/CloudburstBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/CloudburstBehavior.java index 953fc89f0b..7630553be3 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/CloudburstBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/CloudburstBehavior.java @@ -1,10 +1,10 @@ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.bending.bending.air.AbilityCloudBurst; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.EntityCloudBall; +import com.crowsofwar.avatar.common.bending.air.AbilityCloudBurst; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.EntityCloudBall; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/EarthspikesBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/EarthspikesBehavior.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/data/EarthspikesBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/EarthspikesBehavior.java index 7e045137c9..b84e4f84ce 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/EarthspikesBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/EarthspikesBehavior.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.entity.EntityEarthspike; -import com.crowsofwar.avatar.entity.EntityEarthspikeSpawner; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.entity.EntityEarthspike; +import com.crowsofwar.avatar.common.entity.EntityEarthspikeSpawner; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; @@ -43,7 +43,7 @@ import java.util.Objects; import java.util.UUID; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/EntityBenderData.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/EntityBenderData.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/entity/data/EntityBenderData.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/EntityBenderData.java index bf8ca99f65..4663a28dd0 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/EntityBenderData.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/EntityBenderData.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.DataCategory; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.DataCategory; import net.minecraft.entity.EntityLivingBase; /** diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/FireballBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/FireballBehavior.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/data/FireballBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/FireballBehavior.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/FloatingBlockBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/FloatingBlockBehavior.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/data/FloatingBlockBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/FloatingBlockBehavior.java index 58eb2838b2..03b41e6d40 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/FloatingBlockBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/FloatingBlockBehavior.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.entity.EntityFloatingBlock; -import com.crowsofwar.avatar.entity.EntityOffensive; +import com.crowsofwar.avatar.common.entity.EntityFloatingBlock; +import com.crowsofwar.avatar.common.entity.EntityOffensive; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.block.SoundType; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/LightCylinderBehaviour.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightCylinderBehaviour.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/entity/data/LightCylinderBehaviour.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/LightCylinderBehaviour.java index a57aca30b8..c2bdc6a7d8 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/LightCylinderBehaviour.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightCylinderBehaviour.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.bending.bending.water.tickhandlers.WaterChargeHandler; -import com.crowsofwar.avatar.entity.EntityLightCylinder; +import com.crowsofwar.avatar.common.bending.water.tickhandlers.WaterChargeHandler; +import com.crowsofwar.avatar.common.entity.EntityLightCylinder; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataSerializer; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/LightOrbBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightOrbBehavior.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/data/LightOrbBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/LightOrbBehavior.java index 16a4480923..8264439790 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/LightOrbBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightOrbBehavior.java @@ -15,14 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; - -import com.crowsofwar.avatar.bending.bending.fire.AbilityFlameStrike; -import com.crowsofwar.avatar.bending.bending.fire.AbilityImmolate; -import com.crowsofwar.avatar.bending.bending.fire.tickhandlers.FlamethrowerUpdateTick; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightOrb; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity.data; + +import com.crowsofwar.avatar.common.bending.fire.AbilityFireball; +import com.crowsofwar.avatar.common.bending.fire.AbilityFlameStrike; +import com.crowsofwar.avatar.common.bending.fire.AbilityImmolate; +import com.crowsofwar.avatar.common.bending.fire.tickhandlers.FlamethrowerUpdateTick; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightOrb; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/LightningFloodFill.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightningFloodFill.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/data/LightningFloodFill.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/LightningFloodFill.java index f55146a0cd..034aedc58a 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/LightningFloodFill.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightningFloodFill.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; import net.minecraft.entity.EntityLivingBase; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/LightningSpearBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightningSpearBehavior.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/data/LightningSpearBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/LightningSpearBehavior.java index ca005fb777..ef4c106dd0 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/LightningSpearBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/LightningSpearBehavior.java @@ -15,14 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; - -import com.crowsofwar.avatar.bending.bending.lightning.AbilityLightningSpear; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.EntityLightningSpear; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.entity.data; + +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.bending.lightning.AbilityLightningSpear; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.EntityLightningSpear; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -35,7 +36,7 @@ import java.util.List; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_LIGHTNINGSPEAR; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_LIGHTNINGSPEAR; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/OffensiveBehaviour.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/OffensiveBehaviour.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/entity/data/OffensiveBehaviour.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/OffensiveBehaviour.java diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/ShockwaveBehaviour.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/ShockwaveBehaviour.java similarity index 77% rename from src/main/java/com/crowsofwar/avatar/entity/data/ShockwaveBehaviour.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/ShockwaveBehaviour.java index a339066554..143661b16f 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/ShockwaveBehaviour.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/ShockwaveBehaviour.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.AirBurstHandler; -import com.crowsofwar.avatar.bending.bending.air.tickhandlers.SmashGroundHandler; -import com.crowsofwar.avatar.bending.bending.fire.AbilityFireShot; -import com.crowsofwar.avatar.entity.EntityShockwave; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.AirBurstHandler; +import com.crowsofwar.avatar.common.bending.air.tickhandlers.SmashGroundHandler; +import com.crowsofwar.avatar.common.bending.fire.AbilityFireShot; +import com.crowsofwar.avatar.common.entity.EntityShockwave; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataSerializer; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/SyncedEntity.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/SyncedEntity.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/data/SyncedEntity.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/SyncedEntity.java index 2032b9e6aa..30750bcc57 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/SyncedEntity.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/SyncedEntity.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; -import com.crowsofwar.avatar.util.data.CachedEntity; +import com.crowsofwar.avatar.common.data.CachedEntity; import com.google.common.base.Optional; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/WallBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/WallBehavior.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/data/WallBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/WallBehavior.java index 82006a08c5..3f5b6795db 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/WallBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/WallBehavior.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.EntityWallSegment; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.EntityWallSegment; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; @@ -30,8 +30,8 @@ import java.util.List; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; -import static com.crowsofwar.avatar.util.data.StatusControlController.PULL_WALL; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.data.StatusControlController.PULL_WALL; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/WaterArcBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/WaterArcBehavior.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/entity/data/WaterArcBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/WaterArcBehavior.java index b63df193b3..1a71208c19 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/WaterArcBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/WaterArcBehavior.java @@ -15,20 +15,24 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; - -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.EntityOffensive; -import com.crowsofwar.avatar.entity.EntityWaterArc; -import com.crowsofwar.avatar.util.Raytrace; +package com.crowsofwar.avatar.common.entity.data; + +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.EntityOffensive; +import com.crowsofwar.avatar.common.entity.EntityWaterArc; +import com.crowsofwar.avatar.common.particle.ParticleBuilder; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.entity.EntityLivingBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.PacketBuffer; import net.minecraft.network.datasync.DataSerializer; import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.util.math.Vec3d; -import static com.crowsofwar.avatar.util.data.StatusControlController.THROW_WATER; +import static com.crowsofwar.avatar.common.data.StatusControlController.THROW_WATER; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/data/WaterBubbleBehavior.java b/src/main/java/com/crowsofwar/avatar/common/entity/data/WaterBubbleBehavior.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/data/WaterBubbleBehavior.java rename to src/main/java/com/crowsofwar/avatar/common/entity/data/WaterBubbleBehavior.java index 668d77173a..d0170dc718 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/data/WaterBubbleBehavior.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/data/WaterBubbleBehavior.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.data; +package com.crowsofwar.avatar.common.entity.data; -import com.crowsofwar.avatar.util.data.AvatarWorldData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.EntityWaterBubble; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.data.AvatarWorldData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.EntityWaterBubble; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/BisonSummonHandler.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/BisonSummonHandler.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/entity/mob/BisonSummonHandler.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/BisonSummonHandler.java index 5cd0d0497b..ad08266b38 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/BisonSummonHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/BisonSummonHandler.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; import net.minecraft.entity.EntityLivingBase; -import com.crowsofwar.avatar.util.data.TickHandler; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.TickHandler; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import java.util.*; diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityAirbender.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAirbender.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityAirbender.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAirbender.java index f121328dbf..f8754ae8e7 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityAirbender.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAirbender.java @@ -14,27 +14,38 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; - -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.item.scroll.Scrolls; +package com.crowsofwar.avatar.common.entity.mob; + +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.item.scroll.ItemScrollAir; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.format.FormattedMessage; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.EntityAIAttackMelee; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.scoreboard.ScorePlayerTeam; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextComponentString; +import net.minecraft.village.MerchantRecipe; +import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.Objects; -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_NEED_AIR_TRADE_ITEM; +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_NEED_AIR_TRADE_ITEM; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAscendedFlyingLemur.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAscendedFlyingLemur.java new file mode 100644 index 0000000000..b09e839769 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityAscendedFlyingLemur.java @@ -0,0 +1,561 @@ +package com.crowsofwar.avatar.common.entity.mob; + +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import com.crowsofwar.avatar.client.sounds.SoundsHandler; +import com.crowsofwar.avatar.common.capabilities.CapabilityPlayerShoulders; +import com.google.common.collect.Sets; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.*; +import net.minecraft.entity.ai.*; +import net.minecraft.entity.passive.EntityAnimal; +import net.minecraft.entity.passive.EntityFlying; +import net.minecraft.entity.passive.EntityTameable; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.pathfinding.PathNavigateFlying; +import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.DifficultyInstance; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; +import java.util.Set; +import java.util.UUID; + +/** + * EntityWolf EntityParrot EntityOcelot EntityCreeper EntityZombie EntityHorse EntityTameable + * + * @author Korog3a + */ + +public class EntityAscendedFlyingLemur extends EntityTameable implements EntityFlying +{ + private static final DataParameter VARIANT = EntityDataManager.createKey(EntityAscendedFlyingLemur.class, DataSerializers.VARINT); + private static final Set TAME_ITEMS = Sets.newHashSet(Items.CARROT, Items.APPLE, Items.GOLDEN_APPLE); + protected static final DataParameter RIGHTSHOULDER = EntityDataManager.createKey(EntityAscendedFlyingLemur.class, DataSerializers.BYTE); + protected static final DataParameter LEFTSHOULDER = EntityDataManager.createKey(EntityAscendedFlyingLemur.class, DataSerializers.BYTE); + + public double speed; + private boolean previusRidingPos; + private boolean partyLemur; + private BlockPos jukeboxPosition; + + public EntityAscendedFlyingLemur(World worldIn) { + super(worldIn); + this.setSize(0.3F, 1F); + this.moveHelper = new EntityFlyHelper(this); + experienceValue = 200; + } + + @Nullable + public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, @Nullable IEntityLivingData livingdata) { + this.setVariant(this.rand.nextInt(2)); + return super.onInitialSpawn(difficulty, livingdata); + } + + @Override + protected void initEntityAI() { + this.aiSit = new EntityAISit(this); + this.tasks.addTask(1, new EntityAISwimming(this)); + this.tasks.addTask(2, this.aiSit); + this.tasks.addTask(3, new EntityAIWanderAvoidWater(this, 1.0D)); + this.tasks.addTask(3, new EntityAIWanderAvoidWaterFlying(this, 1.0D)); + this.tasks.addTask(2, new EntityAIFollowOwner(this, 1.0F, 10.0F, 2.0F)); + this.tasks.addTask(2, new EntityAIFollowOwnerFlying(this, 1.0D, 5.0F, 1.0F)); + this.tasks.addTask(4, new EntityAIWatchClosest(this, EntityPlayer.class, 16.0F)); + this.tasks.addTask(5, new EntityAIAttackMelee(this, 1.2D, true)); + this.tasks.addTask(6, new EntityAIMate(this, 1.5D)); + this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); + this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); + this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true, new Class[0])); + } + + @Override + public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) { + + if(player.isSneaking() && this.getOwner() != null && this.getOwner() == player && !this.getLeashed()) { + IPlayerShoulders playerShoulders = player.getCapability(CapabilityPlayerShoulders.TEST_HANDLER, null); + this.setSitting(false); + if(playerShoulders.getRiders().size() == 0) { + if(!previusRidingPos) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + } + else { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + } + + playerShoulders.addRiders(this); + } + else { + if(playerShoulders.getRiders().size() < 2) { + if(playerShoulders.getRiders().size() == 1 && !playerShoulders.getRiders().contains(this)) { + if(playerShoulders.getRiders().get(0) instanceof EntityAscendedFlyingLemur) { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur) playerShoulders.getRiders().get(0); + if(lemur.getRightShoulder()) { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + playerShoulders.addRiders(this); + } + else if (lemur.getLeftShoulder()) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + playerShoulders.addRiders(this); + } + } + else if (playerShoulders.getRiders().get(0) instanceof EntityFlyingLemur) { + EntityFlyingLemur lemur = (EntityFlyingLemur) playerShoulders.getRiders().get(0); + if(lemur.getRightShoulder()) { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + playerShoulders.addRiders(this); + } + else if (lemur.getLeftShoulder()) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + playerShoulders.addRiders(this); + + } + } + + } + } + } + + + + + } + return super.applyPlayerInteraction(player, vec, hand); + } + + public boolean isLemurRiding() { + if(!this.getLeftShoulder() && !this.getRightShoulder() && !this.isChild() && this.height != 1 && this.width != 0.4F) { + this.height = 1f; + this.width = 0.4f; + } + return this.getLeftShoulder() || this.getRightShoulder(); + } + + @Override + public void onLivingUpdate() { + super.onLivingUpdate(); + + updatespeed(!this.isLemurRiding()); + + if(!this.isLemurRiding() && this.isAIDisabled()) this.setNoAI(false); + + if(this.ticksExisted % 100 == 0 && this.speed == 0 && this.getAIMoveSpeed() == 0 ) { + if(this.getMoveHelper() instanceof EntityFlyHelper) { + this.moveHelper = new EntityMoveHelper(this); + } + else { + if(!this.isInWater() && !this.isInLove()) { + this.moveHelper = new EntityFlyHelper(this); + } + } + + } + + if (this.jukeboxPosition == null || this.jukeboxPosition.distanceSq(this.posX, this.posY, this.posZ) > 12.0D || this.world.getBlockState(this.jukeboxPosition).getBlock() != Blocks.JUKEBOX) { + this.partyLemur = false; + this.jukeboxPosition = null; + } + + if(this.isLemurRiding()) { + if(this.getOwner() != null && this.getOwner().dimension == this.dimension) { + this.setRotation(this.getOwner().renderYawOffset, 0); + this.setRotationYawHead(this.getOwner().renderYawOffset); + this.setRenderYawOffset(this.getOwner().renderYawOffset); + if(this.isChild()) { + + this.setPosition(this.getOwner().posX, this.getOwner().posY + this.getOwner().getMountedYOffset() + this.getYOffset() + 0.30F, this.getOwner().posZ); + }else { + + this.setPosition(this.getOwner().posX, this.getOwner().posY + this.getOwner().getMountedYOffset() + this.getYOffset() + 0.30F, this.getOwner().posZ); + } + + + } + + } + } + + @SideOnly(Side.CLIENT) + public void setPartying(BlockPos pos, boolean p_191987_2_) { + this.jukeboxPosition = pos; + this.partyLemur = p_191987_2_; + } + + @SideOnly(Side.CLIENT) + public boolean isPartying() { + return this.partyLemur; + } + + @Override + public boolean canBeCollidedWith() { + if(this.isLemurRiding()) return false; + return super.canBeCollidedWith(); + } + + public boolean getLeftShoulder() { + return (((Byte)this.dataManager.get(LEFTSHOULDER)).byteValue() & 1) != 0; + } + public boolean getRightShoulder() { + + return (((Byte)this.dataManager.get(RIGHTSHOULDER)).byteValue() & 1) != 0; + } + + public void setLeftShoulder(boolean ride) { + byte b0 = ((Byte)this.dataManager.get(LEFTSHOULDER)).byteValue(); + + if (ride) { + this.height = 0.0f; + this.width = 0.1f; + this.setSitting(false); + this.dataManager.set(LEFTSHOULDER, Byte.valueOf((byte)(b0 | 1))); + } + else { + this.dataManager.set(LEFTSHOULDER, Byte.valueOf((byte)(b0 & -2))); + } + } + + public void setRightShoulder(boolean ride) { + + byte b0 = ((Byte)this.dataManager.get(RIGHTSHOULDER)).byteValue(); + + if (ride) { + this.height = 0.0f; + this.width = 0.1f; + this.setSitting(false); + this.dataManager.set(RIGHTSHOULDER, Byte.valueOf((byte)(b0 | 1))); + } + else { + this.dataManager.set(RIGHTSHOULDER, Byte.valueOf((byte)(b0 & -2))); + } + } + + @Override + protected boolean canDespawn() { + return false; + } + + @Override + protected void entityInit() { + super.entityInit(); + this.dataManager.register(RIGHTSHOULDER, Byte.valueOf((byte)0)); + this.dataManager.register(LEFTSHOULDER, Byte.valueOf((byte)0)); + this.dataManager.register(VARIANT, Integer.valueOf(0)); + } + + public boolean isFlying() { + return !this.onGround; + } + + public void updatespeed(boolean canUpdate) { + if(canUpdate) { + double motionX = this.posX - this.prevPosX; + double motionY = this.posY - this.prevPosY; + double motionZ = this.posZ - this.prevPosZ; + this.speed = Math.sqrt(motionX * motionX + motionY * motionY + motionZ * motionZ); + } + } + + protected PathNavigate createNavigator(World worldIn) { + PathNavigateFlying pathnavigateflying = new PathNavigateFlying(this, worldIn); + pathnavigateflying.setCanOpenDoors(false); + pathnavigateflying.setCanFloat(true); + pathnavigateflying.setCanEnterDoors(true); + + PathNavigateGround pathnavigateground = new PathNavigateGround(this, worldIn); + + + if(this.getMoveHelper() instanceof EntityFlyHelper) { + return pathnavigateflying; + } + + if(this.getMoveHelper() instanceof EntityMoveHelper) { + return pathnavigateground; + } + + return null; + } + + public float getEyeHeight() { + if(this.isFlying() || this.isLemurRiding() ) { + return 0.1F; + } + else { + if(this.isSitting()) { + return 0.65F; + } + + if(this.isChild()) { + return 0.55F; + } + + return 0.85F; + + } + + } + + @Override + public double getYOffset() { + if(this.getOwner() != null && this.getOwner().isSneaking()) { + if(this.isChild()) { + return 0.15F; + }else { + return 0.50F; + } + } + else { + if(this.isChild()) { + return 0.3F; + }else { + return 0.45F; + } + } + + } + + public void fall(float distance, float damageMultiplier) { + + } + + protected void updateFallState(double y, boolean onGroundIn, IBlockState state, BlockPos pos) { + + } + + public boolean getCanSpawnHere() { + int i = MathHelper.floor(this.posX); + int j = MathHelper.floor(this.getEntityBoundingBox().minY); + int k = MathHelper.floor(this.posZ); + BlockPos blockpos = new BlockPos(i, j, k); + Block block = this.world.getBlockState(blockpos.down()).getBlock(); + return block instanceof BlockLeaves || block == Blocks.GRASS || block instanceof BlockLog || block == Blocks.AIR && this.world.getLight(blockpos) > 8 && super.getCanSpawnHere(); + } + + @Override + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + this.getAttributeMap().registerAttribute(SharedMonsterAttributes.FLYING_SPEED); + this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.33D); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0D); + this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0D); + this.getEntityAttribute(SharedMonsterAttributes.FLYING_SPEED).setBaseValue(1.0D); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0D); + this.getAttributeMap().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0D); + } + + public int getVerticalFaceSpeed() { + return this.isSitting() ? 20 : super.getVerticalFaceSpeed(); + } + + public boolean attackEntityFrom(DamageSource source, float amount) { + if (this.isEntityInvulnerable(source)) { + return false; + } + else { + Entity entity = source.getTrueSource(); + + if (this.aiSit != null) { + this.aiSit.setSitting(false); + } + + if (entity instanceof EntityPlayer) { + if(!((EntityPlayer) entity).isCreative()) return false; + + } + else { + if(source != source.OUT_OF_WORLD) { + return false; + } + } + + return super.attackEntityFrom(source, amount); + } + } + + public boolean attackEntityAsMob(Entity entityIn) { + boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), (float)((int)this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getAttributeValue())); + + if (flag) { + this.applyEnchantments(this, entityIn); + } + + return flag; + } + + public void setTamed(boolean tamed) + { + super.setTamed(tamed); + } + + public boolean processInteract(EntityPlayer player, EnumHand hand) { + ItemStack itemstack = player.getHeldItem(hand); + + if (this.isTamed()) { + if (!itemstack.isEmpty()) { + if (TAME_ITEMS.contains(itemstack.getItem()) && this.getHealth() < 30.0F) { + if (!player.capabilities.isCreativeMode) { + itemstack.shrink(1); + } + + this.heal(10); + return true; + } + } + + if (this.isOwner(player) && !this.world.isRemote && !this.isBreedingItem(itemstack)) { + this.aiSit.setSitting(!this.isSitting()); + this.isJumping = false; + this.navigator.clearPath(); + this.setAttackTarget((EntityLivingBase)null); + } + } + else if (TAME_ITEMS.contains(itemstack.getItem())) { + if (!player.capabilities.isCreativeMode) { + itemstack.shrink(1); + } + + if (!this.world.isRemote) { + if (this.rand.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player)) { + this.setTamedBy(player); + this.navigator.clearPath(); + this.setAttackTarget((EntityLivingBase)null); + this.aiSit.setSitting(true); + this.setHealth(30.0F); + this.playTameEffect(true); + this.world.setEntityState(this, (byte)7); + } + else { + this.playTameEffect(false); + this.world.setEntityState(this, (byte)6); + } + } + + return true; + } + + return super.processInteract(player, hand); + } + + public boolean canBeLeashedTo(EntityPlayer player) { + return super.canBeLeashedTo(player); + } + + public int getMaxSpawnedInChunk() { + return 8; + } + + public void setVariant(int variantIn) { + this.dataManager.set(VARIANT, Integer.valueOf(variantIn)); + } + + public int getVariant() { + return MathHelper.clamp(((Integer)this.dataManager.get(VARIANT)).intValue(), 0, 1); + } + + public boolean isBreedingItem(ItemStack stack) { + return stack.getItem() == Items.GOLDEN_APPLE; + } + + @Override + public EntityAgeable createChild(EntityAgeable ageable) { + EntityAscendedFlyingLemur entitymonkey = new EntityAscendedFlyingLemur(this.world); + UUID uuid = this.getOwnerId(); + + if (uuid != null) { + entitymonkey.setOwnerId(uuid); + entitymonkey.setTamed(true); + } + + return entitymonkey; + } + + public boolean canMateWith(EntityAnimal otherAnimal) { + if (otherAnimal == this) { + return false; + } + else if (!this.isTamed()) { + return false; + } + else if (!(otherAnimal instanceof EntityAscendedFlyingLemur)) { + return false; + } + else { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur)otherAnimal; + + if (!lemur.isTamed()) { + return false; + } + else if (lemur.isSitting()) { + return false; + } + else { + return this.isInLove() && lemur.isInLove(); + } + } + } + + protected SoundEvent getAmbientSound() + { + return SoundsHandler.ENTITY_FLYINGLEMUR_AMBIENT; + } + + protected SoundEvent getHurtSound(DamageSource damageSourceIn) + { + return SoundsHandler.ENTITY_FLYINGLEMUR_HURT; + } + + protected SoundEvent getDeathSound() + { + return SoundsHandler.ENTITY_FLYINGLEMUR_DEATH; + } + + protected float getSoundVolume() + { + return 1.75F; + } + + public void playRideEffect(boolean play) { + EnumParticleTypes enumparticletypes = EnumParticleTypes.EXPLOSION_NORMAL; + for (int i = 0; i < 4; ++i) + { + double d0 = this.rand.nextGaussian() * 0.02D; + double d1 = this.rand.nextGaussian() * 0.02D; + double d2 = this.rand.nextGaussian() * 0.02D; + this.world.spawnParticle(enumparticletypes, this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, d0, d1, d2); + } + } + +} \ No newline at end of file diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityBender.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityBender.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityBender.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityBender.java index 9856ccd9e7..6fbd236a74 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityBender.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityBender.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; - -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BenderEntityComponent; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity.mob; + +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BenderEntityComponent; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.util.AvatarUtils; import io.netty.buffer.ByteBuf; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.IEntityLivingData; @@ -36,7 +36,7 @@ import javax.annotation.Nullable; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityFirebender.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFirebender.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityFirebender.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFirebender.java index 927c1b3b02..4418236ab6 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityFirebender.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFirebender.java @@ -14,14 +14,14 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; - -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.util.AvatarUtils; +package com.crowsofwar.avatar.common.entity.mob; + +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.util.AvatarUtils; import com.crowsofwar.gorecore.format.FormattedMessage; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.SharedMonsterAttributes; @@ -42,7 +42,7 @@ import javax.annotation.Nullable; import java.util.Objects; -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_NEED_FIRE_TRADE_ITEM; +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_NEED_FIRE_TRADE_ITEM; /** * @author CrowsOfWar diff --git a/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFlyingLemur.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFlyingLemur.java new file mode 100644 index 0000000000..ed04e41f20 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityFlyingLemur.java @@ -0,0 +1,617 @@ +package com.crowsofwar.avatar.common.entity.mob; + +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import com.crowsofwar.avatar.client.sounds.SoundsHandler; +import com.crowsofwar.avatar.common.capabilities.CapabilityPlayerShoulders; +import com.google.common.collect.Sets; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeaves; +import net.minecraft.block.BlockLog; +import net.minecraft.block.state.IBlockState; +import net.minecraft.entity.*; +import net.minecraft.entity.ai.*; +import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.monster.EntityGhast; +import net.minecraft.entity.passive.*; +import net.minecraft.entity.passive.EntityFlying; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; +import net.minecraft.network.datasync.DataSerializers; +import net.minecraft.network.datasync.EntityDataManager; +import net.minecraft.pathfinding.PathNavigate; +import net.minecraft.pathfinding.PathNavigateFlying; +import net.minecraft.pathfinding.PathNavigateGround; +import net.minecraft.util.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; +import net.minecraft.world.DifficultyInstance; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import javax.annotation.Nullable; +import java.util.Set; +import java.util.UUID; + +/** + * EntityWolf EntityParrot EntityOcelot EntityCreeper EntityZombie EntityHorse EntityTameable + * + * @author Korog3a + */ + +public class EntityFlyingLemur extends EntityTameable implements EntityFlying { + + private static final DataParameter VARIANT = EntityDataManager.createKey(EntityFlyingLemur.class, DataSerializers.VARINT); + private static final Set TAME_ITEMS = Sets.newHashSet(Items.CARROT, Items.APPLE, Items.GOLDEN_APPLE); + protected static final DataParameter RIGHTSHOULDER = EntityDataManager.createKey(EntityFlyingLemur.class, DataSerializers.BYTE); + protected static final DataParameter LEFTSHOULDER = EntityDataManager.createKey(EntityFlyingLemur.class, DataSerializers.BYTE); + + public double speed; + private boolean previusRidingPos; + private boolean partyLemur; + private BlockPos jukeboxPosition; + + @Nullable + public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, @Nullable IEntityLivingData livingdata) { + this.setVariant(this.rand.nextInt(2)); + return super.onInitialSpawn(difficulty, livingdata); + } + + public EntityFlyingLemur(World worldIn) { + super(worldIn); + this.setSize(0.4F, 1F); + this.moveHelper = new EntityFlyHelper(this); + experienceValue = 200; + } + + @Override + protected void initEntityAI() { + this.aiSit = new EntityAISit(this); + this.tasks.addTask(1, new EntityAISwimming(this)); + this.tasks.addTask(2, this.aiSit); + this.tasks.addTask(3, new EntityAIWanderAvoidWater(this, 1.0D)); + this.tasks.addTask(3, new EntityAIWanderAvoidWaterFlying(this, 1.0D)); + this.tasks.addTask(2, new EntityAIFollowOwner(this, 1.0F, 10.0F, 2.0F)); + this.tasks.addTask(2, new EntityAIFollowOwnerFlying(this, 1.0D, 5.0F, 1.0F)); + this.tasks.addTask(4, new EntityAIWatchClosest(this, EntityPlayer.class, 16.0F)); + this.tasks.addTask(5, new EntityAIAttackMelee(this, 1.2D, true)); + this.tasks.addTask(6, new EntityAIMate(this, 1.5D)); + this.targetTasks.addTask(1, new EntityAIOwnerHurtByTarget(this)); + this.targetTasks.addTask(2, new EntityAIOwnerHurtTarget(this)); + this.targetTasks.addTask(3, new EntityAIHurtByTarget(this, true, new Class[0])); + } + + protected PathNavigate createNavigator(World worldIn) { + PathNavigateFlying pathnavigateflying = new PathNavigateFlying(this, worldIn); + pathnavigateflying.setCanOpenDoors(false); + pathnavigateflying.setCanFloat(true); + pathnavigateflying.setCanEnterDoors(true); + PathNavigateGround pathnavigateground = new PathNavigateGround(this, worldIn); + + if(this.getMoveHelper() instanceof EntityFlyHelper) { + return pathnavigateflying; + } + + if(this.getMoveHelper() instanceof EntityMoveHelper) { + return pathnavigateground; + } + return null; + } + + @Override + public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) { + if(player.isSneaking() && this.getOwner() != null && this.getOwner() == player && !this.getLeashed()) { + IPlayerShoulders playerShoulders = player.getCapability(CapabilityPlayerShoulders.TEST_HANDLER, null); + this.setSitting(false); + if(playerShoulders.getRiders().size() == 0) { + if(!previusRidingPos) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + } + else { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + } + playerShoulders.addRiders(this); + } + else { + if(playerShoulders.getRiders().size() < 2) { + if(playerShoulders.getRiders().size() == 1 && !playerShoulders.getRiders().contains(this)) { + if(playerShoulders.getRiders().get(0) instanceof EntityAscendedFlyingLemur) { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur) playerShoulders.getRiders().get(0); + if(lemur.getRightShoulder()) { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + + playerShoulders.addRiders(this); + } + else if (lemur.getLeftShoulder()) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + + playerShoulders.addRiders(this); + } + } + else if (playerShoulders.getRiders().get(0) instanceof EntityFlyingLemur) { + EntityFlyingLemur lemur = (EntityFlyingLemur) playerShoulders.getRiders().get(0); + if(lemur.getRightShoulder()) { + this.setLeftShoulder(true); + this.setNoAI(true); + playerShoulders.setLeftShoulder(true); + previusRidingPos = false; + + playerShoulders.addRiders(this); + } + else if (lemur.getLeftShoulder()) { + this.setRightShoulder(true); + this.setNoAI(true); + playerShoulders.setRightShoulder(true); + previusRidingPos = true; + + playerShoulders.addRiders(this); + + } + } + + } + } + } + } + return super.applyPlayerInteraction(player, vec, hand); + } + + public boolean isLemurRiding() { + if(!this.getLeftShoulder() && !this.getRightShoulder() && !this.isChild() && this.height != 1 && this.width != 0.4F) { + this.height = 1f; + this.width = 0.4f; + } + return this.getLeftShoulder() || this.getRightShoulder(); + } + + @Override + public void onLivingUpdate() { + super.onLivingUpdate(); + + updatespeed(!this.isLemurRiding()); + + if(!this.isLemurRiding() && this.isAIDisabled()) this.setNoAI(false); + + if (this.jukeboxPosition == null || this.jukeboxPosition.distanceSq(this.posX, this.posY, this.posZ) > 12.0D || this.world.getBlockState(this.jukeboxPosition).getBlock() != Blocks.JUKEBOX) { + this.partyLemur = false; + this.jukeboxPosition = null; + } + + if(this.ticksExisted % 100 == 0 && this.speed == 0 && this.getAIMoveSpeed() == 0) { + if(this.getMoveHelper() instanceof EntityFlyHelper) { + this.moveHelper = new EntityMoveHelper(this); + } + else { + if(!this.isInWater() && !this.isInLove() && !this.isAngry()) { + this.moveHelper = new EntityFlyHelper(this); + } + } + } + + if(this.isLemurRiding()) { + if(this.getOwner() != null && this.getOwner().dimension == this.dimension) { + this.setRotation(this.getOwner().renderYawOffset, 0); + if(this.isFlying()){ + this.setRotationYawHead(this.getOwner().rotationYaw); + }else{ + this.setRotationYawHead(this.getOwner().renderYawOffset); + } + + this.setRenderYawOffset(this.getOwner().renderYawOffset); + if (this.isChild()) { + this.setPosition(this.getOwner().posX, this.getOwner().posY + this.getOwner().getMountedYOffset() + this.getYOffset() + 0.30F, this.getOwner().posZ); + }else { + this.setPosition(this.getOwner().posX, this.getOwner().posY + this.getOwner().getMountedYOffset() + this.getYOffset() + 0.30F, this.getOwner().posZ); + } + + + } + } + if (!this.world.isRemote && this.getAttackTarget() == null && this.isAngry()) { + this.setAngry(false); + } + } + + @SideOnly(Side.CLIENT) + public void setPartying(BlockPos pos, boolean p_191987_2_) { + this.jukeboxPosition = pos; + this.partyLemur = p_191987_2_; + } + + @SideOnly(Side.CLIENT) + public boolean isPartying() { + return this.partyLemur; + } + + @Override + public boolean canBeCollidedWith() { + if(this.isLemurRiding()) return false; + return super.canBeCollidedWith(); + } + + public boolean getLeftShoulder() { + return (((Byte)this.dataManager.get(LEFTSHOULDER)).byteValue() & 1) != 0; + } + + public boolean getRightShoulder() { + return (((Byte)this.dataManager.get(RIGHTSHOULDER)).byteValue() & 1) != 0; + } + + public void setLeftShoulder(boolean ride) { + byte b0 = ((Byte)this.dataManager.get(LEFTSHOULDER)).byteValue(); + + if (ride){ + this.height = 0.0f; + this.width = 0.1f; + this.setSitting(false); + this.dataManager.set(LEFTSHOULDER, Byte.valueOf((byte)(b0 | 1))); + } + else { + this.dataManager.set(LEFTSHOULDER, Byte.valueOf((byte)(b0 & -2))); + } + } + + public void setRightShoulder(boolean ride) { + + byte b0 = ((Byte)this.dataManager.get(RIGHTSHOULDER)).byteValue(); + + if (ride) { + this.height = 0.0f; + this.width = 0.1f; + this.setSitting(false); + this.dataManager.set(RIGHTSHOULDER, Byte.valueOf((byte)(b0 | 1))); + } + else { + this.dataManager.set(RIGHTSHOULDER, Byte.valueOf((byte)(b0 & -2))); + } + } + + @Override + protected boolean canDespawn() { + return false; + } + + @Override + protected void entityInit() { + super.entityInit(); + this.dataManager.register(RIGHTSHOULDER, Byte.valueOf((byte)0)); + this.dataManager.register(LEFTSHOULDER, Byte.valueOf((byte)0)); + this.dataManager.register(VARIANT, Integer.valueOf(0)); + } + + public boolean isFlying() { + return !this.onGround; + } + + public void updatespeed(boolean canUpdate) { + if(canUpdate) { + double motionX = this.posX - this.prevPosX; + double motionY = this.posY - this.prevPosY; + double motionZ = this.posZ - this.prevPosZ; + this.speed = Math.sqrt(motionX * motionX + motionY * motionY + motionZ * motionZ); + } + } + + public float getEyeHeight() { + if(this.isFlying() || this.isLemurRiding() ) { + return 0.1F; + } + else { + if(this.isSitting()) { + return 0.65F; + } + + if(this.isChild()) { + return 0.55F; + } + + return 0.85F; + + } + + } + + @Override + public double getYOffset() { + if(this.getOwner() != null && this.getOwner().isSneaking()) { + if(this.isChild()) { + return 0.15F; + }else { + return 0.50F; + } + } + else { + if(this.isChild()) { + return 0.3F; + }else { + return 0.45F; + } + } + + } + + public void fall(float distance, float damageMultiplier) { + + } + protected void updateFallState(double y, boolean onGroundIn, IBlockState state, BlockPos pos) { + + } + + public boolean getCanSpawnHere() { + int i = MathHelper.floor(this.posX); + int j = MathHelper.floor(this.getEntityBoundingBox().minY); + int k = MathHelper.floor(this.posZ); + BlockPos blockpos = new BlockPos(i, j, k); + Block block = this.world.getBlockState(blockpos.down()).getBlock(); + return block instanceof BlockLeaves || block == Blocks.GRASS || block instanceof BlockLog || block == Blocks.AIR && this.world.getLight(blockpos) > 8 && super.getCanSpawnHere(); + } + + @Override + protected void applyEntityAttributes() { + super.applyEntityAttributes(); + this.getAttributeMap().registerAttribute(SharedMonsterAttributes.FLYING_SPEED); + this.getEntityAttribute(SharedMonsterAttributes.MOVEMENT_SPEED).setBaseValue(0.33D); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0D); + this.getEntityAttribute(SharedMonsterAttributes.ARMOR).setBaseValue(2.0D); + this.getEntityAttribute(SharedMonsterAttributes.FLYING_SPEED).setBaseValue(1.0D); + this.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(30.0D); + this.getAttributeMap().registerAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).setBaseValue(2.0D); + } + + public void setAttackTarget(@Nullable EntityLivingBase entitylivingbaseIn) { + super.setAttackTarget(entitylivingbaseIn); + + if (entitylivingbaseIn == null) { + this.setAngry(false); + } + else if (!this.isTamed()) { + this.setAngry(true); + } + } + + public int getVerticalFaceSpeed() + { + return this.isSitting() ? 20 : super.getVerticalFaceSpeed(); + } + + public boolean attackEntityFrom(DamageSource source, float amount) { + if (this.isEntityInvulnerable(source)) { + return false; + } + else { + Entity entity = source.getTrueSource(); + + if (this.aiSit != null) { + this.aiSit.setSitting(false); + } + + return super.attackEntityFrom(source, amount); + } + } + public boolean attackEntityAsMob(Entity entityIn) { + boolean flag = entityIn.attackEntityFrom(DamageSource.causeMobDamage(this), (float)((int)this.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getAttributeValue())); + + if (flag) { + this.applyEnchantments(this, entityIn); + } + + return flag; + } + + public void setTamed(boolean tamed) + { + super.setTamed(tamed); + } + + public boolean processInteract(EntityPlayer player, EnumHand hand) { + ItemStack itemstack = player.getHeldItem(hand); + + if (this.isTamed()) { + if (!itemstack.isEmpty()) { + if (TAME_ITEMS.contains(itemstack.getItem()) && this.getHealth() < 30.0F) { + if (!player.capabilities.isCreativeMode) { + itemstack.shrink(1); + } + + this.heal(10); + return true; + } + } + + if (this.isOwner(player) && !this.world.isRemote && !this.isBreedingItem(itemstack)) { + this.aiSit.setSitting(!this.isSitting()); + this.isJumping = false; + this.navigator.clearPath(); + this.setAttackTarget((EntityLivingBase)null); + } + } + else if (TAME_ITEMS.contains(itemstack.getItem()) && !this.isAngry()) { + if (!player.capabilities.isCreativeMode) { + itemstack.shrink(1); + } + + if (!this.world.isRemote) { + if (this.rand.nextInt(3) == 0 && !net.minecraftforge.event.ForgeEventFactory.onAnimalTame(this, player)) { + this.setTamedBy(player); + this.navigator.clearPath(); + this.setAttackTarget((EntityLivingBase)null); + this.aiSit.setSitting(true); + this.setHealth(30.0F); + this.playTameEffect(true); + this.world.setEntityState(this, (byte)7); + } + else { + this.playTameEffect(false); + this.world.setEntityState(this, (byte)6); + } + } + + return true; + } + + return super.processInteract(player, hand); + } + + public boolean canBeLeashedTo(EntityPlayer player) + { + return !this.isAngry() && super.canBeLeashedTo(player); + } + + public int getMaxSpawnedInChunk() + { + return 8; + } + + public boolean shouldAttackEntity(EntityLivingBase target, EntityLivingBase owner) { + if (!(target instanceof EntityCreeper) && !(target instanceof EntityGhast) && !(target instanceof EntityAscendedFlyingLemur)) { + if (target instanceof EntityFlyingLemur) { + EntityFlyingLemur entitylemur = (EntityFlyingLemur)target; + + if (entitylemur.isTamed() && entitylemur.getOwner() == owner) { + return false; + } + } + + if (target instanceof EntityPlayer && owner instanceof EntityPlayer && !((EntityPlayer)owner).canAttackPlayer((EntityPlayer)target)) { + return false; + } + else { + return !(target instanceof AbstractHorse) || !((AbstractHorse)target).isTame(); + } + } + else { + return false; + } + } + + @Override + public void writeEntityToNBT(NBTTagCompound compound) { + super.writeEntityToNBT(compound); + compound.setBoolean("Angry", this.isAngry()); + compound.setInteger("Variant", this.getVariant()); + } + + @Override + public void readEntityFromNBT(NBTTagCompound compound) { + super.readEntityFromNBT(compound); + this.setAngry(compound.getBoolean("Angry")); + this.setVariant(compound.getInteger("Variant")); + } + + public boolean isAngry() { + return (((Byte)this.dataManager.get(TAMED)).byteValue() & 2) != 0; + } + + public void setAngry(boolean angry) { + byte b0 = ((Byte)this.dataManager.get(TAMED)).byteValue(); + + if (angry) + { + this.dataManager.set(TAMED, Byte.valueOf((byte)(b0 | 2))); + } + else + { + this.dataManager.set(TAMED, Byte.valueOf((byte)(b0 & -3))); + } + } + + public void setVariant(int variantIn) + { + this.dataManager.set(VARIANT, Integer.valueOf(variantIn)); + } + + public int getVariant() + { + return MathHelper.clamp(((Integer)this.dataManager.get(VARIANT)).intValue(), 0, 1); + } + + public boolean isBreedingItem(ItemStack stack) { + return stack.getItem() == Items.GOLDEN_APPLE; + } + + @Override + public EntityAgeable createChild(EntityAgeable ageable) { + EntityFlyingLemur entitymonkey = new EntityFlyingLemur(this.world); + UUID uuid = this.getOwnerId(); + + if (uuid != null){ + entitymonkey.setOwnerId(uuid); + entitymonkey.setTamed(true); + } + + return entitymonkey; + } + + public boolean canMateWith(EntityAnimal otherAnimal) { + if (otherAnimal == this) { + return false; + } + else if (!this.isTamed()) { + return false; + } + else if (!(otherAnimal instanceof EntityFlyingLemur)) { + return false; + } + else { + EntityFlyingLemur lemur = (EntityFlyingLemur)otherAnimal; + + if (!lemur.isTamed()) { + return false; + } + else if (lemur.isSitting()) { + return false; + } + else { + return this.isInLove() && lemur.isInLove(); + } + } + } + + protected SoundEvent getAmbientSound() + { + return SoundsHandler.ENTITY_FLYINGLEMUR_AMBIENT; + } + + protected SoundEvent getHurtSound(DamageSource damageSourceIn) + { + return SoundsHandler.ENTITY_FLYINGLEMUR_HURT; + } + + protected SoundEvent getDeathSound() + { + return SoundsHandler.ENTITY_FLYINGLEMUR_DEATH; + } + + protected float getSoundVolume() + { + return 1.75F; + } + + public void playRideEffect(boolean play) { + EnumParticleTypes enumparticletypes = EnumParticleTypes.EXPLOSION_NORMAL; + for (int i = 0; i < 4; ++i) { + double d0 = this.rand.nextGaussian() * 0.02D; + double d1 = this.rand.nextGaussian() * 0.02D; + double d2 = this.rand.nextGaussian() * 0.02D; + this.world.spawnParticle(enumparticletypes, this.posX + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, this.posY + 0.5D + (double)(this.rand.nextFloat() * this.height), this.posZ + (double)(this.rand.nextFloat() * this.width * 2.0F) - (double)this.width, d0, d1, d2); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityHumanBender.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityHumanBender.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityHumanBender.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityHumanBender.java index 194734a14c..eb64e4832b 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityHumanBender.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityHumanBender.java @@ -14,15 +14,15 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.util.AvatarUtils; -import com.crowsofwar.avatar.util.WildCardTradeList; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.util.AvatarUtils; +import com.crowsofwar.avatar.common.util.WildCardTradeList; import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.util.GoreCoreNBTUtil; import com.google.common.base.Predicate; @@ -59,8 +59,8 @@ import java.util.Collections; import java.util.Random; -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_NEED_TRADE_ITEM; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_NEED_TRADE_ITEM; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; /** * @author CrowsOfWar, FavouriteDraogn diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityOstrichHorse.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOstrichHorse.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityOstrichHorse.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOstrichHorse.java index 01a6a0c577..d7ec1f783c 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityOstrichHorse.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOstrichHorse.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; -import com.crowsofwar.avatar.client.gui.InventoryOstrichChest; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.item.ItemOstrichEquipment; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.gui.InventoryOstrichChest; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.ItemOstrichEquipment; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityOtterPenguin.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOtterPenguin.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityOtterPenguin.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOtterPenguin.java index acd79b9f6f..f87d1af1fb 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityOtterPenguin.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityOtterPenguin.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; import com.google.common.collect.Sets; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntitySkyBison.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntitySkyBison.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntitySkyBison.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntitySkyBison.java index 3a24253f86..5cce63f103 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntitySkyBison.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntitySkyBison.java @@ -14,32 +14,32 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.AvatarWorldData; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BenderEntityComponent; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.ai.*; -import com.crowsofwar.avatar.entity.data.AnimalCondition; -import com.crowsofwar.avatar.entity.data.BisonSpawnData; -import com.crowsofwar.avatar.entity.data.SyncedEntity; -import com.crowsofwar.avatar.client.gui.AvatarGuiHandler; -import com.crowsofwar.avatar.client.gui.InventoryBisonChest; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.item.ItemBisonArmor.ArmorTier; -import com.crowsofwar.avatar.item.ItemBisonSaddle.SaddleTier; -import com.crowsofwar.avatar.item.ItemBisonWhistle; -import com.crowsofwar.avatar.util.AvatarDataSerializers; -import com.crowsofwar.avatar.util.PlayerViewRegistry; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.AvatarWorldData; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BenderEntityComponent; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.ai.*; +import com.crowsofwar.avatar.common.entity.data.AnimalCondition; +import com.crowsofwar.avatar.common.entity.data.BisonSpawnData; +import com.crowsofwar.avatar.common.entity.data.SyncedEntity; +import com.crowsofwar.avatar.common.gui.AvatarGuiHandler; +import com.crowsofwar.avatar.common.gui.InventoryBisonChest; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.ItemBisonArmor.ArmorTier; +import com.crowsofwar.avatar.common.item.ItemBisonSaddle.SaddleTier; +import com.crowsofwar.avatar.common.item.ItemBisonWhistle; +import com.crowsofwar.avatar.common.util.AvatarDataSerializers; +import com.crowsofwar.avatar.common.util.PlayerViewRegistry; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.AccountUUIDs; import com.crowsofwar.gorecore.util.Vector; import com.google.common.base.Optional; @@ -83,9 +83,9 @@ import java.util.Set; import java.util.UUID; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; -import static com.crowsofwar.avatar.config.ConfigMobs.MOBS_CONFIG; -import static com.crowsofwar.avatar.util.AvatarUtils.*; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG; +import static com.crowsofwar.avatar.common.util.AvatarUtils.*; import static com.crowsofwar.gorecore.util.Vector.getEntityPos; import static com.crowsofwar.gorecore.util.Vector.toRectangular; import static java.lang.Math.*; diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityWaterbender.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityWaterbender.java similarity index 76% rename from src/main/java/com/crowsofwar/avatar/entity/mob/EntityWaterbender.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityWaterbender.java index 665a6ea41f..5f2f810a81 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/EntityWaterbender.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/EntityWaterbender.java @@ -14,17 +14,27 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BenderEntityComponent; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BenderEntityComponent; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import net.minecraft.entity.ai.EntityAIAttackMelee; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.village.MerchantRecipe; +import net.minecraft.village.MerchantRecipeList; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; +import javax.annotation.Nullable; + /** * @author CrowsOfWar */ diff --git a/src/main/java/com/crowsofwar/avatar/entity/mob/SkyBisonMoveHelper.java b/src/main/java/com/crowsofwar/avatar/common/entity/mob/SkyBisonMoveHelper.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/entity/mob/SkyBisonMoveHelper.java rename to src/main/java/com/crowsofwar/avatar/common/entity/mob/SkyBisonMoveHelper.java index ae3c88c8a2..4a0109e7cd 100644 --- a/src/main/java/com/crowsofwar/avatar/entity/mob/SkyBisonMoveHelper.java +++ b/src/main/java/com/crowsofwar/avatar/common/entity/mob/SkyBisonMoveHelper.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.entity.mob; +package com.crowsofwar.avatar.common.entity.mob; import net.minecraft.entity.ai.EntityMoveHelper; import net.minecraft.util.math.AxisAlignedBB; diff --git a/src/main/java/com/crowsofwar/avatar/util/event/AbilityLevelEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/AbilityLevelEvent.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/util/event/AbilityLevelEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/AbilityLevelEvent.java index 845e335342..a849ae8032 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/AbilityLevelEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/AbilityLevelEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; import net.minecraft.entity.EntityLivingBase; public class AbilityLevelEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/util/event/AbilityUnlockEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/AbilityUnlockEvent.java similarity index 75% rename from src/main/java/com/crowsofwar/avatar/util/event/AbilityUnlockEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/AbilityUnlockEvent.java index afea451d86..ddb9464ec6 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/AbilityUnlockEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/AbilityUnlockEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.Ability; +import com.crowsofwar.avatar.common.bending.Ability; import net.minecraft.entity.EntityLivingBase; public class AbilityUnlockEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/util/event/AbilityUseEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/AbilityUseEvent.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/util/event/AbilityUseEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/AbilityUseEvent.java index d027ed0abf..d10d9638c3 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/AbilityUseEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/AbilityUseEvent.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.util.data.AbilityData; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.data.AbilityData; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.fml.common.eventhandler.Cancelable; diff --git a/src/main/java/com/crowsofwar/avatar/util/event/AvatarEventHandler.java b/src/main/java/com/crowsofwar/avatar/common/event/AvatarEventHandler.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/util/event/AvatarEventHandler.java rename to src/main/java/com/crowsofwar/avatar/common/event/AvatarEventHandler.java index c91eb11b48..10ba2e5d2a 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/AvatarEventHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/AvatarEventHandler.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.util.damageutils.AvatarDamageSource; -import com.crowsofwar.avatar.entity.AvatarEntity; +import com.crowsofwar.avatar.common.damageutils.AvatarDamageSource; +import com.crowsofwar.avatar.common.entity.AvatarEntity; import net.minecraft.util.DamageSource; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/com/crowsofwar/avatar/util/event/BendingCycleEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/BendingCycleEvent.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/util/event/BendingCycleEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/BendingCycleEvent.java index 5707c9b032..5a149dffd0 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/BendingCycleEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/BendingCycleEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyle; import net.minecraft.entity.EntityLivingBase; public class BendingCycleEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/util/event/BendingEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/BendingEvent.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/util/event/BendingEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/BendingEvent.java index 9291d42f76..40723cbeb1 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/BendingEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/BendingEvent.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; import net.minecraft.entity.EntityLivingBase; import net.minecraftforge.event.entity.living.LivingEvent; diff --git a/src/main/java/com/crowsofwar/avatar/util/event/BendingUseEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/BendingUseEvent.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/util/event/BendingUseEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/BendingUseEvent.java index d747195689..acf44e95e0 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/BendingUseEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/BendingUseEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyle; import net.minecraft.entity.EntityLivingBase; public class BendingUseEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/common/event/CapabilityHandler.java b/src/main/java/com/crowsofwar/avatar/common/event/CapabilityHandler.java new file mode 100644 index 0000000000..eaef5e45aa --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/event/CapabilityHandler.java @@ -0,0 +1,19 @@ +package com.crowsofwar.avatar.common.event; + +import com.crowsofwar.avatar.common.capabilities.PlayerShoulderProvider; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.event.AttachCapabilitiesEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; + +public class CapabilityHandler +{ + + @SubscribeEvent + public void attachCapability(AttachCapabilitiesEvent event) + { + if (!(event.getObject() instanceof EntityPlayer)) return; + event.addCapability(null, new PlayerShoulderProvider()); + } +} \ No newline at end of file diff --git a/src/main/java/com/crowsofwar/avatar/util/event/ElementRemoveEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/ElementRemoveEvent.java similarity index 76% rename from src/main/java/com/crowsofwar/avatar/util/event/ElementRemoveEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/ElementRemoveEvent.java index 6bdedfe83c..3f99e75613 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/ElementRemoveEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/ElementRemoveEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyle; import net.minecraft.entity.EntityLivingBase; public class ElementRemoveEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/util/event/ElementUnlockEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/ElementUnlockEvent.java similarity index 75% rename from src/main/java/com/crowsofwar/avatar/util/event/ElementUnlockEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/ElementUnlockEvent.java index 295db7b31b..d260f20440 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/ElementUnlockEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/ElementUnlockEvent.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyle; import net.minecraft.entity.EntityLivingBase; public class ElementUnlockEvent extends BendingEvent { diff --git a/src/main/java/com/crowsofwar/avatar/util/event/ParticleCollideEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/ParticleCollideEvent.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/util/event/ParticleCollideEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/ParticleCollideEvent.java index 01f98846ca..6ee7bc22c6 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/ParticleCollideEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/ParticleCollideEvent.java @@ -1,7 +1,8 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.air.Airbending; +import com.crowsofwar.avatar.client.particles.newparticles.ParticleAvatar; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.air.Airbending; import net.minecraft.entity.Entity; import net.minecraft.util.math.Vec3d; import net.minecraftforge.event.entity.EntityEvent; diff --git a/src/main/java/com/crowsofwar/avatar/common/event/ServerEventHandler.java b/src/main/java/com/crowsofwar/avatar/common/event/ServerEventHandler.java new file mode 100644 index 0000000000..74047f4734 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/event/ServerEventHandler.java @@ -0,0 +1,192 @@ +package com.crowsofwar.avatar.common.event; + +import com.crowsofwar.avatar.AvatarMod; +import com.crowsofwar.avatar.api.capabilities.CapabilityHelper; +import com.crowsofwar.avatar.api.capabilities.IPlayerShoulders; +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.common.capabilities.CapabilityPlayerShoulders; +import com.crowsofwar.avatar.common.capabilities.GliderCapabilityImplementation; +import com.crowsofwar.avatar.common.entity.mob.EntityAscendedFlyingLemur; +import com.crowsofwar.avatar.common.entity.mob.EntityFlyingLemur; +import com.crowsofwar.avatar.common.helper.GliderPlayerHelper; +import com.crowsofwar.avatar.common.network.packets.glider.PacketCUpdateClientTarget; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Blocks; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.math.BlockPos; +import net.minecraftforge.event.AttachCapabilitiesEvent; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.gameevent.PlayerEvent; +import net.minecraftforge.fml.common.gameevent.TickEvent; + +public class ServerEventHandler { + + /** + * Initialize the cap to the player. + * + * @param event - attach cap event + */ + @SubscribeEvent + public void onAttachCapability(AttachCapabilitiesEvent event) { + if (event.getObject() instanceof EntityPlayer) { + if (!CapabilityHelper.hasGliderCapability((EntityPlayer) event.getObject())) { + event.addCapability(GliderCapabilityImplementation.Provider.NAME, new GliderCapabilityImplementation.Provider()); + } + } + } + + /** + * Deal with end movement and copying capability data over. + * + * @param event - the player being cloned (teleported in vanilla code) + */ + @SubscribeEvent + public void onPlayerCloning(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) { +// if (!event.isWasDeath()) { //return from end (deal with dumb returning from the end code) //ToDo: Test without + if (CapabilityHelper.hasGliderCapability(event.getOriginal())) { + NBTTagCompound gliderData = CapabilityHelper.getGliderCapability(event.getOriginal()).serializeNBT(); + CapabilityHelper.getGliderCapability(event.getEntityPlayer()).deserializeNBT(gliderData); + } +// } + } + + /** + * Update the position of the player when flying. + * + * @param event - tick event + */ + @SubscribeEvent + public void onTick(TickEvent.PlayerTickEvent event) { + if (GliderHelper.getIsGliderDeployed(event.player)) { + GliderPlayerHelper.updatePosition(event.player); + } + } + + /** + * Sync capability of a tracked player for visual person flying updates. + * + * @param event - the tracking event + */ + @SubscribeEvent + public void onTrack(net.minecraftforge.event.entity.player.PlayerEvent.StartTracking event) { + EntityPlayer tracker = event.getEntityPlayer(); //the tracker + Entity targetEntity = event.getTarget(); //the target that is being tracked + if (targetEntity instanceof EntityPlayerMP) { //only entityPlayerMP ( MP part is very important!) + EntityPlayer targetPlayer = (EntityPlayer) targetEntity; //typecast to entityPlayer + if (CapabilityHelper.hasGliderCapability(targetPlayer)) { //if have the capability + if (GliderHelper.getIsGliderDeployed(targetPlayer)) { //if the target has capability need to update + AvatarMod.network.sendTo(new PacketCUpdateClientTarget(targetPlayer, true), (EntityPlayerMP) targetPlayer); + } else { + AvatarMod.network.sendTo(new PacketCUpdateClientTarget(targetPlayer, false), (EntityPlayerMP) targetPlayer); + } + } + } + } + + //===========================================================Simple Sync Capability EVents============================================== + + @SubscribeEvent + public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { + syncGlidingCapability(event.player); + } + + @SubscribeEvent + public void onPlayerChangedDimensionEvent(PlayerEvent.PlayerChangedDimensionEvent event) { + syncGlidingCapability(event.player); + } + + @SubscribeEvent + public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { + syncGlidingCapability(event.player); + } + + /** + * Sends a message to the client to update the status of the glider to whatever it is on the server. + * + * @param player - the player to sync the data for + */ + private void syncGlidingCapability(EntityPlayer player) { + CapabilityHelper.getGliderCapability(player).sync((EntityPlayerMP) player); + } + + + //===========================================================Lemur Events============================================== + + @SubscribeEvent + void onOwnerTeleport(PlayerEvent.PlayerChangedDimensionEvent event) { + IPlayerShoulders playerShoulders = event.player.getCapability(CapabilityPlayerShoulders.TEST_HANDLER, null); + if(playerShoulders.getRiders().size() > 0) { + for(Entity passeger : playerShoulders.getRiders()) { + if(passeger instanceof EntityFlyingLemur) { + EntityFlyingLemur lemur = (EntityFlyingLemur) passeger; + playerShoulders.removeRiders(lemur); + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + lemur.setSitting(true); + } + else if(passeger instanceof EntityAscendedFlyingLemur) { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur) passeger; + playerShoulders.removeRiders(lemur); + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + lemur.setSitting(true); + } + } + } + } + + @SubscribeEvent + void onLemurRideExit(PlayerInteractEvent.RightClickBlock event) { + IPlayerShoulders playerShoulders = event.getEntityPlayer().getCapability(CapabilityPlayerShoulders.TEST_HANDLER, null); + if(playerShoulders.getRiders().size() > 0 && event.getEntityPlayer().isSneaking()) { + BlockPos pos = new BlockPos(event.getPos().getX(), event.getPos().getY()+1f,event.getPos().getZ()); + if(event.getWorld().getBlockState(pos).getBlock() == Blocks.AIR) { + for(Entity passeger : playerShoulders.getRiders()) { + if(passeger instanceof EntityFlyingLemur) { + EntityFlyingLemur lemur = (EntityFlyingLemur) passeger; + playerShoulders.removeRiders(lemur); + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + lemur.setSitting(true); + lemur.setPosition(event.getPos().getX() +0.5f, event.getPos().getY()+1.0F, event.getPos().getZ() +0.5f); + } + else if(passeger instanceof EntityAscendedFlyingLemur) { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur) passeger; + playerShoulders.removeRiders(lemur); + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + lemur.setSitting(true); + lemur.setPosition(event.getPos().getX() +0.5f, event.getPos().getY()+1.0F, event.getPos().getZ() +0.5f); + } + } + } + } + } + + + @SubscribeEvent + void onLogOutLemurExit(PlayerEvent.PlayerLoggedOutEvent event) { + IPlayerShoulders playerShoulders = event.player.getCapability(CapabilityPlayerShoulders.TEST_HANDLER, null); + if(playerShoulders.getRiders().size() > 0) { + for(Entity passeger : playerShoulders.getRiders()) { + if(passeger instanceof EntityFlyingLemur) { + EntityFlyingLemur lemur = (EntityFlyingLemur) passeger; + lemur.height = 1f; + lemur.width = 0.3f; + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + } + else if(passeger instanceof EntityAscendedFlyingLemur) { + EntityAscendedFlyingLemur lemur = (EntityAscendedFlyingLemur) passeger;; + lemur.height = 1f; + lemur.width = 0.3f; + lemur.setRightShoulder(false); + lemur.setLeftShoulder(false); + } + } + } + } +} diff --git a/src/main/java/com/crowsofwar/avatar/util/event/StaffUseEvent.java b/src/main/java/com/crowsofwar/avatar/common/event/StaffUseEvent.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/util/event/StaffUseEvent.java rename to src/main/java/com/crowsofwar/avatar/common/event/StaffUseEvent.java index ed7092b729..f304ee7768 100644 --- a/src/main/java/com/crowsofwar/avatar/util/event/StaffUseEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/event/StaffUseEvent.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.event; +package com.crowsofwar.avatar.common.event; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/crowsofwar/avatar/common/explosions/AvatarCombustionExplosion.java b/src/main/java/com/crowsofwar/avatar/common/explosions/AvatarCombustionExplosion.java new file mode 100644 index 0000000000..15e246ee35 --- /dev/null +++ b/src/main/java/com/crowsofwar/avatar/common/explosions/AvatarCombustionExplosion.java @@ -0,0 +1,4 @@ +package com.crowsofwar.avatar.common.explosions; + +public class AvatarCombustionExplosion { +} diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarGui.java b/src/main/java/com/crowsofwar/avatar/common/gui/AvatarGui.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/client/gui/AvatarGui.java rename to src/main/java/com/crowsofwar/avatar/common/gui/AvatarGui.java index 44101a2df6..dba860623f 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarGui.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/AvatarGui.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; public interface AvatarGui { diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarGuiHandler.java b/src/main/java/com/crowsofwar/avatar/common/gui/AvatarGuiHandler.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/client/gui/AvatarGuiHandler.java rename to src/main/java/com/crowsofwar/avatar/common/gui/AvatarGuiHandler.java index 593b3bec89..b599eb0578 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/AvatarGuiHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/AvatarGuiHandler.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.IGuiHandler; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/BendingMenuInfo.java b/src/main/java/com/crowsofwar/avatar/common/gui/BendingMenuInfo.java similarity index 91% rename from src/main/java/com/crowsofwar/avatar/client/gui/BendingMenuInfo.java rename to src/main/java/com/crowsofwar/avatar/common/gui/BendingMenuInfo.java index 1e4ca9bfda..cac7c693a7 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/BendingMenuInfo.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/BendingMenuInfo.java @@ -15,11 +15,12 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerBisonChest.java b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerBisonChest.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/client/gui/ContainerBisonChest.java rename to src/main/java/com/crowsofwar/avatar/common/gui/ContainerBisonChest.java index 8dc5c65272..540ea13331 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerBisonChest.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerBisonChest.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.item.AvatarItems; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerGetBending.java b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerGetBending.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/client/gui/ContainerGetBending.java rename to src/main/java/com/crowsofwar/avatar/common/gui/ContainerGetBending.java index 536aad689c..c251ca3da7 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerGetBending.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerGetBending.java @@ -14,12 +14,13 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.item.scroll.ItemScroll; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerSkillsGui.java b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerSkillsGui.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/client/gui/ContainerSkillsGui.java rename to src/main/java/com/crowsofwar/avatar/common/gui/ContainerSkillsGui.java index 6dad79274b..e94c9f1b54 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/ContainerSkillsGui.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/ContainerSkillsGui.java @@ -14,11 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; -import com.crowsofwar.avatar.item.scroll.ItemScroll; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/GetBendingInventory.java b/src/main/java/com/crowsofwar/avatar/common/gui/GetBendingInventory.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/client/gui/GetBendingInventory.java rename to src/main/java/com/crowsofwar/avatar/common/gui/GetBendingInventory.java index a4d5771305..c24c8bb854 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/GetBendingInventory.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/GetBendingInventory.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import net.minecraft.inventory.InventoryBasic; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/InventoryBisonChest.java b/src/main/java/com/crowsofwar/avatar/common/gui/InventoryBisonChest.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/client/gui/InventoryBisonChest.java rename to src/main/java/com/crowsofwar/avatar/common/gui/InventoryBisonChest.java index 8fa5ede563..4d3efaec4d 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/InventoryBisonChest.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/InventoryBisonChest.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import net.minecraft.inventory.InventoryBasic; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/InventoryOstrichChest.java b/src/main/java/com/crowsofwar/avatar/common/gui/InventoryOstrichChest.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/client/gui/InventoryOstrichChest.java rename to src/main/java/com/crowsofwar/avatar/common/gui/InventoryOstrichChest.java index 82b4a3b1eb..da23ef6de7 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/InventoryOstrichChest.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/InventoryOstrichChest.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import net.minecraft.inventory.InventoryBasic; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/MenuTheme.java b/src/main/java/com/crowsofwar/avatar/common/gui/MenuTheme.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/client/gui/MenuTheme.java rename to src/main/java/com/crowsofwar/avatar/common/gui/MenuTheme.java index c8d0262d04..6813ea5e28 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/MenuTheme.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/MenuTheme.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import java.awt.*; diff --git a/src/main/java/com/crowsofwar/avatar/client/gui/SkillsGuiInventory.java b/src/main/java/com/crowsofwar/avatar/common/gui/SkillsGuiInventory.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/client/gui/SkillsGuiInventory.java rename to src/main/java/com/crowsofwar/avatar/common/gui/SkillsGuiInventory.java index 5992b21185..37504b2167 100644 --- a/src/main/java/com/crowsofwar/avatar/client/gui/SkillsGuiInventory.java +++ b/src/main/java/com/crowsofwar/avatar/common/gui/SkillsGuiInventory.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.gui; +package com.crowsofwar.avatar.common.gui; import net.minecraft.inventory.InventoryBasic; diff --git a/src/main/java/com/crowsofwar/avatar/util/helper/GliderPlayerHelper.java b/src/main/java/com/crowsofwar/avatar/common/helper/GliderPlayerHelper.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/util/helper/GliderPlayerHelper.java rename to src/main/java/com/crowsofwar/avatar/common/helper/GliderPlayerHelper.java index 08ace28286..a9a40edf9c 100644 --- a/src/main/java/com/crowsofwar/avatar/util/helper/GliderPlayerHelper.java +++ b/src/main/java/com/crowsofwar/avatar/common/helper/GliderPlayerHelper.java @@ -1,9 +1,10 @@ -package com.crowsofwar.avatar.util.helper; +package com.crowsofwar.avatar.common.helper; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.item.IGlider; -import com.crowsofwar.avatar.util.windhelper.WindHelper; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.api.item.IGlider; +import com.crowsofwar.avatar.common.wind.WindHelper; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -14,8 +15,10 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; -import static com.crowsofwar.avatar.util.helper.MathHelper.*; +import java.util.Arrays; + +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.helper.MathHelper.*; public class GliderPlayerHelper { diff --git a/src/main/java/com/crowsofwar/avatar/util/helper/MathHelper.java b/src/main/java/com/crowsofwar/avatar/common/helper/MathHelper.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/util/helper/MathHelper.java rename to src/main/java/com/crowsofwar/avatar/common/helper/MathHelper.java index abbe64f97a..e3006cde2c 100644 --- a/src/main/java/com/crowsofwar/avatar/util/helper/MathHelper.java +++ b/src/main/java/com/crowsofwar/avatar/common/helper/MathHelper.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.helper; +package com.crowsofwar.avatar.common.helper; public class MathHelper { diff --git a/src/main/java/com/crowsofwar/avatar/item/AvatarDungeonLoot.java b/src/main/java/com/crowsofwar/avatar/common/item/AvatarDungeonLoot.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/item/AvatarDungeonLoot.java rename to src/main/java/com/crowsofwar/avatar/common/item/AvatarDungeonLoot.java index bf30aac4ad..256fcd4377 100644 --- a/src/main/java/com/crowsofwar/avatar/item/AvatarDungeonLoot.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/AvatarDungeonLoot.java @@ -14,12 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; import com.crowsofwar.avatar.AvatarInfo; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.util.AvatarUtils; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.util.AvatarUtils; import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; @@ -33,7 +32,7 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static com.crowsofwar.avatar.config.ConfigStats.STATS_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG; import static net.minecraft.world.storage.loot.LootTableList.*; /** diff --git a/src/main/java/com/crowsofwar/avatar/registry/AvatarItem.java b/src/main/java/com/crowsofwar/avatar/common/item/AvatarItem.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/registry/AvatarItem.java rename to src/main/java/com/crowsofwar/avatar/common/item/AvatarItem.java index b867bb5cc5..2554446b58 100644 --- a/src/main/java/com/crowsofwar/avatar/registry/AvatarItem.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/AvatarItem.java @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.registry; +package com.crowsofwar.avatar.common.item; import net.minecraft.item.Item; diff --git a/src/main/java/com/crowsofwar/avatar/registry/AvatarItems.java b/src/main/java/com/crowsofwar/avatar/common/item/AvatarItems.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/registry/AvatarItems.java rename to src/main/java/com/crowsofwar/avatar/common/item/AvatarItems.java index bb62c41840..a9f8bfe096 100644 --- a/src/main/java/com/crowsofwar/avatar/registry/AvatarItems.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/AvatarItems.java @@ -14,21 +14,21 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.registry; +package com.crowsofwar.avatar.common.item; import com.crowsofwar.avatar.AvatarInfo; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.blocks.AvatarBlocks; -import com.crowsofwar.avatar.item.*; -import com.crowsofwar.avatar.item.scroll.*; +import com.crowsofwar.avatar.common.blocks.AvatarBlocks; +import com.crowsofwar.avatar.common.item.scroll.*; -import com.crowsofwar.avatar.util.GliderInfo; +import com.crowsofwar.avatar.common.GliderInfo; import net.minecraft.block.Block; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraftforge.client.event.ColorHandlerEvent; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemBisonArmor.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonArmor.java similarity index 95% rename from src/main/java/com/crowsofwar/avatar/item/ItemBisonArmor.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemBisonArmor.java index b4d579b059..54fc6bcbf8 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemBisonArmor.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonArmor.java @@ -14,10 +14,8 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemBisonSaddle.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonSaddle.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/item/ItemBisonSaddle.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemBisonSaddle.java index e8933cb3d2..c1d86bb2fe 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemBisonSaddle.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonSaddle.java @@ -14,10 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.AvatarMod; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; +import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemBisonWhistle.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonWhistle.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/item/ItemBisonWhistle.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemBisonWhistle.java index 313c61d1f2..6e3c76ae62 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemBisonWhistle.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemBisonWhistle.java @@ -14,13 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.util.TransferConfirmHandler; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.TransferConfirmHandler; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; import com.crowsofwar.gorecore.util.AccountUUIDs; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -37,8 +35,8 @@ import java.util.List; import java.util.UUID; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; -import static com.crowsofwar.avatar.util.data.TickHandlerController.BISON_SUMMONER; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.data.TickHandlerController.BISON_SUMMONER; import static com.crowsofwar.gorecore.util.GoreCoreNBTUtil.stackCompound; import static net.minecraft.util.EnumActionResult.PASS; import static net.minecraft.util.EnumActionResult.SUCCESS; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderAdvanced.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderAdvanced.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/item/ItemHangGliderAdvanced.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderAdvanced.java index 847568de3f..c75597cb1d 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderAdvanced.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderAdvanced.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.util.GliderInfo; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.api.item.ItemHangGliderBase; +import com.crowsofwar.avatar.client.model.ModelGlider; +import com.crowsofwar.avatar.common.GliderInfo; import net.minecraft.item.Item; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; public class ItemHangGliderAdvanced extends ItemHangGliderBase implements AvatarItem { diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBasic.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderBasic.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBasic.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderBasic.java index 61e94322f9..f7f0dd3544 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderBasic.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderBasic.java @@ -1,10 +1,11 @@ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.util.GliderInfo; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.api.item.ItemHangGliderBase; +import com.crowsofwar.avatar.client.model.ModelGlider; +import com.crowsofwar.avatar.common.GliderInfo; import net.minecraft.item.Item; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; public class ItemHangGliderBasic extends ItemHangGliderBase { diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderPart.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderPart.java similarity index 84% rename from src/main/java/com/crowsofwar/avatar/item/ItemHangGliderPart.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderPart.java index 36de2b6179..f81152ab62 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemHangGliderPart.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemHangGliderPart.java @@ -1,13 +1,15 @@ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.util.GliderInfo; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.AvatarMod; +import com.crowsofwar.avatar.common.GliderInfo; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; +import static com.crowsofwar.avatar.AvatarInfo.MOD_ID; + public class ItemHangGliderPart extends Item implements AvatarItem { private static ItemHangGliderPart instance = null; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemOstrichEquipment.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemOstrichEquipment.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/item/ItemOstrichEquipment.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemOstrichEquipment.java index 86e4dca933..c6af1f6f1d 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemOstrichEquipment.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemOstrichEquipment.java @@ -1,7 +1,5 @@ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/item/ItemWaterPouch.java b/src/main/java/com/crowsofwar/avatar/common/item/ItemWaterPouch.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/item/ItemWaterPouch.java rename to src/main/java/com/crowsofwar/avatar/common/item/ItemWaterPouch.java index c362cb9349..a524bb411c 100644 --- a/src/main/java/com/crowsofwar/avatar/item/ItemWaterPouch.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/ItemWaterPouch.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.item; +package com.crowsofwar.avatar.common.item; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.AvatarMod; +import com.zeitheron.hammercore.internal.blocks.IWitherProofBlock; import net.minecraft.block.BlockCauldron; import net.minecraft.block.BlockLiquid; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScroll.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScroll.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScroll.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScroll.java index ca9be58cb8..0c4d5bb4f8 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScroll.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScroll.java @@ -1,15 +1,15 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.network.AvatarChatMessages; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.client.gui.AvatarGuiHandler; -import com.crowsofwar.avatar.registry.AvatarItem; -import com.crowsofwar.avatar.registry.AvatarItems; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.AvatarChatMessages; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.gui.AvatarGuiHandler; +import com.crowsofwar.avatar.common.item.AvatarItem; +import com.crowsofwar.avatar.common.item.AvatarItems; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; import com.crowsofwar.gorecore.format.FormattedMessageProcessor; import net.minecraft.client.resources.I18n; import net.minecraft.client.util.ITooltipFlag; @@ -30,7 +30,7 @@ import java.util.List; import java.util.UUID; -import static com.crowsofwar.avatar.network.AvatarChatMessages.MSG_SPECIALTY_SCROLL_TOOLTIP; +import static com.crowsofwar.avatar.common.AvatarChatMessages.MSG_SPECIALTY_SCROLL_TOOLTIP; /** * Base class for scrolls diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAir.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAir.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAir.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAir.java index 33855a29a7..4dc8ed837a 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAir.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAir.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAll.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAll.java similarity index 73% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAll.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAll.java index b0ba9fbd50..092975f4cb 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollAll.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollAll.java @@ -1,6 +1,7 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.AvatarMod; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollCombustion.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollCombustion.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollCombustion.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollCombustion.java index 9b55fb3991..b2a26a9ae3 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollCombustion.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollCombustion.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollEarth.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollEarth.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollEarth.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollEarth.java index b6b909e0ed..4a81f770c8 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollEarth.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollEarth.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollFire.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollFire.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollFire.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollFire.java index c1f40c454e..84b53f507f 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollFire.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollFire.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.entity.AvatarEntityItem; +import com.crowsofwar.avatar.common.entity.AvatarEntityItem; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollIce.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollIce.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollIce.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollIce.java index 1183a1a3c4..dcd3377a2d 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollIce.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollIce.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollLightning.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollLightning.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollLightning.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollLightning.java index 464edc5a16..86d89fc621 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollLightning.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollLightning.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollSand.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollSand.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollSand.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollSand.java index 9574002af4..b1f64cad35 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollSand.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollSand.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollWater.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollWater.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollWater.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollWater.java index 1e7dad8b15..e850a75aff 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/ItemScrollWater.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/ItemScrollWater.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; -import com.crowsofwar.avatar.registry.AvatarItems; +import com.crowsofwar.avatar.common.item.AvatarItems; /** * @author Aang23 diff --git a/src/main/java/com/crowsofwar/avatar/item/scroll/Scrolls.java b/src/main/java/com/crowsofwar/avatar/common/item/scroll/Scrolls.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/item/scroll/Scrolls.java rename to src/main/java/com/crowsofwar/avatar/common/item/scroll/Scrolls.java index e9279baffd..d84475216c 100644 --- a/src/main/java/com/crowsofwar/avatar/item/scroll/Scrolls.java +++ b/src/main/java/com/crowsofwar/avatar/common/item/scroll/Scrolls.java @@ -1,19 +1,19 @@ -package com.crowsofwar.avatar.item.scroll; +package com.crowsofwar.avatar.common.item.scroll; import java.util.UUID; import javax.annotation.Nullable; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.combustion.Combustionbending; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.bending.bending.ice.Icebending; -import com.crowsofwar.avatar.bending.bending.lightning.Lightningbending; -import com.crowsofwar.avatar.bending.bending.sand.Sandbending; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.combustion.Combustionbending; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.bending.ice.Icebending; +import com.crowsofwar.avatar.common.bending.lightning.Lightningbending; +import com.crowsofwar.avatar.common.bending.sand.Sandbending; +import com.crowsofwar.avatar.common.bending.water.Waterbending; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/network/DataTransmitter.java b/src/main/java/com/crowsofwar/avatar/common/network/DataTransmitter.java similarity index 90% rename from src/main/java/com/crowsofwar/avatar/network/DataTransmitter.java rename to src/main/java/com/crowsofwar/avatar/common/network/DataTransmitter.java index 238a12098e..6633b55494 100644 --- a/src/main/java/com/crowsofwar/avatar/network/DataTransmitter.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/DataTransmitter.java @@ -15,9 +15,9 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common.network; -import com.crowsofwar.avatar.util.data.BendingData; +import com.crowsofwar.avatar.common.data.BendingData; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/com/crowsofwar/avatar/network/DataTransmitters.java b/src/main/java/com/crowsofwar/avatar/common/network/DataTransmitters.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/network/DataTransmitters.java rename to src/main/java/com/crowsofwar/avatar/common/network/DataTransmitters.java index a6d0873539..86ad893d88 100644 --- a/src/main/java/com/crowsofwar/avatar/network/DataTransmitters.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/DataTransmitters.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common.network; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; -import com.crowsofwar.avatar.bending.bending.BattlePerformanceScore; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.*; +import com.crowsofwar.avatar.common.bending.BattlePerformanceScore; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.*; import io.netty.buffer.ByteBuf; import java.util.*; diff --git a/src/main/java/com/crowsofwar/avatar/network/IPacketHandler.java b/src/main/java/com/crowsofwar/avatar/common/network/IPacketHandler.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/network/IPacketHandler.java rename to src/main/java/com/crowsofwar/avatar/common/network/IPacketHandler.java index d6ab6d621c..02c5f46dc6 100644 --- a/src/main/java/com/crowsofwar/avatar/network/IPacketHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/IPacketHandler.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common.network; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/crowsofwar/avatar/network/PacketHandlerServer.java b/src/main/java/com/crowsofwar/avatar/common/network/PacketHandlerServer.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/network/PacketHandlerServer.java rename to src/main/java/com/crowsofwar/avatar/common/network/PacketHandlerServer.java index afb22d1749..7a4b7ae302 100644 --- a/src/main/java/com/crowsofwar/avatar/network/PacketHandlerServer.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/PacketHandlerServer.java @@ -15,42 +15,42 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common.network; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.util.helper.GliderHelper; -import com.crowsofwar.avatar.util.TransferConfirmHandler; -import com.crowsofwar.avatar.util.analytics.AnalyticEvent; -import com.crowsofwar.avatar.util.analytics.AnalyticEvents; -import com.crowsofwar.avatar.util.analytics.AvatarAnalytics; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyle; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.AbilityData; -import com.crowsofwar.avatar.util.data.AbilityData.AbilityTreePath; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.WallJumpManager; -import com.crowsofwar.avatar.util.data.ctx.AbilityContext; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.entity.mob.EntitySkyBison; -import com.crowsofwar.avatar.util.event.AbilityLevelEvent; -import com.crowsofwar.avatar.util.event.AbilityUnlockEvent; -import com.crowsofwar.avatar.util.event.ElementUnlockEvent; -import com.crowsofwar.avatar.util.event.ParticleCollideEvent; -import com.crowsofwar.avatar.client.gui.AvatarGuiHandler; -import com.crowsofwar.avatar.client.gui.ContainerGetBending; -import com.crowsofwar.avatar.client.gui.ContainerSkillsGui; -import com.crowsofwar.avatar.item.scroll.ItemScroll; -import com.crowsofwar.avatar.item.scroll.Scrolls; -import com.crowsofwar.avatar.item.scroll.Scrolls.ScrollType; -import com.crowsofwar.avatar.network.packets.*; -import com.crowsofwar.avatar.network.packets.glider.PacketSServerGliding; -import com.crowsofwar.avatar.util.AvatarEntityUtils; -import com.crowsofwar.avatar.util.PlayerViewRegistry; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.api.helper.GliderHelper; +import com.crowsofwar.avatar.common.TransferConfirmHandler; +import com.crowsofwar.avatar.common.analytics.AnalyticEvent; +import com.crowsofwar.avatar.common.analytics.AnalyticEvents; +import com.crowsofwar.avatar.common.analytics.AvatarAnalytics; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyle; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.AbilityData; +import com.crowsofwar.avatar.common.data.AbilityData.AbilityTreePath; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.WallJumpManager; +import com.crowsofwar.avatar.common.data.ctx.AbilityContext; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.entity.mob.EntitySkyBison; +import com.crowsofwar.avatar.common.event.AbilityLevelEvent; +import com.crowsofwar.avatar.common.event.AbilityUnlockEvent; +import com.crowsofwar.avatar.common.event.ElementUnlockEvent; +import com.crowsofwar.avatar.common.event.ParticleCollideEvent; +import com.crowsofwar.avatar.common.gui.AvatarGuiHandler; +import com.crowsofwar.avatar.common.gui.ContainerGetBending; +import com.crowsofwar.avatar.common.gui.ContainerSkillsGui; +import com.crowsofwar.avatar.common.item.scroll.ItemScroll; +import com.crowsofwar.avatar.common.item.scroll.Scrolls; +import com.crowsofwar.avatar.common.item.scroll.Scrolls.ScrollType; +import com.crowsofwar.avatar.common.network.packets.*; +import com.crowsofwar.avatar.common.network.packets.glider.PacketSServerGliding; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; +import com.crowsofwar.avatar.common.util.PlayerViewRegistry; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.AccountUUIDs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -67,9 +67,9 @@ import java.util.Objects; import java.util.UUID; -import static com.crowsofwar.avatar.network.AvatarChatMessages.*; -import static com.crowsofwar.avatar.util.analytics.AnalyticEvents.getAbilityExecutionEvent; -import static com.crowsofwar.avatar.network.packets.glider.PacketSServerGliding.IS_GLIDING; +import static com.crowsofwar.avatar.common.AvatarChatMessages.*; +import static com.crowsofwar.avatar.common.analytics.AnalyticEvents.getAbilityExecutionEvent; +import static com.crowsofwar.avatar.common.network.packets.glider.PacketSServerGliding.IS_GLIDING; /** * Implements IPacketHandler. Acts as a packet handler for integrated and diff --git a/src/main/java/com/crowsofwar/avatar/network/PacketRedirector.java b/src/main/java/com/crowsofwar/avatar/common/network/PacketRedirector.java similarity index 97% rename from src/main/java/com/crowsofwar/avatar/network/PacketRedirector.java rename to src/main/java/com/crowsofwar/avatar/common/network/PacketRedirector.java index e002aed6a2..c8983c28fd 100644 --- a/src/main/java/com/crowsofwar/avatar/network/PacketRedirector.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/PacketRedirector.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.common.network; import com.crowsofwar.avatar.AvatarMod; import net.minecraftforge.fml.common.FMLCommonHandler; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/AvatarPacket.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/AvatarPacket.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/network/packets/AvatarPacket.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/AvatarPacket.java index 0d2a9c0ef8..cfe42bfb7a 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/AvatarPacket.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/AvatarPacket.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCErrorMessage.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCErrorMessage.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCErrorMessage.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCErrorMessage.java index 7ce1603a68..d319058bf7 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCErrorMessage.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCErrorMessage.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; @@ -51,7 +51,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCOpenSkillCard.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCOpenSkillCard.java similarity index 78% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCOpenSkillCard.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCOpenSkillCard.java index f5f1729669..68445467dd 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCOpenSkillCard.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCOpenSkillCard.java @@ -1,8 +1,8 @@ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCParticles.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCParticles.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCParticles.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCParticles.java index b7a3a42718..9a064a9dd4 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCParticles.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCParticles.java @@ -15,9 +15,9 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraft.util.EnumParticleTypes; import net.minecraftforge.fml.relauncher.Side; @@ -95,7 +95,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCPlayerData.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPlayerData.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCPlayerData.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPlayerData.java index f725ba953c..3a4798a148 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCPlayerData.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPlayerData.java @@ -15,14 +15,14 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.util.data.AvatarPlayerData; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.DataCategory; +import com.crowsofwar.avatar.common.data.AvatarPlayerData; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.DataCategory; import com.crowsofwar.gorecore.GoreCore; import io.netty.buffer.ByteBuf; import net.minecraft.client.Minecraft; @@ -148,7 +148,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { // Do nothing! // In the avatarFromBytes method, already saved the data into the diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCPowerRating.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPowerRating.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCPowerRating.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPowerRating.java index 81030a9f49..5b02fc9f7c 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCPowerRating.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCPowerRating.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCRemoveStatusControl.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCRemoveStatusControl.java similarity index 79% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCRemoveStatusControl.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCRemoveStatusControl.java index 0afad02660..113f89ace5 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCRemoveStatusControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCRemoveStatusControl.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -53,7 +53,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCStatusControl.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCStatusControl.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCStatusControl.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCStatusControl.java index 2c7bfc462b..72990e0eb1 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCStatusControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCStatusControl.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCSyncAbilityProperties.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCSyncAbilityProperties.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketCSyncAbilityProperties.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCSyncAbilityProperties.java index 17da632808..8089a7e3b2 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketCSyncAbilityProperties.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketCSyncAbilityProperties.java @@ -1,9 +1,9 @@ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; import com.crowsofwar.avatar.AvatarLog; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.config.AbilityProperties; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.config.AbilityProperties; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSBisonInventory.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSBisonInventory.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSBisonInventory.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSBisonInventory.java index b3f27aa062..aea3ca9526 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSBisonInventory.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSBisonInventory.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -39,7 +39,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSConfirmTransfer.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSConfirmTransfer.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSConfirmTransfer.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSConfirmTransfer.java index ed61849790..aea30cb276 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSConfirmTransfer.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSConfirmTransfer.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -39,7 +39,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSCycleBending.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSCycleBending.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSCycleBending.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSCycleBending.java index fa9dae8d7a..2ebd3623aa 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSCycleBending.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSCycleBending.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -50,7 +50,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSOpenUnlockGui.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSOpenUnlockGui.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSOpenUnlockGui.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSOpenUnlockGui.java index 27bb9692ef..075db1cc9e 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSOpenUnlockGui.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSOpenUnlockGui.java @@ -14,9 +14,9 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -39,7 +39,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSParticleCollideEvent.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSParticleCollideEvent.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSParticleCollideEvent.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSParticleCollideEvent.java index 3c018ac252..1d3c181787 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSParticleCollideEvent.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSParticleCollideEvent.java @@ -1,10 +1,11 @@ -package com.crowsofwar.avatar.network.packets; - -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.util.AvatarEntityUtils; +package com.crowsofwar.avatar.common.network.packets; + +import com.crowsofwar.avatar.client.particles.newparticles.ParticleAvatar; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.util.AvatarEntityUtils; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSRequestData.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSRequestData.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSRequestData.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSRequestData.java index ee4869f73b..41963ac767 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSRequestData.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSRequestData.java @@ -15,9 +15,9 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import com.crowsofwar.gorecore.util.AccountUUIDs; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSSendViewStatus.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSendViewStatus.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSSendViewStatus.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSendViewStatus.java index a470b9336f..b556de953c 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSSendViewStatus.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSendViewStatus.java @@ -15,9 +15,9 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSSkillsMenu.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSkillsMenu.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSSkillsMenu.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSkillsMenu.java index 293e82886e..c66cd1ee1b 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSSkillsMenu.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSSkillsMenu.java @@ -14,12 +14,12 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -68,7 +68,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUnlockBending.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUnlockBending.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSUnlockBending.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUnlockBending.java index e4b4f1b08e..d3b8c3a550 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUnlockBending.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUnlockBending.java @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.bending.bending.BendingStyles; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.bending.BendingStyles; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -53,7 +53,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseAbility.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseAbility.java similarity index 86% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseAbility.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseAbility.java index 3c5fe6ab51..56a8ec1dc7 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseAbility.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseAbility.java @@ -15,13 +15,13 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.util.Raytrace; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseScroll.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseScroll.java similarity index 81% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseScroll.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseScroll.java index 8723d9b2ab..50d49294d3 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseScroll.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseScroll.java @@ -14,11 +14,11 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.bending.bending.Abilities; -import com.crowsofwar.avatar.bending.bending.Ability; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.bending.Abilities; +import com.crowsofwar.avatar.common.bending.Ability; +import com.crowsofwar.avatar.common.network.PacketRedirector; import com.crowsofwar.gorecore.util.GoreCoreByteBufUtil; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; @@ -54,7 +54,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseStatusControl.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseStatusControl.java similarity index 87% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseStatusControl.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseStatusControl.java index 27a31ff482..6982f4b552 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSUseStatusControl.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSUseStatusControl.java @@ -15,14 +15,14 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; import com.crowsofwar.avatar.AvatarLog; import com.crowsofwar.avatar.AvatarLog.WarningType; -import com.crowsofwar.avatar.util.data.StatusControl; -import com.crowsofwar.avatar.util.data.StatusControlController; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.common.data.StatusControl; +import com.crowsofwar.avatar.common.data.StatusControlController; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.util.Raytrace; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSWallJump.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSWallJump.java similarity index 76% rename from src/main/java/com/crowsofwar/avatar/network/packets/PacketSWallJump.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSWallJump.java index bbd351b354..fa89304b41 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/PacketSWallJump.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/PacketSWallJump.java @@ -14,11 +14,18 @@ You should have received a copy of the GNU General Public License along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network.packets; +package com.crowsofwar.avatar.common.network.packets; -import com.crowsofwar.avatar.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.PacketRedirector; import io.netty.buffer.ByteBuf; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EnumFaceDirection; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.EnumFacing; import net.minecraftforge.fml.relauncher.Side; +import org.lwjgl.input.Keyboard; /** * @author CrowsOfWar @@ -52,7 +59,7 @@ protected Side getReceivedSide() { } @Override - protected com.crowsofwar.avatar.network.packets.AvatarPacket.Handler getPacketHandler() { + protected com.crowsofwar.avatar.common.network.packets.AvatarPacket.Handler getPacketHandler() { return PacketRedirector::redirectMessage; } diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCClientGliding.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCClientGliding.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCClientGliding.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCClientGliding.java index 648ed9888e..4c8b7e171b 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCClientGliding.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCClientGliding.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.network.packets.glider; +package com.crowsofwar.avatar.common.network.packets.glider; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.network.packets.AvatarPacket; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.packets.AvatarPacket; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCSyncGliderDataToClient.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCSyncGliderDataToClient.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCSyncGliderDataToClient.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCSyncGliderDataToClient.java index 5c559184a7..f2e89afa5a 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCSyncGliderDataToClient.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCSyncGliderDataToClient.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.network.packets.glider; +package com.crowsofwar.avatar.common.network.packets.glider; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.network.packets.AvatarPacket; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.packets.AvatarPacket; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fml.common.network.ByteBufUtils; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCUpdateClientTarget.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCUpdateClientTarget.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCUpdateClientTarget.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCUpdateClientTarget.java index beec397f71..823feb7cb4 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketCUpdateClientTarget.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketCUpdateClientTarget.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.network.packets.glider; +package com.crowsofwar.avatar.common.network.packets.glider; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.network.packets.AvatarPacket; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.packets.AvatarPacket; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketSServerGliding.java b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketSServerGliding.java similarity index 85% rename from src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketSServerGliding.java rename to src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketSServerGliding.java index 2788319989..92b309a496 100644 --- a/src/main/java/com/crowsofwar/avatar/network/packets/glider/PacketSServerGliding.java +++ b/src/main/java/com/crowsofwar/avatar/common/network/packets/glider/PacketSServerGliding.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.network.packets.glider; +package com.crowsofwar.avatar.common.network.packets.glider; -import com.crowsofwar.avatar.network.PacketRedirector; -import com.crowsofwar.avatar.network.packets.AvatarPacket; +import com.crowsofwar.avatar.common.network.PacketRedirector; +import com.crowsofwar.avatar.common.network.packets.AvatarPacket; import io.netty.buffer.ByteBuf; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/com/crowsofwar/avatar/client/particle/ClientParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/particle/ClientParticleSpawner.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/client/particle/ClientParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/particle/ClientParticleSpawner.java index e13da0d8c1..1582db10d0 100644 --- a/src/main/java/com/crowsofwar/avatar/client/particle/ClientParticleSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/particle/ClientParticleSpawner.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.particle; +package com.crowsofwar.avatar.common.particle; import com.crowsofwar.avatar.AvatarMod; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/com/crowsofwar/avatar/client/particle/NetworkParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/particle/NetworkParticleSpawner.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/client/particle/NetworkParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/particle/NetworkParticleSpawner.java index 437be6a366..36e171ac1b 100644 --- a/src/main/java/com/crowsofwar/avatar/client/particle/NetworkParticleSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/particle/NetworkParticleSpawner.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.particle; +package com.crowsofwar.avatar.common.particle; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.network.packets.PacketCParticles; +import com.crowsofwar.avatar.common.network.packets.PacketCParticles; import net.minecraft.util.EnumParticleTypes; import net.minecraft.world.World; import net.minecraftforge.fml.common.network.NetworkRegistry.TargetPoint; diff --git a/src/main/java/com/crowsofwar/avatar/client/particle/ParticleBuilder.java b/src/main/java/com/crowsofwar/avatar/common/particle/ParticleBuilder.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/client/particle/ParticleBuilder.java rename to src/main/java/com/crowsofwar/avatar/common/particle/ParticleBuilder.java diff --git a/src/main/java/com/crowsofwar/avatar/client/particle/ParticleSpawner.java b/src/main/java/com/crowsofwar/avatar/common/particle/ParticleSpawner.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/client/particle/ParticleSpawner.java rename to src/main/java/com/crowsofwar/avatar/common/particle/ParticleSpawner.java index ab8e7bc703..79782cdaa6 100644 --- a/src/main/java/com/crowsofwar/avatar/client/particle/ParticleSpawner.java +++ b/src/main/java/com/crowsofwar/avatar/common/particle/ParticleSpawner.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.client.particle; +package com.crowsofwar.avatar.common.particle; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.util.EnumParticleTypes; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/FirebendingSunModifier.java b/src/main/java/com/crowsofwar/avatar/common/powerrating/FirebendingSunModifier.java similarity index 80% rename from src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/FirebendingSunModifier.java rename to src/main/java/com/crowsofwar/avatar/common/powerrating/FirebendingSunModifier.java index 53453b261b..6886ee5628 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/FirebendingSunModifier.java +++ b/src/main/java/com/crowsofwar/avatar/common/powerrating/FirebendingSunModifier.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bendingmultipliers; +package com.crowsofwar.avatar.common.powerrating; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/PrModifierHandler.java b/src/main/java/com/crowsofwar/avatar/common/powerrating/PrModifierHandler.java similarity index 67% rename from src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/PrModifierHandler.java rename to src/main/java/com/crowsofwar/avatar/common/powerrating/PrModifierHandler.java index e4cc1627b7..1eddc3b56d 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/PrModifierHandler.java +++ b/src/main/java/com/crowsofwar/avatar/common/powerrating/PrModifierHandler.java @@ -1,17 +1,17 @@ -package com.crowsofwar.avatar.bending.bendingmultipliers; +package com.crowsofwar.avatar.common.powerrating; -import com.crowsofwar.avatar.item.ItemHangGliderBase; -import com.crowsofwar.avatar.bending.bending.air.Airbending; -import com.crowsofwar.avatar.bending.bending.air.powermods.StaffPowerModifier; -import com.crowsofwar.avatar.bending.bending.earth.Earthbending; -import com.crowsofwar.avatar.bending.bending.earth.EarthbendingJingModifier; -import com.crowsofwar.avatar.bending.bending.fire.Firebending; -import com.crowsofwar.avatar.bending.bending.water.Waterbending; -import com.crowsofwar.avatar.util.data.Bender; -import com.crowsofwar.avatar.util.data.BendingData; -import com.crowsofwar.avatar.util.data.PowerRatingManager; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; -import com.crowsofwar.avatar.util.Raytrace; +import com.crowsofwar.avatar.api.item.ItemHangGliderBase; +import com.crowsofwar.avatar.common.bending.air.Airbending; +import com.crowsofwar.avatar.common.bending.air.powermods.StaffPowerModifier; +import com.crowsofwar.avatar.common.bending.earth.Earthbending; +import com.crowsofwar.avatar.common.bending.earth.EarthbendingJingModifier; +import com.crowsofwar.avatar.common.bending.fire.Firebending; +import com.crowsofwar.avatar.common.bending.water.Waterbending; +import com.crowsofwar.avatar.common.data.Bender; +import com.crowsofwar.avatar.common.data.BendingData; +import com.crowsofwar.avatar.common.data.PowerRatingManager; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.util.Raytrace; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/WaterbendingMoonBonus.java b/src/main/java/com/crowsofwar/avatar/common/powerrating/WaterbendingMoonBonus.java similarity index 83% rename from src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/WaterbendingMoonBonus.java rename to src/main/java/com/crowsofwar/avatar/common/powerrating/WaterbendingMoonBonus.java index 92d151d96e..336af82e8f 100644 --- a/src/main/java/com/crowsofwar/avatar/bending/bendingmultipliers/WaterbendingMoonBonus.java +++ b/src/main/java/com/crowsofwar/avatar/common/powerrating/WaterbendingMoonBonus.java @@ -1,7 +1,7 @@ -package com.crowsofwar.avatar.bending.bendingmultipliers; +package com.crowsofwar.avatar.common.powerrating; -import com.crowsofwar.avatar.util.data.PowerRatingModifier; -import com.crowsofwar.avatar.util.data.ctx.BendingContext; +import com.crowsofwar.avatar.common.data.PowerRatingModifier; +import com.crowsofwar.avatar.common.data.ctx.BendingContext; import net.minecraft.entity.EntityLivingBase; import net.minecraft.world.World; diff --git a/src/main/java/com/crowsofwar/avatar/registry/CapabilityRegistry.java b/src/main/java/com/crowsofwar/avatar/common/registry/CapabilityRegistry.java similarity index 52% rename from src/main/java/com/crowsofwar/avatar/registry/CapabilityRegistry.java rename to src/main/java/com/crowsofwar/avatar/common/registry/CapabilityRegistry.java index 42cbbf8646..b754d8d463 100644 --- a/src/main/java/com/crowsofwar/avatar/registry/CapabilityRegistry.java +++ b/src/main/java/com/crowsofwar/avatar/common/registry/CapabilityRegistry.java @@ -1,6 +1,6 @@ -package com.crowsofwar.avatar.registry; +package com.crowsofwar.avatar.common.registry; -import com.crowsofwar.avatar.capabilities.GliderCapabilityImplementation; +import com.crowsofwar.avatar.common.capabilities.GliderCapabilityImplementation; public class CapabilityRegistry { diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarByteBufUtils.java b/src/main/java/com/crowsofwar/avatar/common/util/AvatarByteBufUtils.java similarity index 96% rename from src/main/java/com/crowsofwar/avatar/util/AvatarByteBufUtils.java rename to src/main/java/com/crowsofwar/avatar/common/util/AvatarByteBufUtils.java index dc280abc88..71a059b557 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarByteBufUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/AvatarByteBufUtils.java @@ -15,7 +15,7 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarDataSerializers.java b/src/main/java/com/crowsofwar/avatar/common/util/AvatarDataSerializers.java similarity index 94% rename from src/main/java/com/crowsofwar/avatar/util/AvatarDataSerializers.java rename to src/main/java/com/crowsofwar/avatar/common/util/AvatarDataSerializers.java index 87f160e679..8bbea3505d 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarDataSerializers.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/AvatarDataSerializers.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; -import com.crowsofwar.avatar.util.data.BenderInfo; -import com.crowsofwar.avatar.item.ItemBisonArmor.ArmorTier; -import com.crowsofwar.avatar.item.ItemBisonSaddle.SaddleTier; +import com.crowsofwar.avatar.common.data.BenderInfo; +import com.crowsofwar.avatar.common.item.ItemBisonArmor.ArmorTier; +import com.crowsofwar.avatar.common.item.ItemBisonSaddle.SaddleTier; import com.crowsofwar.gorecore.util.Vector; import net.minecraft.block.Block; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarEntityUtils.java b/src/main/java/com/crowsofwar/avatar/common/util/AvatarEntityUtils.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/AvatarEntityUtils.java rename to src/main/java/com/crowsofwar/avatar/common/util/AvatarEntityUtils.java index e9c91490b2..eb07898739 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarEntityUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/AvatarEntityUtils.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarParticleUtils.java b/src/main/java/com/crowsofwar/avatar/common/util/AvatarParticleUtils.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/AvatarParticleUtils.java rename to src/main/java/com/crowsofwar/avatar/common/util/AvatarParticleUtils.java index 6f9253a0f7..6886012d5e 100644 --- a/src/main/java/com/crowsofwar/avatar/util/AvatarParticleUtils.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/AvatarParticleUtils.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -6,6 +6,7 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; +import org.apache.commons.lang3.Validate; import static java.lang.Math.cos; import static java.lang.Math.sin; diff --git a/src/main/java/com/crowsofwar/avatar/util/AvatarUtils.java b/src/main/java/com/crowsofwar/avatar/common/util/AvatarUtils.java similarity index 100% rename from src/main/java/com/crowsofwar/avatar/util/AvatarUtils.java rename to src/main/java/com/crowsofwar/avatar/common/util/AvatarUtils.java diff --git a/src/main/java/com/crowsofwar/avatar/util/GliderHelper.java b/src/main/java/com/crowsofwar/avatar/common/util/GliderHelper.java similarity index 89% rename from src/main/java/com/crowsofwar/avatar/util/GliderHelper.java rename to src/main/java/com/crowsofwar/avatar/common/util/GliderHelper.java index 7221335f43..1a52c4ecd5 100644 --- a/src/main/java/com/crowsofwar/avatar/util/GliderHelper.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/GliderHelper.java @@ -1,5 +1,7 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; +import com.crowsofwar.avatar.AvatarInfo; +import com.crowsofwar.avatar.common.GliderInfo; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; diff --git a/src/main/java/com/crowsofwar/avatar/util/PlayerViewRegistry.java b/src/main/java/com/crowsofwar/avatar/common/util/PlayerViewRegistry.java similarity index 93% rename from src/main/java/com/crowsofwar/avatar/util/PlayerViewRegistry.java rename to src/main/java/com/crowsofwar/avatar/common/util/PlayerViewRegistry.java index 6b21b14d75..d111a27e60 100644 --- a/src/main/java/com/crowsofwar/avatar/util/PlayerViewRegistry.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/PlayerViewRegistry.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/crowsofwar/avatar/util/Raytrace.java b/src/main/java/com/crowsofwar/avatar/common/util/Raytrace.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/Raytrace.java rename to src/main/java/com/crowsofwar/avatar/common/util/Raytrace.java index 53e653d340..eb74aecfa2 100644 --- a/src/main/java/com/crowsofwar/avatar/util/Raytrace.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/Raytrace.java @@ -15,11 +15,11 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.entity.AvatarEntity; -import com.crowsofwar.avatar.entity.ICustomHitbox; +import com.crowsofwar.avatar.common.entity.AvatarEntity; +import com.crowsofwar.avatar.common.entity.ICustomHitbox; import com.crowsofwar.gorecore.util.Vector; import com.crowsofwar.gorecore.util.VectorI; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/com/crowsofwar/avatar/util/SemanticVersion.java b/src/main/java/com/crowsofwar/avatar/common/util/SemanticVersion.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/SemanticVersion.java rename to src/main/java/com/crowsofwar/avatar/common/util/SemanticVersion.java index 0bc53fcab3..15dd240665 100644 --- a/src/main/java/com/crowsofwar/avatar/util/SemanticVersion.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/SemanticVersion.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import java.util.Objects; import java.util.regex.Pattern; diff --git a/src/main/java/com/crowsofwar/avatar/util/WildCardTradeList.java b/src/main/java/com/crowsofwar/avatar/common/util/WildCardTradeList.java similarity index 98% rename from src/main/java/com/crowsofwar/avatar/util/WildCardTradeList.java rename to src/main/java/com/crowsofwar/avatar/common/util/WildCardTradeList.java index 32524d0bb7..c0f7995360 100644 --- a/src/main/java/com/crowsofwar/avatar/util/WildCardTradeList.java +++ b/src/main/java/com/crowsofwar/avatar/common/util/WildCardTradeList.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util; +package com.crowsofwar.avatar.common.util; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/com/crowsofwar/avatar/util/windhelper/WindHelper.java b/src/main/java/com/crowsofwar/avatar/common/wind/WindHelper.java similarity index 92% rename from src/main/java/com/crowsofwar/avatar/util/windhelper/WindHelper.java rename to src/main/java/com/crowsofwar/avatar/common/wind/WindHelper.java index 14c24eb3d9..6c37a0a80a 100644 --- a/src/main/java/com/crowsofwar/avatar/util/windhelper/WindHelper.java +++ b/src/main/java/com/crowsofwar/avatar/common/wind/WindHelper.java @@ -1,11 +1,11 @@ -package com.crowsofwar.avatar.util.windhelper; +package com.crowsofwar.avatar.common.wind; -import com.crowsofwar.avatar.item.IGlider; -import com.crowsofwar.avatar.util.windhelper.generator.OpenSimplexNoise; +import com.crowsofwar.avatar.api.item.IGlider; +import com.crowsofwar.avatar.common.wind.generator.OpenSimplexNoise; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import static com.crowsofwar.avatar.config.ConfigGlider.GLIDER_CONFIG; +import static com.crowsofwar.avatar.common.config.ConfigGlider.GLIDER_CONFIG; /** diff --git a/src/main/java/com/crowsofwar/avatar/util/windhelper/generator/OpenSimplexNoise.java b/src/main/java/com/crowsofwar/avatar/common/wind/generator/OpenSimplexNoise.java similarity index 99% rename from src/main/java/com/crowsofwar/avatar/util/windhelper/generator/OpenSimplexNoise.java rename to src/main/java/com/crowsofwar/avatar/common/wind/generator/OpenSimplexNoise.java index 056d045ad0..883fe3e861 100644 --- a/src/main/java/com/crowsofwar/avatar/util/windhelper/generator/OpenSimplexNoise.java +++ b/src/main/java/com/crowsofwar/avatar/common/wind/generator/OpenSimplexNoise.java @@ -1,4 +1,4 @@ -package com.crowsofwar.avatar.util.windhelper.generator; +package com.crowsofwar.avatar.common.wind.generator; /* * OpenSimplex Noise in Java. diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarKeybindingServer.java b/src/main/java/com/crowsofwar/avatar/server/AvatarKeybindingServer.java similarity index 88% rename from src/main/java/com/crowsofwar/avatar/network/AvatarKeybindingServer.java rename to src/main/java/com/crowsofwar/avatar/server/AvatarKeybindingServer.java index 6d7cf62fd5..bf704d3e77 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarKeybindingServer.java +++ b/src/main/java/com/crowsofwar/avatar/server/AvatarKeybindingServer.java @@ -15,10 +15,10 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; +package com.crowsofwar.avatar.server; -import com.crowsofwar.avatar.client.controls.AvatarControl; -import com.crowsofwar.avatar.client.controls.IControlsHandler; +import com.crowsofwar.avatar.common.controls.AvatarControl; +import com.crowsofwar.avatar.common.controls.IControlsHandler; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/crowsofwar/avatar/network/AvatarServerProxy.java b/src/main/java/com/crowsofwar/avatar/server/AvatarServerProxy.java similarity index 82% rename from src/main/java/com/crowsofwar/avatar/network/AvatarServerProxy.java rename to src/main/java/com/crowsofwar/avatar/server/AvatarServerProxy.java index a3de2dd2e3..e6a8fa0a22 100644 --- a/src/main/java/com/crowsofwar/avatar/network/AvatarServerProxy.java +++ b/src/main/java/com/crowsofwar/avatar/server/AvatarServerProxy.java @@ -15,13 +15,15 @@ along with AvatarMod. If not, see . */ -package com.crowsofwar.avatar.network; - -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.client.gui.AvatarGui; -import com.crowsofwar.avatar.capabilities.IAdvancedGliderCapabilityHandler; +package com.crowsofwar.avatar.server; + +import com.crowsofwar.avatar.common.AvatarCommonProxy; +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.gui.AvatarGui; +import com.crowsofwar.avatar.common.network.IPacketHandler; +import com.crowsofwar.avatar.api.capabilities.IAdvancedGliderCapabilityHandler; import com.crowsofwar.gorecore.data.PlayerDataFetcher; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IThreadListener; diff --git a/src/main/java/com/crowsofwar/avatar/util/event/ServerEventHandler.java b/src/main/java/com/crowsofwar/avatar/util/event/ServerEventHandler.java deleted file mode 100644 index de30f1f164..0000000000 --- a/src/main/java/com/crowsofwar/avatar/util/event/ServerEventHandler.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.crowsofwar.avatar.util.event; - -import com.crowsofwar.avatar.AvatarMod; -import com.crowsofwar.avatar.capabilities.CapabilityHelper; -import com.crowsofwar.avatar.util.helper.GliderHelper; -import com.crowsofwar.avatar.capabilities.GliderCapabilityImplementation; -import com.crowsofwar.avatar.util.helper.GliderPlayerHelper; -import com.crowsofwar.avatar.network.packets.glider.PacketCUpdateClientTarget; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.event.AttachCapabilitiesEvent; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.gameevent.PlayerEvent; -import net.minecraftforge.fml.common.gameevent.TickEvent; - -public class ServerEventHandler { - - /** - * Initialize the cap to the player. - * - * @param event - attach cap event - */ - @SubscribeEvent - public void onAttachCapability(AttachCapabilitiesEvent event) { - if (event.getObject() instanceof EntityPlayer) { - if (!CapabilityHelper.hasGliderCapability((EntityPlayer) event.getObject())) { - event.addCapability(GliderCapabilityImplementation.Provider.NAME, new GliderCapabilityImplementation.Provider()); - } - } - } - - /** - * Deal with end movement and copying capability data over. - * - * @param event - the player being cloned (teleported in vanilla code) - */ - @SubscribeEvent - public void onPlayerCloning(net.minecraftforge.event.entity.player.PlayerEvent.Clone event) { -// if (!event.isWasDeath()) { //return from end (deal with dumb returning from the end code) //ToDo: Test without - if (CapabilityHelper.hasGliderCapability(event.getOriginal())) { - NBTTagCompound gliderData = CapabilityHelper.getGliderCapability(event.getOriginal()).serializeNBT(); - CapabilityHelper.getGliderCapability(event.getEntityPlayer()).deserializeNBT(gliderData); - } -// } - } - - /** - * Update the position of the player when flying. - * - * @param event - tick event - */ - @SubscribeEvent - public void onTick(TickEvent.PlayerTickEvent event) { - if (GliderHelper.getIsGliderDeployed(event.player)) { - GliderPlayerHelper.updatePosition(event.player); - } - } - - /** - * Sync capability of a tracked player for visual person flying updates. - * - * @param event - the tracking event - */ - @SubscribeEvent - public void onTrack(net.minecraftforge.event.entity.player.PlayerEvent.StartTracking event) { - EntityPlayer tracker = event.getEntityPlayer(); //the tracker - Entity targetEntity = event.getTarget(); //the target that is being tracked - if (targetEntity instanceof EntityPlayerMP) { //only entityPlayerMP ( MP part is very important!) - EntityPlayer targetPlayer = (EntityPlayer) targetEntity; //typecast to entityPlayer - if (CapabilityHelper.hasGliderCapability(targetPlayer)) { //if have the capability - if (GliderHelper.getIsGliderDeployed(targetPlayer)) { //if the target has capability need to update - AvatarMod.network.sendTo(new PacketCUpdateClientTarget(targetPlayer, true), (EntityPlayerMP) targetPlayer); - } else { - AvatarMod.network.sendTo(new PacketCUpdateClientTarget(targetPlayer, false), (EntityPlayerMP) targetPlayer); - } - } - } - } - - //===========================================================Simple Sync Capability EVents============================================== - - @SubscribeEvent - public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { - syncGlidingCapability(event.player); - } - - @SubscribeEvent - public void onPlayerChangedDimensionEvent(PlayerEvent.PlayerChangedDimensionEvent event) { - syncGlidingCapability(event.player); - } - - @SubscribeEvent - public void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { - syncGlidingCapability(event.player); - } - - /** - * Sends a message to the client to update the status of the glider to whatever it is on the server. - * - * @param player - the player to sync the data for - */ - private void syncGlidingCapability(EntityPlayer player) { - CapabilityHelper.getGliderCapability(player).sync((EntityPlayerMP) player); - } - -} diff --git a/src/main/java/com/crowsofwar/avatar/world/explosions/AvatarCombustionExplosion.java b/src/main/java/com/crowsofwar/avatar/world/explosions/AvatarCombustionExplosion.java deleted file mode 100644 index 45f9cd5bed..0000000000 --- a/src/main/java/com/crowsofwar/avatar/world/explosions/AvatarCombustionExplosion.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.crowsofwar.avatar.world.explosions; - -public class AvatarCombustionExplosion { -} diff --git a/src/main/java/com/crowsofwar/gorecore/GoreCore.java b/src/main/java/com/crowsofwar/gorecore/GoreCore.java index 667f251424..ba17680686 100644 --- a/src/main/java/com/crowsofwar/gorecore/GoreCore.java +++ b/src/main/java/com/crowsofwar/gorecore/GoreCore.java @@ -27,6 +27,7 @@ import com.crowsofwar.gorecore.tree.test.GoreCoreChatMessages; import com.crowsofwar.gorecore.tree.test.GoreCoreCommand; import com.crowsofwar.gorecore.tree.test.TreeTest; +import com.crowsofwar.gorecore.util.AccountUUIDs; import net.minecraft.entity.Entity; import net.minecraftforge.fml.common.Loader; diff --git a/src/main/java/com/crowsofwar/gorecore/tree/test/GoreCoreCommand.java b/src/main/java/com/crowsofwar/gorecore/tree/test/GoreCoreCommand.java index f783072b3b..d80244ada2 100644 --- a/src/main/java/com/crowsofwar/gorecore/tree/test/GoreCoreCommand.java +++ b/src/main/java/com/crowsofwar/gorecore/tree/test/GoreCoreCommand.java @@ -16,7 +16,11 @@ */ package com.crowsofwar.gorecore.tree.test; +import com.crowsofwar.gorecore.format.FormattedMessage; import com.crowsofwar.gorecore.tree.*; +import com.crowsofwar.gorecore.util.AccountUUIDs; + +import static com.crowsofwar.gorecore.tree.test.GoreCoreChatMessages.*; /** * diff --git a/src/main/resources/assets/avatarmod/lang/en_us.lang b/src/main/resources/assets/avatarmod/lang/en_us.lang index 0f575c6ad5..32b3976d20 100644 --- a/src/main/resources/assets/avatarmod/lang/en_us.lang +++ b/src/main/resources/assets/avatarmod/lang/en_us.lang @@ -576,6 +576,8 @@ entity.Airbender.name=§f§lAirbender entity.Firebender.name=§c§lFirebender entity.Waterbender.name=§9§lWaterbender entity.SkyBison.name=Flying Bison +entity.flying_lemur.name=Flying Lemur +entity.ascended_flying_lemur.name=Ascended Flying Lemur entity.OtterPenguin.name=Otter Penguin entity.OstrichHorse.name=Ostrich Horse diff --git a/src/main/resources/assets/avatarmod/lang/ru_ru.lang b/src/main/resources/assets/avatarmod/lang/ru_ru.lang index 53ca0adad1..8e6c990b15 100644 --- a/src/main/resources/assets/avatarmod/lang/ru_ru.lang +++ b/src/main/resources/assets/avatarmod/lang/ru_ru.lang @@ -489,6 +489,9 @@ entity.SkyBison.name=Летающий бизон entity.OtterPenguin.name=Выдропингвин entity.OstrichHorse.name=Страусиная лошадь +entity.flying_lemur.name=Летающий лемур +entity.ascended_flying_lemur.name=Возвышенный летающий лемур + itemGroup.avatar.items=Предметы вселенной Аватара item.avatarmod:scroll.all.name=§d§lСвиток diff --git a/src/main/resources/assets/avatarmod/sounds.json b/src/main/resources/assets/avatarmod/sounds.json new file mode 100644 index 0000000000..d2e9a2b67a --- /dev/null +++ b/src/main/resources/assets/avatarmod/sounds.json @@ -0,0 +1,22 @@ +{ + + "entity.momo.ambient": + { + "category": "entity", + "subtitle": "entity.momo.ambient", + "sounds": [{ "name": "avatarmod:entity/momo/ambient", "stream": true}] + }, + "entity.momo.hurt": + { + "category": "entity", + "subtitle": "entity.momo.hurt", + "sounds": [{ "name": "avatarmod:entity/momo/hurt", "stream": true}] + }, + "entity.momo.death": + { + "category": "entity", + "subtitle": "entity.momo.death", + "sounds": [{ "name": "avatarmod:entity/momo/death", "stream": true}] + } + +} \ No newline at end of file diff --git a/src/main/resources/assets/avatarmod/sounds/entity/momo/ambient.ogg b/src/main/resources/assets/avatarmod/sounds/entity/momo/ambient.ogg new file mode 100644 index 0000000000..b2931fbc59 Binary files /dev/null and b/src/main/resources/assets/avatarmod/sounds/entity/momo/ambient.ogg differ diff --git a/src/main/resources/assets/avatarmod/sounds/entity/momo/death.ogg b/src/main/resources/assets/avatarmod/sounds/entity/momo/death.ogg new file mode 100644 index 0000000000..1701369a22 Binary files /dev/null and b/src/main/resources/assets/avatarmod/sounds/entity/momo/death.ogg differ diff --git a/src/main/resources/assets/avatarmod/sounds/entity/momo/hurt.ogg b/src/main/resources/assets/avatarmod/sounds/entity/momo/hurt.ogg new file mode 100644 index 0000000000..653918b499 Binary files /dev/null and b/src/main/resources/assets/avatarmod/sounds/entity/momo/hurt.ogg differ diff --git a/src/main/resources/assets/avatarmod/textures/mob/lemur.png b/src/main/resources/assets/avatarmod/textures/mob/lemur.png new file mode 100644 index 0000000000..c3b87891b6 Binary files /dev/null and b/src/main/resources/assets/avatarmod/textures/mob/lemur.png differ diff --git a/src/main/resources/assets/avatarmod/textures/mob/lemur2.png b/src/main/resources/assets/avatarmod/textures/mob/lemur2.png new file mode 100644 index 0000000000..9ba534ef55 Binary files /dev/null and b/src/main/resources/assets/avatarmod/textures/mob/lemur2.png differ