From 5304e385028c283ab3cebdb94a9f7f66e1f073ab Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Sat, 16 Jan 2016 13:27:11 +0000 Subject: [PATCH 1/7] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f0e893074..066f9b623 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,12 @@ The current main maintainer is @gigabit101 if you need any help please contact u @modmuss50 is a past maintainer of the mod(see http://techreborn.ninja/?p=20). -[![Build Status](http://modmuss50.me:8080/buildStatus/icon?job=TechReborn)](http://modmuss50.me:8080/job/TechReborn/) +1.7.10: + +[![Build Status](http://modmuss50.me:8080/job/TechReborn-1.7.10/badge/icon)](http://modmuss50.me:8080/job/TechReborn-1.7.10/) + +1.8.9: + +[![Build Status](http://modmuss50.me:8080/job/TechReborn-1.8.9/badge/icon)](http://modmuss50.me:8080/job/TechReborn-1.8.9/) REMOVED ALL THE JUNK FROM OTHER VERSION 2.78 ONLY From e154c15fd99fe25dd7813a04d53b20f059841dbf Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Sun, 24 Jan 2016 11:37:19 +0000 Subject: [PATCH 2/7] Prep for update for new reborn core --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 27a4e413d..10e67bf00 100644 --- a/build.gradle +++ b/build.gradle @@ -71,7 +71,7 @@ configurations { compile.extendsFrom shade } -version = "0.7.8" +version = "0.7.9" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { From bf691fd8a6ac78e92a58962b4cb0c3c9039e1dd4 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 6 Feb 2016 11:51:55 +0000 Subject: [PATCH 3/7] Fixes #313 --- src/main/java/techreborn/init/ModRecipes.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index e5761fcab..9018efbd5 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -230,7 +230,7 @@ public class CraftingHelper.addShapedOreRecipe(new ItemStack(ModBlocks.FusionCoil), "CSC", "NAN", "CRC", 'A', new ItemStack(ModBlocks.MachineCasing, 1, 2), - 'N', new ItemStack(ModBlocks.FusionCoil), + 'N', ItemParts.getPartByName("nichromeHeatingCoil"), 'C', ItemParts.getPartByName("energyFlowCircuit"), 'S', ItemParts.getPartByName("superConductor"), 'R', ItemParts.getPartByName("iridiumNeutronReflector") From efccf6269087ae90b37d8260c3e80bae899e9ed7 Mon Sep 17 00:00:00 2001 From: The-Fireplace Date: Sat, 6 Feb 2016 14:18:47 -0600 Subject: [PATCH 4/7] Update BlockOre.java Conflicts: src/main/java/techreborn/blocks/BlockOre.java --- src/main/java/techreborn/blocks/BlockOre.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/techreborn/blocks/BlockOre.java b/src/main/java/techreborn/blocks/BlockOre.java index 5e8893255..0ff1b484d 100644 --- a/src/main/java/techreborn/blocks/BlockOre.java +++ b/src/main/java/techreborn/blocks/BlockOre.java @@ -56,6 +56,7 @@ public class BlockOre extends Block { setCreativeTab(TechRebornCreativeTabMisc.instance); setHardness(2.0f); ModBlocks.blocksToCut.add(this); + setHarvestLevel("pickaxe", 2); } @Override From 840f5243507e1bb63cc141ab0e0f81e5670a7616 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 16 Feb 2016 09:11:13 +0000 Subject: [PATCH 5/7] Quick fix for #329 --- src/main/java/techreborn/compat/recipes/RecipesIC2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index 45a819068..32013d537 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -862,8 +862,8 @@ public class RecipesIC2 implements ICompatModule { //Chemical Reactor - RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), ItemDusts.getDustByName("phosphorous", 1), new ItemStack(IC2Items.getItem("fertilizer").getItem(), 3), 100, 30)); RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), null, new ItemStack(IC2Items.getItem("fertilizer").getItem(), 1), 100, 30)); + RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), ItemDusts.getDustByName("phosphorous", 1), new ItemStack(IC2Items.getItem("fertilizer").getItem(), 3), 100, 30)); RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("sodiumSulfide", 1), IC2Items.getItem("airCell"), ItemCells.getCellByName("sodiumPersulfate", 2), 2000, 30)); RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("nitrocarbon", 1), IC2Items.getItem("waterCell"), ItemCells.getCellByName("glyceryl", 2), 580, 30)); RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), ItemDusts.getDustByName("sulfur", 1), new ItemStack(IC2Items.getItem("fertilizer").getItem(), 2), 100, 30)); From c0ebf03f72c369fe6bcfac677401a9abd0aa1b62 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 16 Feb 2016 09:20:26 +0000 Subject: [PATCH 6/7] fixes #326 --- .../client/gui/GuiThermalGenerator.java | 2 +- .../textures/gui/ThermalGenerator.png | Bin 587 -> 0 bytes .../textures/gui/thermal_generator.png | Bin 1602 -> 15913 bytes 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 src/main/resources/assets/techreborn/textures/gui/ThermalGenerator.png diff --git a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java index 2d00db0e7..ad927550d 100644 --- a/src/main/java/techreborn/client/gui/GuiThermalGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiThermalGenerator.java @@ -11,7 +11,7 @@ import techreborn.tiles.TileThermalGenerator; public class GuiThermalGenerator extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - "techreborn", "textures/gui/ThermalGenerator.png"); + "techreborn", "textures/gui/thermal_generator.png"); TileThermalGenerator tile; diff --git a/src/main/resources/assets/techreborn/textures/gui/ThermalGenerator.png b/src/main/resources/assets/techreborn/textures/gui/ThermalGenerator.png deleted file mode 100644 index 5fb386ed8b2ceb065d6f072a91322938953c1f22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 587 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 P1>h?wK_NR3r(F9#RCKF5 literal 1602 zcmb_cSyWS36g}^~B!-Y+NL~g5Gz2PEs1*?bt+5fop&&)dprC*SF#-|>8x*lVDd2z; zIAO(Qpg6RGAO^%aC{n4?Fj>F><0_(50uf~rNc#BbNB_G&?%n&Iwb$C`taZ;`f4^lc zhKK0ss(_B0$H;E3Ra9ASwL)eFMEo2|EzD339nSK0e-LGDSs2)z#JcL`1o} zyXWNO7>z~~2S`GeZisQRL^{Y4X>oCJ>9(?_tBwKeDUnCUH_sBqIlmT(r`L zV@il31N@=bq_wipP8T+%E7gv+YA4$krJ_~De5_QI*a=ImEZaB7JlnicXU}^X7u_Y{ zRyv9+9c{Z)VyndX)lcv@d|D5mN;Xw3=JoPvdYq!?VR{}#?<|SmmDx8_)bBdofMbSn z)3wCS12{Us!`|cAdqvC#E*S~EmXz=zEol%(2XSnWhYfMjE3@o}aBLVyhZWIdNgJ<| zZKf!UT;vzKX*ZL}NPL{-yi-e@ zaZQq&Kpw%_Qry?4Pe~;)VKhEaOP!0$h?_(bXnQ*Plttny0r&o4{8*(a-b>wcxS}w}{G=FKA)i=bQKVE-DJY3&6XdhRmO-rpG zeJTh3p_PV?;jHjPOa%az20j{V#d^(vM-k;?weZk`fYo*P8%FUzdd-IcFyGH z%&JK_E%B(3Qf50WF|=jPl|y&lYKPnT+kbjii^_65(MY&kR1O}#bg+KS=EKq~&-2_g zINt{A7lopl%vL0G-C6J}L*$q8r26ljA0v&vz5>A5%B-ofh50nu{$ol5BAhkrDCP|Q zQ;2fI{cKl|V{GqLb7X8v*y83$jgP>WqoH2-%}n^H@2hnxM99i`WNgX80jewKBi6Rk z@g7eO^oAmP#!g5Ph2zxSY$r3e$#CV1e(dB z8jN;b*ZpU~fk6~5h={r;NIL^bUKL(4jVJ|Gdh&~Ah9=ldlYCZ7MP=%+`%o21NDoq4 z;%J765QZlGIj91l+y0{{djDR#Jy7dGKlp-jFFmmD7Lf*O#cmd~yTw9zF4n#P5fXbs z<^hqDMuX~VWb5w;lR%td!9w$VZX___VK!T~oCh1O{Y{Sy8a5%HpISf|{po682T%{! zSIExc8h9XJjMBkT3qnG(>vYj)8Ttafa<+vBd@vu>qmTv~q_HhX06HjlS?mth@r0?j zqlSUbVP?LZcbTHyW=cJF{R`JXZ+_O@@szkjVyv)-t8*zn^ECemybm$Ny7O$ehoft? z$Rovz#|evEHR29rAqB}E?Js2M3aODXRE>SHm9CI-_#{sw^;9FJUNnHWO_&OSE=!Th z0yO>SfR%qILvUmC6WMzER(mNmABA?yl^_CQD2$+iX7W(EQRM*R=H-^(+1Cmw0G+5S z`Gu<_`=Hc|ty;b`IGFwh;&MC+au;! zv4|!RvS3>%1%6Z! Date: Tue, 16 Feb 2016 10:00:03 +0000 Subject: [PATCH 7/7] Fixes #217 --- .../techreborn/client/gui/GuiQuantumTank.java | 2 +- src/main/java/techreborn/init/ModItems.java | 5 ++ src/main/java/techreborn/items/ItemCells.java | 63 ++++++++++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiQuantumTank.java b/src/main/java/techreborn/client/gui/GuiQuantumTank.java index 92aaa604e..a43ced9b1 100644 --- a/src/main/java/techreborn/client/gui/GuiQuantumTank.java +++ b/src/main/java/techreborn/client/gui/GuiQuantumTank.java @@ -11,7 +11,7 @@ import techreborn.tiles.TileQuantumTank; public class GuiQuantumTank extends GuiContainer { private static final ResourceLocation texture = new ResourceLocation( - "techreborn", "textures/gui/ThermalGenerator.png"); + "techreborn", "textures/gui/thermal_generator.png"); TileQuantumTank tile; diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index cd64466a3..cbde19d10 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -96,6 +96,11 @@ public class ModItems { GameRegistry.registerItem(parts, "part"); cells = new ItemCells(); GameRegistry.registerItem(cells, "cell"); + for (int i = 0; i < ItemCells.types.length; i++) { + if(FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()) != null){ + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("fluid" + ItemCells.types[i].toLowerCase()), ItemCells.getCellByName(ItemCells.types[i])); + } + } rockCutter = PoweredItem.createItem(ItemRockCutter.class); GameRegistry.registerItem(rockCutter, "rockCutter"); lithiumBatpack = PoweredItem.createItem(ItemLithiumBatpack.class); diff --git a/src/main/java/techreborn/items/ItemCells.java b/src/main/java/techreborn/items/ItemCells.java index a6619a894..b43fcf267 100644 --- a/src/main/java/techreborn/items/ItemCells.java +++ b/src/main/java/techreborn/items/ItemCells.java @@ -5,18 +5,20 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidContainerItem; +import reborncore.api.IListInfoProvider; import techreborn.Core; import techreborn.client.TechRebornCreativeTab; import techreborn.init.ModItems; import java.util.List; -public class ItemCells extends ItemTR { +public class ItemCells extends ItemTR implements IFluidContainerItem { public static ItemStack getCellByName(String name, int count) { return getCellByName(name, count, true); @@ -104,8 +106,65 @@ public class ItemCells extends ItemTR { // Adds Dusts SubItems To Creative Tab public void getSubItems(Item item, CreativeTabs creativeTabs, List list) { for (int meta = 0; meta < types.length; ++meta) { - list.add(new ItemStack(item, 1, meta)); + ItemStack stack = new ItemStack(item, 1, meta); + if(FluidRegistry.getFluid("fluid" +types[meta].toLowerCase()) != null){ + this.fill(stack, new FluidStack(FluidRegistry.getFluid("fluid" +types[meta].toLowerCase()), getCapacity(stack)), true); + } + list.add(stack); } } + @Override + public FluidStack getFluid(ItemStack container) { + return FluidStack.loadFluidStackFromNBT(container.getTagCompound()); + } + + @Override + public int getCapacity(ItemStack container) { + return 1000; + } + + @Override + public int fill(ItemStack container, FluidStack resource, boolean doFill) { + if (container.stackSize != 1) { + return 0; + } + if (resource == null || resource.amount != getCapacity(container)) { + return 0; + } + if(FluidRegistry.getFluid("fluid" +types[container.getItemDamage()].toLowerCase()) == null){ + return 0; + } + if (doFill) + { + NBTTagCompound tag = container.getTagCompound(); + if (tag == null) + { + tag = new NBTTagCompound(); + } + resource.writeToNBT(tag); + container.setTagCompound(tag); + } + return getCapacity(container); + } + + @Override + public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) { + if (maxDrain < getCapacity(container)) { + return null; + } + FluidStack fluidStack = getFluid(container); + if (doDrain && fluidStack != null) { + ItemStack empty = ItemCells.getCellByName("empty"); + if(empty != null) { + container.setItemDamage(empty.getItemDamage()); + container.setTagCompound(empty.getTagCompound()); + } + else { + container.stackSize = 0; + } + } + + return fluidStack; + } }