From 5846f1c7846e60732122b9a3b6d77be060bd8182 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Mar 2016 17:58:41 +0100 Subject: [PATCH 01/13] Remove debug code, and 1.0.2 --- build.gradle | 2 +- src/main/java/techreborn/multiblocks/MultiBlockCasing.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index b9096f520..fb70ee7a2 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ configurations { compile.extendsFrom shade } -version = "1.0.1" +version = "1.0.2" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 0259f935b..93fc43488 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -383,7 +383,6 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase protected void isBlockGoodForFrame(World world, int x, int y, int z) throws MultiblockValidationException { Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); - world.setBlockState(new BlockPos(x, y, z), Blocks.bedrock.getDefaultState(), 3); if (block == ModBlocks.MachineCasing) { From 5dad8067eb93e9cfa9536f6ae61cf4cbe2a1a880 Mon Sep 17 00:00:00 2001 From: Prospector Date: Sun, 27 Mar 2016 10:30:32 -0700 Subject: [PATCH 02/13] Hide fluids from JEI --- .../compat/jei/TechRebornJeiPlugin.java | 26 ++++++++++++++++++ .../iron_machines/iron_machine_side.png | Bin 503 -> 490 bytes .../iron_machines/iron_machine_top.png | Bin 441 -> 428 bytes .../electric_furnace_front_off.png | Bin 694 -> 681 bytes .../tier1_machines/tier1_machine_side.png | Bin 460 -> 597 bytes .../tier1_machines/tier1_machine_top.png | Bin 382 -> 499 bytes 6 files changed, 26 insertions(+) diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index 51173a728..e85c474b9 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -19,6 +19,7 @@ import techreborn.api.reactor.FusionReactorRecipeHelper; import techreborn.api.recipe.RecipeHandler; import techreborn.api.recipe.machines.AssemblingMachineRecipe; import techreborn.api.recipe.machines.ImplosionCompressorRecipe; +import techreborn.blocks.fluid.BlockFluidTechReborn; import techreborn.client.container.ContainerAlloyFurnace; import techreborn.client.container.ContainerAlloySmelter; import techreborn.client.container.ContainerAssemblingMachine; @@ -90,6 +91,7 @@ import techreborn.compat.jei.scrapbox.ScrapboxRecipeHandler; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeCategory; import techreborn.compat.jei.vacuumFreezer.VacuumFreezerRecipeHandler; import techreborn.config.ConfigTechReborn; +import techreborn.init.ModFluids; import techreborn.init.ModItems; import techreborn.items.ItemParts; @@ -124,6 +126,30 @@ public class TechRebornJeiPlugin extends BlankModPlugin IJeiHelpers jeiHelpers = registry.getJeiHelpers(); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidBerylium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalcium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidCalciumCarbonate)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidChlorite)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidDeuterium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidGlyceryl)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHelium3)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHeliumplasma)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidHydrogen)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidLithium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMercury)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidMethane)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrocoalfuel)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrofuel)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogen)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidNitrogendioxide)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidPotassium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSilicon)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidSodiumpersulfate)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidTritium)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModFluids.BlockFluidWolframium)); + registry.addRecipeCategories(new AlloySmelterRecipeCategory(guiHelper), new AssemblingMachineRecipeCategory(guiHelper), new BlastFurnaceRecipeCategory(guiHelper), new CentrifugeRecipeCategory(guiHelper), new ChemicalReactorRecipeCategory(guiHelper), diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_side.png index 24a1625aa17002d2bd818dfb432e39a33c68cae4..23c60304d59781dc5798867918457d8dcac550ad 100644 GIT binary patch delta 24 gcmey){EB&k%0xp6u3`oTp<>1!rJd{>gO@M@0AslakN^Mx delta 35 rcmaFG{GEA%3KwH>kh>GZx^prwCn`#Fl`t>}l`!5*ldst5wuBJ?*pLgq diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/iron_machines/iron_machine_top.png index 66085310c55324c2d3e94a8b7f4ab724fb0e7473..934be7979ff206411027054ef3757f8fa2af4166 100644 GIT binary patch delta 24 fcmdnVyoPy#%0xp6u3`oTp<>1!rJd{>gVPuRSQ!S^ delta 35 rcmZ3(ypwr?3KwH>kh>GZx^prwCn`#Fl`t>}l`!5*ldst5mc|GG$D9iV diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/electric_furnace_front_off.png index 4e2e61bc04683fa12e99766b9e6df3e313cc98ef..7b61a852de3fff0c1dc06c589604191cc54c5752 100644 GIT binary patch delta 24 gcmdnSx{`H*%0xp6u0sqAe1{lCHM|-&1}8HC09#WB1poj5 delta 35 rcmZ3kh>GZx^prwCn`#F9cEzQJIr`Ie?`hhw`3*&(BupP diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_side.png index 537ab32cdaa1871b80c90d882a55023dcc619d00..37d74ac2cc796b86e3de01f13a81135a9b7a8370 100644 GIT binary patch delta 583 zcmV-N0=WIm1JwkO8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01|Wn01|Wo-ewprd0X;qxAM(e0}>1P6UPLm;B=sahcn@RO9-zSkevk?{83Re*LS}&n6xWNE4MR z>S!vhDj%PXpMM|PQjr3Y5`1xeldRT|^032fE)q}bH%OiUzq}-Sch5YG0WiosJBf3B zXhTgfe$*`Byx!m$XQeU_8_NivB@|C&N^~+VehjG55y^7c7+^(k{RUR~cbhy^ZvVGU zKzAc{qP9=tTogKtt?fjEo8iF5HdU|^-d);?aIzZNqkl`)e2dDr9^%v=+5~X#@|rui z;`9f#g#c~GydT&+^OLUGi5YK~X-M($EUmf%%T$rVQQN&fTIf*2r`&T8lXXH3j85ud z3js-`XGBUW7}MP2P7lAmLsr#ew%`U5W1XInw!~9M9WDc%{btqCH)ydtEjA6QK@6LI zXwxA4!a&=5Osace7%M+gN2VM=I8q`YI=4GHZ*A|^4O~rz5n~u2;-SLL VJ?A;epNaqg002ovPDHLkV1nrm|KI=s delta 445 zcmV;u0Yd)O1k3}F8Gi-<001BJ|6u?C0h38YK~y-)Ws^&i+b|47A3(}>s*>FQYPrH_ zJlRa55s6P0GAX;FjX)LgdEJowTHiAxhzQIKGb7xwZuH&}5thqBcmR-@#N&RrQ%fnN zDw;`M7M>pwnQ^!i5o9Lrj=R(LoeHpAj>L>aRQ`L9?h!$24SzSo-TC^vQAGq1Av4jU zWaccEnOHM=YxLgn2cnx#N%l^5E0aHr|k_@CE`>Xz}>Olv3@X5yv$j!Zre6h9@eQUb*V4bO$(n;T5Hsg^?e?! zb$ah)=8J`;lz*wqvMf{d`?^x^Z!4GU6*D_0F(V?*u`^FBJNMzfuGHW655E8WK}1ZE z-2IIEVcigN*siKvZ#U|n&rh!3ZqvSzq(x`9F|zx4R@GwBulYMH#FQ#M49?vz@OI08fv)hTQ~CanPV naq-#n;rI9^KpuywM@H}uq-4LaNEuLp00000NkvXXu0mjfRr%Zh diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/tier1_machines/tier1_machine_top.png index d5fadf931e47b39960cdd9e85af050fb4c0b0c51..fdf350ef53f553186d5205f7975b9d05af144065 100644 GIT binary patch delta 484 zcmVcBiOBd6aA+6xv+}kMaHhC@2bc6TlvuwFV9@@Y(9?#M9N_^Yho}>Cxij)#m5J($vM&*2dM>$JW@$*V)P0+RNMA%-r40-QLdM z;NkT2!qC#d&d}E9=)%#{(&OaR<>t!T+riJ#psTK{x4O2&#ecTM#<|DIy2#4A$;-aX z&Yq~Nxm~8i0002ENklviDk9qa;f1LUf(`0xxc&& z^Yga1aJe;!$jHnS(;Wt8Vj^M>47WRs9G!^pzh!QS3&PBi5EBj#Vra;r52J&T*(lZ1 zYDtDcnL=nnNN0$YIxmfC>ZGaLwO5!Nh{PzO8p$$DTF#=yM~ZOs1M^wRd3vZ)*Y4jH z)W7TLXrm{qvG86U^KuAg4YMr?@bSjXJI1BUK#Y;&KNX>xG=15D@&&tDYjasU7T M07*qoM6N<$f&tprH2?qr From b08ca6b91c4b2488bb5a1c336c8843d2c15273ff Mon Sep 17 00:00:00 2001 From: Prospector Date: Sun, 27 Mar 2016 10:57:31 -0700 Subject: [PATCH 03/13] Diesel and Semifluid generator GUI textures Closes #421 --- .../client/gui/GuiDieselGenerator.java | 2 +- .../client/gui/GuiSemifluidGenerator.java | 2 +- .../textures/gui/diesel_generator.png | Bin 0 -> 1899 bytes .../textures/gui/semifluid_generator.png | Bin 2416 -> 1899 bytes 4 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/techreborn/textures/gui/diesel_generator.png diff --git a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java index 963355513..32c8cf469 100644 --- a/src/main/java/techreborn/client/gui/GuiDieselGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiDieselGenerator.java @@ -13,7 +13,7 @@ public class GuiDieselGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/ThermalGenerator.png"); + "textures/gui/diesel_generator.png"); TileDieselGenerator tile; diff --git a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java index a5b3ae896..9c5d0c17d 100644 --- a/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiSemifluidGenerator.java @@ -13,7 +13,7 @@ public class GuiSemifluidGenerator extends GuiContainer // TODO: use semifluid generator texture private static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/ThermalGenerator.png"); + "textures/gui/semifluid_generator.png"); TileSemifluidGenerator tile; diff --git a/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png b/src/main/resources/assets/techreborn/textures/gui/diesel_generator.png new file mode 100644 index 0000000000000000000000000000000000000000..b309600254b24bfa61b1a4413f6533f7b7045803 GIT binary patch literal 1899 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fn+H>=ES4z)+>iz|hdl!0_`w zkbcR)P-?)y@G60U!D9_2E8 zKV042-QBzG`>|uk{{IJ>F$zXQV0ebW)kBg`L7Au|$S)X})JHO42>#9vEH@Z93p^r= z85p<)L71^VC4M4MP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&X0kCX{)D; zV@O5Z+dCJtZaav$1|IbkR{!_^edybheJroKH@;sgdG4M*yNJXw?&(1n%ObC*&b#(& zTItR+!OaJZE}zUz52FtP|VTvqo0(hu&XhBEJw ztA5O`TFSIXq+}n{9RAwA%iUS550;)bj`bI6IKNl*fW=-7ke2G{stpWG90upa8u&l@ z01b1nIdJ>=#=@#VVTLbiK&gWFn^*)K7#NS;Wcr{u&$FR0C>hDhggLP+AD-X%ZLxQS zBtwPxuCIoE`d$z>a4Ik`Jbzz5>qm?+vxq9g{AzE8x`0VQyAJF(4fIpxq$%!u-fz18 zBd`7L?$*-E@fF z{kL;W|FwO)Aq;d6*io>c1?#@>-E8|SPvZkJoC*$R2UapC#O6Ks3uZpBtKb{Y)cSwY z2fj`}Xi^)$Yg3!@b1w!nGsYV?SQ3(j8+v^QoTDp~5c{90EcTM7_X1TmU?OMmboFyt I=akR{02gjXzW@LL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png b/src/main/resources/assets/techreborn/textures/gui/semifluid_generator.png index bd4c6dce5aaba9909b78f6ff078885d9a95d5b39..b309600254b24bfa61b1a4413f6533f7b7045803 100644 GIT binary patch literal 1899 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K58911MRQ8&P5Fn+H>=ES4z)+>iz|hdl!0_`w zkbcR)P-?)y@G60U!D9_2E8 zKV042-QBzG`>|uk{{IJ>F$zXQV0ebW)kBg`L7Au|$S)X})JHO42>#9vEH@Z93p^r= z85p<)L71^VC4M4MP@=>&q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&oalj&X0kCX{)D; zV@O5Z+dCJtZaav$1|IbkR{!_^edybheJroKH@;sgdG4M*yNJXw?&(1n%ObC*&b#(& zTItR+!OaJZE}zUz52FtP|VTvqo0(hu&XhBEJw ztA5O`TFSIXq+}n{9RAwA%iUS550;)bj`bI6IKNl*fW=-7ke2G{stpWG90upa8u&l@ z01b1nIdJ>=#=@#VVTLbiK&gWFn^*)K7#NS;Wcr{u&$FR0C>hDhggLP+AD-X%ZLxQS zBtwPxuCIoE`d$z>a4Ik`Jbzz5>qm?+vxq9g{AzE8x`0VQyAJF(4fIpxq$%!u-fz18 zBd`7L?$*-E@fF z{kL;W|FwO)Aq;d6*io>c1?#@>-E8|SPvZkJoC*$R2UapC#O6Ks3uZpBtKb{Y)cSwY z2fj`}Xi^)$Yg3!@b1w!nGsYV?SQ3(j8+v^QoTDp~5c{90EcTM7_X1TmU?OMmboFyt I=akR{02gjXzW@LL literal 2416 zcmeHI{Zo=z6u$2ZXo#f(f~hGAxS2(kHdeL;l%{D$CFNF{P6}EAqJ)&DZ{)`om}X72 zTN-)fCqKJ(^2p3Ht5Uj z5rH;ILTifnkx1}NBGD5!#p-tMc%8CySRxpe#7>HLj7x9D6$P<8_nnAe+;m3)RJi;2A>r4T?zoi&ka($ z*ISyL4zhp<*+z*#mKu{B2a;kE#4?sRPDb-(d9#)z`ecNe-j_duS8>7>QTkH}n>*PK z+4M@@i9E$e;!@#+Hf~?-N{kuQhllD7-Rin zMsPAOyYE!i?1M@BZM`ir`1_S_iP_k5v?Q_M& z@wj_dkGA*!tw!?miz}k)vQ6upMm7hcTCv2xSX&=s({u50+eDG@YPz}>|p*GuSAF-5aHoAip4qbEobR{IP+g7X6L}KbF z%}(000YiIr588ZOAh})o36}D;XEe3BU0|2~=>stjF{bsnXRhZ(DoIGHF@VR5WYBz} zM<2-?&Tf1d+U|b6EYAG~>C)C{s3tTE8%|hUq_bYS290$VP$OA=gb0V`5-_(4lTlKV zb$OC1tH;9L#pJZZTRgb%X*{aNs^OtB)0lN4iv=W4%g3^F`J@K$VN()pQyvK4pdx+) z%+Mpqx!dP(=OqJBSMY`T4>a{CKs+l z<0n@6fZ@jNnev6-!pAAp-?Ubm-sLO5S>}T(`(9QxWp;2OVTO*g8b5;VEjD`2BlB|U z1hnxymI%FyKM#ielCbY}p4;Fx)@tkW>=&qv zFdO$A;h|*^7kXpiaQwMt#GELcW62`TA~kqM7}??XBi%?D{_Ox*kfx$W%Z?6_%I${fP^BCrQKzA zQ&S@4mdI*otWpqY*jhAM9~aL4*oQgnw7?b-Jwp!E)~KzLa;7Rd2|EwsK23kd4~atP z3^r^MF3Ee0&uz*Q#9Nq)MYJ-5@VRK0VJ;YrT)6DTQ;xv-0&_k)4f6XO#%9fCpCQz7 z&8ZApDD;F-$1&R-A>-GNzWU|%74R(e?vO%a`Gd5S@)Gv$v{0OGJz6uBYwkgd-Wp#3 zzDQHzacS-rsUl=6sC3U9b$h%2{w*|5doPljiX8fc#)?NKQ7EmT&|x<`I$70Jxw! s2ozHA><)J*XbS@btN#070U@X`bLD0KmMeSCN16YO;DE4ImE36Mzmpn*)&Kwi From 8261384cddfa1eb435c07a11e02d989070c4d9db Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Mar 2016 18:06:40 +0100 Subject: [PATCH 04/13] Fixes #420 --- .../java/techreborn/tiles/generator/TileThermalGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index eca3a9a01..6489f273c 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -158,9 +158,9 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab public void updateEntity() { super.updateEntity(); - FluidUtils.drainContainers(this, inventory, 0, 1); if (!worldObj.isRemote) { + FluidUtils.drainContainers(this, inventory, 0, 1); for (EnumFacing direction : EnumFacing.values()) { if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), From c73d1dc773c32b52f841d000fc9fe8b92d890c76 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 27 Mar 2016 19:05:05 +0100 Subject: [PATCH 05/13] closes #425 --- src/main/java/techreborn/tiles/TileQuantumTank.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index f936297e5..9429ab2ef 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -81,7 +81,7 @@ public class TileQuantumTank extends TileMachineBase FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType()); if (tank.getFluidType() != null && getStackInSlot(2) == null) { - inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); +// inventory.setInventorySlotContents(2, new ItemStack(tank.getFluidType().getBlock())); } else if (tank.getFluidType() == null && getStackInSlot(2) != null) { setInventorySlotContents(2, null); From 2801535bf80c3950d185d5de44e3986acade1011 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Mar 2016 18:21:31 +0100 Subject: [PATCH 06/13] Fixes #426 --- .../java/techreborn/parts/EnumCableType.java | 24 +++++++------------ .../java/techreborn/parts/types/TinCable.java | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/main/java/techreborn/parts/EnumCableType.java b/src/main/java/techreborn/parts/EnumCableType.java index 67705ddf6..4266220a3 100644 --- a/src/main/java/techreborn/parts/EnumCableType.java +++ b/src/main/java/techreborn/parts/EnumCableType.java @@ -13,22 +13,14 @@ import techreborn.parts.types.TinCable; public enum EnumCableType implements IStringSerializable { - COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW, - CopperCable.class), TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM, - TinCable.class), GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, - EnumPowerTier.MEDIUM, GoldCable.class), HV("hv", "techreborn:blocks/cables/hv_cable", 2048, - 12.0, true, EnumPowerTier.HIGH, HVCable.class), GLASSFIBER("glassfiber", - "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, - EnumPowerTier.HIGH, GlassFiberCable.class), ICOPPER("insulatedcopper", - "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, - EnumPowerTier.LOW, - InsulatedCopperCable.class), IGOLD("insulatedgold", - "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, - false, EnumPowerTier.MEDIUM, - InsulatedGoldCable.class), IHV("insulatedhv", - "techreborn:blocks/cables/hv_insulated_cable", 2048, - 10.0, false, EnumPowerTier.HIGH, - InsulatedHVCable.class); + COPPER("copper", "techreborn:blocks/cables/copper_cable", 128, 12.0, true, EnumPowerTier.LOW, CopperCable.class), + TIN("tin", "techreborn:blocks/cables/tin_cable", 32, 12.0, true, EnumPowerTier.MEDIUM, TinCable.class), + GOLD("gold", "techreborn:blocks/cables/gold_cable", 512, 12.0, true, EnumPowerTier.MEDIUM, GoldCable.class), + HV("hv", "techreborn:blocks/cables/hv_cable", 2048, 12.0, true, EnumPowerTier.HIGH, HVCable.class), + GLASSFIBER("glassfiber", "techreborn:blocks/cables/glass_fiber_cable", 8192, 12.0, false, EnumPowerTier.HIGH, GlassFiberCable.class), + ICOPPER("insulatedcopper", "techreborn:blocks/cables/copper_insulated_cable", 128, 10.0, false, EnumPowerTier.LOW, InsulatedCopperCable.class), + IGOLD("insulatedgold", "techreborn:blocks/cables/gold_insulated_cable", 512, 10.0, false, EnumPowerTier.MEDIUM, InsulatedGoldCable.class), + IHV("insulatedhv", "techreborn:blocks/cables/hv_insulated_cable", 2048, 10.0, false, EnumPowerTier.HIGH, InsulatedHVCable.class); public String textureName = "minecraft:blocks/iron_block"; public int transferRate = 128; diff --git a/src/main/java/techreborn/parts/types/TinCable.java b/src/main/java/techreborn/parts/types/TinCable.java index 2893072b0..ea0133c49 100644 --- a/src/main/java/techreborn/parts/types/TinCable.java +++ b/src/main/java/techreborn/parts/types/TinCable.java @@ -11,6 +11,6 @@ public class TinCable extends CableMultipart @Override public EnumCableType getCableType() { - return EnumCableType.COPPER; + return EnumCableType.TIN; } } From 40a10cafd95e38f571bad4f97c82f6d192f8c6eb Mon Sep 17 00:00:00 2001 From: Prospector Date: Sun, 27 Mar 2016 11:14:59 -0700 Subject: [PATCH 07/13] Localize cable tooltips --- src/main/java/techreborn/parts/ItemCables.java | 7 ++++--- src/main/resources/assets/techreborn/lang/en_US.lang | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/parts/ItemCables.java b/src/main/java/techreborn/parts/ItemCables.java index c0a2b4005..1d3f99424 100644 --- a/src/main/java/techreborn/parts/ItemCables.java +++ b/src/main/java/techreborn/parts/ItemCables.java @@ -14,6 +14,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.TextFormatting; +import net.minecraft.util.text.translation.I18n; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -96,11 +97,11 @@ public class ItemCables extends ItemMultiPart implements ITexturedItem public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { EnumCableType type = EnumCableType.values()[stack.getItemDamage()]; - tooltip.add(TextFormatting.GREEN + "EU Transfer: " + TextFormatting.LIGHT_PURPLE + type.transferRate); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.euTransfer") + TextFormatting.LIGHT_PURPLE + type.transferRate); if (type.canKill) { - tooltip.add(TextFormatting.RED + "Damages entity's!"); + tooltip.add(TextFormatting.RED + I18n.translateToLocal("desc.uninsulatedCable")); } - tooltip.add(TextFormatting.GREEN + "Tier: " + TextFormatting.LIGHT_PURPLE + type.tier); + tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("desc.tier") + TextFormatting.LIGHT_PURPLE + type.tier); } } \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/lang/en_US.lang b/src/main/resources/assets/techreborn/lang/en_US.lang index be77f20c2..f18dcff70 100644 --- a/src/main/resources/assets/techreborn/lang/en_US.lang +++ b/src/main/resources/assets/techreborn/lang/en_US.lang @@ -958,6 +958,10 @@ Cable.trippleInsulatedIronCable.name=Triple Insulated Copper Cable Cable.glassFiberCable.name=Glass Fiber Cable Cable.tinCable.name=Tin Cable +desc.uninsulatedCable=Damages Entities! +desc.euTransfer=EU Transfer: +desc.tier=Tier: + #Manual techreborn.manual.contents=Contents Page techreborn.manual.gettingstarted=Getting Started From aeb567deb73396b11ae60a7be80a146cd53ee972 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Mar 2016 18:38:43 +0100 Subject: [PATCH 08/13] Fixes #416 --- .../techreborn/items/tools/ItemWrench.java | 148 +++++++++++------- 1 file changed, 93 insertions(+), 55 deletions(-) diff --git a/src/main/java/techreborn/items/tools/ItemWrench.java b/src/main/java/techreborn/items/tools/ItemWrench.java index e32806caf..0be50755b 100644 --- a/src/main/java/techreborn/items/tools/ItemWrench.java +++ b/src/main/java/techreborn/items/tools/ItemWrench.java @@ -24,10 +24,13 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.BlockFluidBase; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import reborncore.common.tile.TileMachineBase; +import techreborn.blocks.storage.BlockBatBox; import techreborn.client.TechRebornCreativeTabMisc; import techreborn.items.ItemTR; import techreborn.lib.ModInfo; import ic2.api.tile.IWrenchable; +import techreborn.tiles.storage.TileBatBox; /** * Created by modmuss50 on 26/02/2016. @@ -43,10 +46,8 @@ public class ItemWrench extends ItemTR implements ITexturedItem } @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, - EnumFacing facing, float hitX, float hitY, float hitZ) - { - if (world.isAirBlock(pos) || !player.isSneaking()) + public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) { + if (world.isAirBlock(pos)) { return EnumActionResult.FAIL; } @@ -55,80 +56,117 @@ public class ItemWrench extends ItemTR implements ITexturedItem { return EnumActionResult.FAIL; } - if (!(tile instanceof IInventory)) + + if(!player.isSneaking()){ + if(tile instanceof TileBatBox){ + tile.getWorld().setBlockState(tile.getPos(), tile.getWorld().getBlockState(pos).withProperty(BlockBatBox.FACING, side.getOpposite())); + return EnumActionResult.SUCCESS; + } else + if(tile instanceof TileMachineBase){ + if(side != EnumFacing.DOWN && side != EnumFacing.UP){ + ((TileMachineBase) tile).setFacing(side); + return EnumActionResult.SUCCESS; + } + } + } + return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand); + } + + @Override + public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, + EnumFacing facing, float hitX, float hitY, float hitZ) + { + if (world.isAirBlock(pos)) + { + return EnumActionResult.FAIL; + } + TileEntity tile = world.getTileEntity(pos); + if (tile == null) { return EnumActionResult.FAIL; } - List items = new ArrayList(); - IInventory inventory = (IInventory) tile; - for (int i = 0; i < inventory.getSizeInventory(); i++) + if (player.isSneaking()) { - ItemStack itemStack = inventory.getStackInSlot(i); - - if (itemStack == null) + List items = new ArrayList(); + if (tile instanceof IInventory) { - continue; - } - if (itemStack != null && itemStack.stackSize > 0) - { - if (itemStack.getItem() instanceof ItemBlock) + IInventory inventory = (IInventory) tile; + for (int i = 0; i < inventory.getSizeInventory(); i++) { - if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase - || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid - || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) + ItemStack itemStack = inventory.getStackInSlot(i); + + if (itemStack == null) { continue; } + if (itemStack != null && itemStack.stackSize > 0) + { + if (itemStack.getItem() instanceof ItemBlock) + { + if (((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase + || ((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid + || ((ItemBlock) itemStack.getItem()).block instanceof BlockDynamicLiquid) + { + continue; + } + } + } + items.add(itemStack.copy()); } } - items.add(itemStack.copy()); - } - if (tile instanceof IWrenchable) - { - if (((IWrenchable) tile).wrenchCanRemove(player)) + if (tile instanceof IWrenchable) { - ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); - if (itemStack == null) + if (((IWrenchable) tile).wrenchCanRemove(player)) { - return EnumActionResult.FAIL; + ItemStack itemStack = ((IWrenchable) tile).getWrenchDrop(player); + if (itemStack == null) + { + return EnumActionResult.FAIL; + } + items.add(itemStack); } - items.add(itemStack); - } - for (ItemStack itemStack : items) - { - Random rand = new Random(); - - float dX = rand.nextFloat() * 0.8F + 0.1F; - float dY = rand.nextFloat() * 0.8F + 0.1F; - float dZ = rand.nextFloat() * 0.8F + 0.1F; - - EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, - itemStack.copy()); - - if (itemStack.hasTagCompound()) + if (!items.isEmpty()) { - entityItem.getEntityItem().setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); + for (ItemStack itemStack : items) + { + Random rand = new Random(); + + float dX = rand.nextFloat() * 0.8F + 0.1F; + float dY = rand.nextFloat() * 0.8F + 0.1F; + float dZ = rand.nextFloat() * 0.8F + 0.1F; + + EntityItem entityItem = new EntityItem(world, pos.getX() + dX, pos.getY() + dY, pos.getZ() + dZ, + itemStack.copy()); + + if (itemStack.hasTagCompound()) + { + entityItem.getEntityItem() + .setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); + } + + float factor = 0.05F; + entityItem.motionX = rand.nextGaussian() * factor; + entityItem.motionY = rand.nextGaussian() * factor + 0.2F; + entityItem.motionZ = rand.nextGaussian() * factor; + if (!world.isRemote) + { + world.spawnEntityInWorld(entityItem); + } + } } - float factor = 0.05F; - entityItem.motionX = rand.nextGaussian() * factor; - entityItem.motionY = rand.nextGaussian() * factor + 0.2F; - entityItem.motionZ = rand.nextGaussian() * factor; + // TODO 1.9 sounds + // world.playSoundAtEntity(player, "techreborn:block_dismantle", + // 0.8F, 1F); if (!world.isRemote) { - world.spawnEntityInWorld(entityItem); + world.setBlockState(pos, Blocks.air.getDefaultState(), 2); } + return EnumActionResult.SUCCESS; } - // TODO 1.9 sounds - // world.playSoundAtEntity(player, "techreborn:block_dismantle", - // 0.8F, 1F); - if (!world.isRemote) - { - world.setBlockState(pos, Blocks.air.getDefaultState(), 2); - } - return EnumActionResult.SUCCESS; + } return EnumActionResult.FAIL; } From 1ab2415e40e772e216bbf3585a91eef3162cf60d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Mar 2016 18:56:27 +0100 Subject: [PATCH 09/13] Fix crash, fix #414 and fix #411 --- src/main/java/techreborn/parts/CableMultipart.java | 4 ++-- src/main/java/techreborn/tiles/TileMatterFabricator.java | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/parts/CableMultipart.java b/src/main/java/techreborn/parts/CableMultipart.java index 7ae3df77c..35d5b65c8 100644 --- a/src/main/java/techreborn/parts/CableMultipart.java +++ b/src/main/java/techreborn/parts/CableMultipart.java @@ -399,8 +399,8 @@ public abstract class CableMultipart extends Multipart } if (ConfigTechReborn.UninsulatedElectocutionSound) { - getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock, - SoundCategory.BLOCKS, 0.6F, 1F, false); +// getWorld().playSound(entity.posX, entity.posY, entity.posZ, ModSounds.shock, +// SoundCategory.BLOCKS, 0.6F, 1F, false); } if (ConfigTechReborn.UninsulatedElectocutionParticle) { diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 95ccd6e6d..9e39fa5f7 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -14,6 +14,7 @@ import reborncore.common.util.ItemUtils; import techreborn.init.ModBlocks; import techreborn.init.ModItems; import ic2.api.tile.IWrenchable; +import techreborn.items.ItemParts; public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchable, IInventory, ISidedInventory { @@ -303,6 +304,11 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab { // int value = getValue(Recipes.matterAmplifier.getOutputFor(itemStack, // false)); + if(itemStack.getItem() == ModItems.parts && itemStack.getItemDamage() == ItemParts.getPartByName("scrap").getItemDamage()){ + return 5000; + } else if (itemStack.getItem() == ModItems.scrapBox){ + return 45000; + } return 0; } From d0289037dc66d421f7c221c60c55bcaaac53c358 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 27 Mar 2016 19:40:10 +0100 Subject: [PATCH 10/13] Added WIP tag to book --- .../java/techreborn/items/tools/ItemTechManual.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/items/tools/ItemTechManual.java b/src/main/java/techreborn/items/tools/ItemTechManual.java index cfdc743ba..c744a72e0 100644 --- a/src/main/java/techreborn/items/tools/ItemTechManual.java +++ b/src/main/java/techreborn/items/tools/ItemTechManual.java @@ -1,11 +1,14 @@ package techreborn.items.tools; +import java.util.List; + import me.modmuss50.jsonDestroyer.api.ITexturedItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import techreborn.Core; import techreborn.client.GuiHandler; @@ -42,5 +45,10 @@ public class ItemTechManual extends ItemTextureBase implements ITexturedItem { return "techreborn:items/tool/manual"; } - + + @Override + public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) + { + tooltip.add(TextFormatting.RED + "WIP Coming Soon"); + } } From 2360df0148f43827664551e942850547fc4d0605 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 27 Mar 2016 19:53:55 +0100 Subject: [PATCH 11/13] closes #429 --- .../techreborn/blocks/storage/BlockLESU.java | 19 +++++++++++++++++-- .../blocks/storage/BlockLESUStorage.java | 12 ++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/blocks/storage/BlockLESU.java b/src/main/java/techreborn/blocks/storage/BlockLESU.java index d805860df..42fc9f01b 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESU.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESU.java @@ -1,14 +1,22 @@ package techreborn.blocks.storage; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.IAdvancedRotationTexture; import techreborn.Core; import techreborn.client.GuiHandler; import techreborn.client.TechRebornCreativeTab; +import techreborn.init.ModBlocks; import techreborn.tiles.lesu.TileLesu; public class BlockLESU extends BlockMachineBase implements IAdvancedRotationTexture @@ -30,13 +38,20 @@ public class BlockLESU extends BlockMachineBase implements IAdvancedRotationText } @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, - float hitY, float hitZ) + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if (!player.isSneaking()) player.openGui(Core.INSTANCE, GuiHandler.lesuID, world, x, y, z); return true; } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) + { + List items = new ArrayList(); + items.add(new ItemStack(ModBlocks.LesuStorage)); + return items; + } @Override public String getFront(boolean isActive) diff --git a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java index c30b64b7e..2a4bed318 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java +++ b/src/main/java/techreborn/blocks/storage/BlockLESUStorage.java @@ -1,7 +1,11 @@ package techreborn.blocks.storage; +import java.util.ArrayList; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -44,6 +48,14 @@ public class BlockLESUStorage extends BlockMachineBase implements IAdvancedRotat } super.breakBlock(world, x, y, z, block, meta); } + + @Override + public List getDrops(IBlockAccess world, BlockPos pos, IBlockState state, int fortune) + { + List items = new ArrayList(); + items.add(new ItemStack(this)); + return items; + } @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) From ea9b92139e6e48dca306e87237cbf0d4a37980ec Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 27 Mar 2016 20:08:51 +0100 Subject: [PATCH 12/13] closes #431 --- src/main/java/techreborn/blocks/BlockMachineCasing.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockMachineCasing.java b/src/main/java/techreborn/blocks/BlockMachineCasing.java index 9a9585269..eaef7daae 100644 --- a/src/main/java/techreborn/blocks/BlockMachineCasing.java +++ b/src/main/java/techreborn/blocks/BlockMachineCasing.java @@ -90,7 +90,8 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured @Override public int damageDropped(IBlockState state) { - return super.damageDropped(state); + int meta = getMetaFromState(state); + return meta; } @Override @@ -122,5 +123,4 @@ public class BlockMachineCasing extends BlockMultiblockBase implements ITextured { return types.length; } - } From f4b32cfcef6adb3fc0bae3a7436d1c05a5f38120 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sun, 27 Mar 2016 20:11:39 +0100 Subject: [PATCH 13/13] closes #432 --- src/main/java/techreborn/blocks/BlockMachineFrame.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/techreborn/blocks/BlockMachineFrame.java b/src/main/java/techreborn/blocks/BlockMachineFrame.java index 6431d261e..632affcab 100644 --- a/src/main/java/techreborn/blocks/BlockMachineFrame.java +++ b/src/main/java/techreborn/blocks/BlockMachineFrame.java @@ -58,7 +58,8 @@ public class BlockMachineFrame extends BaseBlock implements ITexturedBlock @Override public int damageDropped(IBlockState state) { - return super.damageDropped(state); + int meta = getMetaFromState(state); + return meta; } @Override