Skip to content

bug fixes and change interface. #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yogpstop wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bug fixes and change interface. #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb9a6ee
problem fixed.
yogpstop Mar 5, 2013
a4e8a06
fix slot number
yogpstop Mar 5, 2013
90300f2
fix something. change an interface to like buildcraft interface. add …
yogpstop Mar 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 90 additions & 93 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,94 +1,91 @@
<?xml version="1.0" ?>
<project name="Minechem 2" basedir="" default="main">

<!-- CHANGE THE PATHS HERE TO MATCH YOUR SYSTEM -->
<property name="minechem-version" value="2.0.0pr6.1"/>
<property name="build-dir" location="../minechem-build"/>
<property name="forge-dir" location="T:/Modding/Minecraft Src/forge"/>

<!-- DONT CHANGE THESE -->
<property name="minechem-src-dir" location="."/>
<property name="apis-dir" location="${minechem-src-dir}/apis"/>
<property name="mcp-dir" location="${forge-dir}/mcp"/>
<property name="src-dir" location="${mcp-dir}/src/minecraft"/>
<property name="reobf-dir" location="${mcp-dir}/reobf/minecraft"/>

<target name="move-to-mcp">
<!-- Copy Minechem classes -->
<copy todir="${src-dir}/ljdp">
<fileset dir="${minechem-src-dir}/ljdp"/>
<filterset>
<filter token="VERSION" value="${minechem-version}" />
</filterset>
</copy>

<!-- Copy NEI API -->
<copy todir="${src-dir}/codechicken">
<fileset dir="${apis-dir}/NEI/codechicken"/>
</copy>

<!-- Copy BUILDCRAFT API -->
<copy todir="${src-dir}/buildcraft">
<fileset dir="${apis-dir}/BuildCraft"/>
</copy>

<!-- Copy ComputerCraft API -->
<copy todir="${src-dir}/dan200">
<fileset dir="${apis-dir}/dan200/dan200"/>
</copy>

<!-- Copy EasyPacket API -->
<copy todir="${src-dir}/ljdp">
<fileset dir="${apis-dir}/EasyPacket/ljdp"/>
</copy>
</target>

<target name="compile">
<exec dir="${mcp-dir}" executable="cmd" osfamily="windows">
<arg line="/c recompile.bat"/>
</exec>

<exec dir="${mcp-dir}" executable="cmd" osfamily="windows">
<arg line="/c reobfuscate.bat"/>
</exec>
</target>

<target name="move-to-build">
<delete dir="${build-dir}"/>

<!-- Copy LJDP classes -->
<copy todir="${build-dir}/ljdp">
<fileset dir="${reobf-dir}/ljdp"/>
</copy>

<!-- Copy NEI API -->
<copy todir="${build-dir}/codechicken">
<fileset dir="${reobf-dir}/codechicken"/>
</copy>

<!-- Copy BUILDCRAFT API -->
<copy todir="${build-dir}/buildcraft/api">
<fileset dir="${reobf-dir}/buildcraft/api"/>
</copy>

<!-- Copy Minechem Resources -->
<copy todir="${build-dir}">
<fileset dir="${minechem-src-dir}/resources">
</fileset>
</copy>

<!-- delete from src dir -->
<delete dir="${src-dir}/ljdp"/>
<delete dir="${src-dir}/buildcraft"/>
<delete dir="${src-dir}/codechicken"/>
<delete dir="${src-dir}/dan200"/>
</target>

<target name="package">
<delete file="${build-dir}/MineChem-${minechem-version}.zip" />
<zip destfile="${build-dir}/MineChem-${minechem-version}.zip" basedir="${build-dir}"/>
</target>

<target name="main" depends="move-to-mcp,compile,move-to-build,package"/>

<?xml version="1.0" ?>
<project name="Minechem 2" basedir="" default="main">

<!-- CHANGE THE PATHS HERE TO MATCH YOUR SYSTEM -->
<property name="minechem-version" value="2.0.0pr6.1"/>
<property name="build-dir" location="../minechem-build"/>
<property name="forge-dir" location="T:/Modding/Minecraft Src/forge"/>

<!-- DONT CHANGE THESE -->
<property name="minechem-src-dir" location="."/>
<property name="apis-dir" location="${minechem-src-dir}/apis"/>
<property name="mcp-dir" location="${forge-dir}/mcp"/>
<property name="src-dir" location="${mcp-dir}/src/minecraft"/>
<property name="reobf-dir" location="${mcp-dir}/reobf/minecraft"/>

<target name="move-to-mcp">
<!-- Copy Minechem classes -->
<copy todir="${src-dir}/ljdp">
<fileset dir="${minechem-src-dir}/ljdp"/>
<filterset>
<filter token="VERSION" value="${minechem-version}" />
</filterset>
</copy>

<!-- Copy NEI API -->
<copy todir="${src-dir}/codechicken">
<fileset dir="${apis-dir}/NEI/codechicken"/>
</copy>

<!-- Copy BUILDCRAFT API -->
<copy todir="${src-dir}/buildcraft">
<fileset dir="${apis-dir}/BuildCraft"/>
</copy>

<!-- Copy ComputerCraft API -->
<copy todir="${src-dir}/dan200">
<fileset dir="${apis-dir}/dan200/dan200"/>
</copy>

<!-- Copy EasyPacket API -->
<copy todir="${src-dir}/ljdp">
<fileset dir="${apis-dir}/EasyPacket/ljdp"/>
</copy>
</target>

<target name="compile">
<exec dir="${mcp-dir}" executable="cmd" osfamily="windows">
<arg line="/c recompile.bat"/>
</exec>

<exec dir="${mcp-dir}" executable="cmd" osfamily="windows">
<arg line="/c reobfuscate.bat"/>
</exec>
</target>

<target name="move-to-build">
<delete dir="${build-dir}"/>

<!-- Copy LJDP classes -->
<copy todir="${build-dir}/ljdp">
<fileset dir="${reobf-dir}/ljdp"/>
</copy>

<!-- Copy NEI API -->
<copy todir="${build-dir}/codechicken">
<fileset dir="${reobf-dir}/codechicken"/>
</copy>

<!-- BUILDCRAFT API IS NOT NEEDED because buildcraft is required by minechem -->

<!-- Copy Minechem Resources -->
<copy todir="${build-dir}">
<fileset dir="${minechem-src-dir}/resources">
</fileset>
</copy>

<!-- delete from src dir -->
<delete dir="${src-dir}/ljdp"/>
<delete dir="${src-dir}/buildcraft"/>
<delete dir="${src-dir}/codechicken"/>
<delete dir="${src-dir}/dan200"/>
</target>

<target name="package">
<delete file="${build-dir}/MineChem-${minechem-version}.zip" />
<zip destfile="${build-dir}/MineChem-${minechem-version}.zip" basedir="${build-dir}"/>
</target>

<target name="main" depends="move-to-mcp,compile,move-to-build,package"/>

</project>
30 changes: 0 additions & 30 deletions ljdp/minechem/common/ModMinechem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,35 @@
package ljdp.minechem.common;

import java.io.IOException;
import java.util.List;
import java.util.logging.Logger;

import buildcraft.api.power.PowerFramework;

import ljdp.minechem.client.gui.GuiDecomposer;
import ljdp.minechem.client.gui.GuiFusion;
import ljdp.minechem.client.gui.GuiMicroscope;
import ljdp.minechem.client.gui.GuiProjector;
import ljdp.minechem.client.gui.GuiSynthesis;
import ljdp.minechem.client.sound.MinechemSoundEvent;
import ljdp.minechem.common.blueprint.MinechemBlueprint;
import ljdp.minechem.common.containers.ContainerDecomposer;
import ljdp.minechem.common.containers.ContainerFusion;
import ljdp.minechem.common.containers.ContainerMicroscope;
import ljdp.minechem.common.containers.ContainerProjector;
import ljdp.minechem.common.containers.ContainerSynthesis;
import ljdp.minechem.common.gates.MinechemTriggers;
import ljdp.minechem.common.network.PacketHandler;
import ljdp.minechem.common.recipe.MinechemRecipes;
import ljdp.minechem.common.tileentity.TileEntityBlueprintProjector;
import ljdp.minechem.common.tileentity.TileEntityDecomposer;
import ljdp.minechem.common.tileentity.TileEntityFusion;
import ljdp.minechem.common.tileentity.TileEntityMicroscope;
import ljdp.minechem.common.tileentity.TileEntityProxy;
import ljdp.minechem.common.tileentity.TileEntitySynthesis;
import ljdp.minechem.common.utils.Localization;
import ljdp.minechem.common.utils.MinechemHelper;
import ljdp.minechem.computercraft.ICCMain;
import net.minecraft.command.CommandHandler;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.Item;
import net.minecraft.src.TradeEntry;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.Mod.PostInit;
import cpw.mods.fml.common.Mod.PreInit;
import cpw.mods.fml.common.Mod.ServerStarting;
import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.modloader.ModLoaderHelper;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.common.registry.TickRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.relauncher.Side;
Expand Down
3 changes: 3 additions & 0 deletions ljdp/minechem/common/blocks/BlockMicroscope.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ public TileEntity createNewTileEntity(World var1) {
@Override
public ArrayList<ItemStack> addStacksDroppedOnBlockBreak(TileEntity tileEntity, ArrayList itemStacks) {
ItemStack inputStack = ((TileEntityMicroscope)tileEntity).getStackInSlot(0);
ItemStack journal = ((TileEntityMicroscope)tileEntity).getStackInSlot(1);
if(inputStack != null)
itemStacks.add(inputStack);
if(journal != null)
itemStacks.add(journal);
return itemStacks;
}

Expand Down
Loading