mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-17 19:05:16 +00:00
Worldshaper's Sextant
This commit is contained in:
1 parent
c7076f8be9
commit
1c31f1166f
11 files changed
+260
-4
No files matched your search
@@ -38,6 +38,6 @@ public class MultiblockSet {
|
||||
}
|
||||
|
||||
public Multiblock getForIndex(int index) {
|
||||
return mbs[index];
|
||||
return mbs[Math.min(mbs.length - 1, index)];
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [01/11/2015, 19:05:57 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.api.lexicon.multiblock.component;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
/**
|
||||
* A multiblock component that matches any non air blocks that have a collision box.
|
||||
*/
|
||||
public class AnyComponent extends MultiblockComponent {
|
||||
|
||||
public AnyComponent(ChunkCoordinates relPos, Block block, int meta) {
|
||||
super(relPos, block, meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean matches(World world, int x, int y, int z) {
|
||||
Block block = world.getBlock(x, y, z);
|
||||
return !block.isAir(world, x, y, z) && block.getCollisionBoundingBoxFromPool(world, x, y, z) != null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
@API(owner = "Botania", apiVersion = "66", provides = "BotaniaAPI")
|
||||
@API(owner = "Botania", apiVersion = "67", provides = "BotaniaAPI")
|
||||
package vazkii.botania.api;
|
||||
import cpw.mods.fml.common.API;
|
||||
|
||||
@@ -57,6 +57,7 @@ import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
|
||||
import vazkii.botania.common.block.tile.mana.TilePool;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.item.ItemCraftingHalo;
|
||||
import vazkii.botania.common.item.ItemSextant;
|
||||
import vazkii.botania.common.item.ItemTwigWand;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
|
||||
@@ -139,6 +140,12 @@ public final class HUDHandler {
|
||||
ItemCraftingHalo.renderHUD(event.resolution, mc.thePlayer, equippedStack);
|
||||
profiler.endSection();
|
||||
}
|
||||
|
||||
if(equippedStack != null && equippedStack.getItem() instanceof ItemSextant) {
|
||||
profiler.startSection("craftingHalo");
|
||||
ItemSextant.renderHUD(event.resolution, mc.thePlayer, equippedStack);
|
||||
profiler.endSection();
|
||||
}
|
||||
|
||||
/*if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) {
|
||||
profiler.startSection("flugelEye");
|
||||
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemRecord;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntitySkull;
|
||||
import net.minecraft.util.ChunkCoordinates;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldSettings.GameType;
|
||||
@@ -35,6 +36,9 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import vazkii.botania.api.item.IExtendedPlayerController;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
|
||||
import vazkii.botania.api.lexicon.multiblock.Multiblock;
|
||||
import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
|
||||
import vazkii.botania.api.lexicon.multiblock.component.AnyComponent;
|
||||
import vazkii.botania.api.wiki.IWikiProvider;
|
||||
import vazkii.botania.api.wiki.WikiHooks;
|
||||
import vazkii.botania.client.challenge.ModChallenges;
|
||||
@@ -148,6 +152,7 @@ import vazkii.botania.common.block.tile.mana.TilePump;
|
||||
import vazkii.botania.common.block.tile.mana.TileSpreader;
|
||||
import vazkii.botania.common.block.tile.string.TileRedString;
|
||||
import vazkii.botania.common.core.handler.ConfigHandler;
|
||||
import vazkii.botania.common.core.helper.MathHelper;
|
||||
import vazkii.botania.common.core.helper.Vector3;
|
||||
import vazkii.botania.common.core.proxy.CommonProxy;
|
||||
import vazkii.botania.common.core.version.VersionChecker;
|
||||
@@ -163,6 +168,7 @@ import vazkii.botania.common.entity.EntitySpark;
|
||||
import vazkii.botania.common.entity.EntityThornChakram;
|
||||
import vazkii.botania.common.entity.EntityVineBall;
|
||||
import vazkii.botania.common.item.ModItems;
|
||||
import vazkii.botania.common.item.ItemSextant.MultiblockSextant;
|
||||
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
|
||||
import vazkii.botania.common.lib.LibObfuscation;
|
||||
import cpw.mods.fml.client.registry.ClientRegistry;
|
||||
@@ -419,6 +425,33 @@ public class ClientProxy extends CommonProxy {
|
||||
public long getWorldElapsedTicks() {
|
||||
return ClientTickHandler.ticksInGame;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {
|
||||
MultiblockSextant mb = new MultiblockSextant();
|
||||
|
||||
int iradius = (int) radius + 1;
|
||||
for(int i = 0; i < iradius * 2 + 1; i++)
|
||||
for(int j = 0; j < iradius * 2 + 1; j++) {
|
||||
int xp = x + i - iradius;
|
||||
int zp = z + j - iradius;
|
||||
if((int) Math.floor(MathHelper.pointDistancePlane(xp, zp, x, z)) == (iradius - 1))
|
||||
mb.addComponent(new AnyComponent(new ChunkCoordinates(xp - x, 1, zp - z), block, 0));
|
||||
}
|
||||
|
||||
MultiblockRenderHandler.setMultiblock(mb.makeSet());
|
||||
MultiblockRenderHandler.anchor = new ChunkCoordinates(x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void removeSextantMultiblock() {
|
||||
MultiblockSet set = MultiblockRenderHandler.currentMultiblock;
|
||||
if(set != null) {
|
||||
Multiblock mb = set.getForIndex(0);
|
||||
if(mb instanceof MultiblockSextant)
|
||||
MultiblockRenderHandler.setMultiblock(null);
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean noclipEnabled = false;
|
||||
private static boolean corruptSparkle = false;
|
||||
|
||||
@@ -117,6 +117,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
|
||||
addBlock(ModBlocks.cocoon);
|
||||
addBlock(ModBlocks.teruTeruBozu);
|
||||
addItem(ModItems.slimeBottle);
|
||||
addItem(ModItems.sextant);
|
||||
addItem(ModItems.blackHoleTalisman);
|
||||
|
||||
if(Botania.gardenOfGlassLoaded) {
|
||||
|
||||
@@ -192,7 +192,7 @@ public class CommonProxy {
|
||||
public void setLexiconStack(ItemStack stack) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
|
||||
public boolean isTheClientPlayer(EntityLivingBase entity) {
|
||||
return false;
|
||||
}
|
||||
@@ -214,6 +214,14 @@ public class CommonProxy {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public void removeSextantMultiblock() {
|
||||
// NO-OP
|
||||
}
|
||||
|
||||
public long getWorldElapsedTicks() {
|
||||
return MinecraftServer.getServer().worldServers[0].getTotalWorldTime();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,171 @@
|
||||
/**
|
||||
* This class was created by <Vazkii>. It's distributed as
|
||||
* part of the Botania Mod. Get the Source Code in github:
|
||||
* https://github.com/Vazkii/Botania
|
||||
*
|
||||
* Botania is Open Source and distributed under the
|
||||
* Botania License: http://botaniamod.net/license.php
|
||||
*
|
||||
* File Created @ [01/11/2015, 18:25:54 (GMT)]
|
||||
*/
|
||||
package vazkii.botania.common.item;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.FontRenderer;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import vazkii.botania.api.lexicon.multiblock.Multiblock;
|
||||
import vazkii.botania.common.Botania;
|
||||
import vazkii.botania.common.core.helper.ItemNBTHelper;
|
||||
import vazkii.botania.common.core.helper.MathHelper;
|
||||
import vazkii.botania.common.item.equipment.tool.ToolCommons;
|
||||
import vazkii.botania.common.lib.LibItemNames;
|
||||
import codechicken.lib.vec.Vector3;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemSextant extends ItemMod {
|
||||
|
||||
private static final String TAG_SOURCE_X = "sourceX";
|
||||
private static final String TAG_SOURCE_Y = "sourceY";
|
||||
private static final String TAG_SOURCE_Z = "sourceZ";
|
||||
|
||||
public ItemSextant() {
|
||||
setUnlocalizedName(LibItemNames.SEXTANT);
|
||||
setMaxStackSize(1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public EnumAction getItemUseAction(ItemStack par1ItemStack) {
|
||||
return EnumAction.bow;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxItemUseDuration(ItemStack par1ItemStack) {
|
||||
return 72000;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUsingTick(ItemStack stack, EntityPlayer player, int count) {
|
||||
if(getMaxItemUseDuration(stack) - count < 10)
|
||||
return;
|
||||
|
||||
int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0);
|
||||
int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1);
|
||||
int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0);
|
||||
if(y != -1) {
|
||||
World world = player.worldObj;
|
||||
Vector3 source = new Vector3(x, y, z);
|
||||
|
||||
double radius = calculateRadius(stack, player);
|
||||
|
||||
if(count % 10 == 0)
|
||||
for(int i = 0; i < 360; i++) {
|
||||
float radian = (float) ((double) i * Math.PI / 180);
|
||||
double xp = x + Math.cos(radian) * radius;
|
||||
double zp = z + Math.sin(radian) * radius;
|
||||
Botania.proxy.wispFX(world, xp + 0.5, source.y + 1, zp + 0.5, 0F, 1F, 1F, 0.3F, -0.01F);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int time) {
|
||||
double radius = calculateRadius(stack, player);
|
||||
if(radius > 1) {
|
||||
int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0);
|
||||
int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1);
|
||||
int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0);
|
||||
if(y != -1)
|
||||
Botania.proxy.setMultiblock(world, x, y, z, radius, Blocks.cobblestone);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
|
||||
Botania.proxy.removeSextantMultiblock();
|
||||
|
||||
if(!par3EntityPlayer.isSneaking()) {
|
||||
MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128);
|
||||
if(pos != null && pos.entityHit == null) {
|
||||
if(!par2World.isRemote) {
|
||||
ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.blockX);
|
||||
ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.blockY);
|
||||
ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.blockZ);
|
||||
}
|
||||
} else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1);
|
||||
|
||||
par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
|
||||
}
|
||||
|
||||
return par1ItemStack;
|
||||
}
|
||||
|
||||
public static double calculateRadius(ItemStack stack, EntityPlayer player) {
|
||||
int x = ItemNBTHelper.getInt(stack, TAG_SOURCE_X, 0);
|
||||
int y = ItemNBTHelper.getInt(stack, TAG_SOURCE_Y, -1);
|
||||
int z = ItemNBTHelper.getInt(stack, TAG_SOURCE_Z, 0);
|
||||
World world = player.worldObj;
|
||||
Vector3 source = new Vector3(x, y, z);
|
||||
Botania.proxy.wispFX(world, source.x + 0.5, source.y + 1, source.z + 0.5, 1F, 0F, 0F, 0.2F, -0.1F);
|
||||
|
||||
Vector3 centerVec = Vector3.fromEntityCenter(player);
|
||||
Vector3 diffVec = source.copy().subtract(centerVec);
|
||||
Vector3 lookVec = new Vector3(player.getLookVec());
|
||||
double mul = diffVec.y / lookVec.y;
|
||||
lookVec.multiply(mul).add(centerVec);
|
||||
|
||||
lookVec.x = net.minecraft.util.MathHelper.floor_double(lookVec.x);
|
||||
lookVec.z = net.minecraft.util.MathHelper.floor_double(lookVec.z);
|
||||
|
||||
return MathHelper.pointDistancePlane(source.x, source.z, lookVec.x, lookVec.z);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public static void renderHUD(ScaledResolution resolution, EntityPlayer player, ItemStack stack) {
|
||||
ItemStack onUse = player.getItemInUse();
|
||||
int time = player.getItemInUseCount();
|
||||
|
||||
if(onUse == stack && stack.getItem().getMaxItemUseDuration(stack) - time >= 10) {
|
||||
double radius = calculateRadius(stack, player);
|
||||
FontRenderer font = Minecraft.getMinecraft().fontRenderer;
|
||||
int x = resolution.getScaledWidth() / 2 + 30;
|
||||
int y = resolution.getScaledHeight() / 2;
|
||||
|
||||
String s = "" + (int) radius;
|
||||
font.drawStringWithShadow(s, x - font.getStringWidth(s) / 2, y - 4, 0xFFFFFF);
|
||||
|
||||
if(radius > 0) {
|
||||
radius += 4;
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
GL11.glLineWidth(3F);
|
||||
GL11.glBegin(GL11.GL_LINE_STRIP);
|
||||
GL11.glColor4f(0F, 1F, 1F, 1F);
|
||||
for(int i = 0; i < 361; i++) {
|
||||
float radian = (float) ((double) i * Math.PI / 180);
|
||||
double xp = x + Math.cos(radian) * radius;
|
||||
double yp = y + Math.sin(radian) * radius;
|
||||
GL11.glVertex2d(xp, yp);
|
||||
}
|
||||
GL11.glEnd();
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static class MultiblockSextant extends Multiblock {
|
||||
|
||||
@Override
|
||||
public Multiblock[] createRotations() {
|
||||
return new Multiblock[] { this };
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -265,6 +265,7 @@ public final class ModItems {
|
||||
public static Item manaweaveBoots;
|
||||
public static Item autocraftingHalo;
|
||||
public static Item gaiaHead;
|
||||
public static Item sextant;
|
||||
|
||||
public static void init() {
|
||||
lexicon = new ItemLexicon();
|
||||
@@ -412,7 +413,8 @@ public final class ModItems {
|
||||
manaweaveBoots = new ItemManaweaveBoots();
|
||||
autocraftingHalo = new ItemAutocraftingHalo();
|
||||
gaiaHead = new ItemGaiaHead();
|
||||
|
||||
sextant = new ItemSextant();
|
||||
|
||||
OreDictionary.registerOre(LibOreDict.LEXICON, lexicon);
|
||||
for(int i = 0; i < 16; i++) {
|
||||
OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i));
|
||||
|
||||
@@ -158,6 +158,7 @@ public final class LibItemNames {
|
||||
public static final String MANAWEAVE_BOOTS = "manaweaveBoots";
|
||||
public static final String AUTOCRAFTING_HALO = "autocraftingHalo";
|
||||
public static final String GAIA_HEAD = "gaiaHead";
|
||||
public static final String SEXTANT = "sextant";
|
||||
|
||||
public static final String[] LENS_NAMES = new String[] {
|
||||
"lensNormal",
|
||||
|
||||
Reference in new issue
Block a user