diff --git a/misc/Gadomancy_Icon.psd b/misc/Gadomancy_Icon.psd new file mode 100644 index 0000000..ec024b7 Binary files /dev/null and b/misc/Gadomancy_Icon.psd differ diff --git a/misc/Gadomancy_icon.png b/misc/Gadomancy_icon.png new file mode 100644 index 0000000..49d88cc Binary files /dev/null and b/misc/Gadomancy_icon.png differ diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 5640b2f..6ec3042 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -9,14 +9,17 @@ import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.client.gui.InfusionClawGui; import makeo.gadomancy.client.renderers.block.RenderBlockTransparent; import makeo.gadomancy.client.renderers.entity.RenderAdditionalGolemBase; +import makeo.gadomancy.client.renderers.item.ItemExNodeRenderer; import makeo.gadomancy.client.renderers.item.ItemRenderRemoteJar; import makeo.gadomancy.client.renderers.item.ItemRenderTileEntity; import makeo.gadomancy.client.renderers.tile.RenderTileArcaneDropper; +import makeo.gadomancy.client.renderers.tile.RenderTileExtendedNode; import makeo.gadomancy.client.renderers.tile.RenderTileInfusionClaw; 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.TileArcaneDropper; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; @@ -70,6 +73,9 @@ public class ClientProxy extends CommonProxy { RenderTileInfusionClaw renderTileInfusionClaw = new RenderTileInfusionClaw(); ClientRegistry.bindTileEntitySpecialRenderer(TileInfusionClaw.class, renderTileInfusionClaw); + RenderTileExtendedNode nodeRenderer = new RenderTileExtendedNode(); + ClientRegistry.bindTileEntitySpecialRenderer(TileExtendedNode.class, nodeRenderer); + //Items TileArcaneDropper fakeTile = new TileArcaneDropper(); fakeTile.blockMetadata = 8 | ForgeDirection.SOUTH.ordinal(); @@ -77,6 +83,8 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockInfusionClaw), new ItemRenderTileEntity(renderTileInfusionClaw, new TileInfusionClaw())); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockNode), new ItemExNodeRenderer()); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(RegisteredBlocks.blockRemoteJar), new ItemRenderRemoteJar(renderTileRemoteJar)); //Blocks diff --git a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java index 23c0c24..ac5fcf6 100644 --- a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java +++ b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java @@ -22,7 +22,7 @@ import java.util.Map; * Created by makeo @ 03.10.2015 12:09 */ public class ResourceReloadListener implements IResourceManagerReloadListener { - private Map languageList; + public static Map languageList; public ResourceReloadListener() { Injector instance = new Injector(new Injector(StringTranslate.class) diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java new file mode 100644 index 0000000..6b4ebed --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java @@ -0,0 +1,31 @@ +package makeo.gadomancy.client.renderers.item; + +import makeo.gadomancy.common.registration.RegisteredBlocks; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import thaumcraft.client.renderers.tile.ItemNodeRenderer; +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by HellFirePvP @ 22.10.2015 20:11 + */ +public class ItemExNodeRenderer extends ItemNodeRenderer { + + public ItemExNodeRenderer() { + //AspectList list = new AspectList().add(Aspect.FIRE, 100).add(Aspect.ENTROPY, 100).add(Aspect.WATER, 50); + //new Injector(this).setField("aspects", list); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) { + return (item != null) && (item.getItem() == Item.getItemFromBlock(RegisteredBlocks.blockNode)) && (item.getItemDamage() == 0); + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) { + return helper != ItemRendererHelper.EQUIPPED_BLOCK; + } +} diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java index d13654b..2d2f4c5 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java @@ -8,6 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.src.FMLRenderAccessLibrary; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.blocks.ItemJarFilled; +import thaumcraft.common.config.ConfigItems; /** * This class is part of the Gadomancy Mod @@ -26,6 +29,15 @@ public class ItemRenderRemoteJar extends ItemRenderTileEntity { public void renderItem(IItemRenderer.ItemRenderType type, ItemStack stack, Object... data) { GL11.glEnable(GL11.GL_ALPHA_TEST); + AspectList aspects = ((ItemJarFilled)ConfigItems.itemJarFilled).getAspects(stack); + if(aspects != null) { + tile.aspect = aspects.getAspects()[0]; + tile.amount = aspects.getAmount(tile.aspect); + } else { + tile.aspect = null; + tile.amount = 0; + } + super.renderItem(type, stack, data); GL11.glPushMatrix(); diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java new file mode 100644 index 0000000..c8293aa --- /dev/null +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java @@ -0,0 +1,20 @@ +package makeo.gadomancy.client.renderers.tile; + +import net.minecraft.tileentity.TileEntity; +import thaumcraft.client.renderers.tile.TileNodeRenderer; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by HellFirePvP @ 22.10.2015 19:44 + */ +public class RenderTileExtendedNode extends TileNodeRenderer { + + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partialTicks) { + super.renderTileEntityAt(tile, x, y, z, partialTicks); + } +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java new file mode 100644 index 0000000..22784d1 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java @@ -0,0 +1,29 @@ +package makeo.gadomancy.common.blocks; + +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.registration.RegisteredItems; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + * + * Created by HellFirePvP @ 22.10.2015 19:47 + */ +public class BlockNode extends thaumcraft.common.blocks.BlockAiry { + //We overwrite and use the TC class for visual effects and world interact handling. + //This way our node behaves like TC ones. + + public BlockNode() { + super(); + setCreativeTab(RegisteredItems.creativeTab); + } + + @Override + public TileEntity createTileEntity(World world, int metadata) { + return new TileExtendedNode(); + } +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java index 0f1606f..fd60748 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java @@ -2,17 +2,22 @@ package makeo.gadomancy.common.blocks; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.NBTHelper; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import thaumcraft.common.blocks.BlockJar; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.tiles.TileJarFillable; +import java.util.ArrayList; import java.util.List; /** @@ -48,6 +53,23 @@ public class BlockRemoteJar extends BlockJar { this.iconJarBottom = ir.registerIcon(Gadomancy.MODID + ":transparent"); } + @Override + public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { + ArrayList drops = super.getDrops(world, x, y, z, metadata, fortune); + + for(ItemStack drop : drops) { + if(drop.getItem() == ConfigItems.itemJarFilled || drop.getItem() == Item.getItemFromBlock(this)) { + drop.func_150996_a(Item.getItemFromBlock(this)); + + TileRemoteJar tile = getJarTile(world, x, y, z); + if(tile.networkId != null) { + NBTHelper.setUUID(NBTHelper.getData(drop), "networkId", tile.networkId); + } + } + } + return drops; + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float these, float are, float variables) { ItemStack heldItem = player.getHeldItem(); @@ -59,4 +81,20 @@ public class BlockRemoteJar extends BlockJar { } return super.onBlockActivated(world, x, y, z, player, side, these, are, variables); } + + public static TileRemoteJar getJarTile(TileEntity tile) { + if (tile != null) { + if (tile instanceof TileRemoteJar) { + return (TileRemoteJar) tile; + } + if (tile instanceof TileStickyJar && ((TileStickyJar) tile).getParent() instanceof TileRemoteJar) { + return (TileRemoteJar) ((TileStickyJar) tile).getParent(); + } + } + return null; + } + + public static TileRemoteJar getJarTile(World world, int x, int y, int z) { + return getJarTile(world.getTileEntity(x, y, z)); + } } diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java index 8899a92..4b8ac55 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java @@ -143,6 +143,7 @@ public class BlockStickyJar extends BlockJar implements IBlockTransparent { if (tile instanceof TileStickyJar) { ItemStack stack = ((TileStickyJar) tile).getParentBlock().getPickBlock(target, world, x, y, z, player); NBTHelper.getData(stack).setBoolean("isStickyJar", true); + return stack; } return null; } diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java new file mode 100644 index 0000000..4ca3ef5 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -0,0 +1,42 @@ +package makeo.gadomancy.common.blocks.tiles; + +import net.minecraft.nbt.NBTTagCompound; +import thaumcraft.common.tiles.TileNode; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + * + * Created by HellFirePvP @ 21.10.2015 23:39 + */ +public class TileExtendedNode extends TileNode { + + private boolean growing = false; + + @Override + public void updateEntity() { + super.updateEntity(); + } + + @Override + public void readCustomNBT(NBTTagCompound nbttagcompound) { + super.readCustomNBT(nbttagcompound); + + NBTTagCompound compound = nbttagcompound.getCompoundTag("Gadomancy"); + this.growing = compound.getBoolean("growing"); + + } + + @Override + public void writeCustomNBT(NBTTagCompound nbttagcompound) { + super.writeCustomNBT(nbttagcompound); + + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("growing", growing); + + nbttagcompound.setTag("Gadomancy", compound); + } + +} diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java index 476de44..5707588 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -1,5 +1,8 @@ package makeo.gadomancy.common.blocks.tiles; +import makeo.gadomancy.common.utils.NBTHelper; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; import thaumcraft.common.tiles.TileJarFillable; import java.util.*; @@ -20,54 +23,84 @@ public class TileRemoteJar extends TileJarFillable { @Override public void updateEntity() { super.updateEntity(); - if (count % 5 == 0 && !getWorldObj().isRemote && networkId != null && amount < maxAmount) { + if (count % 3 == 0 && !getWorldObj().isRemote && networkId != null && amount < maxAmount) { count = 0; - boolean containsThis = false; + JarNetwork network = getNetwork(networkId); - List network = getNetwork(networkId); - - Collections.sort(network, new Comparator() { - @Override - public int compare(TileRemoteJar o1, TileRemoteJar o2) { - return o2.amount - o1.amount; - } - }); - - for(int i = 0; i < network.size(); i++) { - TileRemoteJar jar = network.get(i); - - if(jar == this) { - containsThis = true; - continue; - } - - if(jar.isInvalid()) { - network.remove(i); - i--; - continue; - } - - if((amount+1) < jar.amount && this.addToContainer(jar.aspect, 1) == 0) { - jar.takeFromContainer(jar.aspect, 1); - break; - } + if(!network.jars.contains(this)) { + network.jars.add(this); } - if(!containsThis) { - network.add(this); - } + network.update(); } count++; } - private static Map> networks = new HashMap>(); + @Override + public void readCustomNBT(NBTTagCompound compound) { + super.readCustomNBT(compound); - private static List getNetwork(UUID id) { - List network = networks.get(id); + networkId = NBTHelper.getUUID(compound, "networkId"); + } + + @Override + public void writeCustomNBT(NBTTagCompound compound) { + super.writeCustomNBT(compound); + + if(networkId != null) { + NBTHelper.setUUID(compound, "networkId", networkId); + } + } + + private static Map networks = new HashMap(); + + private static class JarNetwork { + private long lastTime = 0; + private List jars = new ArrayList(); + + private void update() { + long time = MinecraftServer.getServer().getEntityWorld().getTotalWorldTime(); + if(time > lastTime) { + if(jars.size() > 1) { + Collections.sort(jars, new Comparator() { + @Override + public int compare(TileRemoteJar o1, TileRemoteJar o2) { + return o2.amount - o1.amount; + } + }); + + TileRemoteJar jar1 = jars.get(0); + if(!isValid(jar1)) { + jars.remove(0); + return; + } + + TileRemoteJar jar2 = jars.get(jars.size() - 1); + if(!isValid(jar2)) { + jars.remove(jars.size() - 1); + return; + } + + if((jar2.amount+1) < jar1.amount && jar2.addToContainer(jar1.aspect, 1) == 0) { + jar1.takeFromContainer(jar1.aspect, 1); + } + } + lastTime = time + 3; + } + } + + private static boolean isValid(TileRemoteJar jar) { + return jar != null && jar.getWorldObj() != null && !jar.isInvalid() + && jar.getWorldObj().blockExists(jar.xCoord, jar.yCoord, jar.zCoord); + } + } + + private static JarNetwork getNetwork(UUID id) { + JarNetwork network = networks.get(id); if(network == null) { - network = new ArrayList(); + network = new JarNetwork(); networks.put(id, network); } return network; diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index 1d4621d..90a632d 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -103,7 +103,7 @@ public class EventHandlerWorld { public void on(ItemTooltipEvent e) { if(e.toolTip.size() > 0 && e.itemStack.hasTagCompound()) { if(e.itemStack.stackTagCompound.getBoolean("isStickyJar")) { - e.toolTip.add(1, "§a" + StatCollector.translateToLocal("gadomancy.lore.stickyjar")); + e.toolTip.add(1, "\u00a7a" + StatCollector.translateToLocal("gadomancy.lore.stickyjar")); } } } diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java index 4d52669..6bc7a74 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/IntegrationWaila.java @@ -1,6 +1,7 @@ package makeo.gadomancy.common.integration.waila; import makeo.gadomancy.common.blocks.BlockInfusionClaw; +import makeo.gadomancy.common.blocks.BlockRemoteJar; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.integration.IntegrationMod; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -33,5 +34,6 @@ public class IntegrationWaila extends IntegrationMod { registrar.registerTailProvider(new AdvancedGolemProvider(), EntityGolemBase.class); registrar.registerBodyProvider(new InfusionClawProvider(), BlockInfusionClaw.class); + registrar.registerBodyProvider(new RemoteJarProvider(), BlockRemoteJar.class); } } diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java new file mode 100644 index 0000000..8e98916 --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java @@ -0,0 +1,56 @@ +package makeo.gadomancy.common.integration.waila; + +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.items.ItemBlockRemoteJar; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; + +import java.util.List; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 20.10.2015 22:17 + */ +public class RemoteJarProvider implements IWailaDataProvider { + @Override + public ItemStack getWailaStack(IWailaDataAccessor dataAccessor, IWailaConfigHandler iWailaConfigHandler) { + return null; + } + + @Override + public List getWailaHead(ItemStack stack, List strings, IWailaDataAccessor dataAccessor, IWailaConfigHandler iWailaConfigHandler) { + return null; + } + + @Override + public List getWailaBody(ItemStack stack, List strings, IWailaDataAccessor dataAccessor, IWailaConfigHandler iWailaConfigHandler) { + TileRemoteJar tile = BlockRemoteJar.getJarTile(dataAccessor.getTileEntity()); + if(tile.networkId != null) { + strings.add(String.format(StatCollector.translateToLocal("gadomancy.lore.remotejar"), ItemBlockRemoteJar.generateName(tile.networkId))); + } + return strings; + } + + @Override + public List getWailaTail(ItemStack stack, List strings, IWailaDataAccessor dataAccessor, IWailaConfigHandler iWailaConfigHandler) { + return null; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP entityPlayerMP, TileEntity tileEntity, NBTTagCompound compound, World world, int i, int i2, int i3) { + return null; + } +} diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java new file mode 100644 index 0000000..a14817b --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java @@ -0,0 +1,152 @@ +package makeo.gadomancy.common.items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.events.ResourceReloadListener; +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.NBTHelper; +import makeo.gadomancy.common.utils.StringHelper; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.blocks.ItemJarFilled; +import thaumcraft.common.config.ConfigItems; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.UUID; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + * + * Created by makeo @ 14.10.2015 17:51 + */ +public class ItemBlockRemoteJar extends ItemBlock { + public ItemBlockRemoteJar() { + super(RegisteredBlocks.blockRemoteJar); + } + + public ItemBlockRemoteJar(Block block) { + super(block); + } + + @Override + public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { + return super.onItemRightClick(p_77659_1_, p_77659_2_, p_77659_3_); + } + + @Override + public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) { + return super.onItemUse(p_77648_1_, p_77648_2_, p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_8_, p_77648_9_, p_77648_10_); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + TileRemoteJar tile = BlockRemoteJar.getJarTile(world, x, y, z); + if (tile != null) { + if(!world.isRemote) { + NBTTagCompound compound = NBTHelper.getData(stack); + + UUID networkId = tile.networkId; + if(networkId == null) { + networkId = UUID.randomUUID(); + tile.networkId = networkId; + tile.markForUpdate(); + } + + NBTHelper.setUUID(compound, "networkId", networkId); + return true; + } else { + //TODO: message + return super.onItemUseFirst(stack, player, world, x, y, z, side, hitX, hitY, hitZ); + } + + } + return false; + } + + + + @Override + public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { + boolean placed = super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); + if (placed && stack.hasTagCompound()) { + TileRemoteJar tile = (TileRemoteJar) world.getTileEntity(x, y, z); + + AspectList aspects = ((ItemJarFilled) ConfigItems.itemJarFilled).getAspects(stack); + if(aspects != null) { + tile.aspect = aspects.getAspects()[0]; + tile.amount = aspects.getAmount(tile.aspect); + } + + if(!world.isRemote) { + tile.networkId = NBTHelper.getUUID(stack.getTagCompound(), "networkId"); + tile.markForUpdate(); + } + } + return placed; + } + + @Override + public EnumRarity getRarity(ItemStack stack) { + return EnumRarity.uncommon; + } + + @SideOnly(Side.CLIENT) + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean advancedItemTooltips) { + if (stack.hasTagCompound()) { + UUID networkId = NBTHelper.getUUID(stack.getTagCompound(), "networkId"); + if(networkId != null) { + list.add(String.format(StatCollector.translateToLocal("gadomancy.lore.remotejar"), generateName(networkId))); + } + } + ConfigItems.itemJarFilled.addInformation(stack, player, list, advancedItemTooltips); + } + + public static String generateName(UUID uuid) { + List values = new ArrayList(ResourceReloadListener.languageList.values()); + + Random random = new Random(uuid.getLeastSignificantBits()); + + StringBuilder result = new StringBuilder(); + + for(int i = 0; i < 2; i++) { + int entryIndex = random.nextInt(values.size()); + String[] split = values.get(entryIndex).split(" "); + String part = split[random.nextInt(split.length)]; + + if(!isValidName(part)) { + i--; + continue; + } + result.append(StringHelper.firstToUpper(part.toLowerCase())); + } + return result.toString().trim(); + } + + private static boolean isValidName(String name) { + if(name.length() <= 8 && name.length() >= 4) { + for(char c : name.toCharArray()) { + if(!Character.isAlphabetic(c)) { + return false; + } + } + return true; + } + return false; + } +} \ No newline at end of file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java new file mode 100644 index 0000000..0840acd --- /dev/null +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java @@ -0,0 +1,18 @@ +package makeo.gadomancy.common.items; + +import makeo.gadomancy.common.Gadomancy; +import net.minecraft.item.Item; + +/** + * This class is part of the Gadomancy Mod + * Gadomancy is Open Source and distributed under the + * GNU LESSER GENERAL PUBLIC LICENSE + * for more read the LICENSE file + *

+ * Created by makeo @ 20.10.2015 22:49 + */ +public class ItemFakeModIcon extends Item { + public ItemFakeModIcon() { + setTextureName(Gadomancy.MODID + ":category_icon"); + } +} diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index e990c8a..c221616 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -2,15 +2,17 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.common.blocks.BlockArcaneDropper; import makeo.gadomancy.common.blocks.BlockInfusionClaw; +import makeo.gadomancy.common.blocks.BlockNode; import makeo.gadomancy.common.blocks.BlockRemoteJar; import makeo.gadomancy.common.blocks.BlockStickyJar; import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.items.ItemBlockRemoteJar; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; @@ -39,6 +41,7 @@ public class RegisteredBlocks { public static BlockArcaneDropper blockArcaneDropper; public static BlockInfusionClaw blockInfusionClaw; public static BlockRemoteJar blockRemoteJar; + public static BlockNode blockNode; public static void init() { registerBlocks(); @@ -54,7 +57,8 @@ public class RegisteredBlocks { blockStickyJar = registerBlock(new BlockStickyJar()); blockArcaneDropper = registerBlock(new BlockArcaneDropper()); blockInfusionClaw = registerBlock(new BlockInfusionClaw()); - blockRemoteJar = registerBlock(new BlockRemoteJar()); + blockRemoteJar = registerBlock(new BlockRemoteJar(), ItemBlockRemoteJar.class); + blockNode = registerBlock(new BlockNode()); } private static T registerBlock(String name, T block) { @@ -85,6 +89,7 @@ public class RegisteredBlocks { registerTile(TileArcaneDropper.class); registerTile(TileInfusionClaw.class); registerTile(TileRemoteJar.class); + registerTile(TileExtendedNode.class); } private static void registerTile(Class tile, String name) { @@ -100,6 +105,8 @@ public class RegisteredBlocks { private static void registerDefaultStickyJars() { registerStickyJar(ConfigBlocks.blockJar, 0, true, true); registerStickyJar(ConfigBlocks.blockJar, 3, true, true); + + //registerStickyJar(RegisteredBlocks.blockRemoteJar, 0, false, false); } private static List stickyJars = new ArrayList(); diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 74ede81..0aaa935 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -2,10 +2,7 @@ package makeo.gadomancy.common.registration; import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.items.ItemFakeGolemPlacer; -import makeo.gadomancy.common.items.ItemFakeGolemShield; -import makeo.gadomancy.common.items.ItemGolemCoreBreak; -import makeo.gadomancy.common.items.ItemTransformationFocus; +import makeo.gadomancy.common.items.*; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -29,6 +26,7 @@ public class RegisteredItems { public static CreativeTabs creativeTab; + public static Item itemFakeModIcon; public static Item itemFakeGolemShield; public static Item itemFakeGolemPlacer; public static Item itemTransformationFocus; @@ -38,7 +36,7 @@ public class RegisteredItems { creativeTab = new CreativeTabs(Gadomancy.MODID) { @Override public Item getTabIconItem() { - return Items.boat; + return itemFakeModIcon; } }; } @@ -51,6 +49,7 @@ public class RegisteredItems { //Items private static void registerItems() { + itemFakeModIcon = registerItem(new ItemFakeModIcon()); itemFakeGolemPlacer = registerItem(new ItemFakeGolemPlacer()); itemFakeGolemShield = registerItem(new ItemFakeGolemShield()); itemTransformationFocus = registerItem(new ItemTransformationFocus()); @@ -75,6 +74,9 @@ public class RegisteredItems { Item itemBlockJar = Item.getItemFromBlock(ConfigBlocks.blockJar); registerStickyJar(itemBlockJar, 0, new ItemStack(itemBlockJar, 1, 0)); registerStickyJar(itemBlockJar, 3, new ItemStack(itemBlockJar, 1, 3)); + + //Item itemRemoteJar = Item.getItemFromBlock(RegisteredBlocks.blockRemoteJar); + //registerStickyJar(itemRemoteJar, 0, new ItemStack(itemRemoteJar)); } private static List stickyJarItems = new ArrayList(); diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index ff1d947..6e5eddc 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -25,7 +25,7 @@ public class RegisteredResearches { private RegisteredResearches() {} private static final ResourceLocation CATEGORY_BACKGROUND = new SimpleResourceLocation("/gui/gui_researchback.png"); - private static final ResourceLocation CATEGORY_ICON = new SimpleResourceLocation("/misc/category_icon.png"); + private static final ResourceLocation CATEGORY_ICON = new SimpleResourceLocation("/items/category_icon.png"); public static ResearchItem researchGolemSilverwood; public static ResearchItem researchGolemRunicShield; diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index b852082..646a128 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -35,12 +35,14 @@ gadomancy.golem.breakcore=Break gadomancy.upgrades.runicshield=Runic Shield gadomancy.lore.stickyjar=Sticky +gadomancy.lore.remotejar=§7Network: %s tile.BlockStickyJar.name=Sticky Jar tile.BlockArcaneDropper.name=Arcane Dropper tile.BlockInfusionClaw.name=Infusion Claw tile.BlockRemoteJar.name=[WIP] Mirrored Jar +tile.BlockNode.name=Aura Node gadomancy.info.InfusionClaw.owner=You are now the owner. -gadomancy.info.InfusionClaw.waila=§8Owner: +gadomancy.info.InfusionClaw.waila=§7Owner: gadomancy.info.InfusionClaw.lock=Keep useable wand \ No newline at end of file diff --git a/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.mcmeta b/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.mcmeta new file mode 100644 index 0000000..2077f3c --- /dev/null +++ b/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.mcmeta @@ -0,0 +1,6 @@ +{ + "texture": { + "blur": true + } +} + diff --git a/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.png b/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.png index ce53d1f..b9399c2 100644 Binary files a/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.png and b/src/main/resources/assets/gadomancy/textures/gui/gui_researchback.png differ diff --git a/src/main/resources/assets/gadomancy/textures/items/category_icon.png b/src/main/resources/assets/gadomancy/textures/items/category_icon.png new file mode 100644 index 0000000..702dd82 Binary files /dev/null and b/src/main/resources/assets/gadomancy/textures/items/category_icon.png differ diff --git a/src/main/resources/assets/gadomancy/textures/misc/category_icon.png b/src/main/resources/assets/gadomancy/textures/misc/category_icon.png deleted file mode 100644 index 90b0b79..0000000 Binary files a/src/main/resources/assets/gadomancy/textures/misc/category_icon.png and /dev/null differ