From 0b7ad3f38390aebbc1e68fdb5a9dca76c6b61edd Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 7 Mar 2016 01:32:15 -0800 Subject: [PATCH] Update Fixes #68 Fixes #18 Fixes #74 --- .../java/fox/spiteful/avaritia/Avaritia.java | 7 +- .../java/fox/spiteful/avaritia/Config.java | 8 +- .../spiteful/avaritia/LudicrousEvents.java | 2 +- .../fox/spiteful/avaritia/compat/Belmont.java | 22 + .../compat/bloodmagic/ItemOrbArmok.java | 1 + .../avaritia/compat/botania/Tsundere.java | 8 +- .../compat/botania/alfheim/Alfheim.java | 29 -- .../compat/botania/alfheim/AlfheimBlocks.java | 13 - .../compat/botania/alfheim/AlfheimEvents.java | 182 -------- .../compat/botania/alfheim/AlfheimNoise.java | 190 --------- .../alfheim/ApocalypseCloudRenderer.java | 17 - .../alfheim/ApocalypseSkyRenderer.java | 85 ---- .../botania/alfheim/BasicTeleporter.java | 25 -- .../compat/botania/alfheim/BlockDeadrock.java | 67 --- .../botania/alfheim/ChunkProviderAlfheim.java | 184 -------- .../botania/alfheim/ComponentCityParts.java | 165 -------- .../botania/alfheim/MapGenAlfheimRavines.java | 51 --- .../compat/botania/alfheim/MapGenCity.java | 187 --------- .../avaritia/compat/botania/alfheim/Ruin.java | 397 ------------------ .../botania/alfheim/TeleportHelper.java | 102 ----- .../botania/alfheim/WorldProviderAlfheim.java | 131 ------ .../compat/thaumcraft/ItemBigPearl.java | 41 ++ .../avaritia/compat/thaumcraft/Lucrum.java | 20 +- .../thaumcraft/LudicrousResearchItem.java | 34 ++ .../avaritia/items/ItemArmorInfinity.java | 1 + .../avaritia/items/ItemMorvInABox.java | 24 -- .../avaritia/items/LudicrousItems.java | 4 +- .../items/tools/ItemSwordInfinity.java | 11 +- .../resources/assets/avaritia/lang/en_US.lang | 17 +- .../avaritia/textures/items/big_pearl.png | Bin 0 -> 3044 bytes .../textures/items/big_pearl.png.mcmeta | 3 + .../avaritia/textures/misc/ascension.png | Bin 0 -> 1047 bytes 32 files changed, 152 insertions(+), 1876 deletions(-) create mode 100644 src/main/java/fox/spiteful/avaritia/compat/Belmont.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimBlocks.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimEvents.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimNoise.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/ApocalypseCloudRenderer.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/ApocalypseSkyRenderer.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/BasicTeleporter.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/BlockDeadrock.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/ChunkProviderAlfheim.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/ComponentCityParts.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/MapGenAlfheimRavines.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/MapGenCity.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Ruin.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/TeleportHelper.java delete mode 100644 src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/WorldProviderAlfheim.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemBigPearl.java create mode 100644 src/main/java/fox/spiteful/avaritia/compat/thaumcraft/LudicrousResearchItem.java create mode 100644 src/main/resources/assets/avaritia/textures/items/big_pearl.png create mode 100644 src/main/resources/assets/avaritia/textures/items/big_pearl.png.mcmeta create mode 100644 src/main/resources/assets/avaritia/textures/misc/ascension.png diff --git a/src/main/java/fox/spiteful/avaritia/Avaritia.java b/src/main/java/fox/spiteful/avaritia/Avaritia.java index cf36f76..a20ca71 100644 --- a/src/main/java/fox/spiteful/avaritia/Avaritia.java +++ b/src/main/java/fox/spiteful/avaritia/Avaritia.java @@ -13,8 +13,6 @@ import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.achievements.Achievements; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; -import fox.spiteful.avaritia.compat.botania.alfheim.Alfheim; -import fox.spiteful.avaritia.compat.botania.alfheim.WorldProviderAlfheim; import fox.spiteful.avaritia.crafting.Gregorizer; import fox.spiteful.avaritia.crafting.Grinder; import fox.spiteful.avaritia.crafting.Mincer; @@ -64,8 +62,6 @@ public class Avaritia { LudicrousEntities.letLooseTheDogsOfWar(); proxy.prepareForPretty(); - //if(Compat.botan && Config.alfheim) - //Alfheim.packYourBags(); } @EventHandler @@ -76,7 +72,8 @@ public class Avaritia { return; proxy.makeThingsPretty(); MinecraftForge.EVENT_BUS.register(new LudicrousEvents()); - ItemFracturedOre.brushUpUncomfortablyAgainstTheOreDictionary(); + if(Config.fractured) + ItemFracturedOre.brushUpUncomfortablyAgainstTheOreDictionary(); } @EventHandler diff --git a/src/main/java/fox/spiteful/avaritia/Config.java b/src/main/java/fox/spiteful/avaritia/Config.java index bdd40c6..9a7f799 100644 --- a/src/main/java/fox/spiteful/avaritia/Config.java +++ b/src/main/java/fox/spiteful/avaritia/Config.java @@ -11,6 +11,7 @@ public class Config { public static boolean endStone = true; public static boolean bedrockBreaker = true; public static boolean boringFood = false; + public static boolean fractured = false; public static boolean thaumic = true; public static boolean sc2 = true; @@ -39,9 +40,6 @@ public class Config { public static boolean witch = true; public static boolean rotisserie = true; - public static boolean alfheim = false; - //public static int alfheimID; - public static boolean copper = true; public static boolean tin = true; public static boolean silver = true; @@ -62,6 +60,7 @@ public class Config { endStone = conf.get("general", "Use End Stone", endStone, "Disable to take end stone out of recipes").getBoolean(true); bedrockBreaker = conf.get("general", "Break Bedrock", bedrockBreaker, "Disable if you don't want the World Breaker to break unbreakable blocks").getBoolean(true); boringFood = conf.get("general", "Boring Food", boringFood, "Enable to keep the Ultimate Stew and Cosmic Meatballs from grabbing more ingredients").getBoolean(false); + fractured = conf.get("general", "Fractured Ores", fractured, "Enable if you don't have Rotarycraft installed and want some buggy fractured ores").getBoolean(false); conf.addCustomCategoryComment("compatibility", "Disable to stop compatibility with that particular mod. Will not use the mod in recipes or add new items for that mod."); thaumic = conf.get("compatibility", "Thaumcraft", true).getBoolean(true); @@ -91,9 +90,6 @@ public class Config { witch = conf.get("compatibility", "Witchery", true).getBoolean(true); rotisserie = conf.get("compatibility", "Rotarycraft", true).getBoolean(true); - //alfheim = conf.get("compatibility", "Alfheim", false).getBoolean(false); - alfheim = false; - conf.addCustomCategoryComment("materials", "Disable to stop using that material in recipes. Useful if a mod adds unobtainable placeholder ores."); copper = conf.get("materials", "Copper", true).getBoolean(true); tin = conf.get("materials", "Tin", true).getBoolean(true); diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index 4720485..4d0a911 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -136,7 +136,7 @@ public class LudicrousEvents { if(drop.getItem() != Item.getItemFromBlock(event.block) && !(drop.getItem() instanceof ItemBlock)){ drop.stackSize = Math.min(drop.stackSize * mult, drop.getMaxStackSize()); } - else if(drop.getItem() == Item.getItemFromBlock(event.block)) + else if(Config.fractured && drop.getItem() == Item.getItemFromBlock(event.block)) { ItemFracturedOre ifo = (ItemFracturedOre)LudicrousItems.fractured_ore; int[] oreids = OreDictionary.getOreIDs(drop); diff --git a/src/main/java/fox/spiteful/avaritia/compat/Belmont.java b/src/main/java/fox/spiteful/avaritia/compat/Belmont.java new file mode 100644 index 0000000..1421e73 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/Belmont.java @@ -0,0 +1,22 @@ +package fox.spiteful.avaritia.compat; + +import com.emoniph.witchery.util.CreatureUtil; +import cpw.mods.fml.common.Loader; +import net.minecraft.entity.Entity; + +public class Belmont { + + public static boolean isVampire(Entity entity){ + + if(Loader.isModLoaded("witchery")){ + try { + return CreatureUtil.isVampire(entity); + } + catch(Throwable e){} + } + + return false; + + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java index af74dd3..f58ead3 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java +++ b/src/main/java/fox/spiteful/avaritia/compat/bloodmagic/ItemOrbArmok.java @@ -70,6 +70,7 @@ public class ItemOrbArmok extends Item implements IBloodOrb, IBindable { public EnumRarity getRarity(ItemStack itemstack) { return LudicrousItems.cosmic; } + @Override public boolean hasContainerItem() { diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java index e395a28..47a5839 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java +++ b/src/main/java/fox/spiteful/avaritia/compat/botania/Tsundere.java @@ -5,9 +5,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import fox.spiteful.avaritia.Config; import fox.spiteful.avaritia.blocks.LudicrousBlocks; import fox.spiteful.avaritia.compat.Compat; -import fox.spiteful.avaritia.compat.botania.alfheim.Alfheim; -import fox.spiteful.avaritia.compat.botania.alfheim.AlfheimBlocks; -import fox.spiteful.avaritia.compat.botania.alfheim.AlfheimEvents; import fox.spiteful.avaritia.compat.nei.NotEnough; import fox.spiteful.avaritia.crafting.ExtremeCraftingManager; import fox.spiteful.avaritia.crafting.ExtremeShapedRecipe; @@ -18,7 +15,6 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.OreDictionary; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.recipe.RecipeRuneAltar; @@ -36,9 +32,7 @@ public class Tsundere { Grinder.catalyst.getInput().add(terra); Grinder.catalyst.getInput().add(gaia); - //if(Config.alfheim) - //Alfheim.vacationTime(); - + BotaniaAPI.registerSubTile("asgardandelion", SubTileCheaty.class); BotaniaAPI.registerSubTileSignature(SubTileCheaty.class, new Signature("asgardandelion")); BotaniaAPI.addSubTileToCreativeMenu("asgardandelion"); diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java deleted file mode 100644 index 8b584ec..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Alfheim.java +++ /dev/null @@ -1,29 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import net.minecraft.world.gen.structure.MapGenStructureIO; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.MinecraftForge; -import cpw.mods.fml.common.FMLCommonHandler; - -public class Alfheim { - public static void vacationTime() { - AlfheimBlocks.alfheimify(); - - if(FMLCommonHandler.instance().getSide().isClient()) { - AlfheimEvents alfevents = new AlfheimEvents(); - FMLCommonHandler.instance().bus().register(alfevents); - MinecraftForge.EVENT_BUS.register(alfevents); - } - } - - // this stuff needs to happen whether or not botania is active it seems D: - // DON'T LIE LIKE THAT, CUTS >:P - public static void packYourBags() { - int dim = WorldProviderAlfheim.dimensionID; - DimensionManager.registerProviderType(dim, WorldProviderAlfheim.class, false); - DimensionManager.registerDimension(dim, dim); - - MapGenStructureIO.registerStructure(MapGenCity.Start.class, "AlfCity"); - ComponentCityParts.registerParts(); - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimBlocks.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimBlocks.java deleted file mode 100644 index 765db87..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimBlocks.java +++ /dev/null @@ -1,13 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import net.minecraft.block.Block; -import cpw.mods.fml.common.registry.GameRegistry; -import fox.spiteful.avaritia.blocks.ItemBlockWithMetadataUnderp; - -public class AlfheimBlocks { - public static Block deadrock; - - public static void alfheimify() { - deadrock = GameRegistry.registerBlock(new BlockDeadrock(), ItemBlockWithMetadataUnderp.class, "Alf_Deadrock"); - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimEvents.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimEvents.java deleted file mode 100644 index 3a8f531..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimEvents.java +++ /dev/null @@ -1,182 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import org.apache.logging.log4j.Level; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.WorldClient; -import net.minecraft.client.renderer.EntityRenderer; -import net.minecraft.client.renderer.texture.DynamicTexture; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.Timer; -import net.minecraft.world.World; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.relauncher.ReflectionHelper; -import fox.spiteful.avaritia.FieldHelper; -import fox.spiteful.avaritia.Lumberjack; - -public class AlfheimEvents { - public static Field lightmapUpdateNeededField; - public static Field mcTimerField; - public static Field torchFlickerField; - public static Field lightmapColorsField; - public static Field lightmapTextureField; - public static Field bossColorModifierField; - public static Field bossColorModifierPrevField; - public static Method getNightVisionBrightnessMethod = ReflectionHelper.findMethod(EntityRenderer.class, Minecraft.getMinecraft().entityRenderer, new String[]{"getNightVisionBrightness", "func_82830_a"}, EntityPlayer.class, float.class); - - static { - try { - mcTimerField = ReflectionHelper.findField(Minecraft.class, "timer", "field_71428_T"); - lightmapUpdateNeededField = ReflectionHelper.findField(EntityRenderer.class, "lightmapUpdateNeeded", "field_78536_aa"); - torchFlickerField = ReflectionHelper.findField(EntityRenderer.class, "torchFlickerX", "field_78514_e"); - lightmapColorsField = ReflectionHelper.findField(EntityRenderer.class, "lightmapColors", "field_78504_Q"); - lightmapTextureField = ReflectionHelper.findField(EntityRenderer.class, "lightmapTexture", "field_78513_d"); - bossColorModifierField = ReflectionHelper.findField(EntityRenderer.class, "bossColorModifier", "field_82831_U"); - bossColorModifierPrevField = ReflectionHelper.findField(EntityRenderer.class, "bossColorModifierPrev", "field_82832_V"); - //getNightVisionBrightnessMethod = ReflectionHelper.findMethod(EntityRenderer.class, Minecraft.getMinecraft().entityRenderer, new String[]{"getNightVisionBrightness", "func_82830_a"}, Float.class); - } catch(Exception e) { - Lumberjack.log(Level.ERROR, e); - } - } - - @SubscribeEvent - public void onRenderStart(TickEvent.RenderTickEvent event) { - if (event.phase == Phase.START) { - Minecraft mc = Minecraft.getMinecraft(); - - if (mc.theWorld == null) { - return; - } - World world = mc.theWorld; - if (world.provider == null || !(world.provider instanceof WorldProviderAlfheim)) { - return; - } - EntityRenderer er = mc.entityRenderer; - - boolean needsupdate = FieldHelper.get(lightmapUpdateNeededField, er); - - if (needsupdate) { - updateLightmapRedGiant(); - } - } - } - - public void updateLightmapRedGiant() { - //Lumberjack.info("Lightmap update"); - Minecraft mc = Minecraft.getMinecraft(); - EntityRenderer er = mc.entityRenderer; - Timer timer = FieldHelper.get(mcTimerField, mc); - float partialTicks = timer.renderPartialTicks; - float flicker = FieldHelper.get(torchFlickerField, er); - float bossColorModifier = FieldHelper.get(bossColorModifierField, er); - float bossColorModifierPrev = FieldHelper.get(bossColorModifierPrevField, er); - int[] lightmapColors = FieldHelper.get(lightmapColorsField, er); - DynamicTexture lightmapTexture = FieldHelper.get(lightmapTextureField, er); - - WorldClient worldclient = mc.theWorld; - - if (worldclient != null) - { - for (int i = 0; i < 256; ++i) - { - float brightness = worldclient.getSunBrightness(1.0F) * 0.95F + 0.05F; - float sun = worldclient.provider.lightBrightnessTable[i / 16] * brightness; - float torch = worldclient.provider.lightBrightnessTable[i % 16] * (flicker * 0.1F + 1.5F); - - if (worldclient.lastLightningBolt > 0) - { - sun = worldclient.provider.lightBrightnessTable[i / 16]; - } - - float sunr = sun * (worldclient.getSunBrightness(1.0F) * 0.65F + 0.35F); - float sung = sun * (worldclient.getSunBrightness(1.0F) * 0.65F + 0.35F); - float torchg = torch * ((torch * 0.6F + 0.4F) * 0.6F + 0.4F); - float torchb = torch * (torch * torch * 0.6F + 0.4F); - float fr = sunr + torch; - float fg = sung * 0.3f + torchg; - float fb = sun * 0.2f + torchb; - fr = fr * 0.96F + 0.03F; - fg = fg * 0.96F + 0.03F; - fb = fb * 0.96F + 0.03F; - float modifier; - - if (bossColorModifier > 0.0F) - { - modifier = bossColorModifierPrev + (bossColorModifier - bossColorModifierPrev) * partialTicks; - fr = fr * (1.0F - modifier) + fr * 0.7F * modifier; - fg = fg * (1.0F - modifier) + fg * 0.6F * modifier; - fb = fb * (1.0F - modifier) + fb * 0.6F * modifier; - } - - if (worldclient.provider.dimensionId == 1) - { - fr = 0.22F + torch * 0.75F; - fg = 0.28F + torchg * 0.75F; - fb = 0.25F + torchb * 0.75F; - } - - if (mc.thePlayer.isPotionActive(Potion.nightVision)) - { - modifier = FieldHelper.invoke(getNightVisionBrightnessMethod, er, mc.thePlayer, partialTicks); - - float nightvision = 1.0F / fr; - - if (nightvision > 1.0F / fg) - { - nightvision = 1.0F / fg; - } - - if (nightvision > 1.0F / fb) - { - nightvision = 1.0F / fb; - } - - fr = fr * (1.0F - modifier) + fr * nightvision * modifier; - fg = fg * (1.0F - modifier) + fg * nightvision * modifier; - fb = fb * (1.0F - modifier) + fb * nightvision * modifier; - } - - if (fr > 1.0F) { fr = 1.0F; } - if (fg > 1.0F) { fg = 1.0F; } - if (fb > 1.0F) { fb = 1.0F; } - - modifier = mc.gameSettings.gammaSetting; - float gr = 1.0F - fr; - float gg = 1.0F - fg + 0.25f*sun; - float gb = 1.0F - fb + 0.2f*sun; - gr = 1.0F - gr * gr * gr * gr; - gg = 1.0F - gg * gg * gg * gg; - gb = 1.0F - gb * gb * gb * gb; - fr = fr * (1.0F - modifier) + gr * modifier; - fg = fg * (1.0F - modifier) + gg * modifier; - fb = fb * (1.0F - modifier) + gb * modifier; - fr = fr * 0.96F + 0.03F; - fg = fg * 0.96F + 0.03F; - fb = fb * 0.96F + 0.03F; - - if (fr > 1.0F) { fr = 1.0F; } - if (fg > 1.0F) { fg = 1.0F; } - if (fb > 1.0F) { fb = 1.0F; } - - if (fr < 0.0F) { fr = 0.0F; } - if (fg < 0.0F) { fg = 0.0F; } - if (fb < 0.0F) { fb = 0.0F; } - - short alpha = 255; - int r = (int)(fr * 255.0F); - int g = (int)(fg * 255.0F); - int b = (int)(fb * 255.0F); - lightmapColors[i] = alpha << 24 | r << 16 | g << 8 | b; - } - - lightmapTexture.updateDynamicTexture(); - FieldHelper.set(lightmapUpdateNeededField, er, false); - } - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimNoise.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimNoise.java deleted file mode 100644 index a69c46d..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/AlfheimNoise.java +++ /dev/null @@ -1,190 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import java.util.Random; - -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; - - - -public class AlfheimNoise { - - public final long seed; - private final double[] randomSource; - - private static int XSEED = 1619; - private static int ZSEED = 31337; - private static int NSEED = 1013; - private static int NSHIFT = 8; - - public AlfheimNoise(long seed) { - this.seed = seed; - this.randomSource = new double[256*2]; - Random randy = new Random(this.seed); - for (int i=0; i<256; i++) { - double r = randy.nextDouble(); - double a = randy.nextDouble()*2*Math.PI; - - this.randomSource[i*2] = Math.sin(a)*r; - this.randomSource[i*2+1] = Math.cos(a)*r; - } - } - - private double getNoise(double x, double z, double period, long seed) { - double frequency = period == 0 ? 1.0 : 1.0/period; - return this.calcNoise(x * frequency, z * frequency, seed); - } - - private double calcNoise(double x, double z, long seed) { - int x0 = (x > 0 ? MathHelper.floor_double(x) : MathHelper.floor_double(x)-1); - int x1 = x0 + 1; - int z0 = (z > 0 ? MathHelper.floor_double(z) : MathHelper.floor_double(z)-1); - int z1 = z0 + 1; - - double xs = deriv1(x-x0); - double zs = deriv1(z-z0); - - double tl = this.gradientNoise(x,z, x0,z0, seed); - double tr = this.gradientNoise(x,z, x1,z0, seed); - double top = lerp(tl,tr, xs); - - double bl = this.gradientNoise(x,z, x0,z1, seed); - double br = this.gradientNoise(x,z, x1,z1, seed); - double bot = lerp(bl,br, xs); - - return lerp(top, bot, zs); - } - - private double gradientNoise(double fx, double fz, int ix, int iz, long seed) { - Vec3 grad = this.getGradient(ix, iz, seed); - Vec3 point = Vec3.createVectorHelper(fx-ix, fz-iz, 0); - - return grad.dotProduct(point) * 2.12; - } - - private Vec3 getGradient(int x, int z, long seed) { - long vectorindex = ( - XSEED * x - + ZSEED * z - + NSEED * seed - ) & 0xffffffff; - vectorindex ^= (vectorindex >> NSHIFT); - vectorindex &= 0xff; - int vi = (int)vectorindex; - - return Vec3.createVectorHelper(this.randomSource[vi*2], this.randomSource[vi*2+1], 0); - } - - private Vec3 calcDerivative(double x, double z, long seed) { - int ix = MathHelper.floor_double(x); - int iz = MathHelper.floor_double(z); - double fx = x-ix; - double fz = z-iz; - - double wx = deriv1(fx); - double wz = deriv1(fz); - - double dwx = deriv2(fx); - double dwz = deriv2(fz); - - double dwpx = deriv3(fx); - double dwpz = deriv3(fz); - - Vec3 vtl = getGradient(ix, iz, seed); - Vec3 vtr = getGradient(ix+1, iz, seed); - Vec3 vbl = getGradient(ix, iz+1, seed); - Vec3 vbr = getGradient(ix+1, iz+1, seed); - - double tl = vtl.xCoord * (x - ix) + vtl.yCoord * (z - iz); - double tr = vtr.xCoord * (x - (ix+1)) + vtr.yCoord * (z - iz); - double bl = vbl.xCoord * (x - ix) + vbl.yCoord * (z - (iz+1)); - double br = vbr.xCoord * (x - (ix+1)) + vbr.yCoord * (z - (iz+1)); - - double top = lerp(tl,tr,wx); - double bot = lerp(bl,br,wx); - double n = lerp(top,bot,wz); - - double dx = (vtl.xCoord + (vbl.xCoord-vtl.xCoord)*wz) + ((vtr.yCoord-vtl.yCoord)*fz - vtr.xCoord + - ((vtl.yCoord-vtr.yCoord-vbl.yCoord+vbr.yCoord)*fz + vtr.xCoord + vbl.yCoord - vbr.xCoord - vbr.yCoord)*wz)* - dwx + ((vtr.xCoord-vtl.xCoord) + (vtl.xCoord-vtr.xCoord-vbl.xCoord+vbr.xCoord)*wz)*dwpx; - - double dz = (vtl.yCoord + (vtr.yCoord-vtl.yCoord)*wx) + ((vbl.xCoord-vtl.xCoord)*fx - vbl.yCoord + ((vtl.xCoord- - vtr.xCoord-vbl.xCoord+vbr.xCoord)*fx + vtr.xCoord + vbl.yCoord - vbr.xCoord - vbr.yCoord)*wx)*dwz + - ((vbl.yCoord-vtl.yCoord) + (vtl.yCoord-vtr.yCoord-vbl.yCoord+vbr.yCoord)*wx)*dwpz; - - return Vec3.createVectorHelper(n*2, dx*2, dz*2); - } - - private double getNoiseOctaves(double x, double z, int octaves, double period, double lacunarity, double gain, long seed) { - double sum = 0.0; - double freq = period == 0 ? 1.0 : 1.0 / period; - double amp = 1.0; - - for (int i=0; i= 0) - { - return true; - } - else - { - int j = 0; - int k = 0; - - for (int l = this.boundingBox.minZ; l <= this.boundingBox.maxZ; ++l) - { - for (int i1 = this.boundingBox.minX; i1 <= this.boundingBox.maxX; ++i1) - { - if (bounds.isVecInside(i1, 64, l)) - { - j += Math.max(world.getTopSolidOrLiquidBlock(i1, l), world.provider.getAverageGroundLevel()); - ++k; - } - } - } - - if (k == 0) - { - return false; - } - else - { - this.partPosY = j / k; - this.boundingBox.offset(0, this.partPosY - this.boundingBox.minY + offset, 0); - return true; - } - } - } - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/MapGenAlfheimRavines.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/MapGenAlfheimRavines.java deleted file mode 100644 index 17e443a..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/MapGenAlfheimRavines.java +++ /dev/null @@ -1,51 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import fox.spiteful.avaritia.Lumberjack; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.MapGenRavine; - -public class MapGenAlfheimRavines extends MapGenRavine { - - @Override - protected void func_151538_a(World world, int originChunkX, int originChunkZ, int chunkX, int chunkZ, Block[] blocks) - { - if (this.rand.nextInt(6) == 0) { - Lumberjack.info("crack!"); - double x = (double)(originChunkX * 16 + this.rand.nextInt(16)); - double y = 67;//(double)(this.rand.nextInt(20) + 50); - double z = (double)(originChunkZ * 16 + this.rand.nextInt(16)); - - int angles = this.rand.nextInt(4)+3; - double angleinc = (Math.PI*2.0) / angles; - double baseangle = this.rand.nextDouble() * Math.PI * 2.0; - - for (int i=0; i cells = new ArrayList(); - int[] cellfill = new int[BLOCKS*BLOCKS]; - for (int i=0; i BLOCKS/2-3 && bx < BLOCKS/2+2 && bz > BLOCKS/2-3 && bz < BLOCKS/2+2) { - continue; - } - int x = origin + (BLOCKSIZE + ROADSIZE) * bx; - int z = origin + (BLOCKSIZE + ROADSIZE) * bz; - - double cx = x + BLOCKSIZE * 0.5; - double cz = z + BLOCKSIZE * 0.5; - - double rad = Math.sqrt(cx*cx + cz*cz) / (CITYRADIUS - (BLOCKSIZE*0.75)); - - if (rad < 1.0) { - if (rand.nextDouble() > rad - 0.4) { - cells.add(new ChunkCoordinates(bx,bz,0)); - cellfill[bz*BLOCKS + bx] = 1; - } - } - } - } - - Collections.shuffle(cells); - - while (cells.size() > 0) { - ChunkCoordinates cell = cells.remove(0); - int bx = cell.posX; - int bz = cell.posY; - int index = bz * BLOCKS + bx; - if (cellfill[index] != 1) { - continue; - } - - int dx = BLOCKS/2 - bx; - int dz = BLOCKS/2 - bz; - double dist = Math.sqrt(dx*dx + dz*dz) / (BLOCKS*0.5); - - int width = 1; - int height = 1; - - if (rand.nextDouble() < 1.5 * (1-dist) - 0.05) { - width += 1; - height += 1; - - if (rand.nextDouble() < 0.1) { - width += 1; - } - if (rand.nextDouble() < 0.1) { - height += 1; - } - } - - while(true) { - if (width == 1 && height == 1) { - break; - } - - boolean ok = true; - for (int cx = 0; cx < width; cx++) { - for (int cz = 0; cz < height; cz++) { - if (bx+cx >= BLOCKS || bz+cz >= BLOCKS) { - ok = false; - break; - } - if ((bx < BLOCKS/2 && bx+cx >= BLOCKS/2) || (bz < BLOCKS/2 && bz+cz >= BLOCKS/2)) { - ok = false; - break; - } - int cindex = (bz+cz)*BLOCKS + (bx+cx); - if (cellfill[cindex] != 1) { - ok = false; - break; - } - } - } - - if (ok) { - break; - } else { - if (width > 1 && height > 1) { - if (rand.nextBoolean()) { - width--; - } else { - height--; - } - } else if (width > 1) { - width--; - } else { - height--; - } - } - } - - for (int cx = 0; cx < width; cx++) { - for (int cz = 0; cz < height; cz++) { - int cindex = (bz+cz)*BLOCKS + (bx+cx); - cellfill[cindex] = 2; - } - } - - double size = Math.sqrt(width*height); - int floors = (int)Math.round(0.5 + (size * 1.45 * ((1-dist) + 0.3) * (rand.nextDouble() * rand.nextDouble())) + (rand.nextDouble() * (1-dist) * 0.6) + rand.nextDouble() * 0.2); - - int x = origin + (BLOCKSIZE+ROADSIZE) * bx; - int z = origin + (BLOCKSIZE+ROADSIZE) * bz; - int structurewidth = width * BLOCKSIZE + (width-1) * ROADSIZE; - int structureheight = height * BLOCKSIZE + (height-1) * ROADSIZE; - - /*ComponentScatteredFeaturePieces.SwampHut swamphut = new ComponentScatteredFeaturePieces.SwampHut(rand, x, z); - this.components.add(swamphut);*/ - - ComponentCityParts.CityRuin ruin = new ComponentCityParts.CityRuin(rand, x, z, structurewidth, structureheight, floors); - this.components.add(ruin); - } - - - - //ComponentScatteredFeaturePieces.SwampHut swamphut = new ComponentScatteredFeaturePieces.SwampHut(rand, (chunkX) * 16, (chunkZ) * 16); - //this.components.add(swamphut); - - this.updateBoundingBox(); - } - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Ruin.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Ruin.java deleted file mode 100644 index 7057f08..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/Ruin.java +++ /dev/null @@ -1,397 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Random; - -import fox.spiteful.avaritia.compat.botania.alfheim.Ruin.BlockRuinPalette.BlockPaletteInfo; - -import net.minecraft.block.Block; - -public class Ruin { - public BlockArray blocks; - public double ruinLevel; - public Random rand; - public BlockRuinPalette palette; - - public int xSize; - public int ySize; - public int zSize; - public int xOffset; - public int yOffset; - public int zOffset; - - public Ruin(BlockArray blocks, double ruinLevel, Random rand) { - this(blocks, ruinLevel, rand, new BlockRuinPalette()); - } - public Ruin(BlockArray blocks, double ruinLevel, Random rand, BlockRuinPalette palette) { - this (blocks, ruinLevel, rand, blocks.xSize, blocks.ySize, blocks.zSize, 0,0,0, palette); - } - public Ruin(BlockArray blocks, double ruinLevel, Random rand, int xSize, int ySize, int zSize, int xOffset, int yOffset, int zOffset) { - this (blocks, ruinLevel, rand, xSize, ySize, zSize, xOffset,yOffset,zOffset, new BlockRuinPalette()); - } - public Ruin(BlockArray blocks, double ruinLevel, Random rand, int xSize, int ySize, int zSize, int xOffset, int yOffset, int zOffset, BlockRuinPalette palette) { - this.blocks = blocks; - this.ruinLevel = ruinLevel; - this.rand = rand; - this.palette = palette; - - this.xSize = xSize; - this.ySize = ySize; - this.zSize = zSize; - - this.xOffset = xOffset; - this.yOffset = yOffset; - this.zOffset = zOffset; - - int volume = this.xSize * this.ySize * this.zSize; - int breaks = (int) Math.ceil((volume/16.0) * ruinLevel); - - for (int i=0; i falldirs = new ArrayList(); - if (!blocks.outOfBounds(x-1,y,z) && blocks.getBlock(x-1,y,z) == null && blocks.getBlock(x-1,y-1,z) == null) { - falldirs.add(0); - } - if (!blocks.outOfBounds(x+1,y,z) && blocks.getBlock(x+1,y,z) == null && blocks.getBlock(x+1,y-1,z) == null) { - falldirs.add(1); - } - if (!blocks.outOfBounds(x,y,z-1) && blocks.getBlock(x,y,z-1) == null && blocks.getBlock(x,y-1,z-1) == null) { - falldirs.add(2); - } - if (!blocks.outOfBounds(x,y,z+1) && blocks.getBlock(x,y,z+1) == null && blocks.getBlock(x,y-1,z+1) == null) { - falldirs.add(3); - } - - if (!falldirs.isEmpty()) { - slide = true; - slidedir = falldirs.get(rand.nextInt(falldirs.size())); - } - - if (slide) { - impact(x,y-1,z, falldistance/4, block); - if (slidedir == 0) { - x--; - } else if (slidedir == 1) { - x++; - } else if (slidedir == 2) { - z--; - } else { - z++; - } - } else { - BlockPaletteInfo blockinfo = this.palette.get(block); - double breakchance = fallBreakChance(falldistance) * blockinfo.breakchance; - if (rand.nextDouble() <= breakchance) { - blocks.setBlock(x,y,z,blockinfo.broken); - } else { - if (blockinfo.hardness >= 1) { - blocks.setBlock(x,y,z,block); - } - } - impact(x,y-1,z, falldistance, block); - break; - } - } - } - } - - protected void impact(int x, int y, int z, int falldistance, BlockMeta fallingblock) { - BlockMeta block = blocks.getBlock(x,y,z); - BlockPaletteInfo blockinfo = this.palette.get(block); - double smashchance = fallBreakChance(falldistance) * blockinfo.smashchance; - - if (rand.nextDouble() <= smashchance) { - blocks.setBlock(x,y,z, null); - dropBlock(x,y+1,z, falldistance/3); - } - - double breakchance = fallBreakChance(falldistance) * blockinfo.breakchance; - if (blocks.getBlock(x,y-1,z) != null) { - breakchance *= 0.75; - } - - if (rand.nextDouble() <= breakchance) { - if (blockinfo.broken != null) { - blocks.setBlock(x,y,z, blockinfo.broken); - impact(x,y,z, falldistance/2, fallingblock); - } else { - dropBlock(x,y,z); - dropBlock(x,y+1,z, falldistance/3); - } - } - } - - protected void ruinArea(int ox, int oy, int oz, double radius) { - int range = (int)Math.ceil(radius*2); - int offset = range/2; - - for (int y = 0; y<=range; y++) { - List coords = new ArrayList(); - for (int x = 0; x<=range; x++) { - if (x < 0 || x >= blocks.xSize) { - continue; - } - for (int z = 0; z<=range; z++) { - if (z < 0 || z >= blocks.zSize) { - continue; - } - BlockMeta block = blocks.getBlock(ox+x-offset,oy+y-offset,oz+z-offset); - if (block == null) { - continue; - } - - BlockPaletteInfo blockinfo = this.palette.get(block); - - double rx = (x - range/2); - double ry = (y - range/2); - double rz = (z - range/2); - - double dist = Math.sqrt(rx*rx+ry*ry+rz*rz) / radius; - if(dist <= 1.0) { - if (dist > .75) { - double dchance = (dist - 0.75)*4; - if (rand.nextDouble() > dchance) { - coords.add(new Coord(x,y,z)); - } else if (blockinfo.broken != null || blockinfo.hardness < 1) { - blocks.setBlock(ox+x-offset,oy+y-offset,oz+z-offset,blockinfo.broken); - } - } else { - coords.add(new Coord(x,y,z)); - } - } - } - } - Collections.shuffle(coords, rand); - for (int i=0; i open = new ArrayList(); - open.add(new Coord(ox,0,oz)); - - while(!open.isEmpty()) { - Coord c = open.remove(open.size()-1); - if (!blocks.outOfBounds(c.x, c.y, c.z) && blocks.getBlock(c.x, c.y, c.z) != null) { - connected[blocks.index(c.x,c.y,c.z)] = true; - - if(!blocks.outOfBounds(c.x-1, c.y, c.z) && blocks.getBlock(c.x-1, c.y, c.z) != null && connected[blocks.index(c.x-1,c.y,c.z)] == false) { - open.add(new Coord(c.x-1,c.y,c.z)); - } - if(!blocks.outOfBounds(c.x+1, c.y, c.z) && blocks.getBlock(c.x+1, c.y, c.z) != null && connected[blocks.index(c.x+1,c.y,c.z)] == false) { - open.add(new Coord(c.x+1,c.y,c.z)); - } - if(!blocks.outOfBounds(c.x, c.y, c.z-1) && blocks.getBlock(c.x, c.y, c.z-1) != null && connected[blocks.index(c.x,c.y,c.z-1)] == false) { - open.add(new Coord(c.x,c.y,c.z-1)); - } - if(!blocks.outOfBounds(c.x, c.y, c.z+1) && blocks.getBlock(c.x, c.y, c.z+1) != null && connected[blocks.index(c.x,c.y,c.z+1)] == false) { - open.add(new Coord(c.x,c.y,c.z+1)); - } - if(!blocks.outOfBounds(c.x, c.y-1, c.z) && blocks.getBlock(c.x, c.y-1, c.z) != null && connected[blocks.index(c.x,c.y-1,c.z)] == false) { - open.add(new Coord(c.x,c.y-1,c.z)); - } - if(!blocks.outOfBounds(c.x, c.y+1, c.z) && blocks.getBlock(c.x, c.y+1, c.z) != null && connected[blocks.index(c.x,c.y+1,c.z)] == false) { - open.add(new Coord(c.x,c.y+1,c.z)); - } - } - } - - for (int y = 0; y<=blocks.ySize; y++) { - List coords = new ArrayList(); - for (int x = 0; x<=blocks.xSize; x++) { - for (int z = 0; z<=blocks.zSize; z++) { - if (blocks.getBlock(x,y,z) != null && !connected[blocks.index(x,y,z)]) { - coords.add(new Coord(x,y,z)); - } - } - } - Collections.shuffle(coords, rand); - for (int i=0; i=xSize||y<0||y>=ySize||z<0||z>=zSize); - } - - public void setBlock(int x, int y, int z, BlockMeta block) { - if (outOfBounds(x,y,z)) { - return; - } - - blocks[index(x,y,z)] = block; - } - - public BlockMeta getBlock(int x, int y, int z) { - if (outOfBounds(x,y,z)) { - return null; - } - - return blocks[index(x,y,z)]; - } - - public void fillBlocks(int x, int y, int z, int x2, int y2, int z2, BlockMeta block) { - for (int ix = x; ix<=x2; ix++) { - for (int iy = y; iy<=y2; iy++) { - for (int iz = z; iz<=z2; iz++) { - setBlock(ix,iy,iz, block); - } - } - } - } - - protected int index(int x, int y, int z) { - return y * zSize * xSize + z * xSize + x; - } - } - - public static class BlockMeta { - public Block block; - public byte meta; - - public BlockMeta(Block block, int meta) { - this.block = block; - this.meta = (byte)(meta & 0xFF); - } - - @Override - public String toString() { - return this.block.toString()+"#"+this.meta; - } - - @Override - public int hashCode() { - return this.block.hashCode() + this.meta; - } - } - - public static class BlockRuinPalette { - protected Map infomap = new HashMap(); - - public BlockPaletteInfo get(BlockMeta block) { - if (infomap.containsKey(block)) { - return infomap.get(block); - } - return BlockPaletteInfo.DEFAULT; - } - - public void set(BlockMeta block, double hardness, double breakchance, double smashchance) { - this.set(block, hardness, breakchance, smashchance, null); - } - public void set(BlockMeta block, double hardness, double breakchance, double smashchance, BlockMeta broken) { - infomap.put(block, new BlockPaletteInfo(hardness, breakchance, smashchance, broken)); - } - - public static class BlockPaletteInfo { - public static final BlockPaletteInfo DEFAULT = new BlockPaletteInfo(1.0, 0.2, 0.2, null); - - public final double hardness; - public final double breakchance; - public final double smashchance; - public final BlockMeta broken; - - public BlockPaletteInfo(double hardness, double breakchance, double smashchance, BlockMeta broken) { - this.hardness = hardness; - this.breakchance = breakchance; - this.smashchance = smashchance; - this.broken = broken; - } - } - } - - // ################################################################################# - // Internal Classes - // ################################################################################# - protected static class Coord { - int x; - int y; - int z; - - public Coord(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; - } - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/TeleportHelper.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/TeleportHelper.java deleted file mode 100644 index 3f814d8..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/TeleportHelper.java +++ /dev/null @@ -1,102 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.World; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.DimensionManager; - -public class TeleportHelper { - public static void travelToDimension(Entity ent, int x, int y, int z, int dim){ - if(ent instanceof EntityPlayerMP){ - MinecraftServer minecraftserver = MinecraftServer.getServer(); - WorldServer newWorldServer = minecraftserver.worldServerForDimension(dim); - minecraftserver.getConfigurationManager().transferPlayerToDimension((EntityPlayerMP)ent, dim, new BasicTeleporter(newWorldServer)); - ((EntityPlayer)ent).setPositionAndUpdate(x+0.5, y+0.5, z+0.5); - return; - } - - - if (!ent.worldObj.isRemote && !ent.isDead) - { - ent.worldObj.theProfiler.startSection("changeDimension"); - MinecraftServer minecraftserver = MinecraftServer.getServer(); - int j = ent.dimension; - WorldServer worldserver = minecraftserver.worldServerForDimension(j); - WorldServer worldserver1 = minecraftserver.worldServerForDimension(dim); - ent.dimension = dim; - - if (j == 1 && dim == 1) - { - worldserver1 = minecraftserver.worldServerForDimension(0); - ent.dimension = 0; - } - - ent.worldObj.removeEntity(ent); - ent.isDead = false; - ent.worldObj.theProfiler.startSection("reposition"); - minecraftserver.getConfigurationManager().transferEntityToWorld(ent, j, worldserver, worldserver1); - ent.worldObj.theProfiler.endStartSection("reloading"); - Entity entity = EntityList.createEntityByName(EntityList.getEntityString(ent), worldserver1); - - if (entity != null) - { - entity.copyDataFrom(ent, true); - - if (j == 1 && dim == 1) - { - entity.setLocationAndAngles(x+0.5, y+0.5, z+0.5, entity.rotationYaw, entity.rotationPitch); - } - - worldserver1.spawnEntityInWorld(entity); - entity.setPosition(x+0.5, y+0.5, z+0.5); - } - - ent.isDead = true; - ent.worldObj.theProfiler.endSection(); - worldserver.resetUpdateEntityTick(); - worldserver1.resetUpdateEntityTick(); - ent.worldObj.theProfiler.endSection(); - } - } - - public static void travelToOrFromAlfheim(EntityPlayer player) { - if (DimensionManager.getWorld(0) == player.worldObj) { - // overworld to alfheim - travelToDimension(player, 0, 85, 0, WorldProviderAlfheim.dimensionID); - } else { - // alfheim to overworld - sendPlayerHome(player); - } - } - - public static void sendPlayerHome(EntityPlayer player) { - World world = DimensionManager.getWorld(0); - ChunkCoordinates coord = player.getBedLocation(0); - - if (coord == null) { - coord = world.getSpawnPoint(); - } - - coord = forceLocation(world, coord); - - if (coord == null) { - coord = world.getSpawnPoint(); - } - - travelToDimension(player, coord.posX, coord.posY, coord.posZ, 0); - - while (!world.getCollidingBoundingBoxes(player, player.boundingBox).isEmpty()) - { - player.setPositionAndUpdate(player.posX, player.posY + 1.0D, player.posZ); - } - } - - public static ChunkCoordinates forceLocation(World world, ChunkCoordinates coord) { - return null; - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/WorldProviderAlfheim.java b/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/WorldProviderAlfheim.java deleted file mode 100644 index 8155abb..0000000 --- a/src/main/java/fox/spiteful/avaritia/compat/botania/alfheim/WorldProviderAlfheim.java +++ /dev/null @@ -1,131 +0,0 @@ -package fox.spiteful.avaritia.compat.botania.alfheim; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import fox.spiteful.avaritia.FieldHelper; -import fox.spiteful.avaritia.Lumberjack; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Timer; -import net.minecraft.util.Vec3; -import net.minecraft.world.WorldProvider; -import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.biome.WorldChunkManagerHell; -import net.minecraft.world.chunk.IChunkProvider; - -public class WorldProviderAlfheim extends WorldProvider { - - public static int dimensionID = 13; - - @Override - public void registerWorldChunkManager() - { - this.worldChunkMgr = new WorldChunkManagerHell(BiomeGenBase.hell, 0.0F); - this.isHellWorld = true; - this.hasNoSky = false; - if(FMLCommonHandler.instance().getSide().isClient()) { - this.setCloudRenderer(new ApocalypseCloudRenderer()); - this.setSkyRenderer(new ApocalypseSkyRenderer()); - } - } - - /** - * Return Vec3D with biome specific fog color - */ - @Override - @SideOnly(Side.CLIENT) - public Vec3 getFogColor(float p_76562_1_, float p_76562_2_) - { - /*double r = 0.1; - double g = 0.04; - double b = 0; - - double nr = 1.0; - double ng = 0.5; - double nb = 0.0; - - Minecraft mc = Minecraft.getMinecraft(); - Timer t = FieldHelper.get(AlfheimEvents.mcTimerField, mc); - float partialTicks = t.renderPartialTicks; - - float n = FieldHelper.invoke(AlfheimEvents.getNightVisionBrightnessMethod, mc.entityRenderer, mc.thePlayer, partialTicks); - double notn = 1.0 - n; - - return Vec3.createVectorHelper(n*nr + notn*r, n*ng + notn*g, n*nb + notn*b);*/ - return Vec3.createVectorHelper(0.1, 0.04, 0.0); - } - - /** - * Returns a new chunk provider which generates chunks for this world - */ - @Override - public IChunkProvider createChunkGenerator() - { - return new ChunkProviderAlfheim(this.worldObj, this.worldObj.getSeed()); - } - - /** - * Returns 'true' if in the "main surface world", but 'false' if in the Nether or End dimensions. - */ - @Override - public boolean isSurfaceWorld() - { - return false; - } - - /** - * Will check if the x, z position specified is alright to be set as the map spawn point - */ - @Override - public boolean canCoordinateBeSpawn(int x, int z) - { - return true; // need to improve - } - - /** - * Calculates the angle of sun and moon in the sky relative to a specified time (usually worldTime) - */ - @Override - public float calculateCelestialAngle(long tick, float partialTick) - { - return 1f;//0.425F; - } - - /** - * True if the player can respawn in this dimension (true = overworld, false = nether). - */ - @Override - public boolean canRespawnHere() - { - return true; - } - - /** - * Returns true if the given X,Z coordinate should show environmental fog. - */ - @Override - @SideOnly(Side.CLIENT) - public boolean doesXZShowFog(int x, int z) - { - return false; - //return true; - } - - @Override - public String getDimensionName() { - return "Alfheim Eternal"; - } - - @Override - public float getSunBrightnessFactor(float par1) - { - return 0.6f; - } - - @Override - public ChunkCoordinates getEntrancePortalLocation() - { - return new ChunkCoordinates(0, 85, 0); - } -} diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemBigPearl.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemBigPearl.java new file mode 100644 index 0000000..9084fa8 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/ItemBigPearl.java @@ -0,0 +1,41 @@ +package fox.spiteful.avaritia.compat.thaumcraft; + +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.items.LudicrousItems; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class ItemBigPearl extends Item { + + public ItemBigPearl(){ + setMaxStackSize(1); + this.setUnlocalizedName("extremely_primordial_pearl"); + this.setTextureName("avaritia:big_pearl"); + setCreativeTab(Avaritia.tab); + } + + @Override + public EnumRarity getRarity(ItemStack itemstack) { + return EnumRarity.epic; + } + + @Override + public boolean hasContainerItem() + { + return true; + } + + @Override + public boolean doesContainerItemLeaveCraftingGrid(ItemStack itemStack) + { + return false; + } + + @Override + public ItemStack getContainerItem(ItemStack itemStack) + { + return itemStack; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java index 2667d40..b25768c 100644 --- a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/Lucrum.java @@ -17,6 +17,9 @@ import org.apache.logging.log4j.Level; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.crafting.InfusionRecipe; +import thaumcraft.api.research.ResearchCategories; +import thaumcraft.api.research.ResearchPage; import thaumcraft.api.wands.WandCap; import thaumcraft.api.wands.WandRod; import thaumcraft.common.config.ConfigItems; @@ -28,11 +31,15 @@ public class Lucrum { public static WandRod WAND_ROD_NEUTRONIUM; public static WandCap WAND_CAP_CRYSTAL; - public static void abracadabra(){ + public static void abracadabra() throws Compat.ItemNotFoundException { ULTRA_DEATH = new Aspect("terminus", 0xb90000, new Aspect[] { Aspect.GREED, Aspect.ELDRITCH }, new ResourceLocation("avaritia", "textures/misc/terminus.png"), 771); LudicrousItems.akashic_record = new ItemAkashicRecord(); GameRegistry.registerItem(LudicrousItems.akashic_record, "Akashic_Record"); + LudicrousItems.bigPearl = new ItemBigPearl(); + GameRegistry.registerItem(LudicrousItems.bigPearl, "big_pearl"); + + Grinder.catalyst.getInput().add(new ItemStack(LudicrousItems.bigPearl)); ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 1), new AspectList().add(ULTRA_DEATH, 1).add(Aspect.ENERGY, 8).add(Aspect.CRYSTAL, 32)); ThaumcraftApi.registerObjectTag(new ItemStack(LudicrousItems.resource, 1, 4), new AspectList().add(ULTRA_DEATH, 2).add(Aspect.METAL, 12).add(Aspect.ENERGY, 12)); @@ -75,6 +82,17 @@ public class Lucrum { 'N', new ItemStack(LudicrousItems.resource, 1, 4), 'X', new ItemStack(LudicrousBlocks.resource_block, 1, 1)); + //ResearchCategories.registerCategory("ASCENSION", new ResourceLocation("avaritia", "textures/misc/ascension.png"), new ResourceLocation("thaumcraft", "textures/gui/gui_researchbackeldritch.png")); + + Item eldritch = Compat.getItem("Thaumcraft", "ItemEldritchObject"); + Item resource = Compat.getItem("Thaumcraft", "ItemResource");//9 + + InfusionRecipe pearl_recipe = ThaumcraftApi.addInfusionCraftingRecipe("BIG_PEARL", new ItemStack(LudicrousItems.bigPearl), 12, (new AspectList()).add(Aspect.ELDRITCH, 64).add(Aspect.MAGIC, 64).add(Aspect.WATER, 64).add(Aspect.FIRE, 64).add(Aspect.EARTH, 64).add(Aspect.AIR, 64).add(Aspect.ORDER, 64).add(Aspect.ENTROPY, 64).add(ULTRA_DEATH, 32), new ItemStack(eldritch, 1, 3), new ItemStack[]{new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3), new ItemStack(eldritch, 1, 3)}); + (new LudicrousResearchItem("BIG_PEARL", "ELDRITCH", (new AspectList()).add(ULTRA_DEATH, 8).add(Aspect.MAGIC, 16), -1, 8, 5, new ItemStack(LudicrousItems.bigPearl))).setPages(new ResearchPage[]{new ResearchPage("avaritia.research_page.BIG_PEARL.1"), new ResearchPage(pearl_recipe)}).setParents(new String[]{"PRIMPEARL"}).setConcealed().setSecondary().registerResearchItem(); + + InfusionRecipe akashic_recipe = ThaumcraftApi.addInfusionCraftingRecipe("AKASHIC", new ItemStack(LudicrousItems.akashic_record), 12, (new AspectList()).add(Aspect.MIND, 64).add(Aspect.MAGIC, 64).add(ULTRA_DEATH, 32), new ItemStack(resource, 1, 9), new ItemStack[]{new ItemStack(LudicrousItems.resource, 1, 6), new ItemStack(LudicrousItems.resource, 1, 6), new ItemStack(LudicrousItems.resource, 1, 6), new ItemStack(LudicrousItems.resource, 1, 6)}); + (new LudicrousResearchItem("AKASHIC", "ELDRITCH", (new AspectList()).add(ULTRA_DEATH, 8).add(Aspect.MIND, 16), -3, 8, 5, new ItemStack(LudicrousItems.akashic_record))).setPages(new ResearchPage[]{new ResearchPage("avaritia.research_page.AKASHIC.1"), new ResearchPage(akashic_recipe)}).setParents(new String[]{"BIG_PEARL"}).setConcealed().setSecondary().registerResearchItem(); + if(Loader.isModLoaded("ThaumicTinkerer")) { try { boolean kami = Class.forName("thaumic.tinkerer.common.core.handler.ConfigHandler").getField("enableKami").getBoolean(null); diff --git a/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/LudicrousResearchItem.java b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/LudicrousResearchItem.java new file mode 100644 index 0000000..a911560 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/compat/thaumcraft/LudicrousResearchItem.java @@ -0,0 +1,34 @@ +package fox.spiteful.avaritia.compat.thaumcraft; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.research.ResearchItem; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class LudicrousResearchItem extends ResearchItem { + + public LudicrousResearchItem(String par1, String x) { + super(par1, x); + } + + public LudicrousResearchItem(String par1, String x, AspectList tags, int y, int z, int par5, ResourceLocation icon) { + super(par1, x, tags, y, z, par5, icon); + } + + public LudicrousResearchItem(String par1, String x, AspectList tags, int y, int z, int par5, ItemStack icon) { + super(par1, x, tags, y, z, par5, icon); + } + + @SideOnly(Side.CLIENT) + public String getName() { + return StatCollector.translateToLocal("avaritia.research_name." + key); + } + + @SideOnly(Side.CLIENT) + public String getText() { + return "[AV] " + StatCollector.translateToLocal("avaritia.research_text." + key); + } +} \ No newline at end of file diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java index ac4e062..755dced 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -3,6 +3,7 @@ package fox.spiteful.avaritia.items; import com.google.common.collect.Multimap; import fox.spiteful.avaritia.Avaritia; import fox.spiteful.avaritia.LudicrousText; +import fox.spiteful.avaritia.compat.Belmont; import fox.spiteful.avaritia.compat.Compat; import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.render.ICosmicRenderItem; diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java b/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java index 291460d..3248120 100644 --- a/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java +++ b/src/main/java/fox/spiteful/avaritia/items/ItemMorvInABox.java @@ -6,10 +6,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import fox.spiteful.avaritia.Avaritia; -import fox.spiteful.avaritia.Lumberjack; -import fox.spiteful.avaritia.compat.botania.alfheim.ApocalypseCloudRenderer; -import fox.spiteful.avaritia.compat.botania.alfheim.ApocalypseSkyRenderer; -import fox.spiteful.avaritia.compat.botania.alfheim.TeleportHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -45,24 +41,4 @@ public class ItemMorvInABox extends Item { this.nameoverlay = ir.registerIcon("avaritia:morvinabox2"); } - @Override - public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) - { - /*//if (world.isRemote) { - Lumberjack.info("DESTROY SPACE"); - WorldProvider p = world.provider;//DimensionManager.getProvider(0); - Lumberjack.info(p); - p.setSkyRenderer(new ApocalypseSkyRenderer()); - p.setCloudRenderer(new ApocalypseCloudRenderer()); - Lumberjack.info(p.getCloudRenderer()); - //}*/ - /*if (DimensionManager.getWorld(0) == world) { - player.travelToDimension(13); - } else { - player.travelToDimension(0); - }*/ - - TeleportHelper.travelToOrFromAlfheim(player); - return stack; - } } diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index d63ea67..ae30e50 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -67,6 +67,7 @@ public class LudicrousItems { public static Item armok_orb; public static Item combs; public static Item beesource; + public static Item bigPearl; @@ -90,7 +91,8 @@ public class LudicrousItems { infinity_armor = register(new ItemArmorInfinity(1), "Infinity_Chest"); infinity_pants = register(new ItemArmorInfinity(2), "Infinity_Pants"); infinity_shoes = register(new ItemArmorInfinity(3), "Infinity_Shoes"); - fractured_ore = register(new ItemFracturedOre(), "Fractured_Ore"); + if(Config.fractured) + fractured_ore = register(new ItemFracturedOre(), "Fractured_Ore"); matter_cluster = register(new ItemMatterCluster(), "Matter_Cluster"); infinity_bow = register(new ItemBowInfinity(), "Infinity_Bow"); infinity_shovel = register(new ItemShovelInfinity(), "Infinity_Shovel"); diff --git a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java index e7bcdcd..7b480cf 100644 --- a/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java +++ b/src/main/java/fox/spiteful/avaritia/items/tools/ItemSwordInfinity.java @@ -7,6 +7,7 @@ import fox.spiteful.avaritia.Avaritia; import fox.spiteful.avaritia.DamageSourceInfinitySword; import fox.spiteful.avaritia.Lumberjack; import fox.spiteful.avaritia.achievements.Achievements; +import fox.spiteful.avaritia.compat.Belmont; import fox.spiteful.avaritia.entity.EntityImmortalItem; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.render.ICosmicRenderItem; @@ -57,7 +58,10 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem { if(victim instanceof EntityPlayer){ EntityPlayer pvp = (EntityPlayer)victim; if(LudicrousItems.isInfinite(pvp)){ - victim.attackEntityFrom(new DamageSourceInfinitySword(player).setDamageBypassesArmor(), 4.0F); + if(Belmont.isVampire(pvp)) + victim.attackEntityFrom(new DamageSourceInfinitySword(player).setFireDamage().setDamageBypassesArmor(), 4.0F); + else + victim.attackEntityFrom(new DamageSourceInfinitySword(player).setDamageBypassesArmor(), 4.0F); return true; } if(pvp.getHeldItem() != null && pvp.getHeldItem().getItem() == LudicrousItems.infinity_sword && pvp.isUsingItem()) @@ -72,7 +76,10 @@ public class ItemSwordInfinity extends ItemSword implements ICosmicRenderItem { } victim.func_110142_aN().func_94547_a(new DamageSourceInfinitySword(player), victim.getHealth(), victim.getHealth()); victim.setHealth(0); - victim.onDeath(new EntityDamageSource("infinity", player)); + if(Belmont.isVampire(victim)) + victim.onDeath(new EntityDamageSource("infinity", player).setFireDamage()); + else + victim.onDeath(new EntityDamageSource("infinity", player)); return true; } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index cdbbbdd..ce3cf68 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -42,6 +42,7 @@ item.avaritia.comb.nerfed.name=Nerfed Comb item.avaritia.comb.cosmic.name=Cosmic Comb item.avaritia_beesource.infinity_drop.name=Infinity Drop item.avaritia_beesource.dust.name=Dust +item.extremely_primordial_pearl.name=Extremely Primordial Pearl # # Blocks tile.compressed_workbench.name=Compressed Crafting Table @@ -119,15 +120,15 @@ avaritia.flower.asgardandelion.name=Asgardandelion tile.botania:flower.asgardandelion.name=Asgardandelion tile.avaritia.flower.asgardandelion.lore=Watered with Vazkii's tears :c avaritia.lexicon.asgardandelion=Asgardandelion -avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a never-ending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reckoning.
&oStill not a SAO reference.&r +avaritia.lexicon.asgardandelion.0=Rumors abound about some kind of godlike flower that can produce a never-ending torrent of mana. If such a mythical flower were to exist, it would probably require wealth and resources beyond mortal reckoning.
&oStill not a SAO reference.&r avaritia.lexicon.infinitato=Infinitato -avaritia.lexicon.infinitato.0=Imprinting the essence of everything onto objects can have interesting results, and the Infinitato is no exception.
Somewhat larger than its tiny sibling, and infused with the can-do attitude of a whole crowd of &1Tiny Potatoes&0 plus an &1Infinity Catalyst&0, the &1Infinitato&0 believes that you can do all the things, forever. +avaritia.lexicon.infinitato.0=Imprinting the essence of everything onto objects can have interesting results, and the Infinitato is no exception.
Somewhat larger than its tiny sibling, and infused with the can-do attitude of a whole crowd of &1Tiny Potatoes&0 plus an &1Infinity Catalyst&0, the &1Infinitato&0 believes that you can do all the things, forever. avaritia.lexicon.infinitato.1=Trust me, &oit'll fit.&r avaritia.flower.soarleander.name=Soarleander tile.botania:flower.soarleander.name=Soarleander tile.avaritia.flower.soarleander.lore=Just hook it up to my &oveeeeins!&r avaritia.lexicon.soarleander=Soarleander -avaritia.lexicon.soarleander.0=If you have a surfeit of chicken or chicken by-products, look no further!
The Soarleander will devour any and all things chicken in the vicinity (chickens themselves included) while remaining totally disinterested in everything else. +avaritia.lexicon.soarleander.0=If you have a surfeit of chicken or chicken by-products, look no further!
The Soarleander will devour any and all things chicken in the vicinity (chickens themselves included) while remaining totally disinterested in everything else. avaritia.lexicon.soarleander.1=&oAny random chests are an unintended side-effect.&r # # Thaumcraft @@ -162,4 +163,12 @@ classification.infinite=Infinite classification.infinite.desc=They gather pranic energy from the hidden ley-lines and arcane geometries of the universe itself. avaritia.allele.speedNerfed=Nerfed -avaritia.allele.lifespanArtificial=Artificial \ No newline at end of file +avaritia.allele.lifespanArtificial=Artificial +# +# Research +avaritia.research_name.BIG_PEARL=Extremely Primordial Pearl +avaritia.research_text.BIG_PEARL=Because you can always have more +avaritia.research_page.BIG_PEARL.1=Sure, the Primordial Pearl is pretty potent, but you think it could be even MORE potent.

By smashing several primordial pearls together in an arcane infusion, you create an even more potent item: The Extremely Primordial Pearl.

It's guaranteed to be even more primordial than a regular primordial pearl! +avaritia.research_name.AKASHIC=Akashic Records +avaritia.research_text.AKASHIC=More knowledge than you'll need +avaritia.research_page.AKASHIC.1=You've researched enough of the world to crack the fabric of reality and enter the Outer Realms, but surely there's always room for MORE research, right?

The Akashic Records will give you all the research points in the world and then a little more. \ No newline at end of file diff --git a/src/main/resources/assets/avaritia/textures/items/big_pearl.png b/src/main/resources/assets/avaritia/textures/items/big_pearl.png new file mode 100644 index 0000000000000000000000000000000000000000..cc2e853d0e5874cf6c6bb19cba5c7c4a020d2447 GIT binary patch literal 3044 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 R2)6(L002ovPDHLkV1i$x)4Biv literal 0 HcmV?d00001