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

Updated build script, localization support, some stubbed in classes

Browse source
This commit is contained in:
pahimar 2012-07-19 15:53:59 -04:00
parent 9f7b6a5121
commit fc83d9dd16
14 changed files with 131 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
build.xml
View file

@ -56,7 +56,35 @@
</exec>
</target>
<target name="release">
<target name="release-beta">
<!-- Prep for the release -->
<antcall target="clean" />
<antcall target="build" />
<antcall target="recompile" />
<antcall target="reobfuscate" />
<!-- Update the mod_*.info file for release -->
<copy file="${dir.development}\source\Equivalent-Exchange-3\ee3_common\mod_EE3.info" todir="${dir.development}\releases\" />
<move file="${dir.development}\releases\mod_EE3.info" tofile="${dir.development}\releases\mcmod.info" />
<!-- Build the jar -->
<jar destfile="${dir.development}\releases\ee3-client-v${release.mod.version}.jar">
<fileset dir="${dir.development}\releases\" includes="mcmod.info" />
<fileset dir="${dir.development}\mcp\reobf\minecraft" />
<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
</jar>
<jar destfile="${dir.development}\releases\ee3-server-v${release.mod.version}.jar" basedir="${dir.development}\mcp\reobf\minecraft_server" />
<!-- Put a copy in my Beta DB share -->
<mkdir dir="${dir.beta}\${release.minecraft.version}\${release.mod.version}" />
<move file="${dir.development}\releases\ee3-client-v${release.mod.version}.jar" todir="${dir.beta}\${release.minecraft.version}\${release.mod.version}" />
<move file="${dir.development}\releases\ee3-server-v${release.mod.version}.jar" todir="${dir.beta}\${release.minecraft.version}\${release.mod.version}" />
<!-- Clean up the MCP source now that we are done -->
<antcall target="clean" />
</target>
<target name="release-final">
<!-- Prep for the release -->
<antcall target="clean" />
<antcall target="build" />
@ -68,25 +96,25 @@
<move file="${dir.development}\releases\mod_EE3.info" tofile="${dir.development}\releases\mcmod.info" />
<!-- Build the jar -->
<jar destfile="${dir.development}\releases\ee3-client-v${release.version}.jar">
<jar destfile="${dir.development}\releases\ee3-client-v${release.mod.version}.jar">
<fileset dir="${dir.development}\releases\" includes="mcmod.info" />
<fileset dir="${dir.development}\mcp\reobf\minecraft" />
<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
</jar>
<jar destfile="${dir.development}\releases\ee3-server-v${release.version}.jar" basedir="${dir.development}\mcp\reobf\minecraft_server" />
<jar destfile="${dir.development}\releases\ee3-server-v${release.mod.version}.jar" basedir="${dir.development}\mcp\reobf\minecraft_server" />
<!-- Put a copy in Sengir's DB share -->
<mkdir dir="${dir.dropbox.mod.share}\${release.minecraft.version}\${release.version}" />
<copy file="${dir.development}\releases\ee3-client-v${release.version}.jar" todir="${dir.dropbox.mod.share}\${release.minecraft.version}\${release.version}" />
<copy file="${dir.development}\releases\ee3-server-v${release.version}.jar" todir="${dir.dropbox.mod.share}\${release.minecraft.version}\${release.version}" />
<mkdir dir="${dir.share}\${release.minecraft.version}\${release.mod.version}" />
<copy file="${dir.development}\releases\ee3-client-v${release.mod.version}.jar" todir="${dir.share}\${release.minecraft.version}\${release.mod.version}" />
<copy file="${dir.development}\releases\ee3-server-v${release.mod.version}.jar" todir="${dir.share}\${release.minecraft.version}\${release.mod.version}" />
<!-- Put a copy in my public DB share -->
<mkdir dir="${dir.dropbox.pahimar}\${release.minecraft.version}\${release.version}" />
<move file="${dir.development}\releases\ee3-client-v${release.version}.jar" todir="${dir.dropbox.pahimar}\${release.minecraft.version}\${release.version}" />
<move file="${dir.development}\releases\ee3-server-v${release.version}.jar" todir="${dir.dropbox.pahimar}\${release.minecraft.version}\${release.version}" />
<mkdir dir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
<copy file="${dir.development}\releases\ee3-client-v${release.mod.version}.jar" todir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
<copy file="${dir.development}\releases\ee3-server-v${release.mod.version}.jar" todir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
<!-- Clean up the MCP source now that we are done -->
<antcall target="clean" />
</target>
</project>

19
ee3_client/ee3/client/render/RenderCalcinator.java Normal file
View file

@ -0,0 +1,19 @@
package ee3.client.render;
import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer;
public class RenderCalcinator extends TileEntitySpecialRenderer {
public RenderCalcinator() {
}
@Override
public void renderTileEntityAt(TileEntity var1, double var2, double var4,
double var6, float var8) {
// TODO Auto-generated method stub
}
}

17
ee3_common/ee3/core/BlockEE.java → ee3_common/ee3/block/BlockEE.java
View file

@ -1,4 +1,4 @@
package ee3.core;
package ee3.block;
import net.minecraft.src.BlockContainer;
import net.minecraft.src.Material;
@ -11,26 +11,15 @@ import net.minecraft.src.forge.ITextureProvider;
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
public class BlockEE extends BlockContainer implements ITextureProvider {
public class BlockEE extends BlockContainer {
protected BlockEE(int i) {
super(i, Material.rock);
}
@Override
public String getTextureFile() {
// TODO
return "";
}
@Override
public TileEntity getBlockEntity() {
return null;
}
@Override
public TileEntity getBlockEntity(int metadata) {
// TODO
// TODO Auto-generated method stub
return null;
}
}

12
ee3_common/ee3/block/BlockRedWaterFlowing.java Normal file
View file

@ -0,0 +1,12 @@
package ee3.block;
import net.minecraft.src.BlockFluid;
import net.minecraft.src.Material;
public class BlockRedWaterFlowing extends BlockFluid {
protected BlockRedWaterFlowing(int par1, Material par2Material) {
super(par1, par2Material);
}
}

13
ee3_common/ee3/block/BlockRedWaterStill.java Normal file
View file

@ -0,0 +1,13 @@
package ee3.block;
import net.minecraft.src.BlockStationary;
import net.minecraft.src.Material;
public class BlockRedWaterStill extends BlockStationary {
protected BlockRedWaterStill(int par1, Material par2Material) {
super(par1, par2Material);
// TODO Auto-generated constructor stub
}
}

24
ee3_common/ee3/core/Localization.java → ee3_common/ee3/core/helper/LocalizationHelper.java
View file

@ -1,19 +1,21 @@
package ee3.core;
package ee3.core.helper;
import java.io.InputStream;
import java.util.Properties;
import ee3.lib.Reference;
import net.minecraft.src.StringTranslate;
/**
* Simple mod localization class. Shamelessly ripped from Buildcraft. All Javadoc after this point is from the original
* Simple mod localization class. Shamelessly ripped from Buildcraft, renamed LocalizationHelper, and modified.
*
* @author Jimeo Wan
* @license Public domain
*/
public class Localization {
public class LocalizationHelper {
public static Localization instance = new Localization();
public static LocalizationHelper instance = new LocalizationHelper();
private static final String DEFAULT_LANGUAGE = "en_US";
@ -23,12 +25,12 @@ public class Localization {
/**
* Loads the mod's localization files. All language files must be stored in
* "[modname]/lang/", in .properties files. (ex: for the mod 'invtweaks',
* the french translation is in: "invtweaks/lang/fr_FR.properties")
* "/lang[modname]/", in .lang files. (ex: for the mod 'invtweaks',
* the french translation is in: "lang/invtweaks/fr_FR.lang")
*
* @param modName The mod name
*/
public Localization() {
public LocalizationHelper() {
load(getCurrentLanguage());
}
@ -50,10 +52,10 @@ public class Localization {
defaultMappings.clear();
mappings.clear();
try {
InputStream langStream = Localization.class.getResourceAsStream(
"/lang/ee3/" + newLanguage + ".properties");
InputStream defaultLangStream = Localization.class.getResourceAsStream(
"/lang/ee3/" + DEFAULT_LANGUAGE + ".properties");
InputStream langStream = LocalizationHelper.class.getResourceAsStream(
Reference.LANG_RESOURCE_LOCATION + newLanguage + ".lang");
InputStream defaultLangStream = LocalizationHelper.class.getResourceAsStream(
Reference.LANG_RESOURCE_LOCATION + DEFAULT_LANGUAGE + ".lang");
mappings.load((langStream == null) ? defaultLangStream : langStream);
defaultMappings.load(defaultLangStream);

4
ee3_common/ee3/item/ItemEE.java
View file

@ -1,5 +1,8 @@
package ee3.item;
import net.minecraft.src.ItemStack;
import ee3.core.helper.LocalizationHelper;
/**
* TODO Class Description
* @author pahimar
@ -11,4 +14,5 @@ public class ItemEE extends ItemMod {
public ItemEE(int i) {
super(i);
}
}

3
ee3_common/ee3/item/ItemMiniumShard.java
View file

@ -1,5 +1,8 @@
package ee3.item;
import ee3.core.helper.LocalizationHelper;
import net.minecraft.src.ItemStack;
/**
* TODO Class Description
* @author pahimar

5
ee3_common/ee3/item/ItemMod.java
View file

@ -1,5 +1,6 @@
package ee3.item;
import ee3.core.helper.LocalizationHelper;
import ee3.lib.Reference;
import net.minecraft.src.Item;
import net.minecraft.src.ItemStack;
@ -20,6 +21,10 @@ public class ItemMod extends Item implements ITextureProvider {
setNoRepair();
}
public String getItemDisplayName(ItemStack itemstack) {
return LocalizationHelper.instance.get(getItemNameIS(itemstack));
}
@Override
public String getTextureFile() {
return Reference.SPRITE_SHEET_LOCATION + Reference.ITEM_SPRITE_SHEET;

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

@ -27,12 +27,7 @@ public class ModItems {
/* Initialise each mod item individually */
miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD).setIconCoord(0, 0).setItemName("miniumShard");
miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE).setIconCoord(1, 0).setItemName("miniumStone");
philStone = new ItemPhilosopherStone(ItemIds.PHIL_STONE).setIconCoord(2, 0).setItemName("philStone");
/* Add the item names to the mod items */
ModLoader.addName(miniumShard, "Minium Shard");
ModLoader.addName(miniumStone, "Minium Stone");
ModLoader.addName(philStone, "Philosopher's Stone");
philStone = new ItemPhilosopherStone(ItemIds.PHIL_STONE).setIconCoord(2, 0).setItemName("philosophersStone");
ModLoader.addShapelessRecipe(new ItemStack(miniumStone), Block.dirt);
ModLoader.addShapelessRecipe(new ItemStack(philStone), Block.dirt, Block.dirt);

5
ee3_common/ee3/lib/Reference.java
View file

@ -22,7 +22,12 @@ public class Reference {
public static final String ARMOR_SHEET_LOCATION = "/ee3/art/armor/";
public static final String SOUND_RESOURCE_LOCATION = "ee3/sound/";
public static final String SOUND_PREFIX = "ee3.sound.";
public static final String LANG_RESOURCE_LOCATION = "/ee3/lang/";
public static final int MINIUM_STONE_DURABILITY = 1531;
public static final int MINIUM_STONE_TRANSMUTE_COST = 4;
public static final String ITEM_NAME_MINIUM_SHARD = "item.name.minium_shard";
public static final String ITEM_NAME_MINIUM_STONE = "item.name.minium_stone";
public static final String ITEM_NAME_PHILOSOPHERS_STONE = "item.name.philosophers_stone";
}

5
ee3_common/ee3/te/TileCalcinator.java Normal file
View file

@ -0,0 +1,5 @@
package ee3.te;
public class TileCalcinator extends TileEE {
}

7
ee3_common/ee3/te/TileEE.java Normal file
View file

@ -0,0 +1,7 @@
package ee3.te;
import net.minecraft.src.TileEntity;
public class TileEE extends TileEntity {
}

3
resources/ee3/lang/en_US.lang Normal file
View file

@ -0,0 +1,3 @@
item.miniumShard=Minium Shard
item.miniumStone=Minium Stone
item.philosophersStone=Philosophers Stone