Automatic synchronization

2 files changed, 58 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java
index cacc471249..03b0f944b7 100644
--- a/src/Java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java
@@ -27,6 +27,8 @@ import gtPlusPlus.core.handler.COMPAT_IntermodStaging;
 import gtPlusPlus.core.handler.GuiHandler;
 import gtPlusPlus.core.handler.StopAnnoyingFuckingAchievements;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
+import gtPlusPlus.core.handler.events.EnderDragonDeathHandler;
+import gtPlusPlus.core.handler.events.EntityDeathHandler;
 import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler;
 import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler;
 import gtPlusPlus.core.handler.events.ZombieBackupSpawnEventHandler;
@@ -35,17 +37,26 @@ import gtPlusPlus.core.item.chemistry.GenericChem;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.CORE.ConfigSwitches;
 import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.material.ALLOY;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.tileentities.ModTileEntities;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.debug.DEBUG_INIT;
+import gtPlusPlus.core.util.minecraft.EntityUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.player.PlayerCache;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.villagers.block.BlockGenericSpawner;
 import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO;
 import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.thermalfoundation.item.TF_Items;
+import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.monster.EntityBlaze;
+import net.minecraft.entity.monster.EntityZombie;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.ForgeChunkManager;
 
 public class CommonProxy {
@@ -145,6 +156,8 @@ public class CommonProxy {
 		// Register Chunkloader
 		ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, ChunkManager.getInstance());
 		Utils.registerEvent(ChunkManager.getInstance());
+		Utils.registerEvent(new EnderDragonDeathHandler());
+		Utils.registerEvent(new EntityDeathHandler());
 
 		if (ConfigSwitches.disableZombieReinforcement) {
 			// Make Zombie reinforcements fuck off.
@@ -179,6 +192,7 @@ public class CommonProxy {
 		COMPAT_HANDLER.startLoadingGregAPIBasedRecipes();
 		COMPAT_IntermodStaging.postInit(e);
 		COMPAT_HANDLER.runQueuedRecipes();
+		registerCustomMobDrops();
 	}
 
 	public void serverStarting(final FMLServerStartingEvent e) {
@@ -224,5 +238,38 @@ public class CommonProxy {
 	public void registerCustomItemsForMaterials() {
 		Material.registerComponentForMaterial(GenericChem.CARBYNE, OrePrefixes.plate, GregtechItemList.Carbyne_Sheet_Finished.get(1));
 	}
+	
+	public void registerCustomMobDrops() {
+		
+		//Zombie
+		EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemRope), 3, 100);
+		EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemFiber), 5, 250);
+		EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemSandstoneHammer), 1, 10);
+		EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemBomb), 2, 10);
+		EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.TUMBAGA.getTinyDust(1), 1, 10);
+		EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.POTIN.getTinyDust(1), 1, 10);
+		
+		//Blazes		
+		if (ItemUtils.doesOreDictHaveEntryFor("dustPyrotheum")) {
+			EntityUtils.registerDropsForMob(EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10);	
+			EntityUtils.registerDropsForMob(EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10);			
+		}
+			
+		
+		//Special mobs Support
+		if (ReflectionUtils.doesClassExist("toast.specialMobs.entity.zombie.EntityBrutishZombie")) {
+			Class aBrutishZombie = ReflectionUtils.getClass("toast.specialMobs.entity.zombie.EntityBrutishZombie");
+			ItemStack aFortune1 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
+			ItemStack aFortune2 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
+			ItemStack aFortune3 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1);
+			EntityUtils.registerDropsForMob(aBrutishZombie, aFortune1, 1, 100);
+			EntityUtils.registerDropsForMob(aBrutishZombie, aFortune2, 1, 50);
+			EntityUtils.registerDropsForMob(aBrutishZombie, aFortune3, 1, 1);	
+			EntityUtils.registerDropsForMob(aBrutishZombie, ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), 3, 200);		
+		}
+		
+		
+		
+	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index c6fcc83d01..c9704603af 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -3,6 +3,7 @@ package gtPlusPlus.core.common.compat;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble;
+import gtPlusPlus.core.item.bauble.FireProtectionBauble;
 import gtPlusPlus.core.item.bauble.MonsterKillerBaseBauble;
 import gtPlusPlus.core.item.general.ItemCloakingDevice;
 import gtPlusPlus.core.item.general.ItemHealingDevice;
@@ -34,12 +35,18 @@ public class COMPAT_Baubles {
 		ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0);
 		//itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set;
 		ModItems.itemPersonalHealingDevice = new ItemHealingDevice();
+		ModItems.itemPersonalFireProofDevice = new FireProtectionBauble();
 
 		try {
-			ModItems.itemChargePack1 = new BatteryPackBaseBauble(6);
-			ModItems.itemChargePack2 = new BatteryPackBaseBauble(7);
-			ModItems.itemChargePack3 = new BatteryPackBaseBauble(8);
-			ModItems.itemChargePack4 = new BatteryPackBaseBauble(9);		
+			ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1);
+			ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2);
+			ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3);
+			ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4);
+			ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5);			
+			ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6);
+			ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7);
+			ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8);
+			ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9);		
 		}
 		catch (Throwable t) {
 			t.printStackTrace();