From b09b54435f9427332854558c42bd2c902825cbfe Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 21 Jun 2016 18:42:02 +0200 Subject: remove all --- .../common/covers/GT_Cover_SolarPanel.java | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java deleted file mode 100644 index 5c15505c4b..0000000000 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ /dev/null @@ -1,32 +0,0 @@ -package gregtech.common.covers; - -import gregtech.api.interfaces.tileentity.ICoverable; -import gregtech.api.util.GT_CoverBehavior; - -public class GT_Cover_SolarPanel - extends GT_CoverBehavior { - private final int mVoltage; - - public GT_Cover_SolarPanel(int aVoltage) { - this.mVoltage = aVoltage; - } - - public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { - if (aTimer % 100L == 0L) { - if ((aSide != 1) || (aTileEntity.getWorld().isThundering())) { - aCoverVariable = 0; - } else { - boolean bRain = (aTileEntity.getWorld().isRaining()) && (aTileEntity.getBiome().rainfall > 0.0F); - aCoverVariable = bRain && aTileEntity.getWorld().skylightSubtracted >= 4 || !aTileEntity.getSkyAtSide(aSide) ? 0 : ((int) (!bRain && aTileEntity.getWorld().isDaytime() ? 1 : 2)); - } - } - if ((aCoverVariable == 1) || ((aCoverVariable == 2) && (aTimer % 8L == 0L))) { - aTileEntity.injectEnergyUnits((byte) 6, this.mVoltage, 1L); - } - return aCoverVariable; - } - - public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { - return 1; - } -} \ No newline at end of file -- cgit From 09add3e8ac3be54b1e6c068e87d4fb5143c6d785 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 21 Jun 2016 18:50:29 +0200 Subject: even with Blood asp experimental branch --- .../common/covers/GT_Cover_SolarPanel.java | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java new file mode 100644 index 0000000000..ca25a0a12d --- /dev/null +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -0,0 +1,32 @@ +package gregtech.common.covers; + +import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.util.GT_CoverBehavior; + +public class GT_Cover_SolarPanel + extends GT_CoverBehavior { + private final int mVoltage; + + public GT_Cover_SolarPanel(int aVoltage) { + this.mVoltage = aVoltage; + } + + public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { + if (aTimer % 100L == 0L) { + if ((aSide != 1) || (aTileEntity.getWorld().isThundering())) { + aCoverVariable = 0; + } else { + boolean bRain = (aTileEntity.getWorld().isRaining()) && (aTileEntity.getBiome().rainfall > 0.0F); + aCoverVariable = bRain && aTileEntity.getWorld().skylightSubtracted >= 4 || !aTileEntity.getSkyAtSide(aSide) ? 0 : ((int) (!bRain && aTileEntity.getWorld().isDaytime() ? 1 : 2)); + } + } + if ((aCoverVariable == 1) || ((aCoverVariable == 2) && (aTimer % 8L == 0L))) { + aTileEntity.injectEnergyUnits((byte) 6, this.mVoltage, 1L); + } + return aCoverVariable; + } + + public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { + return 1; + } +} \ No newline at end of file -- cgit From 50a3dfcd32086100fe4e379ef265db298bb8b768 Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 25 Nov 2016 01:26:23 +0100 Subject: Solar nerf of doom --- .../common/covers/GT_Cover_SolarPanel.java | 70 +++++++++++++++++++--- 1 file changed, 63 insertions(+), 7 deletions(-) (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index ca25a0a12d..458d2354e3 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -1,7 +1,20 @@ package gregtech.common.covers; +import forestry.core.items.ItemRegistry; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OreDictNames; +import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.objects.XSTR; import gregtech.api.util.GT_CoverBehavior; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import ic2.api.item.ElectricItem; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.network.Packet; public class GT_Cover_SolarPanel extends GT_CoverBehavior { @@ -12,21 +25,64 @@ public class GT_Cover_SolarPanel } public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) { + if(aSide != 1)return 0; + int coverState=aCoverVariable&0x3; + int coverNum=aCoverVariable>>2; if (aTimer % 100L == 0L) { - if ((aSide != 1) || (aTileEntity.getWorld().isThundering())) { - aCoverVariable = 0; + if (aTileEntity.getWorld().isThundering()) { + return aTileEntity.getBiome().rainfall > 0.0F && aTileEntity.getSkyAtSide(aSide) ? Math.min(20,coverNum)<<2 : coverNum<<2; } else { - boolean bRain = (aTileEntity.getWorld().isRaining()) && (aTileEntity.getBiome().rainfall > 0.0F); - aCoverVariable = bRain && aTileEntity.getWorld().skylightSubtracted >= 4 || !aTileEntity.getSkyAtSide(aSide) ? 0 : ((int) (!bRain && aTileEntity.getWorld().isDaytime() ? 1 : 2)); + if(aTileEntity.getWorld().isRaining() && aTileEntity.getBiome().rainfall > 0.0F){//really rains + if(aTileEntity.getSkyAtSide(aSide)) coverNum=Math.min(30,coverNum); + if(aTileEntity.getWorld().skylightSubtracted >= 4){ + if(aTileEntity.getWorld().isDaytime()){ + coverState=2; + }else{ + return coverNum<<2; + } + } + }else{//not rains + if(aTileEntity.getWorld().isDaytime()){ + coverState=1; + }else{ + coverState=2; + } + } } } - if ((aCoverVariable == 1) || ((aCoverVariable == 2) && (aTimer % 8L == 0L))) { - aTileEntity.injectEnergyUnits((byte) 6, this.mVoltage, 1L); + if (coverState == 1 || (coverState == 2 && aTimer % 8L == 0L)) + aTileEntity.injectEnergyUnits((byte) 6, ((100L-(long)coverNum)*((long)this.mVoltage))/100L, 1L); + if(aTimer % 28800L == 0L && coverNum<100 && (coverNum>10 || (new XSTR()).nextInt(3)==2)) + coverNum++; + return coverState+(coverNum<<2); + } + + @Override + public boolean onCoverRightclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { + if(aPlayer.capabilities.isCreativeMode){ + GT_Utility.sendChatToPlayer(aPlayer,"Cleaned solar panel from "+(aCoverVariable>>2)+"% dirt"); + aTileEntity.setCoverDataAtSide(aSide, (aCoverVariable & 0x3)); + return true; + } + for(int i=0;i>2)+"% dirt"); + aTileEntity.setCoverDataAtSide(aSide, (aCoverVariable & 0x3)); + return true; + } } - return aCoverVariable; + GT_Utility.sendChatToPlayer(aPlayer,"You need water bucket in inventory to clean the panel with hand."); + return false; } + + public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 1; } + } \ No newline at end of file -- cgit From 9bc3ea63dd93d1388d7e6bb9b5f6f56b46026068 Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 25 Nov 2016 01:28:17 +0100 Subject: Optimize imports (IntelliJ) --- src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 458d2354e3..2ee684903f 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -1,20 +1,12 @@ package gregtech.common.covers; -import forestry.core.items.ItemRegistry; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OreDictNames; -import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.tileentity.ICoverable; import gregtech.api.objects.XSTR; import gregtech.api.util.GT_CoverBehavior; -import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; -import ic2.api.item.ElectricItem; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.network.Packet; public class GT_Cover_SolarPanel extends GT_CoverBehavior { -- cgit From 3425da9e1276b33ce74d6b25fccd2f8f864a475e Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 25 Nov 2016 09:55:53 +0100 Subject: Minor string changes --- src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 2ee684903f..1b6a0e23d3 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -67,7 +67,7 @@ public class GT_Cover_SolarPanel return true; } } - GT_Utility.sendChatToPlayer(aPlayer,"You need water bucket in inventory to clean the panel with hand."); + GT_Utility.sendChatToPlayer(aPlayer,"You need water bucket in inventory to clean the panel."); return false; } -- cgit From 389267d73391abdea33c9eae09aa2d3aac51ac7b Mon Sep 17 00:00:00 2001 From: Technus Date: Sat, 26 Nov 2016 11:02:11 +0100 Subject: Fix scaling of ItemBlock GT machines in certain scenarios, repostion wire heating info. --- src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java') diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 1b6a0e23d3..73cfd7dae9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -71,10 +71,7 @@ public class GT_Cover_SolarPanel return false; } - - public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 1; } - } \ No newline at end of file -- cgit