- Added some Thaumonomicon Stuff

- Organized Imports
This commit is contained in:
HellFirePvP committed 2015-11-11 23:36:37 +01:00
1 parent 07036847c2
commit d5deb28518
13 files changed
+98 -29

No files matched your search

@@ -20,7 +20,17 @@ import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar;
import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar;
import makeo.gadomancy.client.renderers.item.ItemRenderStoneMachine;
import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity;
import makeo.gadomancy.client.renderers.tile.*;
import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper;
import makeo.gadomancy.client.renderers.tile.RenderTileCapEldritch;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode;
import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNodeJar;
import makeo.gadomancy.client.renderers.tile.RenderTileInfusionClaw;
import makeo.gadomancy.client.renderers.tile.RenderTileManipulationFocus;
import makeo.gadomancy.client.renderers.tile.RenderTileManipulatorPillar;
import makeo.gadomancy.client.renderers.tile.RenderTileNodeManipulator;
import makeo.gadomancy.client.renderers.tile.RenderTileObelisk;
import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar;
import makeo.gadomancy.client.renderers.tile.RenderTileStickyJar;
import makeo.gadomancy.common.CommonProxy;
import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal;
import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper;
@@ -37,7 +47,6 @@ import makeo.gadomancy.common.registration.RegisteredItems;
import makeo.gadomancy.common.utils.Injector;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.client.resources.SimpleReloadableResourceManager;
import net.minecraft.entity.Entity;
@@ -3,7 +3,6 @@ package makeo.gadomancy.common.blocks;
import makeo.gadomancy.common.Gadomancy;
import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator;
import makeo.gadomancy.common.registration.RegisteredItems;
import makeo.gadomancy.common.registration.RegisteredRecipes;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,13 +12,11 @@ import makeo.gadomancy.common.registration.RegisteredBlocks;
import makeo.gadomancy.common.registration.RegisteredMultiblocks;
import makeo.gadomancy.common.registration.RegisteredRecipes;
import makeo.gadomancy.common.utils.MultiblockHelper;
import makeo.gadomancy.common.utils.world.TCMazeHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import thaumcraft.api.aspects.Aspect;
@@ -636,7 +634,7 @@ public class TileNodeManipulator extends TileWandPedestal implements IAspectCont
public static enum MultiblockType {
NODE_MANIPULATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", RegisteredRecipes.costsNodeManipulatorMultiblock),
E_PORTAL_CREATOR(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", RegisteredRecipes.costsEldritchPortalCreatorMultiblock); //TODO Change sometime.
E_PORTAL_CREATOR(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", RegisteredRecipes.costsEldritchPortalCreatorMultiblock);
private String research;
private AspectList costs;
@@ -2,7 +2,6 @@ package makeo.gadomancy.common.events;
import cpw.mods.fml.common.eventhandler.EventPriority;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import makeo.gadomancy.common.blocks.tiles.TileAuraPylon;
import makeo.gadomancy.common.data.ModConfig;
import makeo.gadomancy.common.familiar.FamiliarAIController;
import makeo.gadomancy.common.utils.world.TCMazeHandler;
@@ -17,15 +17,12 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import net.minecraft.world.Explosion;
import net.minecraft.world.GameRules;
import net.minecraft.world.WorldServer;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.event.entity.living.LivingEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -3,8 +3,14 @@ package makeo.gadomancy.common.items;
import makeo.gadomancy.common.Gadomancy;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import java.util.List;
/**
* This class is part of the Gadomancy Mod
@@ -27,6 +33,12 @@ public class ItemBlockAdditionalEldritchPortal extends ItemBlock {
portalIcon = ir.registerIcon(Gadomancy.MODID + ":eldritch_portal");
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean flag) {
list.add(EnumChatFormatting.DARK_PURPLE + StatCollector.translateToLocal("gadomancy.eldritch.portalPlacerCreative"));
super.addInformation(stack, player, list, flag);
}
@Override
public IIcon getIconFromDamage(int damage) {
return portalIcon;
@@ -12,6 +12,8 @@ import net.minecraft.item.EnumRarity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.StatCollector;
import org.lwjgl.input.Keyboard;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.common.Thaumcraft;
@@ -52,29 +54,42 @@ public class ItemFamiliar extends Item implements IBauble {
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List lore, boolean par4Flag) {
public void addInformation(ItemStack stack, EntityPlayer player, List lore, boolean flag) {
if(stack.hasTagCompound()) {
if(hasAspect(stack)) {
lore.add(getAspect(stack).getName());
}
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_2) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) {
String strength = EnumChatFormatting.DARK_RED + "Strength ";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1)) strength += "I";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_2)) strength += "I";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) strength += "I";
lore.add(strength);
}
if(Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54)) {
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_2) || hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) {
String strength = EnumChatFormatting.DARK_RED + "Strength ";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_1)) strength += "I";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_2)) strength += "I";
if(hasUpgrade(stack, FamiliarUpgrade.ATTACK_3)) strength += "I";
lore.add(strength);
}
if(hasUpgrade(stack, FamiliarUpgrade.RANGE_1)) {
lore.add(EnumChatFormatting.GOLD + "Reach I");
}
if(hasUpgrade(stack, FamiliarUpgrade.RANGE_1)) {
lore.add(EnumChatFormatting.GOLD + "Reach I");
}
if(hasUpgrade(stack, FamiliarUpgrade.COOLDOWN_1)) {
lore.add(EnumChatFormatting.AQUA + "Swiftness I");
if(hasUpgrade(stack, FamiliarUpgrade.COOLDOWN_1)) {
lore.add(EnumChatFormatting.AQUA + "Swiftness I");
}
} else {
if(hasAnyUpgrade(stack)) {
lore.add(EnumChatFormatting.DARK_GRAY + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("gadomancy.lore.hasAdditionalLore"));
}
}
}
super.addInformation(stack, player, lore, par4Flag);
super.addInformation(stack, player, lore, flag);
}
public boolean hasAnyUpgrade(ItemStack stack) {
for(FamiliarUpgrade upgrade : FamiliarUpgrade.values()) {
if(hasUpgrade(stack, upgrade)) return true;
}
return false;
}
@Override
@@ -13,7 +13,6 @@ import makeo.gadomancy.common.blocks.BlockStickyJar;
import makeo.gadomancy.common.blocks.BlockStoneMachine;
import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal;
import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper;
import makeo.gadomancy.common.blocks.tiles.TileAuraPylon;
import makeo.gadomancy.common.blocks.tiles.TileBlockProtector;
import makeo.gadomancy.common.blocks.tiles.TileExtendedNode;
import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar;
@@ -7,7 +7,6 @@ import makeo.gadomancy.common.items.baubles.ItemFamiliar;
import makeo.gadomancy.common.network.PacketHandler;
import makeo.gadomancy.common.network.packets.PacketFamiliar;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
@@ -39,6 +39,7 @@ public class RegisteredRecipes {
public static AspectList costsEldritchPortalCreatorMultiblock = new AspectList().add(Aspect.FIRE, 150).add(Aspect.WATER, 150).add(Aspect.EARTH, 150).add(Aspect.AIR, 150).add(Aspect.ORDER, 150).add(Aspect.ENTROPY, 150);
public static List multiblockNodeManipulator;
public static List multiblockEldritchPortalCreator;
public static InfusionRecipe recipeGolemSilverwood;
public static InfusionRecipe[] recipesGolemRunicShield;
@@ -48,6 +49,7 @@ public class RegisteredRecipes {
public static InfusionRecipe recipeRandomizationFocus;
public static InfusionRecipe[] recipesFamilar;
public static InfusionRecipe recipeGolemCoreBodyguard;
public static InfusionRecipe recipePortalFocus;
//ID's: 0-2=Strength upgrades, 3=range, 4=cdReduction
public static InfusionRecipe[][] recipesFamiliarAugmentation;
@@ -55,6 +57,7 @@ public class RegisteredRecipes {
public static IArcaneRecipe recipeStickyJar;
public static IArcaneRecipe recipeArcaneDropper;
public static IArcaneRecipe recipeRemoteJar;
public static IArcaneRecipe recipeAncientPedestal;
public static void init() {
AdditionalGolemType typeSilverwood = RegisteredGolemStuff.typeSilverwood;
@@ -99,15 +102,33 @@ public class RegisteredRecipes {
new ItemStack(ConfigBlocks.blockStoneDevice, 1, 8),
new ItemStack[] {new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), new ItemStack(ConfigItems.itemResource, 1, 16)});
recipePortalFocus = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR",
new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 3), 7,
new AspectList().add(Aspect.ELDRITCH, 22).add(Aspect.VOID, 38).add(Aspect.MECHANISM, 30).add(Aspect.DARKNESS, 28).add(Aspect.EXCHANGE, 38),
new ItemStack(ConfigBlocks.blockStoneDevice, 1, 8),
new ItemStack[] {new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemEldritchObject, 1, 0), new ItemStack(ConfigBlocks.blockCrystal, 1, 5), new ItemStack(ConfigItems.itemResource, 1, 16), new ItemStack(ConfigBlocks.blockCrystal, 1, 5)} );
multiblockNodeManipulator = Arrays.asList(costsNodeManipulatorMultiblock, 3, 3, 3,
Arrays.asList(
null, null, null, null, new ItemStack(RegisteredBlocks.blockNode, 1, 5), null, null, null, null,
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 0), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11),
new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15)));
// x y z
multiblockEldritchPortalCreator = Arrays.asList(costsEldritchPortalCreatorMultiblock, 7, 3, 7,
Arrays.asList(
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(RegisteredBlocks.blockNode, 1, 5), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, null, null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 3), null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, new ItemStack(RegisteredBlocks.blockNodeManipulator, 1, 5), null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15), null, null, null, null, null, null, null, null, null, null, null, null, new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1), null, null, null
));
recipeGolemCoreBodyguard = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".GOLEMCOREBODYGUARD", new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), 3, new AspectList().add(Aspect.TOOL, 28).add(Aspect.MECHANISM, 20).add(Aspect.WEAPON, 10).add(Aspect.ARMOR, 16),
new ItemStack(ConfigItems.itemGolemCore, 1, 4), new ItemStack[] { new ItemStack(ConfigItems.itemBootsTraveller, 1, 0), new ItemStack(Items.ender_pearl, 1, 0), new ItemStack(ConfigItems.itemSwordElemental, 1, 0), new ItemStack(Items.ender_pearl, 1, 0) } );
recipeAncientPedestal = ThaumcraftApi.addArcaneCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", new ItemStack(RegisteredBlocks.blockStoneMachine, 1, 1),
new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.ORDER, 25),
"SPS", " S ", "SPS", 'S', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 11), 'P', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 15));
recipesFamilar = createFamilarRecipes();
recipesFamiliarAugmentation = createFamiliarAugmentationRecipes();
}
@@ -39,6 +39,7 @@ public class RegisteredResearches {
public static ResearchItem researchInfusionClaw;
public static ResearchItem researchRemoteJar;
public static ResearchItem researchNodeManipulator;
public static ResearchItem researchEldritchPortalCreator;
//Growing nodes stuff
public static ResearchItem researchGrowingNodes;
@@ -105,6 +106,8 @@ public class RegisteredResearches {
ResearchItem researchNodeStabilizer = PseudoResearchItem.create("WANDPEDFOC", -12, -5).registerResearchItem();
ResearchItem researchCoreUse = PseudoResearchItem.create("COREUSE", -5, -9).registerResearchItem();
ResearchItem researchOculus = PseudoResearchItem.create("OCULUS", -11, -2).setRound().setSpecial().registerResearchItem();
researchInfusionClaw = new SimpleResearchItem("INFUSIONCLAW", -6, -7, 5, new ItemStack(RegisteredBlocks.blockInfusionClaw),
new AspectList().add(Aspect.ELDRITCH, 8).add(Aspect.MECHANISM, 8).add(Aspect.MAGIC, 8).add(Aspect.ORDER, 8).add(Aspect.DARKNESS, 4))
.setParents(researchFocusPrimal.key, researchItemVoidMetal.key, researchWandPedestal.key, researchCoreUse.key).setConcealed()
@@ -117,6 +120,13 @@ public class RegisteredResearches {
.setParents(researchItemVoidMetal.key, researchNodeStabilizer.key, researchWardingStone.key, researchWandPedestal.key)
.setPages(new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.1"), new ResearchPage(RegisteredRecipes.recipeNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.3"), new ResearchPage(RegisteredRecipes.recipeRandomizationFocus), new ResearchPage(RegisteredRecipes.multiblockNodeManipulator), new ResearchPage("gadomancy.research_page.NODE_MANIPULATOR.6")).registerResearchItem();
researchEldritchPortalCreator = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", Gadomancy.MODID,
new AspectList().add(Aspect.ELDRITCH, 6).add(Aspect.DARKNESS, 10).add(Aspect.TRAVEL, 8).add(Aspect.AURA, 10).add(Aspect.VOID, 6).add(Aspect.MECHANISM, 4),
-10, 0, 2, new ItemStack(RegisteredBlocks.blockAdditionalEldrichPortal, 1, 0))
.setConcealed().setSpecial()
.setParents(researchNodeManipulator.key, researchOculus.key)
.setPages(new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.1"), new ResearchPage(RegisteredRecipes.recipeAncientPedestal), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.3"), new ResearchPage(RegisteredRecipes.recipePortalFocus), new ResearchPage("gadomancy.research_page.E_PORTAL_CREATOR.5"), new ResearchPage(RegisteredRecipes.multiblockEldritchPortalCreator)).registerResearchItem();
researchGrowingNodes = new ResearchItem(Gadomancy.MODID.toUpperCase() + ".GROWING", Gadomancy.MODID, new AspectList(), -8, -1, 5, new ResourceLocation("thaumcraft", "textures/misc/r_nodes.png"))
.setSpecial().setLost().setConcealed()
.setParents(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR")
@@ -209,6 +219,7 @@ public class RegisteredResearches {
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".NODE_MANIPULATOR", 4);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".GROWING_GROWTHCLUE", 3);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", 1);
ThaumcraftApi.addWarpToResearch(Gadomancy.MODID.toUpperCase() + ".E_PORTAL_CREATOR", 3);
}
public static void postInit() {
@@ -5,10 +5,8 @@ import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.profiler.Profiler;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.EnumSkyBlock;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
@@ -17,7 +15,6 @@ import net.minecraftforge.common.util.ForgeDirection;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.entities.EntityPermanentItem;
import thaumcraft.common.entities.monster.EntityEldritchGuardian;
import thaumcraft.common.lib.utils.BlockUtils;
import java.util.ArrayList;
import java.util.HashMap;