New stuff for the mirrored jar

Added new icon by HellFirePvP
This commit is contained in:
makeo committed 2015-10-20 23:12:03 +02:00
1 parent 2df0995c0d
commit f711061253
15 files changed
+363 -46

No files matched your search

@@ -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)
@@ -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<TileRemoteJar> {
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();
@@ -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<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) {
ArrayList<ItemStack> 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));
}
}
@@ -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<TileRemoteJar> network = getNetwork(networkId);
Collections.sort(network, new Comparator<TileRemoteJar>() {
@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<UUID, List<TileRemoteJar>> networks = new HashMap<UUID, List<TileRemoteJar>>();
@Override
public void readCustomNBT(NBTTagCompound compound) {
super.readCustomNBT(compound);
private static List<TileRemoteJar> getNetwork(UUID id) {
List<TileRemoteJar> 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<UUID, JarNetwork> networks = new HashMap<UUID, JarNetwork>();
private static class JarNetwork {
private long lastTime = 0;
private List<TileRemoteJar> jars = new ArrayList<TileRemoteJar>();
private void update() {
long time = MinecraftServer.getServer().getEntityWorld().getTotalWorldTime();
if(time > lastTime) {
if(jars.size() > 1) {
Collections.sort(jars, new Comparator<TileRemoteJar>() {
@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<TileRemoteJar>();
network = new JarNetwork();
networks.put(id, network);
}
return network;
@@ -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"));
}
}
}
@@ -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);
}
}
@@ -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
* <p/>
* 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<String> getWailaHead(ItemStack stack, List<String> strings, IWailaDataAccessor dataAccessor, IWailaConfigHandler iWailaConfigHandler) {
return null;
}
@Override
public List<String> getWailaBody(ItemStack stack, List<String> 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<String> getWailaTail(ItemStack stack, List<String> 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;
}
}
@@ -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<String> values = new ArrayList<String>(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;
}
}
@@ -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
* <p/>
* Created by makeo @ 20.10.2015 22:49
*/
public class ItemFakeModIcon extends Item {
public ItemFakeModIcon() {
setTextureName(Gadomancy.MODID + ":category_icon");
}
}
@@ -11,6 +11,7 @@ import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper;
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;
@@ -54,7 +55,7 @@ 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);
}
private static <T extends Block> T registerBlock(String name, T block) {
@@ -100,6 +101,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<StickyJarInfo> stickyJars = new ArrayList<StickyJarInfo>();
@@ -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<StickyJarItemInfo> stickyJarItems = new ArrayList<StickyJarItemInfo>();
@@ -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("/itemscategory_icon.png");
public static ResearchItem researchGolemSilverwood;
public static ResearchItem researchGolemRunicShield;