Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #14 from pahimar/master

Browse source 
Updating repo
This commit is contained in:
Lure 2012-12-13 15:15:48 -08:00
commit 87d93fef19
62 changed files with 355 additions and 197 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee3_client/ee3/client/core/ClientProxy.java
View file

@ -1,6 +1,6 @@
package ee3.client.core;
import net.minecraft.src.EnumRarity;
import net.minecraft.item.EnumRarity;
import net.minecraftforge.client.EnumHelperClient;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge;

5
ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java
View file

@ -7,9 +7,8 @@ import ee3.common.item.ITransmutationStone;
import ee3.common.item.IChargeable;
import ee3.common.lib.ConfigurationSettings;
import ee3.common.lib.Sprites;
import net.minecraft.src.EnumMovingObjectType;
import net.minecraft.src.RenderEngine;
import net.minecraft.src.Tessellator;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.event.ForgeSubscribe;

8
ee3_client/ee3/client/core/handlers/KeyBindingHandler.java
View file

@ -3,10 +3,10 @@ package ee3.client.core.handlers;
import java.util.EnumSet;
import java.util.logging.Level;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.KeyBinding;
import net.minecraft.client.settings.KeyBinding;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.common.TickType;

16
ee3_client/ee3/client/core/handlers/RenderTickHandler.java
View file

@ -6,15 +6,13 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import net.minecraft.client.Minecraft;
import net.minecraft.src.Block;
import net.minecraft.src.EntityItem;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ItemBlock;
import net.minecraft.src.ItemStack;
import net.minecraft.src.MovingObjectPosition;
import net.minecraft.src.RenderHelper;
import net.minecraft.src.RenderItem;
import net.minecraft.src.ScaledResolution;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemBlock;
import net.minecraft.util.MovingObjectPosition;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.ITickHandler;

3
ee3_client/ee3/client/core/helper/KeyBindingHelper.java
View file

@ -1,7 +1,8 @@
package ee3.client.core.helper;
import java.util.ArrayList;
import net.minecraft.src.KeyBinding;
import net.minecraft.client.settings.KeyBinding;
/**
* KeyBindings

14
ee3_client/ee3/client/core/helper/RenderUtils.java
View file

@ -2,13 +2,13 @@ package ee3.client.core.helper;
import org.lwjgl.opengl.GL11;
import net.minecraft.src.Block;
import net.minecraft.src.FontRenderer;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.RenderBlocks;
import net.minecraft.src.RenderEngine;
import net.minecraft.src.Tessellator;
import net.minecraft.block.Block;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
public class RenderUtils {

9
ee3_client/ee3/client/gui/GuiCalcinator.java
View file

@ -1,5 +1,9 @@
package ee3.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Side;
@ -9,11 +13,6 @@ import ee3.common.container.ContainerCalcinator;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.Container;
import net.minecraft.src.GuiContainer;
import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.StatCollector;
import net.minecraft.src.TileEntityFurnace;
/**
* GuiCalcinator

10
ee3_client/ee3/client/gui/GuiPortableCrafting.java
View file

@ -1,15 +1,15 @@
package ee3.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import ee3.common.container.ContainerPortableCrafting;
import net.minecraft.src.Container;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.GuiContainer;
import net.minecraft.src.StatCollector;
import net.minecraft.src.World;
/**
* GuiPortableCrafting

4
ee3_client/ee3/client/render/ModelCalcinator.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Sprites;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.ModelBase;
import net.minecraft.src.ModelRenderer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.client.ForgeHooksClient;
/**

6
ee3_client/ee3/client/render/RenderCalcinator.java
View file

@ -4,10 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.ModelBase;
import net.minecraft.src.ModelRenderer;
import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
/**
* RenderCalcinator

4
ee3_client/ee3/client/render/RenderItemCalcinator.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
import net.minecraft.src.ItemStack;
import net.minecraft.src.Tessellator;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer;

2
ee3_client/ee3/client/render/TextureRedWaterFX.java
View file

@ -2,7 +2,7 @@ package ee3.client.render;
import org.lwjgl.opengl.GL11;
import net.minecraft.src.RenderEngine;
import net.minecraft.client.renderer.RenderEngine;
import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.FMLTextureFX;
import ee3.common.block.ModBlocks;

2
ee3_client/ee3/client/render/TextureRedWaterFlowFX.java
View file

@ -1,6 +1,6 @@
package ee3.client.render;
import net.minecraft.src.RenderEngine;
import net.minecraft.client.renderer.RenderEngine;
import org.lwjgl.opengl.GL11;

8
ee3_common/ee3/common/EquivalentExchange3.java
View file

@ -1,6 +1,6 @@
package ee3.common;
import net.minecraft.src.CreativeTabs;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
@ -21,6 +21,7 @@ import ee3.client.core.handlers.RenderTickHandler;
import ee3.common.block.ModBlocks;
import ee3.common.core.CommonProxy;
import ee3.common.core.CreativeTabEE3;
import ee3.common.core.handlers.ModActionHandler;
import ee3.common.core.handlers.AddonHandler;
import ee3.common.core.handlers.ConfigurationHandler;
import ee3.common.core.handlers.EntityLivingHandler;
@ -30,6 +31,7 @@ import ee3.common.core.handlers.LocalizationHandler;
import ee3.common.core.handlers.PacketHandler;
import ee3.common.core.handlers.PlayerDestroyItemHandler;
import ee3.common.core.handlers.VersionCheckTickHandler;
import ee3.common.core.handlers.WorldTransmutationHandler;
import ee3.common.core.helper.LogHelper;
import ee3.common.core.helper.VersionHelper;
import ee3.common.item.ModItems;
@ -108,6 +110,10 @@ public class EquivalentExchange3 {
// Register the EntityLiving Handler
MinecraftForge.EVENT_BUS.register(new EntityLivingHandler());
MinecraftForge.EVENT_BUS.register(new ModActionHandler());
MinecraftForge.EVENT_BUS.register(new WorldTransmutationHandler());
// Register the DrawBlockHighlight Handler
proxy.registerDrawBlockHighlightHandler();

9
ee3_common/ee3/common/block/BlockCalcinator.java
View file

@ -5,11 +5,10 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.RenderIds;
import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Material;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
/**
* BlockCalcinator

6
ee3_common/ee3/common/block/BlockEE.java
View file

@ -1,9 +1,7 @@
package ee3.common.block;
import net.minecraft.src.BlockContainer;
import net.minecraft.src.Material;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
/**
* BlockEE

5
ee3_common/ee3/common/block/BlockRedWaterFlowing.java
View file

@ -4,9 +4,8 @@ import ee3.common.EquivalentExchange3;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
import net.minecraft.src.BlockFlowing;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.Material;
import net.minecraft.block.BlockFlowing;
import net.minecraft.block.material.Material;
/**
* BlockRedWaterFlowing

4
ee3_common/ee3/common/block/BlockRedWaterStill.java
View file

@ -3,8 +3,8 @@ package ee3.common.block;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.Sprites;
import ee3.common.lib.Strings;
import net.minecraft.src.BlockStationary;
import net.minecraft.src.Material;
import net.minecraft.block.BlockStationary;
import net.minecraft.block.material.Material;
/**
* BlockRedWaterFlowing

7
ee3_common/ee3/common/block/ModBlocks.java
View file

@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.BlockIds;
import ee3.common.lib.Strings;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.src.Material;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
/**
* ModBlocks

14
ee3_common/ee3/common/container/ContainerCalcinator.java
View file

@ -1,13 +1,13 @@
package ee3.common.container;
import ee3.common.tile.TileCalcinator;
import net.minecraft.src.Container;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.FurnaceRecipes;
import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.ItemStack;
import net.minecraft.src.Slot;
import net.minecraft.src.TileEntityFurnace;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace;
/**
* ContainerCalcinator

8
ee3_common/ee3/common/container/ContainerPortableCrafting.java
View file

@ -1,9 +1,9 @@
package ee3.common.container;
import net.minecraft.src.ContainerWorkbench;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.ContainerWorkbench;
import net.minecraft.world.World;
/**
* ContainerPortableCrafting

6
ee3_common/ee3/common/core/CommonProxy.java
View file

@ -1,8 +1,8 @@
package ee3.common.core;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumRarity;
import net.minecraft.src.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
import ee3.client.gui.GuiCalcinator;

4
ee3_common/ee3/common/core/CreativeTabEE3.java
View file

@ -4,8 +4,8 @@ import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import ee3.common.item.ModItems;
import ee3.common.lib.ItemIds;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.Item;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
public class CreativeTabEE3 extends CreativeTabs {

4
ee3_common/ee3/common/core/addons/AddonRedPower2.java
View file

@ -8,8 +8,8 @@ import cpw.mods.fml.common.Loader;
import ee3.common.core.helper.LogHelper;
import ee3.common.core.helper.RecipeHelper;
import ee3.common.recipe.RecipesTransmutationStone;
import net.minecraft.src.Block;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraft.src.ModLoader;
public class AddonRedPower2 {

5
ee3_common/ee3/common/core/handlers/EntityLivingHandler.java
View file

@ -3,10 +3,7 @@ package ee3.common.core.handlers;
import ee3.common.core.helper.ItemDropHelper;
import ee3.common.core.helper.RedWaterHelper;
import ee3.common.lib.Reference;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Potion;
import net.minecraft.src.PotionEffect;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;

2
ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
View file

@ -3,7 +3,7 @@ package ee3.common.core.handlers;
import java.util.ArrayList;
import ee3.common.core.helper.GeneralHelper;
import net.minecraft.src.ItemStack;
import net.minecraft.item.ItemStack;
/**
* EquivalencyHandler

2
ee3_common/ee3/common/core/handlers/FuelHandler.java
View file

@ -1,6 +1,6 @@
package ee3.common.core.handlers;
import net.minecraft.src.ItemStack;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.IFuelHandler;
/**

13
ee3_common/ee3/common/core/handlers/ModActionHandler.java Normal file
View file

@ -0,0 +1,13 @@
package ee3.common.core.handlers;
import ee3.common.event.ModActionEvent;
import net.minecraftforge.event.ForgeSubscribe;
public class ModActionHandler {
@ForgeSubscribe
public void onModActionEvent(ModActionEvent event) {
}
}

5
ee3_common/ee3/common/core/handlers/PacketHandler.java
View file

@ -3,8 +3,9 @@ package ee3.common.core.handlers;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Packet250CustomPayload;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
import ee3.common.network.PacketEE;

14
ee3_common/ee3/common/core/handlers/WorldTransmutationHandler.java Normal file
View file

@ -0,0 +1,14 @@
package ee3.common.core.handlers;
import ee3.common.event.WorldTransmutationEvent;
import net.minecraftforge.event.ForgeSubscribe;
public class WorldTransmutationHandler {
@ForgeSubscribe
public void onWorldTransmutationEvent(WorldTransmutationEvent event) {
System.out.println(event.toString());
}
}

10
ee3_common/ee3/common/core/helper/GeneralHelper.java
View file

@ -2,11 +2,11 @@ package ee3.common.core.helper;
import java.util.ArrayList;
import net.minecraft.src.Block;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityMob;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
/**
* GeneralHelper

5
ee3_common/ee3/common/core/helper/ItemDropHelper.java
View file

@ -1,9 +1,8 @@
package ee3.common.core.helper;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import ee3.common.item.ModItems;
import net.minecraft.src.EntityAgeable;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityPlayer;
/**
* ItemDropHelper

4
ee3_common/ee3/common/core/helper/NBTHelper.java
View file

@ -1,7 +1,7 @@
package ee3.common.core.helper;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
/**
* NBTHelper

2
ee3_common/ee3/common/core/helper/QualityHelper.java
View file

@ -1,6 +1,6 @@
package ee3.common.core.helper;
import net.minecraft.src.ItemStack;
import net.minecraft.item.ItemStack;
/**
* QualityHelper

8
ee3_common/ee3/common/core/helper/RecipeHelper.java
View file

@ -2,10 +2,10 @@ package ee3.common.core.helper;
import java.util.ArrayList;
import net.minecraft.src.Block;
import net.minecraft.src.FurnaceRecipes;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry;
/**

10
ee3_common/ee3/common/core/helper/RedWaterHelper.java
View file

@ -2,11 +2,11 @@ package ee3.common.core.helper;
import ee3.common.block.ModBlocks;
import ee3.common.lib.ConfigurationSettings;
import net.minecraft.src.AxisAlignedBB;
import net.minecraft.src.Block;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.MathHelper;
import net.minecraft.src.World;
import net.minecraft.block.Block;
import net.minecraft.entity.EntityLiving;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
/**
* RedWaterHelper

16
ee3_common/ee3/common/core/helper/TransmutationHelper.java
View file

@ -4,14 +4,14 @@ import java.util.ArrayList;
import ee3.common.core.handlers.EquivalencyHandler;
import ee3.common.lib.Sounds;
import net.minecraft.src.Block;
import net.minecraft.src.BlockSand;
import net.minecraft.src.BlockLeaves;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ItemBlock;
import net.minecraft.src.ItemStack;
import net.minecraft.src.Material;
import net.minecraft.src.World;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSand;
import net.minecraft.block.BlockLeaves;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
/**
* TransmutationHelper

6
ee3_common/ee3/common/emc/EMCRegistry.java
View file

@ -3,9 +3,9 @@ package ee3.common.emc;
import java.util.HashMap;
import java.util.Map;
import net.minecraft.src.Block;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
/**
* EMCRegistry

38
ee3_common/ee3/common/event/ModActionEvent.java Normal file
View file

@ -0,0 +1,38 @@
package ee3.common.event;
import static net.minecraftforge.event.Event.Result.*;
import ee3.common.lib.ModAction;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.entity.player.PlayerEvent;
@Cancelable
public class ModActionEvent extends PlayerEvent {
public final ModAction modAction;
public final int x, y, z;
public final int sideHit;
public Result allowEvent;
public ModActionEvent(EntityPlayer player, ModAction modAction, int x, int y, int z, int sideHit) {
super(player);
this.modAction = modAction;
this.x = x;
this.y = y;
this.z = z;
this.sideHit = sideHit;
if (sideHit == -1) {
allowEvent = DENY;
}
}
@Override
public void setCanceled(boolean cancel)
{
super.setCanceled(cancel);
allowEvent = (cancel ? DENY : allowEvent == DENY ? DENY : DEFAULT);
}
}

29
ee3_common/ee3/common/event/WorldTransmutationEvent.java Normal file
View file

@ -0,0 +1,29 @@
package ee3.common.event;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import net.minecraftforge.event.Event;
public class WorldTransmutationEvent extends Event {
public final EntityPlayer player;
public final World world;
public final int originX, originY, originZ;
public final byte sideHit;
public final byte rangeX, rangeY, rangeZ;
public final String data;
public WorldTransmutationEvent(EntityPlayer player, World world, int originX, int originY, int originZ, byte sideHit, byte rangeX, byte rangeY, byte rangeZ, String data) {
this.player = player;
this.world = world;
this.originX = originX;
this.originY = originY;
this.originZ = originZ;
this.sideHit = sideHit;
this.rangeX = rangeX;
this.rangeY = rangeY;
this.rangeZ = rangeZ;
this.data = data;
}
}

2
ee3_common/ee3/common/item/IChargeable.java
View file

@ -1,6 +1,6 @@
package ee3.common.item;
import net.minecraft.src.ItemStack;
import net.minecraft.item.ItemStack;
public interface IChargeable {

4
ee3_common/ee3/common/item/IKeyBound.java
View file

@ -1,7 +1,7 @@
package ee3.common.item;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ItemStack;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
public interface IKeyBound {

2
ee3_common/ee3/common/item/ITransmutationStone.java
View file

@ -1,6 +1,6 @@
package ee3.common.item;
import net.minecraft.src.EntityPlayer;
import net.minecraft.entity.player.EntityPlayer;
/**
* ITransmutationStone

6
ee3_common/ee3/common/item/ItemAlchemyBag.java
View file

@ -2,9 +2,9 @@ package ee3.common.item;
import java.util.List;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.ItemStack;
import net.minecraft.src.MathHelper;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;

10
ee3_common/ee3/common/item/ItemAlchemyDust.java
View file

@ -2,12 +2,10 @@ package ee3.common.item;
import java.util.List;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumRarity;
import net.minecraft.src.ItemStack;
import net.minecraft.src.MathHelper;
import net.minecraft.src.StringTranslate;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
import cpw.mods.fml.common.registry.LanguageRegistry;

2
ee3_common/ee3/common/item/ItemEE.java
View file

@ -2,7 +2,7 @@ package ee3.common.item;
import ee3.common.lib.Reference;
import ee3.common.lib.Sprites;
import net.minecraft.src.Item;
import net.minecraft.item.Item;
/**
* ItemEE

8
ee3_common/ee3/common/item/ItemMiniumStone.java
View file

@ -1,9 +1,9 @@
package ee3.common.item;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumRarity;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;

8
ee3_common/ee3/common/item/ItemPhilosopherStone.java
View file

@ -16,10 +16,10 @@ import ee3.common.lib.WorldEvents;
import ee3.common.network.PacketKeyPressed;
import ee3.common.network.PacketTypeHandler;
import ee3.common.network.PacketWorldEvent;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.EnumRarity;
import net.minecraft.src.ItemStack;
import net.minecraft.src.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumRarity;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/**
* ItemPhilosopherStone

7
ee3_common/ee3/common/item/ModItems.java
View file

@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Strings;
import net.minecraft.src.Block;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
/**
* ModItems

14
ee3_common/ee3/common/lib/ModAction.java Normal file
View file

@ -0,0 +1,14 @@
package ee3.common.lib;
public enum ModAction {
TRANSMUTATION(WorldEvents.TRANSMUTATION);
public int actionId;
ModAction(int actionId) {
this.actionId = actionId;
}
}

3
ee3_common/ee3/common/network/PacketEE.java
View file

@ -4,8 +4,9 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.network.INetworkManager;
import cpw.mods.fml.common.network.Player;
import net.minecraft.src.INetworkManager;
/**
* PacketEE

7
ee3_common/ee3/common/network/PacketKeyPressed.java
View file

@ -4,6 +4,9 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3;
@ -13,10 +16,6 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.ItemIds;
import ee3.common.lib.Reference;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Packet250CustomPayload;
/**
* PacketKeyPressed
*

2
ee3_common/ee3/common/network/PacketTileUpdate.java
View file

@ -6,7 +6,7 @@ import java.io.IOException;
import cpw.mods.fml.common.network.Player;
import net.minecraft.src.INetworkManager;
import net.minecraft.network.INetworkManager;
import net.minecraftforge.common.ForgeDirection;
/**

5
ee3_common/ee3/common/network/PacketTypeHandler.java
View file

@ -3,10 +3,11 @@ package ee3.common.network;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import ee3.common.lib.Reference;
import net.minecraft.src.Packet;
import net.minecraft.src.Packet250CustomPayload;
/**
* PacketTypeHandler

41
ee3_common/ee3/common/network/PacketWorldEvent.java
View file

@ -4,10 +4,18 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.World;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event;
import net.minecraftforge.event.Event.Result;
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
import cpw.mods.fml.common.network.Player;
import ee3.common.event.ModActionEvent;
import ee3.common.event.WorldTransmutationEvent;
import ee3.common.lib.ModAction;
import ee3.common.lib.WorldEvents;
public class PacketWorldEvent extends PacketEE {
@ -92,20 +100,6 @@ public class PacketWorldEvent extends PacketEE {
public void execute(INetworkManager manager, Player player) {
System.out.println("World Event Packet received");
System.out.println("eventType: " + eventType);
System.out.println("originX: " + originX);
System.out.println("originY: " + originY);
System.out.println("originZ: " + originZ);
System.out.println("sideHit: " + sideHit);
System.out.println("rangeX: " + rangeX);
System.out.println("rangeY: " + rangeY);
System.out.println("rangeZ: " + rangeZ);
System.out.println("data: " + data);
EntityPlayer thePlayer = (EntityPlayer) player;
World world = thePlayer.worldObj;
/*
* Server knows the world, the player, and all the packet data
* Server checks (for each block);
@ -117,6 +111,19 @@ public class PacketWorldEvent extends PacketEE {
* so Range would be 1, 2, 4, 6
* 1 + 0, 1 + 1, 1 + 3, 1 + 5
*/
EntityPlayer thePlayer = (EntityPlayer) player;
ModActionEvent modActionEvent;
WorldTransmutationEvent worldTransmutationEvent;
modActionEvent= new ModActionEvent(thePlayer, ModAction.TRANSMUTATION, originX, originY, originZ, (int) sideHit);
MinecraftForge.EVENT_BUS.post(modActionEvent);
if (modActionEvent.allowEvent != Result.DENY) {
worldTransmutationEvent = new WorldTransmutationEvent(thePlayer, thePlayer.worldObj, originX, originY, originZ, sideHit, rangeX, rangeY, rangeZ, data);
MinecraftForge.EVENT_BUS.post(worldTransmutationEvent);
}
}
}

8
ee3_common/ee3/common/recipe/RecipesTransmutationStone.java
View file

@ -8,10 +8,10 @@ import java.util.Map;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import net.minecraft.src.Block;
import net.minecraft.src.FurnaceRecipes;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import ee3.common.core.handlers.EquivalencyHandler;
import ee3.common.core.helper.GeneralHelper;
import ee3.common.core.helper.RecipeHelper;

8
ee3_common/ee3/common/tile/TileCalcinator.java
View file

@ -2,10 +2,10 @@ package ee3.common.tile;
import ee3.common.block.ModBlocks;
import ee3.common.lib.Strings;
import net.minecraft.src.IInventory;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.NBTTagList;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
/**
* TileCalcinator

6
ee3_common/ee3/common/tile/TileEE.java
View file

@ -2,9 +2,9 @@ package ee3.common.tile;
import ee3.common.lib.Reference;
import ee3.common.lib.Strings;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.TileEntity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
/**
* TileEE

16
resources/ee3/lang/la_IT.xml
View file

@ -16,6 +16,22 @@
<entry key="item.alchemyDust.azure.name">Caeruleus Afae</entry>
<entry key="item.alchemyDust.amaranthine.name">Amarantus Afae</entry>
<entry key="item.alchemyDust.iridescent.name">Iris Afae</entry>
<entry key="item.alchemyBag.white.name">Albulus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.orange.name">Luteus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.magenta.name">Rufus Purpurei Saccus Alchimiae</entry>
<entry key="item.alchemyBag.light_blue.name">Albulus Caeruli Saccus Alchimiae</entry>
<entry key="item.alchemyBag.yellow.name">Flavus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.lime.name">Prasinus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.pink.name">Roseus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.gray.name">Canutus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.light_gray.name">Albulus Canuti Saccus Alchimiae</entry>
<entry key="item.alchemyBag.cyan.name">Luculentus Caerulus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.purple.name">Purpureus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.blue.name">Caeruleus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.brown.name">Brunus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.green.name">Carpasinus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.red.name">Rufus Saccus Alchimiae</entry>
<entry key="item.alchemyBag.black.name">Pullejaceus Saccus Alchimiae</entry>
<entry key="tile.redWaterStill.name">Rufi Aqua (Residans)</entry>
<entry key="tile.redWaterFlowing.name">Rufi Aqua (Fluens)</entry>
<entry key="tile.calcinator.name">Auctor Calcus</entry>

30
resources/ee3/lang/pt_PT.xml
View file

@ -16,17 +16,31 @@
<entry key="item.alchemyDust.azure.name">Pó Cerúleo</entry>
<entry key="item.alchemyDust.amaranthine.name">Pó Amarantino</entry>
<entry key="item.alchemyDust.iridescent.name">Pó Iridescente</entry>
<entry key="tile.redWaterStill.name">Água Vermelha (Estagnada)</entry>
<entry key="tile.redWaterFlowing.name">Água Vermelha (A fluir)</entry>
<entry key="item.alchemyBag.white.name">Saco Alquímico Branco</entry>
<entry key="item.alchemyBag.orange.name">Saco Alquímico Cor-de-Laranja</entry>
<entry key="item.alchemyBag.magenta.name">Saco Alquímico Magenta</entry>
<entry key="item.alchemyBag.light_blue.name">Saco Alquímico Azul Claro</entry>
<entry key="item.alchemyBag.yellow.name">Saco Alquímico Amarelo</entry>
<entry key="item.alchemyBag.lime.name">Saco Alquímico Verde Lima</entry>
<entry key="item.alchemyBag.pink.name">Saco Alquímico Cor-de-Rosa</entry>
<entry key="item.alchemyBag.gray.name">Saco Alquímico Cinzento</entry>
<entry key="item.alchemyBag.light_gray.name">Saco Alquímico Cinzento Claro</entry>
<entry key="item.alchemyBag.cyan.name">Saco Alquímico Azul Ciano</entry>
<entry key="item.alchemyBag.purple.name">Saco Alquímico Roxo</entry>
<entry key="item.alchemyBag.blue.name">Saco Alquímico Azul</entry>
<entry key="item.alchemyBag.brown.name">Saco Alquímico Castanho</entry>
<entry key="item.alchemyBag.green.name">Saco Alquímico Verde</entry>
<entry key="item.alchemyBag.red.name">Saco Alquímico Vermelho</entry>
<entry key="item.alchemyBag.black.name">Saco Alquímico Preto</entry>
<entry key="tile.redWaterStill.name">Água Vermelha Estagnada</entry>
<entry key="tile.redWaterFlowing.name">Água Vermelha a fluir</entry>
<entry key="tile.calcinator.name">Calcinatório</entry>
<entry key="gui.calcinator.name">Calcinatório</entry>
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
<entry key="text.impure">Impuro</entry>
<entry key="text.pure">Puro</entry>
<entry key="version.init_log_message">A inicializar verificação da versão contra o ficheiro autoritário de versão remoto, localizado em</entry>
<entry key="version.uninitialized">A verificação da versão não concluiu com sucesso (a verificação da versão não inicializou correctamente)</entry>
<entry key="version.current">Estás actualmente a usar a versão mais actualizada para a tua versão do Minecraft</entry>
<entry key="version.outdated">Estás actualmente a usar uma versão desactualizada; considera actualizar aqui - @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">Erro ao ligar ao ficheiro autoritário de versão remoto (verifica a tua ligação de Internet?)</entry>
<entry key="version.uninitialized">A verificação da versão não inicializou correctamente</entry>
<entry key="version.current">Estás actualmente a usar a versão mais actualizada (@REMOTE_MOD_VERSION@) do Equivalent Exchange 3 para o @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Existe uma versão nova do @MOD_NAME@ (@REMOTE_MOD_VERSION@) para o @MINECRAFT_VERSION@. Obtém-na aqui: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">Erro ao ligar ao ficheiro autoritário de versão remoto</entry>
<entry key="version.check_disabled">Verificação de versão remota desactivada, a ignorar</entry>
</properties>

2
resources/ee3/lang/ru_RU.xml
View file

@ -17,7 +17,7 @@
<entry key="item.alchemyDust.amaranthine.name">Пурпурная Пыль</entry>
<entry key="item.alchemyDust.iridescent.name">Радужная Пыль</entry>
<entry key="item.alchemyBag.white.name">Белая Алхимическая Сумка</entry>
<entry key="item.alchemyBag.orange.name">Оранжевая Alchemical Bag</entry>
<entry key="item.alchemyBag.orange.name">Оранжевая Алхимическая Сумка</entry>
<entry key="item.alchemyBag.magenta.name">Пурпурная Алхимическая Сумка</entry>
<entry key="item.alchemyBag.light_blue.name">Светло-Синяя Алхимическая Сумка</entry>
<entry key="item.alchemyBag.yellow.name">Желтая Алхимическая Сумка</entry>

32
resources/ee3/lang/sv_SE.xml
View file

@ -8,16 +8,38 @@
<entry key="key.charge">Ladda</entry>
<entry key="item.miniumShard.name">Mönjaskärva</entry>
<entry key="item.inertStone.name">Inert Sten</entry>
<entry key="item.miniumStone.name">Mönja Sten</entry>
<entry key="item.miniumStone.name">Mönjasten</entry>
<entry key="item.philStone.name">De Vises Sten</entry>
<entry key="item.alchemyDust.ash.name">Aska</entry>
<entry key="item.alchemyDust.minium.name">Mönjapulver</entry>
<entry key="item.alchemyDust.verdant.name">Grönskande Pulver</entry>
<entry key="item.alchemyDust.azure.name">Azurblå Pulver</entry>
<entry key="item.alchemyDust.amaranthine.name">Amarant Pulver</entry>
<entry key="item.alchemyDust.iridescent.name">Skimmrande Pulver</entry>
<entry key="item.alchemyBag.white.name">Vit Alkemisk Påse</entry>
<entry key="item.alchemyBag.orange.name">Orange Alkemisk Påse</entry>
<entry key="item.alchemyBag.magenta.name">Magenta Alkemisk Påse</entry>
<entry key="item.alchemyBag.light_blue.name">Ljusblå Alkemisk Påse</entry>
<entry key="item.alchemyBag.yellow.name">Gul Alkemisk Påse</entry>
<entry key="item.alchemyBag.lime.name">Lime Alkemisk Påse</entry>
<entry key="item.alchemyBag.pink.name">Rosa Alkemisk Påse</entry>
<entry key="item.alchemyBag.gray.name">Grå Alkemisk Påse</entry>
<entry key="item.alchemyBag.light_gray.name">Ljusgrå Alkemisk Påse</entry>
<entry key="item.alchemyBag.cyan.name">Cyan Alkemisk Påse</entry>
<entry key="item.alchemyBag.purple.name">Lila Alkemisk Påse</entry>
<entry key="item.alchemyBag.blue.name">Blå Alkemisk Påse</entry>
<entry key="item.alchemyBag.brown.name">Brun Alkemisk Påse</entry>
<entry key="item.alchemyBag.green.name">Grön Alkemisk Påse</entry>
<entry key="item.alchemyBag.red.name">Röd Alkemisk Påse</entry>
<entry key="item.alchemyBag.black.name">Svart Alkemisk Påse</entry>
<entry key="tile.redWaterStill.name">Rödvatten (Stilla)</entry>
<entry key="tile.redWaterFlowing.name">Rödvatten (Forsande)</entry>
<entry key="tile.calcinator.name">Kalcinator</entry>
<entry key="gui.calcinator.name">Kalcinator</entry>
<entry key="version.init_log_message">Initierar versionskontroll mot fjärrversions auktoritetsfil, lokaliserad vid</entry>
<entry key="version.uninitialized">Versionskontrollen misslyckades (Versionskontrollen initierades inte korrekt)</entry>
<entry key="version.current">Du använder den mest uppdaterade versionen för din version av Minecraft</entry>
<entry key="version.outdated">Du använder en utdaterad version; överväg att uppdatera här - @MOD_UPDATE_LOCATION@</entry>
<entry key="version.connection_error">Misslyckades med att ansluta till fjärrversions auktoritetsfil (Kontrollera din internetanslutning?)</entry>
<entry key="version.check_disabled">Fjärrversions versionskontroll inaktiverad, hoppar över</entry>
<entry key="version.current">Du använder den mest uppdaterade versionen (@REMOTE_MOD_VERSION@) av Equivalent Exchange 3 för @MINECRAFT_VERSION@</entry>
<entry key="version.outdated">Det finns en ny version av @MOD_NAME@ (@REMOTE_MOD_VERSION@) för @MINECRAFT_VERSION@. Hämta den här: @MOD_UPDATE_LOCATION@</entry>
<entry key="version.general_error">Ett fel uppstod vid kontroll av fjärrversions auktoritetsfilen</entry>
<entry key="version.check_disabled">Versionskontroll inaktiverad, hoppar över</entry>
</properties>