Merge all new content into my master branch

build.gradle

@@ -13,17 +13,24 @@ buildscript {
     }
     dependencies {
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath "com.github.jengelman.gradle.plugins:shadow:1.2.3"
-        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.2"
+        classpath "com.github.jengelman.gradle.plugins:shadow:2.0.4"
+        classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"
     }
 }
 plugins {
-    id "org.sonarqube" version "2.2"
+    id "org.sonarqube" version "2.6.2"
 }
 
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'com.github.johnrengelman.shadow'
 
+// Needs this for IntelliJ to recognize assets folder
+idea {
+    module {
+        inheritOutputDirs = true
+    }
+}
+
 ext.configFile = file('build.properties')
 ext.config = parseConfig(configFile)
 
@@ -34,6 +41,7 @@ sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 dependencies {
+    //todo:Update dependencies
     compile files("libs/joml/joml-1.8.1.jar")
     compile files("libs/yaml/snakeyaml-1.16.jar");
 }

build.properties

@@ -1,3 +1,3 @@
-version=a5.4
+version=a5.9
 mappings=snapshot_20171003
-forge=1.12.2-14.23.4.2712
+forge=1.12.2-14.23.4.2751

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Aug 02 12:46:21 PDT 2018
+#Sun Sep 23 20:07:31 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

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

@@ -20,6 +20,7 @@
 import com.crowsofwar.avatar.common.*;
 import com.crowsofwar.avatar.common.analytics.AvatarAnalytics;
 import com.crowsofwar.avatar.common.bending.Abilities;
+import com.crowsofwar.avatar.common.bending.BendingAi;
 import com.crowsofwar.avatar.common.bending.lightning.AbilityLightningRaze;
 import com.crowsofwar.avatar.common.bending.BendingStyles;
 import com.crowsofwar.avatar.common.bending.air.*;
@@ -69,6 +70,7 @@
 import net.minecraftforge.fml.common.registry.EntityRegistry;
 import net.minecraftforge.fml.relauncher.Side;
 
+import static com.crowsofwar.avatar.common.config.ConfigMobs.MOBS_CONFIG;
 import static com.crowsofwar.avatar.common.config.ConfigStats.STATS_CONFIG;
 import static net.minecraft.init.Biomes.*;
 import static net.minecraftforge.fml.common.registry.EntityRegistry.registerEgg;
@@ -221,10 +223,10 @@ public void init(FMLInitializationEvent e) {
 		registerEntity(EntityFireball.class, "Fireball");
 		registerEntity(EntityAirblade.class, "Airblade");
 		registerEntity(EntityAirBubble.class, "AirBubble");
-		registerEntity(EntityFirebender.class, "Firebender", 0xffffff, 0xffffff);
-		registerEntity(EntityAirbender.class, "Airbender", 0xffffff, 0xffffff);
-		registerEntity(EntitySkyBison.class, "SkyBison", 0xffffff, 0xffffff);
-		registerEntity(EntityOtterPenguin.class, "OtterPenguin", 0xffffff, 0xffffff);
+		registerEntity(EntityFirebender.class, "Firebender", 0xB0171F, 0xFFFF00);
+		registerEntity(EntityAirbender.class, "Airbender", 0xffffff,0xDDA0DD);
+		registerEntity(EntitySkyBison.class, "SkyBison", 0xffffff, 0x8B5A00);
+		registerEntity(EntityOtterPenguin.class, "OtterPenguin", 0xffffff, 0x104E8B);
 		registerEntity(AvatarEntityItem.class, "Item");
 		registerEntity(EntityIceShield.class, "iceshield");
 		registerEntity(EntityIceShard.class, "iceshard");
@@ -240,18 +242,22 @@ public void init(FMLInitializationEvent e) {
 		registerEntity(EntitySandstorm.class, "Sandstorm");
 		registerEntity(EntityExplosionSpawner.class, "ExplosionSpawner");
 		registerEntity(EntityBoulder.class, "Boulder");
-		registerEntity(EntityLightningSpawner.class, "LightningSpawnerr");
+		registerEntity(EntityLightningSpawner.class, "LightningSpawner");
+		registerEntity(EntityShockwave.class, "Shockwave");
 
-		EntityRegistry.addSpawn(EntitySkyBison.class, 5, 3, 6, EnumCreatureType.CREATURE, //
-				EXTREME_HILLS, MUTATED_SAVANNA);
-		EntityRegistry.addSpawn(EntityOtterPenguin.class, 4, 5, 9, EnumCreatureType.CREATURE, //
+		EntityRegistry.addSpawn(EntitySkyBison.class, 5, 1, 3, EnumCreatureType.CREATURE, //
+				SAVANNA_PLATEAU, EXTREME_HILLS, BIRCH_FOREST_HILLS, TAIGA_HILLS, ICE_MOUNTAINS, REDWOOD_TAIGA_HILLS, MUTATED_EXTREME_HILLS,
+				MUTATED_EXTREME_HILLS_WITH_TREES, EXTREME_HILLS_WITH_TREES, EXTREME_HILLS_EDGE);
+		EntityRegistry.addSpawn(EntityOtterPenguin.class, 10, 3, 6, EnumCreatureType.CREATURE, //
 				COLD_BEACH, ICE_PLAINS, ICE_MOUNTAINS, MUTATED_ICE_FLATS);
-		EntityRegistry.addSpawn(EntityOstrichHorse.class, 5, 3, 6, EnumCreatureType.CREATURE, //
+		EntityRegistry.addSpawn(EntityOstrichHorse.class, 5, 1, 3, EnumCreatureType.CREATURE, //
 				DESERT, DESERT_HILLS, SAVANNA, SAVANNA_PLATEAU, PLAINS);
 
-		// Second loading required since other mods blocks might not be
+		// Second loading required since other mods blocks and items might not be
 		// registered
 		STATS_CONFIG.loadBlocks();
+		MOBS_CONFIG.loadLists();
+		ConfigMobs.load();
 
 		proxy.init();
 
@@ -273,7 +279,7 @@ private <MSG extends AvatarPacket<MSG>> void registerPacket(Class<MSG> packet, S
 
 	private void registerEntity(Class<? extends Entity> entity, String name) {
 		EntityRegistry.registerModEntity(new ResourceLocation("avatarmod", name), entity, name,
-				nextEntityID++, this, 128, 3, true);
+				nextEntityID++, this, 256, 3, true);
 	}
 
 	private void registerEntity(Class<? extends Entity> entity, String name, int primary, int secondary) {

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

@@ -17,54 +17,41 @@
 
 package com.crowsofwar.avatar.client;
 
-import com.crowsofwar.avatar.AvatarInfo;
-import com.crowsofwar.avatar.AvatarLog;
-import com.crowsofwar.avatar.AvatarLog.WarningType;
-import com.crowsofwar.avatar.AvatarMod;
-import com.crowsofwar.avatar.client.gui.AnalyticsWarningGui;
-import com.crowsofwar.avatar.client.gui.AvatarUiRenderer;
-import com.crowsofwar.avatar.client.gui.GuiBisonChest;
-import com.crowsofwar.avatar.client.gui.PreviewWarningGui;
-import com.crowsofwar.avatar.client.gui.skills.GetBendingGui;
-import com.crowsofwar.avatar.client.gui.skills.SkillsGui;
-import com.crowsofwar.avatar.client.particles.AvatarParticleAir;
-import com.crowsofwar.avatar.client.particles.AvatarParticleFlames;
-import com.crowsofwar.avatar.client.render.*;
-import com.crowsofwar.avatar.client.render.iceprison.RenderIcePrison;
-import com.crowsofwar.avatar.common.AvatarCommonProxy;
-import com.crowsofwar.avatar.common.AvatarParticles;
-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.*;
-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.particle.ClientParticleSpawner;
-import com.crowsofwar.gorecore.data.PlayerDataFetcher;
-import com.crowsofwar.gorecore.data.PlayerDataFetcherClient;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiMainMenu;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.*;
 import net.minecraft.client.multiplayer.PlayerControllerMP;
 import net.minecraft.client.particle.ParticleManager;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.IThreadListener;
 import net.minecraft.world.World;
+
 import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.client.FMLClientHandler;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.fml.relauncher.*;
+
+import com.crowsofwar.avatar.*;
+import com.crowsofwar.avatar.AvatarLog.WarningType;
+import com.crowsofwar.avatar.client.gui.*;
+import com.crowsofwar.avatar.client.gui.skills.*;
+import com.crowsofwar.avatar.client.particles.*;
+import com.crowsofwar.avatar.client.render.*;
+import com.crowsofwar.avatar.client.render.iceprison.RenderIcePrison;
+import com.crowsofwar.avatar.common.*;
+import com.crowsofwar.avatar.common.controls.*;
+import com.crowsofwar.avatar.common.data.AvatarPlayerData;
+import com.crowsofwar.avatar.common.entity.*;
+import com.crowsofwar.avatar.common.entity.mob.*;
+import com.crowsofwar.avatar.common.gui.*;
+import com.crowsofwar.avatar.common.network.IPacketHandler;
+import com.crowsofwar.avatar.common.network.packets.PacketSRequestData;
+import com.crowsofwar.avatar.common.particle.ClientParticleSpawner;
+import com.crowsofwar.gorecore.data.*;
 
 import java.lang.reflect.Field;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static com.crowsofwar.avatar.common.config.ConfigAnalytics.ANALYTICS_CONFIG;
 import static com.crowsofwar.avatar.common.config.ConfigClient.CLIENT_CONFIG;
@@ -78,7 +65,7 @@ public class AvatarClientProxy implements AvatarCommonProxy {
 	private ClientInput inputHandler;
 	private PlayerDataFetcher<AvatarPlayerData> clientFetcher;
 	private boolean displayedMainMenu;
-	private List<KeyBinding> allKeybindings;
+	private Map<String, KeyBinding> allKeybindings;
 
 	@Override
 	public void preInit() {
@@ -106,8 +93,7 @@ public void preInit() {
 		registerEntityRenderingHandler(EntityWaterArc.class, RenderWaterArc::new);
 		registerEntityRenderingHandler(EntityAirGust.class, RenderAirGust::new);
 		registerEntityRenderingHandler(EntityRavine.class, RenderRavine::new);
-		registerEntityRenderingHandler(EntityFlames.class,
-				rm -> new RenderFlames(rm, new ClientParticleSpawner()));
+		registerEntityRenderingHandler(EntityFlames.class, rm -> new RenderFlames(rm, new ClientParticleSpawner()));
 		registerEntityRenderingHandler(EntityWave.class, RenderWave::new);
 		registerEntityRenderingHandler(EntityWaterBubble.class, RenderWaterBubble::new);
 		registerEntityRenderingHandler(EntityWallSegment.class, RenderWallSegment::new);
@@ -132,14 +118,11 @@ public void preInit() {
 		registerEntityRenderingHandler(EntityExplosionSpawner.class, RenderNothing::new);
 		registerEntityRenderingHandler(EntityLightningSpawner.class, RenderLightningSpawner::new);
 		registerEntityRenderingHandler(EntityAvatarLightning.class, RenderAvatarLightning::new);
+		registerEntityRenderingHandler(EntityShockwave.class, RenderNothing::new);
 
-
-		registerEntityRenderingHandler(EntityAirbender.class,
-				rm -> new RenderHumanBender(rm, "airbender", 7));
-		registerEntityRenderingHandler(EntityFirebender.class,
-				rm -> new RenderHumanBender(rm, "firebender", 1));
-		registerEntityRenderingHandler(EntityWaterbender.class,
-				rm -> new RenderHumanBender(rm, "waterbender", 1));
+		registerEntityRenderingHandler(EntityAirbender.class, rm -> new RenderHumanBender(rm, "airbender", 7));
+		registerEntityRenderingHandler(EntityFirebender.class, rm -> new RenderHumanBender(rm, "firebender", 1));
+		//registerEntityRenderingHandler(EntityWaterbender.class, rm -> new RenderHumanBender(rm, "waterbender", 1));
 
 	}
 
@@ -167,9 +150,10 @@ public void init() {
 		ParticleManager pm = mc.effectRenderer;
 
 		if (CLIENT_CONFIG.useCustomParticles) {
-			pm.registerParticle(AvatarParticles.getParticleFlames().getParticleID(),
-					AvatarParticleFlames::new);
+			pm.registerParticle(AvatarParticles.getParticleFlames().getParticleID(), AvatarParticleFlames::new);
 			pm.registerParticle(AvatarParticles.getParticleAir().getParticleID(), AvatarParticleAir::new);
+			pm.registerParticle(AvatarParticles.getParticleRestore().getParticleID(), AvatarParticleRestore::new);
+			pm.registerParticle(AvatarParticles.getParticleElectricity().getParticleID(), AvatarParticleElectricity::new);
 		}
 
 	}
@@ -189,8 +173,7 @@ public AvatarGui createClientGui(int id, EntityPlayer player, World world, int x
 				return new GuiBisonChest(player.inventory, bison);
 
 			} else {
-				AvatarLog.warn(WarningType.WEIRD_PACKET, player.getName()
-						+ " tried to open skybison inventory, was not found. BisonId: " + bisonId);
+				AvatarLog.warn(WarningType.WEIRD_PACKET, player.getName() + " tried to open skybison inventory, was not found. BisonId: " + bisonId);
 			}
 		}
 		if (id == AvatarGuiHandler.GUI_ID_GET_BENDING) {
@@ -235,19 +218,11 @@ public void onMainMenu(GuiOpenEvent e) {
 
 	@Override
 	public KeybindingWrapper createKeybindWrapper(String keybindName) {
-
 		if (allKeybindings == null) {
 			initAllKeybindings();
 		}
 
-		KeyBinding kb = null;
-		for (KeyBinding candidate : allKeybindings) {
-			if (candidate.getKeyDescription().equals(keybindName)) {
-				kb = candidate;
-				break;
-			}
-		}
-
+		KeyBinding kb = allKeybindings.get(keybindName);
 		return kb == null ? new KeybindingWrapper() : new ClientKeybindWrapper(kb);
 
 	}
@@ -266,18 +241,16 @@ public boolean isOptifinePresent() {
 	 * Finds all keybindings list via reflection. Performance-wise this is ok
 	 * since only supposed to be called once, after keybindings are registered
 	 */
+	@SuppressWarnings("unchecked")
 	private void initAllKeybindings() {
 		try {
 
 			Field field = KeyBinding.class.getDeclaredFields()[0];
 			field.setAccessible(true);
-			Map<String, KeyBinding> kbMap = (Map<String, KeyBinding>) field.get(null);
-			this.allKeybindings = kbMap.entrySet().stream().map(Map.Entry::getValue).collect(Collectors.toList());
+			allKeybindings = (Map<String, KeyBinding>) field.get(null);
 
 		} catch (Exception ex) {
-			AvatarLog.error(
-					"Could not load all keybindings list by using reflection. Will probably have serious problems",
-					ex);
+			AvatarLog.error("Could not load all keybindings list by using reflection. Will probably have serious problems", ex);
 		}
 	}
 

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

@@ -61,6 +61,7 @@ public static void register() {
 			register(AvatarItems.itemWaterPouch, i);
 		}
 		register(AvatarItems.itemBisonWhistle);
+		register(AvatarItems.airbenderStaff);
 		for (int i = 0; i <= 3; i++) {
 			register(AvatarItems.itemBisonArmor, i);
 			register(AvatarItems.itemBisonSaddle, i);