From a202737f48799ddb2ca376a0e9cbb17211a5ecd8 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Sat, 18 Jan 2014 17:37:33 +0800 Subject: [PATCH] Added rubble and refined dust --- .../resonantinduction/archaic/Archaic.java | 6 +- .../archaic/firebox/BlockHotPlate.java | 1 - .../core/ResonantInduction.java | 23 ++-- .../core/resource/ResourceGenerator.java | 8 +- .../{ItemDust.java => ItemOreResource.java} | 29 +++-- .../electrical/armbot/BlockArmbot.java | 5 +- .../electrical/battery/RenderBattery.java | 2 +- .../mechanical/Mechanical.java | 115 ++++++++++-------- .../mechanical/grinder/TilePurifier.java | 4 +- .../mechanical/logistic/BlockManipulator.java | 4 +- .../languages/en_US.properties | 9 +- .../textures/blocks/hotPlate.png | Bin 0 -> 1014 bytes .../textures/items/oreDirtyDust.png | Bin 385 -> 0 bytes .../textures/items/oreDust.png | Bin 538 -> 992 bytes .../textures/items/oreRefinedDust.png | Bin 0 -> 614 bytes .../textures/items/oreRubble.png | Bin 807 -> 947 bytes 16 files changed, 112 insertions(+), 94 deletions(-) rename src/main/java/resonantinduction/core/resource/item/{ItemDust.java => ItemOreResource.java} (68%) create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/hotPlate.png delete mode 100644 src/main/resources/assets/resonantinduction/textures/items/oreDirtyDust.png create mode 100644 src/main/resources/assets/resonantinduction/textures/items/oreRefinedDust.png diff --git a/src/main/java/resonantinduction/archaic/Archaic.java b/src/main/java/resonantinduction/archaic/Archaic.java index 32cb829d..98ee0f77 100644 --- a/src/main/java/resonantinduction/archaic/Archaic.java +++ b/src/main/java/resonantinduction/archaic/Archaic.java @@ -96,7 +96,7 @@ public class Archaic @EventHandler 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(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(blockTurntable, "SSS", "RGR", "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', "gear", '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(new ItemStack(blockHotPlate, 1, 1), "HHH", "WWW", 'H', new ItemStack(blockHotPlate, 1, 0), 'W', UniversalRecipe.WIRE.get())); diff --git a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java index a6fbfaa7..f8cf0c63 100644 --- a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -27,7 +27,6 @@ public class BlockHotPlate extends BlockRI public BlockHotPlate() { super("hotPlate", Material.wood); - setTextureName(Reference.PREFIX + "material_wood_surface"); setBlockBounds(0, 0, 0, 1, 0.2f, 1); this.setTickRandomly(true); } diff --git a/src/main/java/resonantinduction/core/ResonantInduction.java b/src/main/java/resonantinduction/core/ResonantInduction.java index a9680d7d..e0da7742 100644 --- a/src/main/java/resonantinduction/core/ResonantInduction.java +++ b/src/main/java/resonantinduction/core/ResonantInduction.java @@ -16,7 +16,7 @@ import resonantinduction.core.prefab.part.PacketMultiPart; import resonantinduction.core.resource.ResourceGenerator; import resonantinduction.core.resource.fluid.BlockFluidMixture; 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.TileMultiBlockPart; import calclavia.lib.network.PacketHandler; @@ -65,10 +65,10 @@ public class ResonantInduction public static final PacketMultiPart PACKET_MULTIPART = new PacketMultiPart(Reference.CHANNEL); /** Blocks and Items */ - public static BlockMulti blockMulti; - 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 blockGas; @@ -87,18 +87,18 @@ public class ResonantInduction MinecraftForge.EVENT_BUS.register(new LinkEventHandler()); MinecraftForge.EVENT_BUS.register(new FluidEventHandler()); - blockMulti = new BlockMulti(Settings.CONFIGURATION.getBlock("blockMulti", Settings.getNextBlockID()).getInt()).setPacketType(PACKET_TILE); - MIXTURE = new Fluid("mixture"); FluidRegistry.registerFluid(MIXTURE); blockFluidMixture = new BlockFluidMixture(Settings.CONFIGURATION.getBlock("FluidMixture", Settings.getNextBlockID()).getInt(), MIXTURE); // Items - itemDust = new ItemDust(Settings.getNextItemID()); - GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName()); + itemRubble = new ItemOreResource(Settings.getNextItemID(), "oreRubble"); + itemDust = new ItemOreResource(Settings.getNextItemID(), "oreDust"); + itemRefinedDust = new ItemOreResource(Settings.getNextItemID(), "oreRefinedDust"); - GameRegistry.registerTileEntity(TileMultiBlockPart.class, "TileEntityMultiBlockPart"); - GameRegistry.registerBlock(blockMulti, "blockMulti"); + GameRegistry.registerItem(itemRubble, itemRubble.getUnlocalizedName()); + GameRegistry.registerItem(itemDust, itemDust.getUnlocalizedName()); + GameRegistry.registerItem(itemRefinedDust, itemRefinedDust.getUnlocalizedName()); GameRegistry.registerBlock(blockFluidMixture, blockFluidMixture.getUnlocalizedName()); GameRegistry.registerTileEntity(TileFluidMixture.class, blockFluidMixture.getUnlocalizedName()); @@ -120,8 +120,7 @@ public class ResonantInduction public void postInit(FMLPostInitializationEvent evt) { // Generate Dusts - ResourceGenerator.generateDusts(); - + ResourceGenerator.generateOreResources(); } } diff --git a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java index 7b1d26d5..2ebf741a 100644 --- a/src/main/java/resonantinduction/core/resource/ResourceGenerator.java +++ b/src/main/java/resonantinduction/core/resource/ResourceGenerator.java @@ -23,7 +23,7 @@ import resonantinduction.api.recipe.MachineRecipes.RecipeType; import resonantinduction.api.recipe.OreDetectionBlackList; import resonantinduction.core.Reference; 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.SideOnly; @@ -51,7 +51,7 @@ public class ResourceGenerator } } - public static void generateDusts() + public static void generateOreResources() { for (String materialName : materialNames) { @@ -61,9 +61,9 @@ public class ResourceGenerator { // 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("dustRefined" + name, ResonantInduction.itemRefinedDust.getStackFromDust(materialName)); } // Add to machine recipes diff --git a/src/main/java/resonantinduction/core/resource/item/ItemDust.java b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java similarity index 68% rename from src/main/java/resonantinduction/core/resource/item/ItemDust.java rename to src/main/java/resonantinduction/core/resource/item/ItemOreResource.java index 10474ab6..5ea5c88f 100644 --- a/src/main/java/resonantinduction/core/resource/item/ItemDust.java +++ b/src/main/java/resonantinduction/core/resource/item/ItemOreResource.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import resonantinduction.core.Reference; +import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.item.ItemBase; import resonantinduction.core.resource.ResourceGenerator; import calclavia.lib.utility.LanguageUtility; @@ -22,24 +23,28 @@ import cpw.mods.fml.relauncher.SideOnly; * @author Calclavia * */ -public class ItemDust extends ItemBase +public class ItemOreResource extends ItemBase { - public static final Set dusts = new HashSet(); - - public ItemDust(int id) + public ItemOreResource(int id, String name) { - super("oreDust", id); - this.setTextureName(Reference.PREFIX + "oreDust"); + super(name, id); } @Override public String getItemDisplayName(ItemStack is) { String dustName = getDustFromStack(is); - ItemStack type = OreDictionary.getOres("ingot" + dustName.substring(0, 1).toUpperCase() + dustName.substring(1)).get(0); + List 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(" $", ""); - return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " "); + String name = type.getDisplayName().replace(LanguageUtility.getLocal("misc.resonantinduction.ingot"), "").replaceAll("^ ", "").replaceAll(" $", ""); + return (LanguageUtility.getLocal(this.getUnlocalizedName() + ".name")).replace("%v", name).replace(" ", " "); + } + + return ""; } public ItemStack getStackFromDust(String name) @@ -65,9 +70,9 @@ public class ItemDust extends ItemBase @Override 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. */ - String name = ItemDust.getDustFromStack(itemStack); + String name = ItemOreResource.getDustFromStack(itemStack); if (ResourceGenerator.materialColors.containsKey(name)) { diff --git a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java index 6b9c5fda..4d328d61 100644 --- a/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java +++ b/src/main/java/resonantinduction/electrical/armbot/BlockArmbot.java @@ -14,6 +14,7 @@ import net.minecraftforge.common.Configuration; import resonantinduction.core.ResonantInduction; import resonantinduction.core.prefab.block.BlockRI; import resonantinduction.core.render.RIBlockRenderingHandler; +import calclavia.components.CalclaviaLoader; import calclavia.lib.content.IExtraInfo.IExtraBlockInfo; import calclavia.lib.multiblock.link.IBlockActivate; import calclavia.lib.multiblock.link.IMultiBlock; @@ -43,7 +44,7 @@ public class BlockArmbot extends BlockRI implements IExtraBlockInfo 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) { ((TileArmbot) tileEntity).dropHeldObject(); - ResonantInduction.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity); + CalclaviaLoader.blockMulti.destroyMultiBlockStructure((TileArmbot) tileEntity); } this.dropBlockAsItem_do(world, x, y, z, new ItemStack(this)); super.breakBlock(world, x, y, z, par5, par6); diff --git a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java index f9710757..10c123f0 100644 --- a/src/main/java/resonantinduction/electrical/battery/RenderBattery.java +++ b/src/main/java/resonantinduction/electrical/battery/RenderBattery.java @@ -41,7 +41,7 @@ public class RenderBattery extends TileEntitySpecialRenderer glTranslatef((float) x + 0.5F, (float) y, (float) z + 0.5F); glScalef(0.46f, 0.46f, 0.46f); GL11.glRotatef(90 * i, 0, 1, 0); - FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CAP); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE_CASE); MODEL.renderOnly("Default"); glPopMatrix(); } diff --git a/src/main/java/resonantinduction/mechanical/Mechanical.java b/src/main/java/resonantinduction/mechanical/Mechanical.java index fbf55874..c1d7dd0e 100644 --- a/src/main/java/resonantinduction/mechanical/Mechanical.java +++ b/src/main/java/resonantinduction/mechanical/Mechanical.java @@ -2,6 +2,8 @@ package resonantinduction.mechanical; import net.minecraft.block.Block; import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; import resonantinduction.core.Reference; import resonantinduction.core.ResonantInduction; import resonantinduction.core.Settings; @@ -28,6 +30,7 @@ import resonantinduction.mechanical.logistic.TileManipulator; import resonantinduction.mechanical.logistic.TileRejector; import calclavia.lib.content.ContentRegistry; import calclavia.lib.network.PacketHandler; +import calclavia.lib.recipe.UniversalRecipe; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -37,77 +40,83 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; 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) @NetworkMod(channels = Reference.CHANNEL, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketHandler.class) public class Mechanical { - /** Mod Information */ - public static final String ID = "ResonantInduction|Mechanical"; - public static final String NAME = Reference.NAME + " Mechanical"; + /** Mod Information */ + public static final String ID = "ResonantInduction|Mechanical"; + public static final String NAME = Reference.NAME + " Mechanical"; - @Instance(ID) - public static Mechanical INSTANCE; + @Instance(ID) + public static Mechanical INSTANCE; - @SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy") - public static CommonProxy proxy; + @SidedProxy(clientSide = "resonantinduction.mechanical.ClientProxy", serverSide = "resonantinduction.mechanical.CommonProxy") + public static CommonProxy proxy; - @Mod.Metadata(ID) - public static ModMetadata metadata; + @Mod.Metadata(ID) + public static ModMetadata metadata; - public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, ID); + public static final ContentRegistry contentRegistry = new ContentRegistry(Settings.CONFIGURATION, ID); - // Energy - public static Item itemGear; - public static Block itemGearShaft; + // Energy + public static Item itemGear; + public static Block itemGearShaft; - // Transport - public static Block blockConveyorBelt; - public static Block blockManipulator; - public static Block blockDetector; - public static Block blockRejector; + // Transport + public static Block blockConveyorBelt; + public static Block blockManipulator; + public static Block blockDetector; + public static Block blockRejector; - // Fluids - public static Block blockTank; - public static Block blockPipe; - public static Block blockReleaseValve; - public static Block blockGrate; - public static Block blockPump; + // Fluids + public static Block blockTank; + public static Block blockPipe; + public static Block blockReleaseValve; + public static Block blockGrate; + public static Block blockPump; - public static Item itemPipeGuage; + public static Item itemPipeGuage; - @EventHandler - public void preInit(FMLPreInitializationEvent evt) - { - Settings.load(); - NetworkRegistry.instance().registerGuiHandler(this, proxy); - itemGear = contentRegistry.createItem(ItemGear.class); + @EventHandler + public void preInit(FMLPreInitializationEvent evt) + { + Settings.load(); + NetworkRegistry.instance().registerGuiHandler(this, proxy); + itemGear = contentRegistry.createItem(ItemGear.class); - blockConveyorBelt = contentRegistry.createTile(BlockConveyorBelt.class, TileConveyorBelt.class); - blockManipulator = contentRegistry.createTile(BlockManipulator.class, TileManipulator.class); - blockDetector = contentRegistry.createTile(BlockDetector.class, TileDetector.class); - blockRejector = contentRegistry.createTile(BlockRejector.class, TileRejector.class); + blockConveyorBelt = contentRegistry.createTile(BlockConveyorBelt.class, TileConveyorBelt.class); + blockManipulator = contentRegistry.createTile(BlockManipulator.class, TileManipulator.class); + blockDetector = contentRegistry.createTile(BlockDetector.class, TileDetector.class); + blockRejector = contentRegistry.createTile(BlockRejector.class, TileRejector.class); - blockTank = contentRegistry.createBlock(BlockTank.class, ItemBlockFluidContainer.class, TileTank.class); - blockPipe = contentRegistry.createBlock(BlockPipe.class, ItemBlockFluidContainer.class, TilePipe.class); - blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); - blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class); - blockReleaseValve = contentRegistry.createTile(BlockReleaseValve.class, TileReleaseValve.class); + blockTank = contentRegistry.createBlock(BlockTank.class, ItemBlockFluidContainer.class, TileTank.class); + blockPipe = contentRegistry.createBlock(BlockPipe.class, ItemBlockFluidContainer.class, TilePipe.class); + blockGrate = contentRegistry.createTile(BlockGrate.class, TileGrate.class); + blockPump = contentRegistry.createTile(BlockPump.class, TilePump.class); + blockReleaseValve = contentRegistry.createTile(BlockReleaseValve.class, TileReleaseValve.class); - itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class); + itemPipeGuage = contentRegistry.createItem(ItemPipeGauge.class); - proxy.preInit(); - Settings.save(); - } + OreDictionary.registerOre("gear", itemGear); + + proxy.preInit(); + Settings.save(); + } + + @EventHandler + public void init(FMLInitializationEvent evt) + { + MultipartMechanical.INSTANCE = new MultipartMechanical(); + Settings.setModMetadata(metadata, ID, NAME); + proxy.init(); + } - @EventHandler - public void init(FMLInitializationEvent evt) - { - MultipartMechanical.INSTANCE = new MultipartMechanical(); - Settings.setModMetadata(metadata, ID, NAME); - proxy.init(); - } } diff --git a/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java b/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java index f04e0d02..01a6a3f6 100644 --- a/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java +++ b/src/main/java/resonantinduction/mechanical/grinder/TilePurifier.java @@ -8,7 +8,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import resonantinduction.core.Reference; -import resonantinduction.core.resource.item.ItemDust; +import resonantinduction.core.resource.item.ItemOreResource; import universalelectricity.api.energy.EnergyStorageHandler; import universalelectricity.api.vector.Vector3; import calclavia.lib.prefab.tile.TileElectrical; @@ -78,7 +78,7 @@ public class TilePurifier extends TileElectrical 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; } diff --git a/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java b/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java index 25ef43b9..2db83957 100644 --- a/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java +++ b/src/main/java/resonantinduction/mechanical/logistic/BlockManipulator.java @@ -40,7 +40,7 @@ public class BlockManipulator extends BlockImprintable if (!world.isRemote) { ((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; @@ -76,7 +76,7 @@ public class BlockManipulator extends BlockImprintable } if (!world.isRemote) { - entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manip. outputing = " + manip.isOutput())); + entityPlayer.sendChatToPlayer(ChatMessageComponent.createFromText("Manipulator outputing = " + manip.isOutput())); } } diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties index 13a0e2af..7438861b 100644 --- a/src/main/resources/assets/resonantinduction/languages/en_US.properties +++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties @@ -9,10 +9,15 @@ meta.resonantinduction.credits=Visit website for credits. fluid.mixture=Mixture -### Archaic Module -## Items +### Core +misc.resonantinduction.ingot=Ingot item.resonantinduction\:ingot.name=%v Ingot 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 ## Machines diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/hotPlate.png b/src/main/resources/assets/resonantinduction/textures/blocks/hotPlate.png new file mode 100644 index 0000000000000000000000000000000000000000..e34957a090a539166c2d6fd4b7cb1952abf3a1f8 GIT binary patch literal 1014 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000AJNkl8RkvHWMU3CF;wARbC4=(lQ+e%#;t$<+%5N%@v)C6TlP@H42 z7&Se;1v+7C7|(UV8%dyVNhI3fVJw4DH^w0P$fU}`Z(SM5)j>Njc)XVvYLgbSV96yg z`3-1sH@bX5DF1-XyFaAVZkTfMbAzL!Bf1N*-yk7o45UVp(kxJOa&kgJi0bus*igVC zEk@gqZ;)+pczB4Kv$HdbLxXbuf&vz4G1`6@WPhl1O}BZ|6K*JAk!7&;3@FDUU4ysV zvt@}$G+ad}=z`!wD6tGB((UuG(zT_BfN^b!*bQc2M7b6kp07r>ZTS$oUvZ3uK z1_|spNPscu@TIB7gS40hzIFiv5C*tU>T!0@2 z7)onf23JFYL>p9oeJlPvkCbRj1`=0tO$qexx?V`vl3hz!nJrN76dT2Ja2jq-P;7{g zGYOpQ{MuB&Kl8rT=g}Q3Uy%XYZVVbFv<5LS{7Dal+1l*cS?rfoMwxcwwV0atzT;ZEm}Esc=_dWH8e>+&IHFI3I8% z+F)VH<6bQ?U=CVjK&mYCge&Ym%I^AA7}(u?vpw3P*g&imuqU**8^H@|%ku$mDrHLT z2E=IliNV3a0o{ezZ;%$p20|r!7NO?&_?Uta_#7)M`;?`{X!~CVr>CbB=WWAi?n#_HQh0;qZ$fAysxb{ z-=u&=TFi`V3_nV50X1|NVxrbx9sT`rjCYArTS$n5le|5yGYt~hZ;$|EfVmo-JzC7d zROP0(oM&}koxx1!$DIl-WFhJnk85mJl)~v)q-B3thm~P@ABw)F(0zI=W!UrKh!lvI6;>1s;*b3=DjSL74G){)!Z!pj3%#L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9i zsh**s`)4O}psEj^E{-7)?r$e;&idp=gprTaIDM#ML+IOmj>x~j2ErSp|eO4u@~40pk(+FATF!{&cj zxIKR<$9(P&-`0veEM|QCd#2I)t-=|0iSL-xm&x}!t}44aoMB5qXQ}?) zt$Vc-J_r{up2@%dndM&1d7bSH(n;qS|2%h5{I)qFkCDNd#g29E7@u`1RanK(z1T|NYJ2PcB<%}3 b9i;4bIVLLjFa9D6^gDy6tDnm{r-UW|M?;mD diff --git a/src/main/resources/assets/resonantinduction/textures/items/oreDust.png b/src/main/resources/assets/resonantinduction/textures/items/oreDust.png index a278e0fc494ad275dc919d68339defe85ebc21d5..88a2fb030d9552206de626532ef5663bd28a5a3d 100644 GIT binary patch delta 912 zcmV;B18@AA1mFjdB#|)~3c>&Y4#EKyC`y2lQz(A}TuDShR9HvFm1$EGK@f)hpOltL zm6TYVf&mi38IquYgxnz~T`i6I9Bkdniomj0sGncmFSY%(gvhxNmg>3*lDyLU3P z`v|~)MJbwzQZy5#XeLV0Oq8OTC`B_-ie{n||HRPH5M+cV<{yGm>_;y8vk<6II8lM}k%pG$>Ol;MerteC5}1DBNojoGjt2Z23AcHUvtGE3T3yNrO_ zjp>&o_ijQdip7H1?hahb+LPWiJ|WGD%kzIuyUpNR#>Z$}vuRED=a(4}_=4_P4W5m4 zT6}j>Mt(m4=ez~euSQAhp43s#rch2raTxNE#__vdhUN;12$rq$y5C=mqZ=aV?sJnZ zvSM;X+s1F_4Rne*d`w2+aXGNoOV}=C(LHUVm<%Jb{SIEY6JDnSanBBt-uI}n21S2P z8BtF#(11)MpP{i+{J>7W6Tz*wi1~K0x?nNHomVsPZ#od%bRznG8|6e4)pUa9nuRo0 zmzFU6_%ZpSp1|M;c;Icj!4B9KY*Ul8kZ*0swShx+|MQUmMxQ^!+{8G|bx&(Fa#DT| zJ$*JDApfjZ!up~WFNcT8@2_QWL=t~ax6`667yk8e1(Dq?WLa_E#NwM7%#LY?tzF8} zc;NHs@tIJs0k(V3pFSa5t|ib79&pttVsmwcf}`xe1TEaBHhn?3m+ zJ$3akjzWB&<}RyRV;oVZAKl4$!Jz)yDCeVZW?&g}p<#Epo~j9I;5&1Y(YJ@-fGX$I0f+l-W1I zy<%s#=B*wh)?Bqp?4h*VB67(L2=_r05hU3+VS9Z|_x}_t>w*E{A^fYz-%yHXq7=5Tp7w{})q46PY3!XYmxn)EYaQ$< zZte)Fu$pEwXON1kaW-=XR$NV8|0t^48E7;1MpS22dwy`u*jr=kJXtKMh}JVk{R*9- z;ue0ck11|`gf%8^fqzuzMl6IBH>}*Q-wnjNQqk#*xwQ6rX%4|fz-d${2Y7#by&v0zUx3;f zA*?xw-<`()62LV`Gy!}o0N-9~aUU?4^C~5V0d5@w@XyCH;C~y^eGL%(7Kb%5a}B_t z{6yG`=DPy$_A~-Cry&FC9QQMG&=n#y060UKM%srsYMGfc2ez0E6Ab{=l(09VE9?~l zd-iM*>=6UiJ@&hXvekSGbAY`j*gLulb_=P9>u2a5m>=Bm2o<7+K3CYhpm28$x2Kc` v9cq-}_LTBqMk3tjxvIHoxQd2Y*KX4N2bPDNB8 zb~7$DE-^7j^FlWO00H7jL_t(oN3D`OPQySLgmZ~-GpZCxq`adH@6LMHPKr;q|HsUD?a6fd5NMhvfjz~|-9lDaO>;B%ASmdCcPGOITy#7RYQiYd~qP zgf#|kn85h==R1J=xKBztATj1r?s#Fi-|yQ1U!NZ#L>$CvI+8&Sy8tkGd438k7K`R` zxr6|Hr=gmTj=hYhk=n3GuUavdmfY0dhlr)3}i2XVbIT(W9Udz+}J%=rVF=C*0kNu>f3^gA@8(^#n_HNw;qlHw&^>gSRXm8wb2^FG--q$dALE&y6 zZcnKmbf{4dx2IGO=7{(CT&p=~xE2l3uiZ@k0WZc}QbZ7^egFUf07*qoM6N<$f+0-+ A7ytkO literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/resonantinduction/textures/items/oreRubble.png b/src/main/resources/assets/resonantinduction/textures/items/oreRubble.png index 683e282e36a099076e0fa283a219ffab36169a80..5e4e80f543afd6ba405df0f588c3f8eb338ed83a 100644 GIT binary patch delta 867 zcmV-p1DyP)2D1l{B#|)~3c>&Y4#EKyC`y2lQz(A}FG)l}R9HvFl<7`lK@f#`H&jH7 zK|~YW*j=K6h%s(KqaX?hh#QjVtCoC~^rSCz4C5qsew^If)yt_mb-Dv0@?YT$`Uz*y zPdI~q!Wr}v&fq9!XJ=)3d3pHjp8pp(gJ5ZCNkXBJ;`8%U>h-$J&(9C1-0Ob}XK-a@ zMc#kj-sJuLT~Vvmq*N+NBoY};OCTH$>vs~Mp4sPuGf1Tnlf>QKosu6O9_klGE-o&F zgGcuA{@zvFp?&)^B^78T`&(F_teSIxwXJ>zMbaW(~Yd8!%1A}NZst0jku~?K$CL@VN zLaXX@I-0=E&5e?toSZ1x$H#{f_j*0Ky}gz5^K(r+o6SlxnUr)oE%A6IoNM!VNNr$5Hd8IK zw%cuO3*?y5kkAGQ^7*_R931GEmI3D2&tBSzI<(j3@sQd;DjbaLxcK4WLHi2%-rk<% zayfN7Ye)J2%vBP|C39w_EehDz}TxOOYE>)eQ2t5Mtg{o?-QE3TM%qOpHjfR@0EZ3+12rC!a+f&>a;p6L`qGL~ghK(6 z+X-+jx%Wsw|8T1p* tpr3FC{e&~5|JniYot8D&sg%_=(coQ)t#F0 z3?kwI9*#WSU0wH9^|&WjER-z9n7_h*1DOo`DYMK2G9}Ftn*{TKYe||VU*-*QNbxNB zybYt#$Sn+qLvM`d@qc*i#uCILMq{;E+WEY&$d>q5G$bp zwEAQFxoY6a`l2-t)A`wgmsdkIz%yg3Aqo?y9OIKWd*<}ur4{=5?aUh3Yi+nVo;{eW z+{`5zQ4J6pXstyyImfIP0_*_RVTjcuXQ^1Wx#cYyqJJ8QyJC@;1}=`@+F#xWSPSFR zkk|nUs$~c8#^YLMtED*aeiRW`h$PVf-vyrM&gQahwT#gSzm$MF63lx8!fQ1Aus}S{ zfOgrS1Duz_Qqvn~Uqgbba4*0BTOY>6fxAEoOHFT(M4Iyi$Tf9iIyXC$ce#^r4_dO{ zK_*Xwdoj?G5xHSfEJ?d(VgQhdCdHDpdnN{4H~+c;llujq_U{#}GYLol0000