diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/common')
16 files changed, 154 insertions, 110 deletions
diff --git a/src/main/java/gtPlusPlus/core/common/BasePlayer.java b/src/main/java/gtPlusPlus/core/common/BasePlayer.java index 69cd46178a..d119ca2015 100644 --- a/src/main/java/gtPlusPlus/core/common/BasePlayer.java +++ b/src/main/java/gtPlusPlus/core/common/BasePlayer.java @@ -1,16 +1,18 @@ package gtPlusPlus.core.common; -import api.player.client.ClientPlayerAPI; -import api.player.client.ClientPlayerBase; -import gtPlusPlus.core.handler.events.CustomMovementHandler; -import gtPlusPlus.core.handler.events.SneakManager; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.util.MovementInputFromOptions; +import api.player.client.ClientPlayerAPI; +import api.player.client.ClientPlayerBase; +import gtPlusPlus.core.handler.events.CustomMovementHandler; +import gtPlusPlus.core.handler.events.SneakManager; + public class BasePlayer extends ClientPlayerBase { + private final Minecraft mc = Minecraft.getMinecraft(); private final CustomMovementHandler customMovementInput = new CustomMovementHandler(); private final GameSettings settings = this.mc.gameSettings; @@ -20,7 +22,7 @@ public class BasePlayer extends ClientPlayerBase { } /* - * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI + * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI */ @Override public void onLivingUpdate() { @@ -61,7 +63,7 @@ public class BasePlayer extends ClientPlayerBase { this.customMovementInput.update(this.mc, (MovementInputFromOptions) this.player.movementInput, this.player); /* - * Begin ToggleSneak Changes - ToggleSprint + * Begin ToggleSneak Changes - ToggleSprint */ SneakManager aSneak = SneakManager.get(this.player); @@ -79,8 +81,7 @@ public class BasePlayer extends ClientPlayerBase { // as a whole if (isSprintDisabled) { // Utils.LOG_INFO("Sprint pressed"); - if (aSneak.optionDoubleTap - && this.player.onGround + if (aSneak.optionDoubleTap && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isSprinting() @@ -100,8 +101,7 @@ public class BasePlayer extends ClientPlayerBase { } } - if (!this.player.isSprinting() - && (this.player.movementInput.moveForward >= minSpeed) + if (!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed) && !this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && this.settings.keyBindSprint.getIsKeyPressed()) { @@ -123,8 +123,7 @@ public class BasePlayer extends ClientPlayerBase { // if(this.player.onGround && enoughHunger && !this.player.isUsingItem() && // !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased) - if (!this.player.isUsingItem() - && !this.player.isPotionActive(Potion.blindness) + if (!this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased) { if ((canDoubleTap && !this.player.isSprinting()) || !canDoubleTap) { if (aSneak.Sprinting()) { @@ -135,8 +134,7 @@ public class BasePlayer extends ClientPlayerBase { } } - if (canDoubleTap - && !state + if (canDoubleTap && !state && this.player.onGround && !isMovingForward && (this.player.movementInput.moveForward >= minSpeed) @@ -162,8 +160,7 @@ public class BasePlayer extends ClientPlayerBase { this.player.setSprinting(false); // Undo toggle if we resumed vanilla operation due to Hold&Release, DoubleTap, Fly, Ride - if ((this.customMovementInput.sprintHeldAndReleased == true) - || isSprintDisabled + if ((this.customMovementInput.sprintHeldAndReleased == true) || isSprintDisabled || this.customMovementInput.sprintDoubleTapped || this.player.capabilities.isFlying || this.player.isRiding()) { @@ -172,42 +169,42 @@ public class BasePlayer extends ClientPlayerBase { } /* - * End ToggleSneak Changes - ToggleSprint + * End ToggleSneak Changes - ToggleSprint */ - // // - // // Debug Framework - Added 5/7/2014 - // // - // if (this.showDebug && this.settings.keyBindPickBlock.getIsKeyPressed() && !this.handledDebugPress) - // { - // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); - // this.player.addChatMessage(new ChatComponentText("| ToggleSneak Debug Info |")); - // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText("isFlying - " + + // // + // // Debug Framework - Added 5/7/2014 + // // + // if (this.showDebug && this.settings.keyBindPickBlock.getIsKeyPressed() && !this.handledDebugPress) + // { + // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); + // this.player.addChatMessage(new ChatComponentText("| ToggleSneak Debug Info |")); + // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); + // this.player.addChatMessage(new ChatComponentText(" ")); + // this.player.addChatMessage(new ChatComponentText("isFlying - " + // (this.player.capabilities.isFlying == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("isCreative - " + + // this.player.addChatMessage(new ChatComponentText("isCreative - " + // (this.player.capabilities.isCreativeMode == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("enableFlyBoost - " + + // this.player.addChatMessage(new ChatComponentText("enableFlyBoost - " + // (SneakManager.optionEnableFlyBoost == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("flyBoostAmount - " + + // this.player.addChatMessage(new ChatComponentText("flyBoostAmount - " + // SneakManager.optionFlyBoostAmount)); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText("keybindSprint - " + + // this.player.addChatMessage(new ChatComponentText(" ")); + // this.player.addChatMessage(new ChatComponentText("keybindSprint - " + // (this.settings.keyBindSprint.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("keybindSneak - " + + // this.player.addChatMessage(new ChatComponentText("keybindSneak - " + // (this.settings.keyBindSneak.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("keybindJump - " + + // this.player.addChatMessage(new ChatComponentText("keybindJump - " + // (this.settings.keyBindJump.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText(" ")); + // this.player.addChatMessage(new ChatComponentText(" ")); + // this.player.addChatMessage(new ChatComponentText(" ")); // - // this.handledDebugPress = true; - // } - // else if (this.showDebug && !this.settings.keyBindPickBlock.getIsKeyPressed() && this.handledDebugPress) - // { - // this.handledDebugPress = false; - // } + // this.handledDebugPress = true; + // } + // else if (this.showDebug && !this.settings.keyBindPickBlock.getIsKeyPressed() && this.handledDebugPress) + // { + // this.handledDebugPress = false; + // } } } diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index 421dd05b8f..26bf349b93 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -1,5 +1,15 @@ package gtPlusPlus.core.common; +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.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.client.IItemRenderer; + import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; @@ -34,15 +44,6 @@ import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.eio.handler.HandlerTooltip_EIO; import gtPlusPlus.xmod.galacticraft.handler.HandlerTooltip_GC; import gtPlusPlus.xmod.gregtech.api.util.SpecialBehaviourTooltipHandler; -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.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.client.IItemRenderer; public class CommonProxy { @@ -223,8 +224,8 @@ public class CommonProxy { // 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.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); @@ -232,9 +233,15 @@ public class CommonProxy { // Blazes if (ItemUtils.doesOreDictHaveEntryFor("dustPyrotheum")) { EntityUtils.registerDropsForMob( - EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10); + EntityBlaze.class, + ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), + 1, + 10); EntityUtils.registerDropsForMob( - EntityBlaze.class, ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), 1, 10); + EntityBlaze.class, + ItemUtils.getItemStackOfAmountFromOreDict("dustPyrotheum", 1), + 1, + 10); } // Special mobs Support @@ -247,20 +254,26 @@ public class CommonProxy { EntityUtils.registerDropsForMob(aBrutishZombie, aFortune2, 1, 50); EntityUtils.registerDropsForMob(aBrutishZombie, aFortune3, 1, 1); EntityUtils.registerDropsForMob( - aBrutishZombie, ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), 3, 200); + aBrutishZombie, + ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), + 3, + 200); } // GalaxySpace Support if (ReflectionUtils.doesClassExist("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze")) { - Class<?> aColdBlaze = - ReflectionUtils.getClass("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze"); + Class<?> aColdBlaze = ReflectionUtils + .getClass("galaxyspace.SolarSystem.moons.europa.entities.EntityEvolvedColdBlaze"); ItemStack aSmallBlizz, aTinyBlizz, aSmallCryo, aTinyCryo; aSmallBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallBlizz", 1); aTinyBlizz = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyBlizz", 1); aSmallCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustSmallCryotheum", 1); aTinyCryo = ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCryotheum", 1); EntityUtils.registerDropsForMob( - aColdBlaze, ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), 2, 500); + aColdBlaze, + ItemUtils.getItemStackOfAmountFromOreDict("stickBlizz", 1), + 2, + 500); if (aSmallBlizz != null) { EntityUtils.registerDropsForMob(aColdBlaze, aSmallBlizz, 2, 750); } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index 4af788a9df..53b4911faa 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -1,14 +1,5 @@ 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; -import gtPlusPlus.core.item.general.ItemSlowBuildingRing; -import gtPlusPlus.core.lib.LoadedMods; import net.minecraft.entity.monster.EntityBlaze; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; @@ -19,6 +10,16 @@ import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntitySpider; import net.minecraft.entity.monster.EntityZombie; +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; +import gtPlusPlus.core.item.general.ItemSlowBuildingRing; +import gtPlusPlus.core.lib.LoadedMods; + public class COMPAT_Baubles { public static void run() { @@ -50,18 +51,28 @@ public class COMPAT_Baubles { t.printStackTrace(); } - ModItems.itemAmuletMonsterKiller_Zombie = - new MonsterKillerBaseBauble(new Class[] {EntityZombie.class}, "Zombie", 3); - ModItems.itemAmuletMonsterKiller_Skeleton = - new MonsterKillerBaseBauble(new Class[] {EntitySkeleton.class}, "Skeleton", 3); - ModItems.itemAmuletMonsterKiller_Spider = - new MonsterKillerBaseBauble(new Class[] {EntitySpider.class}, "Spider", 3); - ModItems.itemAmuletMonsterKiller_Creeper = - new MonsterKillerBaseBauble(new Class[] {EntityCreeper.class}, "Creeper", 4); - ModItems.itemAmuletMonsterKiller_Enderman = - new MonsterKillerBaseBauble(new Class[] {EntityEnderman.class}, "Enderman", 4); + ModItems.itemAmuletMonsterKiller_Zombie = new MonsterKillerBaseBauble( + new Class[] { EntityZombie.class }, + "Zombie", + 3); + ModItems.itemAmuletMonsterKiller_Skeleton = new MonsterKillerBaseBauble( + new Class[] { EntitySkeleton.class }, + "Skeleton", + 3); + ModItems.itemAmuletMonsterKiller_Spider = new MonsterKillerBaseBauble( + new Class[] { EntitySpider.class }, + "Spider", + 3); + ModItems.itemAmuletMonsterKiller_Creeper = new MonsterKillerBaseBauble( + new Class[] { EntityCreeper.class }, + "Creeper", + 4); + ModItems.itemAmuletMonsterKiller_Enderman = new MonsterKillerBaseBauble( + new Class[] { EntityEnderman.class }, + "Enderman", + 4); ModItems.itemAmuletMonsterKiller_Nether = new MonsterKillerBaseBauble( - new Class[] {EntityPigZombie.class, EntityGhast.class, EntityMagmaCube.class, EntityBlaze.class}, + new Class[] { EntityPigZombie.class, EntityGhast.class, EntityMagmaCube.class, EntityBlaze.class }, "Hellish", 6); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java index fcaf76e81c..c2bbacd5d8 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; -import net.minecraft.item.ItemStack; public class COMPAT_BigReactors { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java index 3f097eed4a..159cfe2b78 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java @@ -2,9 +2,10 @@ package gtPlusPlus.core.common.compat; import static gtPlusPlus.core.handler.COMPAT_HANDLER.*; +import net.minecraft.item.ItemStack; + import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class COMPAT_CompactWindmills { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java index 31c2943f24..041aa1fd18 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java @@ -1,9 +1,10 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class COMPAT_EnderIO { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index 70c342453c..e17bccb60a 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.recipe.RECIPES_Tools; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import net.minecraft.item.ItemStack; public class COMPAT_ExtraUtils { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 1169473d85..666c0177ee 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -2,11 +2,12 @@ package gtPlusPlus.core.common.compat; import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue; +import net.minecraft.item.ItemStack; + import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.recipe.ShapedRecipeObject; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class COMPAT_IC2 { @@ -38,8 +39,10 @@ public class COMPAT_IC2 { public static void OreDict() { // Get ItemStacks for results - /*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); - itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); */ + /* + * itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1); itemSolarHelmet = + * UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); + */ run(); } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java index 3e9c6da4ec..8e665b366e 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java @@ -20,10 +20,16 @@ public class COMPAT_MorePlanets { ItemUtils.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1); ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3); ItemUtils.getItemForOreDict( - "MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4); + "MorePlanet:koentus_item", + "ingotKoentusMeteoricIron", + "Koentus Meteoric Iron Ingot", + 4); ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2); ItemUtils.getItemForOreDict( - "MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4); + "MorePlanet:polongnius_item", + "ingotPolongiusMeteoricIron", + "Polongius Meteoric Iron Ingot", + 4); ItemUtils.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3); ItemUtils.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java index cade4c4418..94b3d27c7e 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_OpenBlocks.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.common.compat; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; import net.minecraft.item.Item; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class COMPAT_OpenBlocks { public static void OreDict() { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java index 762ffe79a1..286de43fcb 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java @@ -6,6 +6,7 @@ import gtPlusPlus.core.common.BasePlayer; public class COMPAT_PlayerAPI { public static class commonProxy { + public static void initPre() {} public static void Init() {} @@ -14,6 +15,7 @@ public class COMPAT_PlayerAPI { } public static class clientProxy { + public static void initPre() { // Utils.registerEvent(SneakManager.instance); } @@ -26,6 +28,7 @@ public class COMPAT_PlayerAPI { } public static class serverProxy { + public static void initPre() {} public static void Init() {} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java index 5b29345b9d..51ea1a3587 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; -import net.minecraft.item.ItemStack; public class COMPAT_PneumaticCraft { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java index 05e32b21fd..b05e42ba45 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; -import net.minecraft.item.ItemStack; public class COMPAT_RFTools { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java index c93d522c40..0e745ba0b0 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java @@ -1,8 +1,9 @@ package gtPlusPlus.core.common.compat; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.ModItems; -import net.minecraft.item.ItemStack; public class COMPAT_SimplyJetpacks { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index 75e7707a01..73dad8602f 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java @@ -19,11 +19,11 @@ public class COMPAT_Thaumcraft { for (int i = 0; i <= 6; i++) { // Utils.LOG_INFO(""+i); ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); - GT_OreDictUnificator.registerOre( - "shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); + GT_OreDictUnificator + .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard " + i, i); - GT_OreDictUnificator.registerOre( - "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); + GT_OreDictUnificator + .registerOre("gemInfusedAnything", ItemUtils.getItemStackFromFQRN("Thaumcraft:ItemShard:" + i, 1)); // System.out.println("TC Shard registration count is: "+i); } @@ -31,19 +31,21 @@ public class COMPAT_Thaumcraft { for (int i = 0; i <= 6; i++) { // Utils.LOG_INFO(""+i); ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard " + i, i); - GT_OreDictUnificator.registerOre( - "shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); + GT_OreDictUnificator + .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); ItemUtils.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard " + i, i); GT_OreDictUnificator.registerOre( - "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); + "gemInfusedAnything", + ItemUtils.getItemStackFromFQRN("ForbiddenMagic:NetherShard:" + i, 1)); // System.out.println("TC Shard registration count is: "+i); } ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0); - GT_OreDictUnificator.registerOre( - "shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); + GT_OreDictUnificator + .registerOre("shardAny", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); ItemUtils.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0); GT_OreDictUnificator.registerOre( - "gemInfusedAnything", ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); + "gemInfusedAnything", + ItemUtils.getItemStackFromFQRN("ForbiddenMagic:GluttonyShard", 1)); } } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java index 9af582e0de..e0470fe02a 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java @@ -2,9 +2,10 @@ package gtPlusPlus.core.common.compat; import static gtPlusPlus.core.lib.LoadedMods.Witchery; +import net.minecraft.item.ItemStack; + import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.ItemStack; public class COMPAT_Witchery { @@ -14,12 +15,12 @@ public class COMPAT_Witchery { private static final void run() { // Koboldite - ItemStack aKobolditeDust = - ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1); - ItemStack aKobolditeNugget = - ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1); - ItemStack aKobolditeIngot = - ItemUtils.getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1); + ItemStack aKobolditeDust = ItemUtils + .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Dust", 148, 1); + ItemStack aKobolditeNugget = ItemUtils + .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Nugget", 149, 1); + ItemStack aKobolditeIngot = ItemUtils + .getItemStackWithMeta(Witchery, "witchery:ingredient", "Koboldite Ingot", 150, 1); if (aKobolditeDust != null) GT_OreDictUnificator.registerOre("dust" + "Koboldite", aKobolditeDust); if (aKobolditeNugget != null) GT_OreDictUnificator.registerOre("nugget" + "Koboldite", aKobolditeNugget); if (aKobolditeIngot != null) GT_OreDictUnificator.registerOre("ingot" + "Koboldite", aKobolditeIngot); |