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

I'll come back to this in the morning

Browse source
This commit is contained in:
pahimar 2013-09-24 00:26:42 -04:00
parent 75f4a248d0
commit a1feb1b63c
6 changed files with 219 additions and 210 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,5 +1,5 @@
#Mon, 23 Sep 2013 15:00:03 -0400
minecraft_version=1.6.4
forge_version=9.11.0.883
forge_version=9.11.0.884
mod_version=pre2a
build_number=26

1
common/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -177,6 +177,7 @@ public class EquivalentExchange3 {
DynEMC dynEMC = DynEMC.getInstance();
LogHelper.debug(dynEMC.graph.getAllNodes().size());
dynEMC.printDebugDump();
}
@EventHandler

226
common/com/pahimar/ee3/client/renderer/item/ItemAlchemyTableRenderer.java
View file

@ -1,113 +1,113 @@
/**
*
*/
package com.pahimar.ee3.client.renderer.item;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import com.pahimar.ee3.client.model.ModelAlchemyTable;
import com.pahimar.ee3.lib.Textures;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Equivalent-Exchange-3
*
* ItemAlchemyTableRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
@SideOnly(Side.CLIENT)
public class ItemAlchemyTableRenderer implements IItemRenderer {
private ModelAlchemyTable modelAlchemyTable;
public ItemAlchemyTableRenderer() {
modelAlchemyTable = new ModelAlchemyTable();
}
/*
* (non-Javadoc)
* @see
* net.minecraftforge.client.IItemRenderer#handleRenderType(net.minecraft
* .item.ItemStack, net.minecraftforge.client.IItemRenderer.ItemRenderType)
*/
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return true;
}
/*
* (non-Javadoc)
* @see net.minecraftforge.client.IItemRenderer#shouldUseRenderHelper(net.
* minecraftforge.client.IItemRenderer.ItemRenderType,
* net.minecraft.item.ItemStack,
* net.minecraftforge.client.IItemRenderer.ItemRendererHelper)
*/
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return true;
}
/*
* (non-Javadoc)
* @see
* net.minecraftforge.client.IItemRenderer#renderItem(net.minecraftforge
* .client.IItemRenderer.ItemRenderType, net.minecraft.item.ItemStack,
* java.lang.Object[])
*/
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY: {
renderAlchemyTable(-0.5F, 0.0F, 0.5F, 1.0F);
return;
}
case EQUIPPED: {
renderAlchemyTable(0.0F, 0.0F, 1.0F, 1.0F);
return;
}
case EQUIPPED_FIRST_PERSON: {
renderAlchemyTable(0.0F, 0.0F, 1.0F, 1.0F);
return;
}
case INVENTORY: {
renderAlchemyTable(0.0F, -0.1F, 1.0F, 1.0F);
return;
}
default:
return;
}
}
private void renderAlchemyTable(float x, float y, float z, float scale) {
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
// Scale, Translate, Rotate
GL11.glScalef(scale, scale, scale);
GL11.glTranslatef(x, y, z);
GL11.glRotatef(-90F, 1F, 0, 0);
// Bind texture
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMY_TABLE);
// Render
modelAlchemyTable.render();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
}
/**
*
*/
package com.pahimar.ee3.client.renderer.item;
import org.lwjgl.opengl.GL11;
import net.minecraft.item.ItemStack;
import net.minecraftforge.client.IItemRenderer;
import com.pahimar.ee3.client.model.ModelAlchemyTable;
import com.pahimar.ee3.lib.Textures;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Equivalent-Exchange-3
*
* ItemAlchemyTableRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
@SideOnly(Side.CLIENT)
public class ItemAlchemyTableRenderer implements IItemRenderer {
private ModelAlchemyTable modelAlchemyTable;
public ItemAlchemyTableRenderer() {
modelAlchemyTable = new ModelAlchemyTable();
}
/*
* (non-Javadoc)
* @see
* net.minecraftforge.client.IItemRenderer#handleRenderType(net.minecraft
* .item.ItemStack, net.minecraftforge.client.IItemRenderer.ItemRenderType)
*/
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return true;
}
/*
* (non-Javadoc)
* @see net.minecraftforge.client.IItemRenderer#shouldUseRenderHelper(net.
* minecraftforge.client.IItemRenderer.ItemRenderType,
* net.minecraft.item.ItemStack,
* net.minecraftforge.client.IItemRenderer.ItemRendererHelper)
*/
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return true;
}
/*
* (non-Javadoc)
* @see
* net.minecraftforge.client.IItemRenderer#renderItem(net.minecraftforge
* .client.IItemRenderer.ItemRenderType, net.minecraft.item.ItemStack,
* java.lang.Object[])
*/
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
switch (type) {
case ENTITY: {
renderAlchemyTable(-0.5F, 0.0F, 0.5F, 1.0F);
return;
}
case EQUIPPED: {
renderAlchemyTable(0.0F, 0.0F, 1.0F, 1.0F);
return;
}
case EQUIPPED_FIRST_PERSON: {
renderAlchemyTable(0.0F, 0.0F, 1.0F, 1.0F);
return;
}
case INVENTORY: {
renderAlchemyTable(0.0F, -0.1F, 1.0F, 1.0F);
return;
}
default:
return;
}
}
private void renderAlchemyTable(float x, float y, float z, float scale) {
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
// Scale, Translate, Rotate
GL11.glScalef(scale, scale, scale);
GL11.glTranslatef(x, y, z);
GL11.glRotatef(-90F, 1F, 0, 0);
// Bind texture
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMY_TABLE);
// Render
modelAlchemyTable.render();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
}

128
common/com/pahimar/ee3/client/renderer/tileentity/TileEntityAlchemyTableRenderer.java
View file

@ -1,64 +1,64 @@
/**
*
*/
package com.pahimar.ee3.client.renderer.tileentity;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import com.pahimar.ee3.client.model.ModelAlchemyTable;
import com.pahimar.ee3.lib.Textures;
import com.pahimar.ee3.tileentity.TileAlchemyTable;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Equivalent-Exchange-3
*
* TileEntityAlchemyTableRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
@SideOnly(Side.CLIENT)
public class TileEntityAlchemyTableRenderer extends TileEntitySpecialRenderer {
private ModelAlchemyTable modelAlchemyTable = new ModelAlchemyTable();
/*
* (non-Javadoc)
* @see net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer#
* renderTileEntityAt(net.minecraft.tileentity.TileEntity, double, double,
* double, float)
*/
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) {
if (tileEntity instanceof TileAlchemyTable) {
// TODO Use the TileAlchemyTable to determine what circle to project on the server of the table
TileAlchemyTable tileAlchemyTable = (TileAlchemyTable) tileEntity;
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
// Scale, Translate, Rotate
GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glTranslatef((float) x + 0.0F, (float) y + 0.0F, (float) z + 1.0F);
// Bind texture
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMY_TABLE);
// Render
modelAlchemyTable.render();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
}
}
/**
*
*/
package com.pahimar.ee3.client.renderer.tileentity;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
import com.pahimar.ee3.client.model.ModelAlchemyTable;
import com.pahimar.ee3.lib.Textures;
import com.pahimar.ee3.tileentity.TileAlchemyTable;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* Equivalent-Exchange-3
*
* TileEntityAlchemyTableRenderer
*
* @author pahimar
* @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
*
*/
@SideOnly(Side.CLIENT)
public class TileEntityAlchemyTableRenderer extends TileEntitySpecialRenderer {
private ModelAlchemyTable modelAlchemyTable = new ModelAlchemyTable();
/*
* (non-Javadoc)
* @see net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer#
* renderTileEntityAt(net.minecraft.tileentity.TileEntity, double, double,
* double, float)
*/
@Override
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float tick) {
if (tileEntity instanceof TileAlchemyTable) {
// TODO Use the TileAlchemyTable to determine what circle to project on the server of the table
TileAlchemyTable tileAlchemyTable = (TileAlchemyTable) tileEntity;
GL11.glPushMatrix();
GL11.glDisable(GL11.GL_LIGHTING);
// Scale, Translate, Rotate
GL11.glScalef(1.0F, 1.0F, 1.0F);
GL11.glTranslatef((float) x + 0.0F, (float) y + 0.0F, (float) z + 1.0F);
// Bind texture
FMLClientHandler.instance().getClient().renderEngine.bindTexture(Textures.MODEL_ALCHEMY_TABLE);
// Render
modelAlchemyTable.render();
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glPopMatrix();
}
}
}

59
common/com/pahimar/ee3/emc/DynEMC.java
View file

@ -2,12 +2,13 @@ package com.pahimar.ee3.emc;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
import com.google.common.collect.Multimap;
import com.pahimar.ee3.core.util.LogHelper;
import com.pahimar.ee3.emc.graph.Node;
import com.pahimar.ee3.emc.graph.WeightedDirectedGraph;
import com.pahimar.ee3.emc.graph.WeightedEdge;
import com.pahimar.ee3.item.CustomWrappedStack;
import com.pahimar.ee3.item.crafting.RecipeRegistry;
@ -68,12 +69,7 @@ public class DynEMC {
if (graph.containsNode(unWrappedRecipeInput)) {
if (recipeOutput.getStackSize() != 0) {
try {
graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize());
}
catch (NoSuchElementException e) {
LogHelper.severe(e.getLocalizedMessage());
}
graph.addEdge(unWrappedRecipeOutput, unWrappedRecipeInput, (recipeInput.getStackSize() * 1.0f) / recipeOutput.getStackSize());
}
}
else {
@ -91,40 +87,47 @@ public class DynEMC {
public void printDebugDump() {
// TODO Temporarily commented out - come back and fix this proper
// LogHelper.debug("Total node count: " + graph.getAllNodes().size());
// LogHelper.debug("Critical node count: " + graph.getCriticalNodes().size());
// LogHelper.debug("Orphan node count: " + graph.getOrphanNodes().size());
LogHelper.debug("Total node count: " + graph.getAllNodes().size());
LogHelper.debug("Leaf node count: " + graph.getLeafNodes().size());
LogHelper.debug("Orphan node count: " + graph.getOrphanNodes().size());
LogHelper.debug("Compound node count: " + graph.getCompoundNodes().size());
// LogHelper.debug("");
// LogHelper.debug("***** START NODES *****");
// Iterator<CustomWrappedStack> nodeIter = graph.iterator();
//
// Iterator<Node<CustomWrappedStack>> nodeIter = graph.iterator();
// while (nodeIter.hasNext()) {
// CustomWrappedStack node = nodeIter.next();
// Node<CustomWrappedStack> node = nodeIter.next();
// LogHelper.debug("Node: " + node);
// }
// LogHelper.debug("***** END NODES *****");
//
// LogHelper.debug("");
//
// LogHelper.debug("***** START EDGES FROM *****");
// nodeIter = graph.iterator();
// while (nodeIter.hasNext()) {
// CustomWrappedStack node = nodeIter.next();
// ImmutableList<WeightedEdge<CustomWrappedStack>> edgesFrom = graph.edgesFrom(node);
// for (WeightedEdge<CustomWrappedStack> edge : edgesFrom) {
// LogHelper.debug("Crafting Output: " + node + ", Crafting Input: " + edge.targetNode + ", Weight: " + edge.weight);
// Node<CustomWrappedStack> node = nodeIter.next();
// List<WeightedEdge<Node<CustomWrappedStack>>> edgesFrom = graph.edgesFrom(node);
// for (WeightedEdge<Node<CustomWrappedStack>> edge : edgesFrom) {
// LogHelper.debug("Crafting Output: " + node + ", Crafting Input: " + edge.destinationNode + ", Weight: " + edge.weight);
// }
// }
// LogHelper.debug("***** END EDGES FROM *****");
// LogHelper.debug("");
// LogHelper.debug("***** START EDGES TO *****");
// nodeIter = graph.iterator();
// while (nodeIter.hasNext()) {
// CustomWrappedStack node = nodeIter.next();
// ImmutableList<WeightedEdge<CustomWrappedStack>> edgesTo = graph.edgesTo(node);
// for (WeightedEdge<CustomWrappedStack> edge : edgesTo) {
// LogHelper.debug("Crafting Input: " + node + ", Crafting Output: " + edge.targetNode + ", Weight: " + edge.weight);
// }
// }
// LogHelper.debug("***** END EDGES TO *****");
LogHelper.debug("");
LogHelper.debug("***** START EDGES TO *****");
Iterator<Node<CustomWrappedStack>> nodeIter = graph.iterator();
while (nodeIter.hasNext()) {
Node<CustomWrappedStack> node = nodeIter.next();
List<WeightedEdge<Node<CustomWrappedStack>>> edgesTo = graph.edgesTo(node);
for (WeightedEdge<Node<CustomWrappedStack>> edge : edgesTo) {
LogHelper.debug("Crafting Input: " + node + ", Crafting Output: " + edge.destinationNode + ", Weight: " + edge.weight);
}
}
LogHelper.debug("***** END EDGES TO *****");
}
@Override

13
common/com/pahimar/ee3/emc/graph/WeightedDirectedGraph.java
View file

@ -259,13 +259,14 @@ public class WeightedDirectedGraph<T extends Comparable<T>>
graph.remove(node);
}
}
/**
* Removes the Node that contains the specified node object
*
* @param nodeObject
*/
public void removeNode(T nodeObject) {
this.removeNode(new Node<T>(nodeObject));
}
@ -302,8 +303,9 @@ public class WeightedDirectedGraph<T extends Comparable<T>>
graph.get(node).clear();
}
}
public void removeEdgesFrom(T nodeObject) {
this.removeEdgesFrom(new Node<T>(nodeObject));
}
@ -332,8 +334,9 @@ public class WeightedDirectedGraph<T extends Comparable<T>>
}
}
}
public void removeEdgesTo(T nodeObject) {
this.removeEdgesTo(new Node<T>(nodeObject));
}
@ -360,8 +363,9 @@ public class WeightedDirectedGraph<T extends Comparable<T>>
}
}
}
public void removeEdgesBetween(T firstObject, T secondObject) {
this.removeEdgesBetween(new Node<T>(firstObject), new Node<T>(secondObject));
}
@ -393,6 +397,7 @@ public class WeightedDirectedGraph<T extends Comparable<T>>
List<WeightedEdge<Node<T>>> edgesFromGraphNode = edgesFrom(graphNode);
for (WeightedEdge<Node<T>> fromEdge : edgesFromGraphNode) {
if (fromEdge.destinationNode.equals(destinationNode)) {
edgesToTargetNodeList.add(new WeightedEdge<Node<T>>(graphNode, fromEdge.weight));
}