Added rubble and refined dust

This commit is contained in:
Calclavia 2014-01-18 17:37:33 +08:00
parent 812131c2c0
commit a202737f48
16 changed files with 112 additions and 94 deletions

View file

@ -96,7 +96,7 @@ public class Archaic
@EventHandler @EventHandler
public void postInit(FMLPostInitializationEvent evt) public void postInit(FMLPostInitializationEvent evt)
{ {
// Add recipes Added rubble and refined dust // Add recipes
GameRegistry.addRecipe(new ShapedOreRecipe(blockEngineeringTable, "RAH", "SCP", "WWW", 'R', Item.shears, 'H', Item.hoeStone, 'A', Item.axeStone, 'P', Item.pickaxeStone, 'S', Item.shovelStone, 'C', Block.workbench, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockEngineeringTable, "RAH", "SCP", "WWW", 'R', Item.shears, 'H', Item.hoeStone, 'A', Item.axeStone, 'P', Item.pickaxeStone, 'S', Item.shovelStone, 'C', Block.workbench, 'W', "logWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCrate, 1, 0), "WWW", "WSW", "WWW", 'S', Item.stick, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockCrate, 1, 0), "WWW", "WSW", "WWW", 'S', Item.stick, 'W', "logWood"));
@ -107,8 +107,8 @@ public class Archaic
GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, "SSS", "W W", "PPP", 'S', Block.stone, 'P', Block.pistonBase, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockImprinter, "SSS", "W W", "PPP", 'S', Block.stone, 'P', Block.pistonBase, 'W', "logWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "RGR", "WWW", 'S', Block.stone, 'G', "gear", 'P', Block.pistonBase, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "PGP", "WWW", 'S', Block.stone, 'G', "gear", 'P', Block.pistonBase, 'W', "logWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "RGR", "WWW", 'S', Block.stone, 'G', Item.redstone, 'P', Block.pistonBase, 'W', "logWood")); GameRegistry.addRecipe(new ShapedOreRecipe(blockTurntable, "SSS", "PGP", "WWW", 'S', Block.stone, 'G', Item.redstone, 'P', Block.pistonBase, 'W', "logWood"));
GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone)); GameRegistry.addRecipe(new ShapedOreRecipe(blockHotPlate, "SSS", "III", 'I', Item.ingotIron, 'S', Block.stone));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockHotPlate, 1, 1), "HHH", "WWW", 'H', new ItemStack(blockHotPlate, 1, 0), 'W', UniversalRecipe.WIRE.get())); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(blockHotPlate, 1, 1), "HHH", "WWW", 'H', new ItemStack(blockHotPlate, 1, 0), 'W', UniversalRecipe.WIRE.get()));

View file

@ -27,7 +27,6 @@ public class BlockHotPlate extends BlockRI
public BlockHotPlate() public BlockHotPlate()
{ {
super("hotPlate", Material.wood); super("hotPlate", Material.wood);
setTextureName(Reference.PREFIX + "material_wood_surface");
setBlockBounds(0, 0, 0, 1, 0.2f, 1); setBlockBounds(0, 0, 0, 1, 0.2f, 1);
this.setTickRandomly(true); this.setTickRandomly(true);
} }

View file

@ -16,7 +16,7 @@ import resonantinduction.core.prefab.part.PacketMultiPart;
import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.ResourceGenerator;
import resonantinduction.core.resource.fluid.BlockFluidMixture; import resonantinduction.core.resource.fluid.BlockFluidMixture;
import resonantinduction.core.resource.fluid.TileFluidMixture; import resonantinduction.core.resource.fluid.TileFluidMixture;
import resonantinduction.core.resource.item.ItemDust; import resonantinduction.core.resource.item.ItemOreResource;
import calclavia.lib.multiblock.link.BlockMulti; import calclavia.lib.multiblock.link.BlockMulti;
import calclavia.lib.multiblock.link.TileMultiBlockPart; import calclavia.lib.multiblock.link.TileMultiBlockPart;
import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketHandler;
@ -65,10 +65,10 @@ public class ResonantInduction
public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL); public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL);
/** Blocks and Items */ /** Blocks and Items */
public static BlockMulti blockMulti;
public static Block blockOre; public static Block blockOre;
public static ItemDust itemDust; public static ItemOreResource itemRubble;
public static ItemOreResource itemDust;
public static ItemOreResource itemRefinedDust;
public static Block blockFluidMixture; public static Block blockFluidMixture;
public static Block blockGas; public static Block blockGas;
@ -87,18 +87,18 @@ public class ResonantInduction
MinecraftForge.EVENT_BUS.register(new LinkEventHandler()); MinecraftForge.EVENT_BUS.register(new LinkEventHandler());
MinecraftForge.EVENT_BUS.register(new FluidEventHandler()); MinecraftForge.EVENT_BUS.register(new FluidEventHandler());
blockMulti = new BlockMulti(Settings.CONFIGURATION.getBlock("blockMulti", Settings.getNextBlockID()).getInt()).setPacketType(PACKET_TILE);
MIXTURE = new Fluid("mixture"); MIXTURE = new Fluid("mixture");
FluidRegistry.registerFluid(MIXTURE); FluidRegistry.registerFluid(MIXTURE);
blockFluidMixture = new BlockFluidMixture(Settings.CONFIGURATION.getBlock("FluidMixture", Settings.getNextBlockID()).getInt(), MIXTURE); blockFluidMixture = new BlockFluidMixture(Settings.CONFIGURATION.getBlock("FluidMixture", Settings.getNextBlockID()).getInt(), MIXTURE);
// Items // Items
itemDust = new ItemDust(Settings.getNextItemID()); itemRubble = new ItemOreResource(Settings.getNextItemID(), "oreRubble");
GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName()); itemDust = new ItemOreResource(Settings.getNextItemID(), "oreDust");
itemRefinedDust = new ItemOreResource(Settings.getNextItemID(), "oreRefinedDust");
GameRegistry.registerTileEntity(TileMultiBlockPart.class, "TileEntityMultiBlockPart"); GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName());
GameRegistry.registerBlock(blockMulti, "blockMulti"); GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName());
GameRegistry.registerItem(itemRefinedDust, itemRefinedDust.getUnlocalizedName());
GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName());
GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName());
@ -120,8 +120,7 @@ public class ResonantInduction
public void postInit(FMLPostInitializationEvent evt) public void postInit(FMLPostInitializationEvent evt)
{ {
// Generate Dusts // Generate Dusts
ResourceGenerator.generateDusts(); ResourceGenerator.generateOreResources();
} }
} }

View file

@ -23,7 +23,7 @@ import resonantinduction.api.recipe.MachineRecipes.RecipeType;
import resonantinduction.api.recipe.OreDetectionBlackList; import resonantinduction.api.recipe.OreDetectionBlackList;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.resource.item.ItemDust; import resonantinduction.core.resource.item.ItemOreResource;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@ -51,7 +51,7 @@ public class ResourceGenerator
} }
} }
public static void generateDusts() public static void generateOreResources()
{ {
for (String materialName : materialNames) for (String materialName : materialNames)
{ {
@ -61,9 +61,9 @@ public class ResourceGenerator
{ {
// if (OreDictionary.getOres("dust" + name).size() == 0) // if (OreDictionary.getOres("dust" + name).size() == 0)
{ {
ItemDust.dusts.add(ResonantInduction.itemDust.getStackFromDust(materialName)); OreDictionary.registerOre("rubble" + name, ResonantInduction.itemRubble.getStackFromDust(materialName));
OreDictionary.registerOre("dust" + name, ResonantInduction.itemDust.getStackFromDust(materialName)); OreDictionary.registerOre("dust" + name, ResonantInduction.itemDust.getStackFromDust(materialName));
OreDictionary.registerOre("dustRefined" + name, ResonantInduction.itemRefinedDust.getStackFromDust(materialName));
} }
// Add to machine recipes // Add to machine recipes

View file

@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.OreDictionary;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.item.ItemBase; import resonantinduction.core.prefab.item.ItemBase;
import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.ResourceGenerator;
import calclavia.lib.utility.LanguageUtility; import calclavia.lib.utility.LanguageUtility;
@ -22,26 +23,30 @@ import cpw.mods.fml.relauncher.SideOnly;
* @author Calclavia * @author Calclavia
* *
*/ */
public class ItemDust extends ItemBase public class ItemOreResource extends ItemBase
{ {
public static final Set<ItemStack> dusts = new HashSet<ItemStack>(); public ItemOreResource(int id, String name)
public ItemDust(int id)
{ {
super("oreDust", id); super(name, id);
this.setTextureName(Reference.PREFIX + "oreDust");
} }
@Override @Override
public String getItemDisplayName(ItemStack is) public String getItemDisplayName(ItemStack is)
{ {
String dustName = getDustFromStack(is); String dustName = getDustFromStack(is);
ItemStack type = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1)).get(0); List<ItemStack> list = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1));
if (list.size() > 0)
{
ItemStack type = list.get(0);
String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", ""); String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", "");
return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " "); return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " ");
} }
return "";
}
public ItemStack getStackFromDust(String name) public ItemStack getStackFromDust(String name)
{ {
ItemStack itemStack = new ItemStack(this); ItemStack itemStack = new ItemStack(this);
@ -65,9 +70,9 @@ public class ItemDust extends ItemBase
@Override @Override
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
{ {
for (ItemStack dust : dusts) for (String materialName : ResourceGenerator.materialNames)
{ {
par3List.add(dust); par3List.add(getStackFromDust(materialName));
} }
} }
@ -78,7 +83,7 @@ public class ItemDust extends ItemBase
/** /**
* Auto-color based on the texture of the ingot. * Auto-color based on the texture of the ingot.
*/ */
String name = ItemDust.getDustFromStack(itemStack); String name = ItemOreResource.getDustFromStack(itemStack);
if (ResourceGenerator.materialColors.containsKey(name)) if (ResourceGenerator.materialColors.containsKey(name))
{ {

View file

@ -14,6 +14,7 @@ import net.minecraftforge.common.Configuration;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.prefab.block.BlockRI; import resonantinduction.core.prefab.block.BlockRI;
import resonantinduction.core.render.RIBlockRenderingHandler; import resonantinduction.core.render.RIBlockRenderingHandler;
import calclavia.components.CalclaviaLoader;
import calclavia.lib.content.IExtraInfo.IExtraBlockInfo; import calclavia.lib.content.IExtraInfo.IExtraBlockInfo;
import calclavia.lib.multiblock.link.IBlockActivate; import calclavia.lib.multiblock.link.IBlockActivate;
import calclavia.lib.multiblock.link.IMultiBlock; import calclavia.lib.multiblock.link.IMultiBlock;
@ -43,7 +44,7 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo
if (tileEntity instanceof IMultiBlock) if (tileEntity instanceof IMultiBlock)
{ {
ResonantInduction.blockMulti.createMultiBlockStructure((IMultiBlock) tileEntity); CalclaviaLoader.blockMulti.createMultiBlockStructure((IMultiBlock) tileEntity);
} }
} }
@ -68,7 +69,7 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo
if (tileEntity instanceof TileArmbot) if (tileEntity instanceof TileArmbot)
{ {
((TileArmbot) tileEntity).dropHeldObject(); ((TileArmbot) tileEntity).dropHeldObject();
ResonantInduction.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity); CalclaviaLoader.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity);
} }
this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this)); this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this));
super.breakBlock(world, x, y, z, par5, par6); super.breakBlock(world, x, y, z, par5, par6);

View file

@ -41,7 +41,7 @@ public class RenderBattery extends TileEntitySpecialRenderer
glTranslatef((float) x + 0.5F, (float) y, (float) z + 0.5F); glTranslatef((float) x + 0.5F, (float) y, (float) z + 0.5F);
glScalef(0.46f, 0.46f, 0.46f); glScalef(0.46f, 0.46f, 0.46f);
GL11.glRotatef(90 * i, 0, 1, 0); GL11.glRotatef(90 * i, 0, 1, 0);
FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CAP); FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CASE);
MODEL.renderOnly("Default"); MODEL.renderOnly("Default");
glPopMatrix(); glPopMatrix();
} }

View file

@ -2,6 +2,8 @@ package resonantinduction.mechanical;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.ResonantInduction; import resonantinduction.core.ResonantInduction;
import resonantinduction.core.Settings; import resonantinduction.core.Settings;
@ -28,6 +30,7 @@ import resonantinduction.mechanical.logistic.TileManipulator;
import resonantinduction.mechanical.logistic.TileRejector; import resonantinduction.mechanical.logistic.TileRejector;
import calclavia.lib.content.ContentRegistry; import calclavia.lib.content.ContentRegistry;
import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketHandler;
import calclavia.lib.recipe.UniversalRecipe;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.Mod.Instance;
@ -37,10 +40,13 @@ import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
/** Resonant Induction Archaic Module /**
* Resonant Induction Archaic Module
* *
* @author DarkCow, Calclavia */ * @author DarkCow, Calclavia
*/
@Mod(modid = Mechanical.ID, name = Mechanical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID) @Mod(modid = Mechanical.ID, name = Mechanical.NAME, version = Reference.VERSION, dependencies = "required-after:" + ResonantInduction.ID)
@NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) @NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class)
public class Mechanical public class Mechanical
@ -99,6 +105,8 @@ public class Mechanical
itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class); itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class);
OreDictionary.registerOre("gear", itemGear);
proxy.preInit(); proxy.preInit();
Settings.save(); Settings.save();
} }
@ -110,4 +118,5 @@ public class Mechanical
Settings.setModMetadata(metadata, ID, NAME); Settings.setModMetadata(metadata, ID, NAME);
proxy.init(); proxy.init();
} }
} }

View file

@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import resonantinduction.core.Reference; import resonantinduction.core.Reference;
import resonantinduction.core.resource.item.ItemDust; import resonantinduction.core.resource.item.ItemOreResource;
import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.energy.EnergyStorageHandler;
import universalelectricity.api.vector.Vector3; import universalelectricity.api.vector.Vector3;
import calclavia.lib.prefab.tile.TileElectrical; import calclavia.lib.prefab.tile.TileElectrical;
@ -78,7 +78,7 @@ public class TilePurifier extends TileElectrical
if (this.processingItem == null && entity instanceof EntityItem) if (this.processingItem == null && entity instanceof EntityItem)
{ {
if (((EntityItem) entity).getEntityItem().getItem() instanceof ItemDust) if (((EntityItem) entity).getEntityItem().getItem() instanceof ItemOreResource)
{ {
this.processingItem = (EntityItem) entity; this.processingItem = (EntityItem) entity;
} }

View file

@ -40,7 +40,7 @@ public class BlockManipulator extends BlockImprintable
if (!world.isRemote) if (!world.isRemote)
{ {
((TileManipulator) tileEntity).setSelfPulse(!((TileManipulator) tileEntity).isSelfPulse()); ((TileManipulator) tileEntity).setSelfPulse(!((TileManipulator) tileEntity).isSelfPulse());
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manip. set to " + (((TileManipulator) tileEntity).isSelfPulse() ? "auto pulse" : "not pulse"))); entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manipulator set to " + (((TileManipulator) tileEntity).isSelfPulse() ? "auto pulse" : "not pulse")));
} }
} }
return true; return true;
@ -76,7 +76,7 @@ public class BlockManipulator extends BlockImprintable
} }
if (!world.isRemote) if (!world.isRemote)
{ {
entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manip. outputing = " + manip.isOutput())); entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manipulator outputing = " + manip.isOutput()));
} }
} }

View file

@ -9,10 +9,15 @@ meta.resonantinduction.credits=Visit website for credits.
fluid.mixture=Mixture fluid.mixture=Mixture
### Archaic Module ### Core
## Items misc.resonantinduction.ingot=Ingot
item.resonantinduction\:ingot.name=%v Ingot item.resonantinduction\:ingot.name=%v Ingot
item.resonantinduction\:oreDust.name=%v Dust item.resonantinduction\:oreDust.name=%v Dust
item.resonantinduction\:oreRefinedDust.name=%v Refined Dust
item.resonantinduction\:oreRubble.name=%v Rubble
### Archaic Module
## Items
item.resonantinduction\:imprint.name=Imprint item.resonantinduction\:imprint.name=Imprint
## Machines ## Machines

Binary file not shown.

After

Width:  |  Height:  |  Size: 1,014 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 538 B

After

Width:  |  Height:  |  Size: 992 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 614 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 947 B