From 3dc9b190aa99db5baa8eab71e67634af0d17686e Mon Sep 17 00:00:00 2001 From: Tec Date: Wed, 28 Mar 2018 22:02:08 +0200 Subject: bump ver --- .../java/com/github/technus/tectech/TecTech.java | 23 +++++++++-- .../core/stacks/cElementalInstanceStack.java | 6 +-- .../core/templates/iElementalDefinition.java | 2 +- .../technus/tectech/recipe/TT_recipeAdder.java | 2 +- .../multi/GT_MetaTileEntity_EM_decay.java | 47 +++++++++++----------- .../base/GT_MetaTileEntity_MultiblockBase_EM.java | 9 ++++- .../single/GT_MetaTileEntity_DataReader.java | 4 +- .../single/gui/GT_GUIContainer_DataReader.java | 2 +- 8 files changed, 57 insertions(+), 38 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 84f2ddf58b..f4dd1c826a 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -158,7 +158,6 @@ public class TecTech { "dreamcraft", "miscutils", "GT++DarkWorld", - "TwilightForest", "GalacticraftCore", "GalacticraftMars", "GalaxySpace", @@ -179,8 +178,8 @@ public class TecTech { "thaumicenergistics", "witchery", "lootgames", - Reference.MODID, - "utilityworlds" + "utilityworlds", + Reference.MODID )); String modId; for(Block block : GameData.getBlockRegistry().typeSafeIterable()) { @@ -193,9 +192,25 @@ public class TecTech { if ("grave".equals(GameRegistry.findUniqueIdentifierFor(block).name)) { continue; } + } else if ("TwilightForest".equals(modId)){ + if ("tile.TFShield".equals(GameRegistry.findUniqueIdentifierFor(block).name)){ + block.setResistance(40); + continue; + }else if ("tile.TFThorns".equals(GameRegistry.findUniqueIdentifierFor(block).name)){ + block.setResistance(10); + continue; + }else if ("tile.TFTowerTranslucent".equals(GameRegistry.findUniqueIdentifierFor(block).name)){ + block.setResistance(30); + continue; + }else if ("tile.TFDeadrock".equals(GameRegistry.findUniqueIdentifierFor(block).name)) { + block.setResistance(5); + continue; + } else { + continue; + } } } - block.setResistance(6); + block.setResistance(5); } } } diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java index f8a52cf6a3..0575c2b8a5 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/stacks/cElementalInstanceStack.java @@ -98,14 +98,12 @@ public final class cElementalInstanceStack implements iHasElementalDefinition { setLifeTimeMultiplier(getLifeTimeMultiplier()); } - @Deprecated //can be done from definition public float getEnergySettingCost(long currentEnergyLevel, long newEnergyLevel){ - return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel); + return definition.getEnergyDiffBetweenStates(currentEnergyLevel,newEnergyLevel)*amount; } - @Deprecated //can be done from definition public float getEnergySettingCost(long newEnergyLevel){ - return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel); + return definition.getEnergyDiffBetweenStates(energy,newEnergyLevel)*amount; } public cElementalDefinitionStack getDefinitionStack() { diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java index 8a0bd486c0..8692203e55 100644 --- a/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java +++ b/src/main/java/com/github/technus/tectech/elementalMatter/core/templates/iElementalDefinition.java @@ -17,7 +17,7 @@ public abstract class iElementalDefinition implements ComparablegetMinimumStoredEU()) { for (GT_MetaTileEntity_Hatch_Dynamo tHatch : mDynamoHatches) { if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(tHatch)) { euVar = tHatch.maxEUOutput(); @@ -1819,6 +1819,12 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt return false; } + /** + * + * @param EU + * @param Amperes + * @return if was able to put inside the hatches + */ private boolean addEnergyOutput_EM(long EU, long Amperes) { if(EU<0) { EU = -EU; @@ -1862,6 +1868,7 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM extends GT_MetaTileEnt } } } + setEUVar(Math.min(getEUVar() + euVar,maxEUStore())); return false; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java index db60b2df39..bf557fa4f7 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java @@ -191,7 +191,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine @SideOnly(Side.CLIENT) void loadResources(); @SideOnly(Side.CLIENT) - void initRecipe(ItemStack itemStack); + void initRender(ItemStack itemStack); @SideOnly(Side.CLIENT) void renderTooltips(ItemStack itemStack,int mouseX,int mouseY,GT_GUIContainer_DataReader gui); @SideOnly(Side.CLIENT) @@ -218,7 +218,7 @@ public class GT_MetaTileEntity_DataReader extends GT_MetaTileEntity_BasicMachine } @Override - public void initRecipe(ItemStack itemStack) { + public void initRender(ItemStack itemStack) { slots=new HashMap<>(); slots2=new HashMap<>(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java index 1b9c2f384c..97e7601b67 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/gui/GT_GUIContainer_DataReader.java @@ -119,7 +119,7 @@ public class GT_GUIContainer_DataReader extends GT_GUIContainerMetaTile_Machine for (GT_MetaTileEntity_DataReader.DataRender render : renders) { if (render.canRender(thing, mTier)) { if (!GT_Utility.areStacksEqual(stack, thing, false)) { - render.initRecipe(thing); + render.initRender(thing); } render.renderBackgroundOverlay(thing, mouseX, mouseY, x, y, this); break; -- cgit