Merge remote-tracking branch 'upstream/master'
Conflicts: resources/ee3/lang/pt_PT.xml
This commit is contained in:
commit
8a838c53a8
55 changed files with 590 additions and 60 deletions
|
@ -14,7 +14,15 @@ import net.minecraft.src.InventoryPlayer;
|
|||
import net.minecraft.src.StatCollector;
|
||||
import net.minecraft.src.TileEntityFurnace;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
/**
|
||||
* GuiCalcinator
|
||||
*
|
||||
* Calcinator Gui class
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class GuiCalcinator extends GuiContainer {
|
||||
|
||||
private TileCalcinator calcinator;
|
||||
|
|
|
@ -11,7 +11,15 @@ import net.minecraft.src.GuiContainer;
|
|||
import net.minecraft.src.StatCollector;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
/**
|
||||
* GuiPortableCrafting
|
||||
*
|
||||
* Portable Crafting Gui class
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class GuiPortableCrafting extends GuiContainer {
|
||||
|
||||
public GuiPortableCrafting(EntityPlayer player, World world, int x, int y, int z) {
|
||||
|
|
|
@ -8,6 +8,15 @@ import net.minecraft.src.ModelBase;
|
|||
import net.minecraft.src.ModelRenderer;
|
||||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
|
||||
/**
|
||||
* ModelCalcinator
|
||||
*
|
||||
* Model for the Calcinator
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ModelCalcinator extends ModelBase {
|
||||
|
||||
private static final int TEXTURE_HEIGHT = 128;
|
||||
|
|
|
@ -9,6 +9,15 @@ import net.minecraft.src.ModelRenderer;
|
|||
import net.minecraft.src.TileEntity;
|
||||
import net.minecraft.src.TileEntitySpecialRenderer;
|
||||
|
||||
/**
|
||||
* RenderCalcinator
|
||||
*
|
||||
* Renders the Calcinator in game as a TESR (Tile Entity Special Render)
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RenderCalcinator extends TileEntitySpecialRenderer {
|
||||
|
||||
static final float scale = (float) (1.0 / 16.0);
|
||||
|
|
|
@ -8,6 +8,15 @@ import net.minecraft.src.Tessellator;
|
|||
import net.minecraftforge.client.ForgeHooksClient;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
/**
|
||||
* RenderItemCalcinator
|
||||
*
|
||||
* Renders the Calcinator in game as an item (in hand, on the ground, and in inventory)
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RenderItemCalcinator implements IItemRenderer {
|
||||
|
||||
private ModelCalcinator calcinatorModel;
|
||||
|
|
|
@ -8,6 +8,15 @@ import cpw.mods.fml.client.FMLTextureFX;
|
|||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* TextureRedWaterFX
|
||||
*
|
||||
* TextureFX for still Red Water
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class TextureRedWaterFX extends FMLTextureFX {
|
||||
|
||||
protected float[] red = new float[256];
|
||||
|
|
|
@ -8,6 +8,15 @@ import cpw.mods.fml.client.FMLTextureFX;
|
|||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* TextureRedWaterFlowFX
|
||||
*
|
||||
* TextureFX for flowing Red Water
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class TextureRedWaterFlowFX extends FMLTextureFX {
|
||||
|
||||
protected float[] red = new float[256];
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package ee3.common;
|
||||
|
||||
import net.minecraft.src.CreativeTabs;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
|
@ -18,6 +19,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
|||
import cpw.mods.fml.common.registry.TickRegistry;
|
||||
import ee3.common.block.ModBlocks;
|
||||
import ee3.common.core.CommonProxy;
|
||||
import ee3.common.core.CreativeTabEE3;
|
||||
import ee3.common.core.handlers.AddonHandler;
|
||||
import ee3.common.core.handlers.ConfigurationHandler;
|
||||
import ee3.common.core.handlers.EntityLivingHandler;
|
||||
|
@ -53,6 +55,8 @@ public class EquivalentExchange3 {
|
|||
@SidedProxy(clientSide = Reference.CLIENT_PROXY_CLASS, serverSide = Reference.SERVER_PROXY_CLASS)
|
||||
public static CommonProxy proxy;
|
||||
|
||||
public static CreativeTabs tabsEE3 = new CreativeTabEE3(CreativeTabs.getNextID(), Reference.MOD_ID);
|
||||
|
||||
@PreInit
|
||||
public void preInit(FMLPreInitializationEvent event) {
|
||||
|
||||
|
|
|
@ -24,7 +24,6 @@ public class BlockCalcinator extends BlockEE {
|
|||
public BlockCalcinator(int id) {
|
||||
super(id, Material.rock);
|
||||
setHardness(5F);
|
||||
setCreativeTab(CreativeTabs.tabDecorations);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -5,6 +5,15 @@ import net.minecraft.src.BlockFlowing;
|
|||
import net.minecraft.src.CreativeTabs;
|
||||
import net.minecraft.src.Material;
|
||||
|
||||
/**
|
||||
* BlockRedWaterFlowing
|
||||
*
|
||||
* Class for the flowing version of Red Water
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class BlockRedWaterFlowing extends BlockFlowing {
|
||||
|
||||
protected BlockRedWaterFlowing(int id, Material material) {
|
||||
|
@ -12,7 +21,6 @@ public class BlockRedWaterFlowing extends BlockFlowing {
|
|||
this.blockHardness = 100F;
|
||||
this.setLightOpacity(3);
|
||||
this.setBlockName("redWaterFlowing");
|
||||
this.setCreativeTab(CreativeTabs.tabDecorations);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -5,6 +5,15 @@ import net.minecraft.src.BlockStationary;
|
|||
import net.minecraft.src.CreativeTabs;
|
||||
import net.minecraft.src.Material;
|
||||
|
||||
/**
|
||||
* BlockRedWaterFlowing
|
||||
*
|
||||
* Class for the still version of Red Water
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class BlockRedWaterStill extends BlockStationary {
|
||||
|
||||
protected BlockRedWaterStill(int id, Material material) {
|
||||
|
@ -14,7 +23,6 @@ public class BlockRedWaterStill extends BlockStationary {
|
|||
setBlockName("redWaterStill");
|
||||
disableStats();
|
||||
setRequiresSelfNotify();
|
||||
setCreativeTab(CreativeTabs.tabDecorations);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -2,12 +2,22 @@ package ee3.common.block;
|
|||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.BlockIds;
|
||||
import net.minecraft.src.Block;
|
||||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
import net.minecraft.src.Material;
|
||||
|
||||
/**
|
||||
* ModBlocks
|
||||
*
|
||||
* Class containing all the EE3 custom blocks
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ModBlocks {
|
||||
|
||||
/* Block name constants */
|
||||
|
@ -21,9 +31,9 @@ public class ModBlocks {
|
|||
|
||||
public static void init() {
|
||||
|
||||
calcinator = new BlockCalcinator(BlockIds.CALCINATOR).setBlockName(CALCINATOR_NAME);
|
||||
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL, Material.water);
|
||||
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1, Material.water);
|
||||
calcinator = new BlockCalcinator(BlockIds.CALCINATOR).setBlockName(CALCINATOR_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
redWaterStill = new BlockRedWaterStill(BlockIds.RED_WATER_STILL, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
redWaterFlowing = new BlockRedWaterFlowing(BlockIds.RED_WATER_STILL - 1, Material.water).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
|
||||
GameRegistry.registerBlock(calcinator);
|
||||
GameRegistry.registerBlock(redWaterStill);
|
||||
|
@ -36,13 +46,14 @@ public class ModBlocks {
|
|||
private static void initBlockRecipes() {
|
||||
|
||||
// Calcinator Recipe
|
||||
/* Temporarily disabled for pre-release 1, as it is not completely functional
|
||||
GameRegistry.addRecipe(new ItemStack(calcinator),
|
||||
new Object[] {"i i","iii","sfs",
|
||||
Character.valueOf('i'), Item.ingotIron,
|
||||
Character.valueOf('s'), Block.stone,
|
||||
Character.valueOf('f'), Item.flintAndSteel
|
||||
});
|
||||
|
||||
*/
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -9,6 +9,15 @@ import net.minecraft.src.ItemStack;
|
|||
import net.minecraft.src.Slot;
|
||||
import net.minecraft.src.TileEntityFurnace;
|
||||
|
||||
/**
|
||||
* ContainerCalcinator
|
||||
*
|
||||
* The container class for the Calcinator
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ContainerCalcinator extends Container {
|
||||
|
||||
private TileCalcinator calcinator;
|
||||
|
|
|
@ -5,6 +5,15 @@ import net.minecraft.src.EntityPlayer;
|
|||
import net.minecraft.src.InventoryPlayer;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
/**
|
||||
* ContainerPortableCrafting
|
||||
*
|
||||
* Container class for the portable crafting interface
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ContainerPortableCrafting extends ContainerWorkbench {
|
||||
|
||||
public ContainerPortableCrafting(InventoryPlayer inventoryPlayer, World world, int x, int y, int z) {
|
||||
|
|
25
ee3_common/ee3/common/core/CreativeTabEE3.java
Normal file
25
ee3_common/ee3/common/core/CreativeTabEE3.java
Normal file
|
@ -0,0 +1,25 @@
|
|||
package ee3.common.core;
|
||||
|
||||
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;
|
||||
|
||||
public class CreativeTabEE3 extends CreativeTabs {
|
||||
|
||||
public CreativeTabEE3(int par1, String par2Str) {
|
||||
super(par1, par2Str);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
/**
|
||||
* the itemID for the item to be displayed on the tab
|
||||
*/
|
||||
public int getTabIconItemIndex() {
|
||||
return ItemIds.PHILOSOPHER_STONE;
|
||||
}
|
||||
|
||||
}
|
|
@ -64,6 +64,9 @@ public class ConfigurationHandler {
|
|||
ItemIds.MINIUM_SHARD = configuration
|
||||
.getItem(ModItems.MINIUM_SHARD_NAME, ItemIds.MINIUM_SHARD_DEFAULT)
|
||||
.getInt(ItemIds.MINIUM_SHARD_DEFAULT);
|
||||
ItemIds.INERT_STONE = configuration
|
||||
.getItem(ModItems.INERT_STONE_NAME, ItemIds.INERT_STONE_DEFAULT)
|
||||
.getInt(ItemIds.INERT_STONE_DEFAULT);
|
||||
ItemIds.MINIUM_STONE = configuration
|
||||
.getItem(ModItems.MINIUM_STONE_NAME, ItemIds.MINIUM_STONE_DEFAULT)
|
||||
.getInt(ItemIds.MINIUM_STONE_DEFAULT);
|
||||
|
|
|
@ -11,6 +11,15 @@ import net.minecraftforge.event.ForgeSubscribe;
|
|||
import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
|
||||
|
||||
/**
|
||||
* EntityLivingHandler
|
||||
*
|
||||
* Class containing all EE3 custom event related logic for EntityLiving events
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class EntityLivingHandler {
|
||||
|
||||
@ForgeSubscribe
|
||||
|
|
|
@ -5,6 +5,15 @@ import java.util.ArrayList;
|
|||
import ee3.common.core.helper.GeneralHelper;
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
/**
|
||||
* EquivalencyHandler
|
||||
*
|
||||
* Class to handle all the equivalency relationships between items/etc
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class EquivalencyHandler {
|
||||
|
||||
private static final EquivalencyHandler instance = new EquivalencyHandler();
|
||||
|
@ -139,6 +148,10 @@ public class EquivalencyHandler {
|
|||
int i = 0;
|
||||
|
||||
if (list != null) {
|
||||
if (list.size() == 1) {
|
||||
return list.get(i);
|
||||
}
|
||||
|
||||
while (i < list.size()) {
|
||||
currentStack = list.get(i);
|
||||
|
||||
|
@ -172,6 +185,10 @@ public class EquivalencyHandler {
|
|||
int i = 0;
|
||||
|
||||
if (list != null) {
|
||||
if (list.size() == 1) {
|
||||
return list.get(i);
|
||||
}
|
||||
|
||||
while (i < list.size()) {
|
||||
currentStack = list.get(i);
|
||||
|
||||
|
|
|
@ -3,6 +3,15 @@ package ee3.common.core.handlers;
|
|||
import net.minecraft.src.ItemStack;
|
||||
import cpw.mods.fml.common.IFuelHandler;
|
||||
|
||||
/**
|
||||
* FuelHandler
|
||||
*
|
||||
* Class for querying and returning fuel values for items
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class FuelHandler implements IFuelHandler {
|
||||
|
||||
@Override
|
||||
|
|
|
@ -3,12 +3,21 @@ package ee3.common.core.handlers;
|
|||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
|
||||
|
||||
/**
|
||||
* PlayerDestroyItemHandler
|
||||
*
|
||||
* Class containing all EE3 custom event related logic for PlayerDestroyItem events
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class PlayerDestroyItemHandler {
|
||||
|
||||
@ForgeSubscribe
|
||||
public void onPlayerDestroyItemEvent(PlayerDestroyItemEvent event) {
|
||||
// TODO Come back and actually do what I want here
|
||||
System.out.println(event.original.func_82833_r());
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -10,6 +10,15 @@ import ee3.common.lib.Colours;
|
|||
import ee3.common.lib.ConfigurationSettings;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* VersionCheckTickHandler
|
||||
*
|
||||
* Class for notifying the player on their client when they get in game the outcome of the remote version check
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class VersionCheckTickHandler implements ITickHandler {
|
||||
|
||||
private static boolean initialized = false;
|
||||
|
|
|
@ -6,6 +6,15 @@ import net.minecraft.src.Block;
|
|||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
/**
|
||||
* GeneralHelper
|
||||
*
|
||||
* General helper methods for EE3
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class GeneralHelper {
|
||||
|
||||
public static ItemStack convertObjectToItemStack(Object obj) {
|
||||
|
|
|
@ -5,6 +5,15 @@ import net.minecraft.src.EntityAgeable;
|
|||
import net.minecraft.src.EntityLiving;
|
||||
import net.minecraft.src.EntityPlayer;
|
||||
|
||||
/**
|
||||
* ItemDropHelper
|
||||
*
|
||||
* Helper methods for dropping items in game
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ItemDropHelper {
|
||||
|
||||
private static double rand;
|
||||
|
|
|
@ -8,6 +8,15 @@ import cpw.mods.fml.common.FMLLog;
|
|||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* LogHelper
|
||||
*
|
||||
* Helper methods for logging to the EE3 logger
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class LogHelper {
|
||||
|
||||
private static Logger eeLogger = Logger.getLogger(Reference.MOD_NAME);
|
||||
|
@ -17,7 +26,6 @@ public class LogHelper {
|
|||
}
|
||||
|
||||
public static void log(Level logLevel, String message) {
|
||||
//System.out.println(Reference.LOGGER_PREFIX + message);
|
||||
eeLogger.log(logLevel, message);
|
||||
}
|
||||
|
||||
|
|
|
@ -3,6 +3,15 @@ package ee3.common.core.helper;
|
|||
import net.minecraft.src.ItemStack;
|
||||
import net.minecraft.src.NBTTagCompound;
|
||||
|
||||
/**
|
||||
* NBTHelper
|
||||
*
|
||||
* Helper methods for manipulating NBT data on ItemStacks
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class NBTHelper {
|
||||
|
||||
/**
|
||||
|
|
|
@ -2,20 +2,17 @@ package ee3.common.core.helper;
|
|||
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
/**
|
||||
* QualityHelper
|
||||
*
|
||||
* Helper methods for determining the quality tier of items
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class QualityHelper {
|
||||
|
||||
/*
|
||||
* Legend for the dust table quality lookup, comparison is based off of quality tiers
|
||||
*
|
||||
* Item Quality
|
||||
* |_0_|_1_|_2_|_3_|_4_|_5_|
|
||||
* Fuel 0 | 0 | 0 | 0 | 1 | 1 | 1 |
|
||||
* Quality 1 | 0 | 1 | 1 | 1 | 2 | 2 |
|
||||
* 2 | 0 | 1 | 2 | 2 | 2 | 2 |
|
||||
* 3 | 1 | 1 | 2 | 3 | 3 | 3 |
|
||||
* 4 | 1 | 2 | 2 | 3 | 4 | 4 |
|
||||
* 5 | 1 | 2 | 2 | 3 | 4 | 5 |
|
||||
*/
|
||||
private static int[][] dustTable = {
|
||||
{0, 0, 0, 1, 1, 1},
|
||||
{0, 1, 1, 1, 2, 2},
|
||||
|
|
|
@ -8,6 +8,15 @@ import net.minecraft.src.Item;
|
|||
import net.minecraft.src.ItemStack;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
/**
|
||||
* RecipeHelper
|
||||
*
|
||||
* Helper methods for adding recipes
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RecipeHelper {
|
||||
|
||||
public static void addRecipe(ItemStack output, Object... input) {
|
||||
|
|
|
@ -8,6 +8,15 @@ import net.minecraft.src.EntityLiving;
|
|||
import net.minecraft.src.MathHelper;
|
||||
import net.minecraft.src.World;
|
||||
|
||||
/**
|
||||
* RedWaterHelper
|
||||
*
|
||||
* Helper methods for Red Water related effects
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RedWaterHelper {
|
||||
|
||||
public static boolean handleRedWaterDetection(EntityLiving entity) {
|
||||
|
|
|
@ -1,12 +1,27 @@
|
|||
package ee3.common.core.helper;
|
||||
|
||||
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;
|
||||
|
||||
/**
|
||||
* TransmutationHelper
|
||||
*
|
||||
* Helper methods for transmutation related things
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class TransmutationHelper {
|
||||
|
||||
public static boolean transmuteInWorld(World world, EntityPlayer player, ItemStack stack, int x, int y, int z) {
|
||||
|
@ -14,12 +29,11 @@ public class TransmutationHelper {
|
|||
int id = world.getBlockId(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
|
||||
if (world.getBlockMaterial(x, y, z) == Material.leaves) {
|
||||
if ((world.getBlockMaterial(x, y, z) == Material.leaves) && (Block.blocksList[id] instanceof BlockLeaves)) {
|
||||
meta = meta % 4;
|
||||
}
|
||||
|
||||
/*
|
||||
ItemStack nextItem = EquivalencyHandler.getNextBlockInEquivalencyList(id, meta, player.isSneaking());
|
||||
ItemStack nextItem = getNextBlock(id, meta, player.isSneaking());
|
||||
|
||||
if (nextItem != null) {
|
||||
if (Block.blocksList[nextItem.itemID] != null) {
|
||||
|
@ -28,9 +42,70 @@ public class TransmutationHelper {
|
|||
return true;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
public static ItemStack getNextBlock(int id, int meta, boolean allowFalling) {
|
||||
ArrayList<ItemStack> list = EquivalencyHandler.instance().getEquivalencyList(id, meta);
|
||||
|
||||
ItemStack nextStack = null;
|
||||
|
||||
if (list != null) {
|
||||
return getNextBlock(id, meta, id, meta, allowFalling);
|
||||
}
|
||||
|
||||
return nextStack;
|
||||
}
|
||||
|
||||
private static ItemStack getNextBlock(int id, int meta, int origId, int origMeta, boolean allowFalling) {
|
||||
ArrayList<ItemStack> list = EquivalencyHandler.instance().getEquivalencyList(id, meta);
|
||||
|
||||
ItemStack nextStack = null;
|
||||
|
||||
if (list != null) {
|
||||
nextStack = EquivalencyHandler.instance().getNextInList(id, meta);
|
||||
|
||||
/*
|
||||
* If the current item is the same as the original one we started with, then we have
|
||||
* recursed through the entire list and not found a next block so return the original.
|
||||
* This is the "base case" for the recursion.
|
||||
*/
|
||||
if ((nextStack.itemID == origId) && (nextStack.getItemDamage() == origMeta)) {
|
||||
return nextStack;
|
||||
}
|
||||
else {
|
||||
/*
|
||||
* If we are allowing any block (including falling ones) just check to see if the
|
||||
* next item is a block. If it is, return it. Otherwise continue the recursion.
|
||||
*/
|
||||
if (allowFalling) {
|
||||
if (nextStack.getItem() instanceof ItemBlock) {
|
||||
return nextStack;
|
||||
}
|
||||
else {
|
||||
return getNextBlock(nextStack.itemID, nextStack.getItemDamage(), origId, origMeta, allowFalling);
|
||||
}
|
||||
}
|
||||
/*
|
||||
* Else we need to check to make sure the next item is both a block and not an
|
||||
* instance of BlockSand (which all gravity affected blocks are a subclass of.
|
||||
* If the next item is a block, and is not a subclass of BlockSand return it,
|
||||
* otherwise, continue the recursion.
|
||||
*/
|
||||
else {
|
||||
if ((nextStack.getItem() instanceof ItemBlock) && (!(Block.blocksList[nextStack.itemID] instanceof BlockSand))) {
|
||||
return nextStack;
|
||||
}
|
||||
else {
|
||||
return getNextBlock(nextStack.itemID, nextStack.getItemDamage(), origId, origMeta, allowFalling);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// In the event the list is null, return null
|
||||
return nextStack;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -4,6 +4,15 @@ import java.util.Collections;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* EMCEntry
|
||||
*
|
||||
* Holds the breakdown of how much, and what kinds, of EMC an object has
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class EMCEntry {
|
||||
|
||||
private float cost, recoveryPercentage;
|
||||
|
|
|
@ -7,6 +7,15 @@ import net.minecraft.src.Block;
|
|||
import net.minecraft.src.Item;
|
||||
import net.minecraft.src.ItemStack;
|
||||
|
||||
/**
|
||||
* EMCRegistry
|
||||
*
|
||||
* Registry containing all EMC entries for objects
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class EMCRegistry {
|
||||
|
||||
private static final EMCRegistry emcRegistry = new EMCRegistry();
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.emc;
|
||||
|
||||
/**
|
||||
* EMCType
|
||||
*
|
||||
* Enum containing the different types of EMC available in the mod
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public enum EMCType {
|
||||
CORPOREAL, KINETIC, TEMPORAL, ESSENTIA, AMORPHOUS, VOID, OMNI
|
||||
}
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.item;
|
||||
|
||||
/**
|
||||
* ITransmutationStone
|
||||
*
|
||||
* Transmutation Stone interface, for use amongst all different kinds of transmutation stones
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public interface ITransmutationStone {
|
||||
|
||||
public abstract void openPortableCraftingGui();
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.item;
|
||||
|
||||
/**
|
||||
* ItemInertStone
|
||||
*
|
||||
* An inert stone
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ItemInertStone extends ItemEE {
|
||||
|
||||
public ItemInertStone(int id) {
|
||||
|
|
|
@ -25,7 +25,7 @@ public class ItemMiniumStone extends ItemEE {
|
|||
|
||||
public ItemMiniumStone(int id) {
|
||||
super(id);
|
||||
setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY);
|
||||
setMaxDamage(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY - 1);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
|
|
@ -2,6 +2,7 @@ package ee3.common.item;
|
|||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import ee3.common.EquivalentExchange3;
|
||||
import ee3.common.lib.ItemIds;
|
||||
import net.minecraft.src.Block;
|
||||
import net.minecraft.src.CreativeTabs;
|
||||
|
@ -20,23 +21,23 @@ import net.minecraft.src.ItemStack;
|
|||
public class ModItems {
|
||||
|
||||
/* Item name constants */
|
||||
public static final String INERT_STONE_NAME = "inertStone";
|
||||
public static final String MINIUM_SHARD_NAME = "miniumShard";
|
||||
public static final String INERT_STONE_NAME = "inertStone";
|
||||
public static final String MINIUM_STONE_NAME = "miniumStone";
|
||||
public static final String PHILOSOPHER_STONE_NAME = "philStone";
|
||||
|
||||
/* Mod item instances */
|
||||
public static Item inertStone;
|
||||
public static Item miniumShard;
|
||||
public static Item inertStone;
|
||||
public static Item miniumStone;
|
||||
public static Item philStone;
|
||||
|
||||
public static void init() {
|
||||
/* Initialize each mod item individually */
|
||||
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(2, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(CreativeTabs.tabMisc);
|
||||
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName(MINIUM_SHARD_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
inertStone = new ItemInertStone(ItemIds.INERT_STONE).setIconCoord(1, 0).setItemName(INERT_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName(MINIUM_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE).setIconCoord(2, 0).setItemName(PHILOSOPHER_STONE_NAME).setCreativeTab(EquivalentExchange3.tabsEE3);
|
||||
|
||||
miniumStone.setContainerItem(miniumStone);
|
||||
philStone.setContainerItem(philStone);
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.lib;
|
||||
|
||||
/**
|
||||
* Colours
|
||||
*
|
||||
* Library containing the default colour values used in the mod
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class Colours {
|
||||
|
||||
public static final String PURE_RED = "ff0000";
|
||||
|
|
|
@ -2,6 +2,15 @@ package ee3.common.lib;
|
|||
|
||||
import ee3.common.item.ModItems;
|
||||
|
||||
/**
|
||||
* ConfigurationSettings
|
||||
*
|
||||
* Stores the various configuration settings read in from configuration files
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class ConfigurationSettings {
|
||||
|
||||
/*
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.lib;
|
||||
|
||||
/**
|
||||
* GuiIds
|
||||
*
|
||||
* Library containing the various ids for different Guis in the mod
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class GuiIds {
|
||||
|
||||
public static final int PORTABLE_CRAFTING = 1;
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.lib;
|
||||
|
||||
/**
|
||||
* PacketIds
|
||||
*
|
||||
* Library containing the various ids for different packets in the mod
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class PacketIds {
|
||||
|
||||
public static final int KEYBINDING_PRESSED = 0;
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.lib;
|
||||
|
||||
/**
|
||||
* RenderIds
|
||||
*
|
||||
* Library containing the various ids for different renders in the mod
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RenderIds {
|
||||
|
||||
public static int calcinatorRenderId;
|
||||
|
|
|
@ -7,6 +7,15 @@ import java.io.IOException;
|
|||
import cpw.mods.fml.common.network.Player;
|
||||
import net.minecraft.src.INetworkManager;
|
||||
|
||||
/**
|
||||
* PacketEE
|
||||
*
|
||||
* General packet for EE3 related packets
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class PacketEE {
|
||||
|
||||
protected PacketTypeHandler packetType;
|
||||
|
|
|
@ -15,6 +15,15 @@ import net.minecraft.src.EntityPlayer;
|
|||
import net.minecraft.src.INetworkManager;
|
||||
import net.minecraft.src.Packet250CustomPayload;
|
||||
|
||||
/**
|
||||
* PacketKeyPressed
|
||||
*
|
||||
* Packet specifically for notifying the server of client key pressed events
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class PacketKeyPressed extends PacketEE {
|
||||
|
||||
public String key;
|
||||
|
|
|
@ -9,6 +9,15 @@ import cpw.mods.fml.common.network.Player;
|
|||
import net.minecraft.src.INetworkManager;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
||||
/**
|
||||
* PacketTileUpdate
|
||||
*
|
||||
* Packet specifically for updating/synching tile entities between client and server
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class PacketTileUpdate extends PacketEE {
|
||||
|
||||
public int x, y, z;
|
||||
|
|
|
@ -8,6 +8,15 @@ import ee3.common.lib.Reference;
|
|||
import net.minecraft.src.Packet;
|
||||
import net.minecraft.src.Packet250CustomPayload;
|
||||
|
||||
/**
|
||||
* PacketTypeHandler
|
||||
*
|
||||
* Handler that routes packets to the appropriate destinations depending on what kind of packet they are
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public enum PacketTypeHandler {
|
||||
KEY(PacketKeyPressed.class),
|
||||
TILE(PacketTileUpdate.class);
|
||||
|
|
|
@ -1,5 +1,14 @@
|
|||
package ee3.common.recipe;
|
||||
|
||||
/**
|
||||
* RecipesCalcinator
|
||||
*
|
||||
* Calcinator recipes
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RecipesCalcinator {
|
||||
|
||||
}
|
||||
|
|
|
@ -18,6 +18,15 @@ import ee3.common.core.helper.RecipeHelper;
|
|||
import ee3.common.item.ModItems;
|
||||
import ee3.common.lib.Reference;
|
||||
|
||||
/**
|
||||
* RecipesTransmutationStone
|
||||
*
|
||||
* Transmutation Stone recipes
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class RecipesTransmutationStone {
|
||||
|
||||
private static ItemStack philStone = new ItemStack(ModItems.philStone, 1, -1);
|
||||
|
|
|
@ -6,6 +6,15 @@ import net.minecraft.src.ItemStack;
|
|||
import net.minecraft.src.NBTTagCompound;
|
||||
import net.minecraft.src.NBTTagList;
|
||||
|
||||
/**
|
||||
* TileCalcinator
|
||||
*
|
||||
* Calcinator tile entity, and all the logic associated with it
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class TileCalcinator extends TileEE implements IInventory {
|
||||
|
||||
/**
|
||||
|
|
|
@ -5,6 +5,15 @@ import net.minecraft.src.EntityPlayer;
|
|||
import net.minecraft.src.NBTTagCompound;
|
||||
import net.minecraft.src.TileEntity;
|
||||
|
||||
/**
|
||||
* TileEE
|
||||
*
|
||||
* General tile entity for EE3 related tile entities
|
||||
*
|
||||
* @author pahimar
|
||||
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
|
||||
*
|
||||
*/
|
||||
public class TileEE extends TileEntity {
|
||||
|
||||
private byte direction;
|
||||
|
|
|
@ -2,14 +2,22 @@
|
|||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties version="1.0">
|
||||
<comment>Welsh Localization File</comment>
|
||||
<entry key="key.extra">Ychwanegol</entry>
|
||||
<entry key="key.release">Rhyddhau</entry>
|
||||
<entry key="key.toggle">Toglo</entry>
|
||||
<entry key="key.charge">Gwefru</entry>
|
||||
<entry key="item.miniumShard.name">Darn o Finiwm</entry>
|
||||
<entry key="item.inertStone.name">Carreg Anadweithiol</entry>
|
||||
<entry key="item.miniumStone.name">Carreg Miniwm</entry>
|
||||
<entry key="item.philStone.name">Maen Athronwyr</entry>
|
||||
<entry key="tile.redWaterStill.name">Dŵr Coch (Llonydd)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Dŵr Coch (Llifeiriol)</entry>
|
||||
<entry key="tile.calcinator.name">Calchyniadwr</entry>
|
||||
<entry key="version.uninitialized">Heb Ymgychwyn</entry>
|
||||
<entry key="version.current">Cyfredol</entry>
|
||||
<entry key="version.outdated">Wedi Dyddio</entry>
|
||||
<entry key="version.connection_error">Gwall Cysylltiad</entry>
|
||||
<entry key="gui.calcinator.name">Calchyniadwr</entry>
|
||||
<entry key="version.init_log_message">Ymgychwynnu gwiriad fersiwn yn erbyn y ffeil awdurdod fersiwn o bell, a leolir ar</entry>
|
||||
<entry key="version.uninitialized">Ni gyflawnwyd y gwiriad fersiwn yn llwyddiannus (ni ymgychwynodd y gwiriad fersiwn yn briodol)</entry>
|
||||
<entry key="version.current">Rydych yn defnyddio y fersiwn diweddaraf ar gyfer eich fersiwn o Minecraft</entry>
|
||||
<entry key="version.outdated">Rydych yn defnyddio fersiwn wedi dyddio; cysidrwch diweddaru yma - http://goo.gl/sNcGl</entry>
|
||||
<entry key="version.connection_error">Gwall wrth drio cysylltu gyda'r ffeil awdurdod fersiwn o bell (Gwiriwch eich cysylltiad rhwydwaith)</entry>
|
||||
<entry key="version.check_disabled">Gwiriad fersiwn o bell wedi'i ddiffodd, esgusodid</entry>
|
||||
</properties>
|
||||
|
|
|
@ -2,14 +2,23 @@
|
|||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties version="1.0">
|
||||
<comment>German (DE) Localization File</comment>
|
||||
<entry key="key.extra">Extra</entry>
|
||||
<entry key="key.release">Freilassen</entry>
|
||||
<entry key="key.toggle">Umschalten</entry>
|
||||
<entry key="key.charge">Aufladen</entry>
|
||||
<entry key="item.miniumShard.name">Miniumscherbe</entry>
|
||||
<entry key="item.inertStone.name">Träger Stein</entry>
|
||||
<entry key="item.miniumStone.name">Miniumstein</entry>
|
||||
<entry key="item.philStone.name">Stein der Weisen</entry>
|
||||
<entry key="tile.redWaterStill.name">Rotes Wasser (Still)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Rotes Wasser (Fliessend)</entry>
|
||||
<entry key="tile.calcinator.name">Calcinator</entry>
|
||||
<entry key="version.uninitialized">Uninitialisiert</entry>
|
||||
<entry key="version.current">Aktuell</entry>
|
||||
<entry key="version.outdated">Veraltet</entry>
|
||||
<entry key="version.connection_error">Verbindungsfehler</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Rotes Wasser (Fließend)</entry>
|
||||
<entry key="tile.calcinator.name">Kalkinator</entry>
|
||||
<entry key="gui.calcinator.name">Kalkinator</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
<entry key="version.init_log_message">Initialisiere Versionsvergleich mit der Remotedatei, die sich auf folgendem Server befindet</entry>
|
||||
<entry key="version.uninitialized">Die Versionsprüfung wurde nicht erfolgreich abgeschlossen (Versionsprüfung wurde nicht entsprechend initialisiert)</entry>
|
||||
<entry key="version.current">Du benutzt gerade die aktuellste Version für deine Minecraft-Version</entry>
|
||||
<entry key="version.outdated">Du benutzt gerade eine veraltete Version; bitte ziehe es in Betracht es hier zu updaten - http://goo.gl/sNcGl</entry>
|
||||
<entry key="version.connection_error">Fehler bei der Verbindung zur Remoteversion(überprüfe bitte deine Internetverbindung)</entry>
|
||||
<entry key="version.check_disabled">Versionsvergleich mit der Remotedatei deaktiviert, überspringe</entry>
|
||||
</properties>
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
<entry key="tile.redWaterFlowing.name">Red Water (Flowing)</entry>
|
||||
<entry key="tile.calcinator.name">Calcinator</entry>
|
||||
<entry key="gui.calcinator.name">Calcinator</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
<entry key="version.init_log_message">Initializing version check against the remote version authority file, located at</entry>
|
||||
<entry key="version.uninitialized">The version check did not complete successfully (version check did not initialize properly)</entry>
|
||||
<entry key="version.current">You are currently using the most up to date version for your version of Minecraft</entry>
|
||||
|
|
24
resources/ee3/lang/jp_JP.xml
Normal file
24
resources/ee3/lang/jp_JP.xml
Normal file
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties version="1.0">
|
||||
<comment>Japanese Localization File</comment>
|
||||
<entry key="key.extra">エクストラ</entry>
|
||||
<entry key="key.release">解き放つ</entry>
|
||||
<entry key="key.toggle">トグル</entry>
|
||||
<entry key="key.charge">充電する</entry>
|
||||
<entry key="item.miniumShard.name">ミニウムの片</entry>
|
||||
<entry key="item.inertStone.name">不活発な石</entry>
|
||||
<entry key="item.miniumStone.name">ミニウム石</entry>
|
||||
<entry key="item.philStone.name">賢者の石</entry>
|
||||
<entry key="tile.redWaterStill.name">赤い水 (動かない)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">赤い水 (流れ出る)</entry>
|
||||
<entry key="tile.calcinator.name">煆焼の鍋</entry>
|
||||
<entry key="gui.calcinator.name">煆焼の鍋</entry>
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</entry>
|
||||
<entry key="version.init_log_message">EE3版の点検は始める。</entry>
|
||||
<entry key="version.uninitialized">EE3版の点検は失敗しました。 (初期化は失敗しました。)</entry>
|
||||
<entry key="version.current">EE3版は通用している。</entry>
|
||||
<entry key="version.outdated">EE3版は廃れたです。 アップデイトへ http://goo.gl/sNcGl</entry>
|
||||
<entry key="version.connection_error">リモートバージョンのファイルへの接続でエラーが発生しました。 (インターネット接続を確認。)</entry>
|
||||
<entry key="version.check_disabled">EE3版の遠いの点検は出来なくするです、とばします。</entry>
|
||||
</properties>
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
|
||||
<properties version="1.0">
|
||||
<comment>Portuguese (PT) Post Reform Localization File</comment>
|
||||
<comment>European Portuguese (pt-PT) Localization File</comment>
|
||||
<entry key="key.extra">Extra</entry>
|
||||
<entry key="key.release">Disparar</entry>
|
||||
<entry key="key.toggle">Alternar</entry>
|
||||
|
@ -9,15 +9,25 @@
|
|||
<entry key="item.miniumShard.name">Fragmento de Mínio</entry>
|
||||
<entry key="item.inertStone.name">Pedra Inerte</entry>
|
||||
<entry key="item.miniumStone.name">Pedra de Mínio</entry>
|
||||
<entry key="item.philStone.name">Pedra do Filósofo</entry>
|
||||
<entry key="item.philStone.name">Pedra Filosofal</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>
|
||||
<<<<<<< HEAD
|
||||
<entry key="version.init_log_message">A iniciar a verificação da versão em relação ao ficheiro de versões remoto, localizado em</entry>
|
||||
<entry key="version.uninitialized">A verificação de versão não teve sucesso porque não foi iniciada correctamente</entry>
|
||||
<entry key="version.current">Estás a usar a versão atual para a tua versão do Minecraft</entry>
|
||||
<entry key="version.outdated">A tua versão está desatualizada, considera atualizar aqui - http://goo.gl/sNcGl</entry>
|
||||
<entry key="version.connection_error">Ocorreu um erro de ligação com o ficheiro de versões remoto (Tenta testar a tua ligação à internet?)</entry>
|
||||
<entry key="version.check_disabled">A saltar a etapa de verificação de versões, porque esta foi desativada</entry>
|
||||
=======
|
||||
<entry key="itemGroup.EE3">Equivalent Exchange 3</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 - http://goo.gl/sNcGl</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.check_disabled">Verificação de versão remota desactivada, a ignorar</entry>
|
||||
>>>>>>> upstream/master
|
||||
</properties>
|
||||
|
|
|
@ -3,21 +3,21 @@
|
|||
<properties version="1.0">
|
||||
<comment>Swedish (SE) Localization File</comment>
|
||||
<entry key="key.extra">Extra</entry>
|
||||
<entry key="key.release">Släpp</entry>
|
||||
<entry key="key.release">Utgivning</entry>
|
||||
<entry key="key.toggle">Växla</entry>
|
||||
<entry key="key.charge">Laddda</entry>
|
||||
<entry key="item.miniumShard.name">Fragment av Minium</entry>
|
||||
<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">Minium Sten</entry>
|
||||
<entry key="item.philStone.name">Filosofens Sten</entry>
|
||||
<entry key="tile.redWaterStill.name">Rött Vatten (Stilla)</entry>
|
||||
<entry key="tile.redWaterFlowing.name">Rött Vatten (Forsande)</entry>
|
||||
<entry key="item.miniumStone.name">Mönja Sten</entry>
|
||||
<entry key="item.philStone.name">De Vises Sten</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 den fjärrversions auktoritet filen, lokaliserad vid</entry>
|
||||
<entry key="version.uninitialized">Versionskontrollen avslutades inte framgångsrikt (Versionskontrollen initierade inte riktigt)</entry>
|
||||
<entry key="version.current">Du använder för närvarande den mest uppdaterade versionen för din version av Minecraft</entry>
|
||||
<entry key="version.outdated">Du använder för närvarande en utdaterad version; Fundera på att uppdatera här - http://goo.gl/sNcGl</entry>
|
||||
<entry key="version.connection_error">Fel att ansluta till den fjärrversions auktoritets fil (Kolla din internetanslutning?)</entry>
|
||||
<entry key="version.check_disabled">Fjärrversions kontroll inaktiverad, hoppar över</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 - http://goo.gl/sNcGl</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>
|
||||
</properties>
|
||||
|
|
Loading…
Reference in a new issue