Getting there!
This commit is contained in:
pahimar
parent
46f7f08ffa
commit
489d3095a1
|
|
@ -3,12 +3,12 @@ package com.pahimar.ee3;
|
|||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
|
@ -33,7 +33,7 @@ import com.pahimar.ee3.creativetab.CreativeTabEE3;
|
|||
import com.pahimar.ee3.emc.EmcRegistry;
|
||||
import com.pahimar.ee3.item.CustomWrappedStack;
|
||||
import com.pahimar.ee3.item.ModItems;
|
||||
import com.pahimar.ee3.item.crafting.RecipeRegistry;
|
||||
import com.pahimar.ee3.item.OreStack;
|
||||
import com.pahimar.ee3.item.crafting.RecipesAlchemicalBagDyes;
|
||||
import com.pahimar.ee3.lib.InterModComms;
|
||||
import com.pahimar.ee3.lib.Reference;
|
||||
|
|
@ -170,6 +170,7 @@ public class EquivalentExchange3 {
|
|||
// recipe registry works
|
||||
FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketWater, Arrays.asList(Item.bucketEmpty, Block.waterStill)));
|
||||
FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Item.bucketLava, Arrays.asList(Item.bucketEmpty, Block.lavaStill)));
|
||||
FMLInterModComms.sendMessage(Reference.MOD_ID, InterModComms.ADD_RECIPE, NBTHelper.encodeRecipeAsNBT(Block.pumpkinLantern, Arrays.asList(Block.pumpkin, Block.torchWood)));
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
|
@ -179,7 +180,8 @@ public class EquivalentExchange3 {
|
|||
AddonHandler.init();
|
||||
|
||||
EmcRegistry.lazyInit();
|
||||
EmcRegistry.findUnmappedCompoundStacks();
|
||||
EmcRegistry.printUnmappedCompoundStacks();
|
||||
EmcRegistry.printStackValueMappings();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
|
|
|
|||
|
|
@ -32,44 +32,68 @@ public class EmcDefaultValues {
|
|||
|
||||
private void init() {
|
||||
|
||||
// To be sorted
|
||||
valueMap.put(new CustomWrappedStack(Block.stone), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.stone))), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.waterStill), new EmcValue(0.1f, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.grass), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.dirt), new EmcValue(1));
|
||||
// OreDictionary assignment
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.cobblestone))), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.sand.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.leaves), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.glass), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.glass.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(1));
|
||||
for (int meta = 0; meta < 16; meta++) {
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Item.dyePowder, 1, meta))), new EmcValue(8));
|
||||
}
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.wood))), new EmcValue(32, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreDiamond))), new EmcValue(8192));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreEmerald))), new EmcValue(8192));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreGold))), new EmcValue(2048));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreIron))), new EmcValue(256));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreLapis))), new EmcValue(864));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreNetherQuartz))), new EmcValue(256));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreRedstone))), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.oreRedstoneGlowing))), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.planks))), new EmcValue(8));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Item.record11))), new EmcValue(2048));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.woodSingleSlab))), new EmcValue(4));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.stairsWoodOak))), new EmcValue(12));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Item.stick))), new EmcValue(4));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.stone))), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.leaves))), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.sapling))), new EmcValue(32, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
|
||||
// To be sorted
|
||||
valueMap.put(new CustomWrappedStack(Block.waterStill), new EmcValue(0.1f, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.tallGrass), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.tallGrass.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.deadBush), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.ice), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.sandStone.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(4, EmcType.CORPOREAL));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.wood))), new EmcValue(32, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Block.planks))), new EmcValue(8));
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Item.stick))), new EmcValue(4));
|
||||
valueMap.put(new CustomWrappedStack(Item.ingotIron), new EmcValue(256));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreIron), new EmcValue(256));
|
||||
valueMap.put(new CustomWrappedStack(Item.ingotGold), new EmcValue(2048));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreGold), new EmcValue(2048));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreDiamond), new EmcValue(8192));
|
||||
valueMap.put(new CustomWrappedStack(Item.diamond), new EmcValue(8192));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreCoal), new EmcValue(32, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.KINETIC, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Item.silk), new EmcValue(12));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.cloth.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(48));
|
||||
valueMap.put(new CustomWrappedStack(Block.gravel), new EmcValue(4, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Item.redstone), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreRedstone), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreRedstoneGlowing), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Block.mushroomBrown), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Block.mushroomRed), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Item.slimeBall), new EmcValue(24));
|
||||
|
||||
/* Building Blocks */
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.pumpkin, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(144));
|
||||
valueMap.put(new CustomWrappedStack(Block.stone), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.grass), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.ESSENTIA, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.dirt), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.cobblestone), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.sand), new EmcValue(1, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.gravel), new EmcValue(4, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 9), new EmcComponent(EmcType.AMORPHOUS, 1))));
|
||||
valueMap.put(new CustomWrappedStack(Block.oreCoal), new EmcValue(32, Arrays.asList(new EmcComponent(EmcType.CORPOREAL, 4), new EmcComponent(EmcType.KINETIC, 1))));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.glass.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.sandStone.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(4, EmcType.CORPOREAL));
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Block.cloth.blockID, 1, OreDictionary.WILDCARD_VALUE)), new EmcValue(48));
|
||||
// Moss Stone (48:0)
|
||||
// Obsidian (49:0)
|
||||
valueMap.put(new CustomWrappedStack(Block.ice), new EmcValue(1));
|
||||
// Snow (80:0)
|
||||
valueMap.put(new CustomWrappedStack(Block.pumpkin), new EmcValue(144));
|
||||
valueMap.put(new CustomWrappedStack(Block.netherrack), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Block.slowSand), new EmcValue(49));
|
||||
// Mossy Stone Bricks (98:1)
|
||||
// Cracked Stone Bricks (98:2)
|
||||
// Chiseled Stone Bricks (98:3)
|
||||
// Mycelium (110:0)
|
||||
// End Stone (121:0)
|
||||
// Mossy Cobblestone Wall (139:1)
|
||||
valueMap.put(new CustomWrappedStack(Block.hardenedClay), new EmcValue(256));
|
||||
|
||||
/* Decoration Blocks */
|
||||
|
||||
|
|
@ -120,16 +144,14 @@ public class EmcDefaultValues {
|
|||
valueMap.put(new CustomWrappedStack(Item.reed), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Item.egg), new EmcValue(32));
|
||||
valueMap.put(new CustomWrappedStack(Item.glowstone), new EmcValue(384));
|
||||
for (int meta = 0; meta < 16; meta++) {
|
||||
valueMap.put(new CustomWrappedStack(new OreStack(new ItemStack(Item.dyePowder, 1, meta))), new EmcValue(8));
|
||||
}
|
||||
|
||||
valueMap.put(new CustomWrappedStack(new ItemStack(Item.dyePowder, 1, 4)), new EmcValue(864));
|
||||
valueMap.put(new CustomWrappedStack(Item.blazeRod), new EmcValue(1536));
|
||||
valueMap.put(new CustomWrappedStack(Item.netherStalkSeeds), new EmcValue(24));
|
||||
// Emerald
|
||||
valueMap.put(new CustomWrappedStack(Item.emerald), new EmcValue(8192));
|
||||
// Nether Star
|
||||
// Nether Brick
|
||||
// Nether Quartz
|
||||
valueMap.put(new CustomWrappedStack(Item.netherrackBrick), new EmcValue(1));
|
||||
valueMap.put(new CustomWrappedStack(Item.netherQuartz), new EmcValue(256));
|
||||
|
||||
/* Equivalent Exchange 3 */
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ public class EmcRegistry {
|
|||
if (valuedStack.getWrappedStack() instanceof ItemStack) {
|
||||
ItemStack valuedItemStack = (ItemStack) valuedStack.getWrappedStack();
|
||||
|
||||
if (valuedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE && valuedItemStack.itemID == wrappedItemStack.itemID) {
|
||||
if ((valuedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || wrappedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE) && valuedItemStack.itemID == wrappedItemStack.itemID) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -230,7 +230,7 @@ public class EmcRegistry {
|
|||
|
||||
ItemStack valuedItemStack = (ItemStack) valuedStack.getWrappedStack();
|
||||
|
||||
if (valuedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE && valuedItemStack.itemID == wrappedItemStack.itemID) {
|
||||
if ((valuedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE || wrappedItemStack.getItemDamage() == OreDictionary.WILDCARD_VALUE) && valuedItemStack.itemID == wrappedItemStack.itemID) {
|
||||
|
||||
if (stackValue.compareTo(lowestValue) < 0) {
|
||||
lowestValue = stackValue;
|
||||
|
|
@ -323,7 +323,7 @@ public class EmcRegistry {
|
|||
}
|
||||
}
|
||||
|
||||
public static void findUnmappedCompoundStacks() {
|
||||
public static void printUnmappedCompoundStacks() {
|
||||
|
||||
lazyInit();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue