diff options
10 files changed, 55 insertions, 36 deletions
diff --git a/.classpath b/.classpath index 87eb28df0d..f17cbaee5e 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,6 @@ <classpathentry kind="src" path="src/resources"/> <classpathentry combineaccessrules="false" kind="src" path="/Forge"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/> - <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.720-experimental-dev.jar"/> <classpathentry kind="lib" path="libs/appliedenergistics2-rv2-stable-1-dev.jar"/> <classpathentry kind="lib" path="libs/Waila-1.5.10_1.7.10-deobf.jar"/> <classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.2.8.381-dev.jar" sourcepath="libsrc/EnderIO-1.7.10-2.2.8.381-sources.jar"/> @@ -15,8 +14,8 @@ <classpathentry kind="lib" path="libs/CoFHCore-[1.7.10]3.0.3-303.jar"/> <classpathentry kind="lib" path="libs/RaisinToastCore-0.1-dev.jar"/> <classpathentry kind="lib" path="libs/Psychedelicraft-1.5.2.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/VillageWipe"/> <classpathentry kind="lib" path="libs/Baubles-deobf-1.7.10-1.0.1.10.jar"/> <classpathentry kind="lib" path="libs/forestry_1.7.10-4.2.2.50-deobf.jar"/> + <classpathentry kind="lib" path="libs/industrialcraft-2-2.2.783-experimental-deobf.jar"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java index 66420a72a5..809537f346 100644 --- a/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java +++ b/src/Java/miscutil/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -45,8 +45,8 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II private int facing = 2; private int progress; - @Override - public void updateEntity(){ + + public void update2Entity(){ Utils.LOG_WARNING("updateEntity"); if(++progress >= 40){ //if(++progress >= 300){ diff --git a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 6e7fc4ff81..7bb9c17088 100644 --- a/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/Java/miscutil/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -338,8 +338,10 @@ public enum GregtechOrePrefixes { //Radioactive Materials - UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium HexaFluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - UraniumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium TetraFluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))); + HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), + UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Hexafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), + UraniumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Tetrafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), + ThoriumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 15, 120, 15, 0, "Thorium Tetrafluoride", 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))); diff --git a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java index 5ec53adb9d..cf796f8042 100644 --- a/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java +++ b/src/Java/miscutil/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java @@ -1,10 +1,13 @@ package miscutil.xmod.gregtech.common.blocks.fluid; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; import miscutil.core.lib.LoadedMods; import miscutil.core.util.Utils; +import miscutil.core.util.fluid.FluidUtils; +import miscutil.core.util.item.UtilsItems; import miscutil.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import miscutil.xmod.gregtech.common.Meta_GT_Proxy; @@ -39,10 +42,25 @@ public class GregtechFluidHandler { } if (LoadedMods.IndustrialCraft2){ - Utils.LOG_INFO("Adding in GT Fluids for Molten Salt, Cooled Salt and Various other Nuclide related content."); - Meta_GT_Proxy.addFluid("uraniumHexafluoride", "Uranium Hexafluoride", GT_Materials.UraniumHexaFluoride, 2, 100, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.UraniumHexaFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - Meta_GT_Proxy.addFluid("UraniumTetrafluoride", "Uranium Tetrafluoride", GT_Materials.UraniumTetraFluoride, 2, 950, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.UraniumTetraFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); - } + Utils.LOG_INFO("Adding in GT Fluids for Molten Salt, Cooled Salt and Various other Nuclide related content."); + Meta_GT_Proxy.addFluid("hydrofluoricAcid", "Hydrofluoric Acid", GT_Materials.HydrofluoricAcid, 1, 120, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.HydrofluoricAcid, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + Meta_GT_Proxy.addFluid("uraniumHexafluoride", "Uranium Hexafluoride", GT_Materials.UraniumHexaFluoride, 4, 200, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.UraniumHexaFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + Meta_GT_Proxy.addFluid("uraniumTetrafluoride", "Uranium Tetrafluoride", GT_Materials.UraniumTetraFluoride, 4, 950, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.UraniumTetraFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + Meta_GT_Proxy.addFluid("thoriumTetrafluoride", "Thorium Tetrafluoride", GT_Materials.ThoriumTetraFluoride, 4, 1250, GT_OreDictUnificator.get(OrePrefixes.cell, GT_Materials.ThoriumTetraFluoride, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000); + + /*GT_Values.RA.addChemicalBathRecipe( + UtilsItems.getItemStackOfAmountFromOreDict("gemApatite", 1), + FluidUtils.getFluidStack("sulfuricacid", 1500), + aOutput1, + aOutput2, + aOutput3, + aChances, + aDuration, + aEUt)*/ + + GT_Values.RA.addMixerRecipe(UtilsItems.getItemStackOfAmountFromOreDict("dustUranium235", 1), UtilsItems.getItemStackOfAmountFromOreDict("dustUranium235", 1), null, null, FluidUtils.getFluidStack("hydrofluoricacid", 2000), FluidUtils.getFluidStack("uraniumtetrafluoride", 266), null, 3000, 500); + GT_Values.RA.addMixerRecipe(UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 1), UtilsItems.getItemStackOfAmountFromOreDict("cellFluorine", 1), null, null, FluidUtils.getFluidStack("uraniumtetrafluoride", 665), FluidUtils.getFluidStack("uraniumhexafluoride", 266), null, 5000, 2000); + } } } diff --git a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java index 1c943d3546..8d7f73eb08 100644 --- a/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java +++ b/src/Java/miscutil/xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java @@ -2,7 +2,7 @@ package miscutil.xmod.ic2.block.RTGGenerator.gui; import ic2.core.IC2; import ic2.core.block.generator.gui.GuiRTGenerator; -import ic2.core.util.GuiTooltiphelper; +import ic2.core.util.GuiTooltipHelper; import miscutil.xmod.ic2.block.RTGGenerator.TileEntityRTG; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -32,7 +32,7 @@ protected void drawGuiContainerForegroundLayer(int par1, int par2) { this.fontRendererObj.drawString(this.name, (this.xSize - this.fontRendererObj.getStringWidth(this.name)) / 2, 4, 4210752); - GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48); + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocalFormatted("ic2.generic.text.bufferEU", new Object[] { Double.valueOf(((TileEntityRTG)this.container.base).storage) }), 117, 38, 150, 48); } @Override diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java index 9b816b7f90..f92636f08e 100644 --- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java +++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/gui/GuiKineticWindGenerator.java @@ -3,7 +3,7 @@ package miscutil.xmod.ic2.block.kieticgenerator.gui; import ic2.core.IC2; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; -import ic2.core.util.GuiTooltiphelper; +import ic2.core.util.GuiTooltipHelper; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -48,8 +48,8 @@ public class GuiKineticWindGenerator this.fontRendererObj.drawString(((TileEntityWindKineticGenerator)this.container.base).getRotorhealth() + " %", 46, 70, 2157374); if (((TileEntityWindKineticGenerator)this.container.base).guiisoverload()) { - GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45); - GuiTooltiphelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45); + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload"), 44, 20, 79, 45); + GuiTooltipHelper.drawAreaTooltip(par1 - this.guiLeft, par2 - this.guiTop, StatCollector.translateToLocal("ic2.WindKineticGenerator.error.overload2"), 102, 20, 131, 45); } } } diff --git a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java index 076697956d..3670dcc36e 100644 --- a/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java +++ b/src/Java/miscutil/xmod/ic2/block/kieticgenerator/tileentity/TileEntityKineticWindGenerator.java @@ -1,12 +1,13 @@ package miscutil.xmod.ic2.block.kieticgenerator.tileentity; import ic2.api.energy.tile.IKineticSource; -import ic2.api.item.IKineticWindRotor; +import ic2.api.item.IKineticRotor; +import ic2.api.item.IKineticRotor.GearboxType; import ic2.core.ContainerBase; import ic2.core.IC2; import ic2.core.IHasGui; import ic2.core.WorldData; -import ic2.core.block.invslot.InvSlotConsumableIKineticWindRotor; +import ic2.core.block.invslot.InvSlotConsumableKineticRotor; import ic2.core.block.kineticgenerator.container.ContainerWindKineticGenerator; import ic2.core.block.kineticgenerator.gui.GuiWindKineticGenerator; import ic2.core.block.kineticgenerator.tileentity.TileEntityWindKineticGenerator; @@ -31,7 +32,7 @@ public class TileEntityKineticWindGenerator extends TileEntityWindKineticGenerator implements IKineticSource, IHasGui { - public final InvSlotConsumableIKineticWindRotor rotorSlot; + public final InvSlotConsumableKineticRotor rotorSlot; private double windStrength; private int obstructedCrossSection; private int crossSection; @@ -43,11 +44,11 @@ implements IKineticSource, IHasGui public TileEntityKineticWindGenerator() { this.updateTicker = IC2.random.nextInt(getTickRate()); - this.rotorSlot = new InvSlotConsumableIKineticWindRotor(this, "rotorslot", 0, 1); + this.rotorSlot = new InvSlotConsumableKineticRotor(this, "rotorslot", 0, null, 1, null, GearboxType.WIND); } - @Override - public void updateEntity() + + public void update2Entity() { super.updateEntity(); @@ -155,7 +156,6 @@ implements IKineticSource, IHasGui super.setFacing(side); } - @Override public boolean enableUpdateEntity() { return IC2.platform.isSimulating(); @@ -314,8 +314,8 @@ implements IKineticSource, IHasGui public float getefficiency() { ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) { - return (float) (((IKineticWindRotor)stack.getItem()).getEfficiency(stack)*1.5); + if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { + return (float) (((IKineticRotor)stack.getItem()).getEfficiency(stack)*1.5); } return 0.0F; } @@ -324,8 +324,8 @@ implements IKineticSource, IHasGui public int getMinWindStrength() { ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) { - return ((IKineticWindRotor)stack.getItem()).getMinWindStrength(stack)/2; + if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { + return ((IKineticRotor)stack.getItem()).getMinWindStrength(stack)/2; } return 0; } @@ -334,8 +334,8 @@ implements IKineticSource, IHasGui public int getMaxWindStrength() { ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) { - return ((IKineticWindRotor)stack.getItem()).getMaxWindStrength(stack)*2; + if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { + return ((IKineticRotor)stack.getItem()).getMaxWindStrength(stack)*2; } return 0; } @@ -344,8 +344,8 @@ implements IKineticSource, IHasGui public int getRotorDiameter() { ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) { - return ((IKineticWindRotor)stack.getItem()).getDiameter(stack)/2; + if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { + return ((IKineticRotor)stack.getItem()).getDiameter(stack)/2; } return 0; } @@ -354,8 +354,8 @@ implements IKineticSource, IHasGui public ResourceLocation getRotorRenderTexture() { ItemStack stack = this.rotorSlot.get(); - if ((stack != null) && ((stack.getItem() instanceof IKineticWindRotor))) { - return ((IKineticWindRotor)stack.getItem()).getRotorRenderTexture(stack); + if ((stack != null) && ((stack.getItem() instanceof IKineticRotor))) { + return ((IKineticRotor)stack.getItem()).getRotorRenderTexture(stack); } return new ResourceLocation(IC2.textureDomain, "textures/items/rotors/rotorWoodmodel.png"); } diff --git a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java index 671eba0dea..1ab23f0c6b 100644 --- a/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java +++ b/src/Java/miscutil/xmod/thermalfoundation/fluid/TF_Fluids.java @@ -29,7 +29,7 @@ public class TF_Fluids registerFluid(fluidPyrotheum, "pyrotheum"); } else { - Utils.LOG_INFO("Registering Blazing Pyrotheum as it an already existing Fluid."); + Utils.LOG_INFO("Registering Blazing Pyrotheum as it is an already existing Fluid."); fluidPyrotheum = pyrotheum; } if (cryotheum == null){ @@ -38,7 +38,7 @@ public class TF_Fluids registerFluid(fluidCryotheum, "cryotheum"); } else { - Utils.LOG_INFO("Registering Gelid Cryotheum as it an already existing Fluid."); + Utils.LOG_INFO("Registering Gelid Cryotheum as it is an already existing Fluid."); fluidCryotheum = cryotheum; } } diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta index 70cc4d313c..f6730e30a9 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta +++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumhexafluoride.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 6 + "frametime": 4 } }
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta index 70cc4d313c..5169aabdc2 100644 --- a/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta +++ b/src/resources/assets/miscutils/textures/blocks/fluids/fluid.uraniumtetrafluoride.png.mcmeta @@ -1,5 +1,5 @@ { "animation": { - "frametime": 6 + "frametime": 8 } }
\ No newline at end of file |
