Implement a functioning Blood Tank #969

Arcaratus · 2016-11-08T20:51:12Z

-Added a search bar to the Upgrade Tomes Creative Tab
-Updated some Altar fluid code (remove deprecated stuff)
-Moved Rendering classes into appropriate package
-Fix the localization errors on the Demon Crystals
-A few cleanups here and there
-Removed obsolete fluid methods in Utils
-Has comparator output
-Update JEI compat

-- TO DO --
-Add recipes for the Blood Tank
~~-Fix the lighting-not-updating-upon-fluid-placement within the tank bug~~
~~-Render tank in inventory if possible~~ <- Terrible but working
-Future (maybe 1.11) update from deprecated methods and classes throughout entire mod
~~-Fix JEI bug where cheating a tank in reverts to a Tier 1 tank regardless of which tank you cheated in~~

Added a search bar to the Upgrade Tomes Creative Tab Updated some Altar fluid code (remove deprecated stuff) Moved Rendering classes into appropriate package Fix the localization errors on the Demon Crystals A few cleanups here and there

TehNut · 2016-11-08T21:12:35Z

Again, please no TESR. Use the model system.

I will look over this more when I get home

TehNut · 2016-11-08T21:55:33Z

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java

+        if (!config.getConfig(Constants.Compat.WAILA_CONFIG_BLOOD_TANK))
+            return currenttip;
+
+        if (accessor.getPlayer().isSneaking() || config.getConfig(Constants.Compat.WAILA_CONFIG_BYPASS_SNEAK))


This whole bit is wrong. You cannot access a Tiles NBT here. Write everything you need to the tag in #getNBTData and read it from accessor#getNBTData. I need to fix our other implementations to do this. See the altar impl for an example.

TehNut · 2016-11-08T21:56:02Z

src/main/java/WayofTime/bloodmagic/item/block/ItemBlockBloodTank.java

@@ -17,108 +25,144 @@
    public ItemBlockBloodTank(Block block)
    {
        super(block);
+
+        setHasSubtypes(true);
+        setMaxDamage(0);


Unecessary.

TehNut · 2016-11-08T21:59:58Z

src/main/resources/assets/bloodmagic/lang/en_US.lang

+tile.BloodMagic.demonCrystal.corrosive.name=Corrosive Will Crystal Cluster
+tile.BloodMagic.demonCrystal.destructive.name=Destructive Will Crystal Cluster
+tile.BloodMagic.demonCrystal.vengeful.name=Vengeful Will Crystal Cluster
+tile.BloodMagic.demonCrystal.steadfast.name=Steadfast Will Crystal Cluster



If you change this here, you need to change every language.

WayofTime · 2016-11-09T00:59:50Z

Good to pull, or need more stuff?

TehNut · 2016-11-09T01:47:39Z

Needs tank rewritten as a model instead of a TESR. If this is being done, it should be done correctly.

WayofTime · 2016-11-10T17:26:27Z

@TehNut Talked to both Grum and cpw. They said that a TESR for any form of block that updates its model regularly is a bad idea because it redraws the chunk of 16^3 blocks that it is in. So the static part of the model (the block) should be a model, but the fluid part should either be a regular TESR or a fast TESR.

TehNut · 2016-11-10T17:31:26Z

Alright, let's do that, then.

TehNut · 2016-11-11T01:49:43Z

src/main/resources/assets/bloodmagic/blockstates/BlockBloodTank.json

+    "tier": {
+	  "0": {
+		"textures": {
+	      "all": "bloodmagic:blocks/BloodTank"


If you add

"textures": { "all": "bloodmagic:blocks/BloodTank" }

to the "default": {} block, you shouldn't need it in all of these variants.

TehNut · 2016-11-11T01:54:29Z

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java

+                currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.fluid.capacity") + ": " + bloodTank.getCapacity() + "mB");
+
+                NBTTagCompound tag = accessor.getNBTData().getCompoundTag(Constants.NBT.TANK);
+                if (!Strings.isNullOrEmpty(tag.getString("FluidName")) && FluidStack.loadFluidStackFromNBT(tag) != null)


Save the FluidStack instead of creating it from NBT twice.

TehNut · 2016-11-11T01:57:10Z

src/main/java/WayofTime/bloodmagic/compat/waila/provider/DataProviderBloodTank.java

+                if (!Strings.isNullOrEmpty(tag.getString("FluidName")) && FluidStack.loadFluidStackFromNBT(tag) != null)
+                {
+                    currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.fluid.type") + ": " + FluidStack.loadFluidStackFromNBT(tag).getLocalizedName());
+                    currenttip.add(TextHelper.localizeEffect("tooltip.BloodMagic.fluid.amount") + ": " + tag.getInteger("Amount") + "/" + bloodTank.getCapacity() + "mB");


This getCapacity() call (and the one above) need to either be changed to be retrieved from NBT or the getCapacity() method needs to be changed to not depend on a field obtained via NBT.

TehNut · 2016-11-11T01:58:11Z

src/main/java/WayofTime/bloodmagic/client/render/block/RenderBloodTank.java

+        tessellator.draw();
+    }
+
+    public static TextureAtlasSprite checkIcon(TextureAtlasSprite icon)


Why create this method? You run this bit of code once, as far as I can tell.

TehNut · 2016-11-11T02:00:47Z

Whitespacing seems to be a mix of tabs and spaces. Please convert all of the tabs to spaces.

WayofTime · 2016-11-11T02:02:21Z

That said, I'll probably be running Eclipse's formatter afterwards, so the last part isn't as bad of an issue.

Fixed JEI cheating in bug Updated fluid handling Removed unnecessary fluid methods in Utils

Fixed the lighting bugs

TehNut · 2016-12-03T01:53:52Z

src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java

@@ -99,4 +99,9 @@ public void register(@Nonnull IModRegistry registry)
        jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.DIMENSION_ID);
        jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.ITEM_INVENTORY);
    }
+
+    @Override
+    public void onRuntimeAvailable(IJeiRuntime runtime)


Why implement this? BlankModPlugin should be taking care of any unneeded methods.

TehNut · 2016-12-03T01:55:14Z

src/main/java/WayofTime/bloodmagic/util/handler/event/BakedCustomItemModel.java

+
+/**
+ * Shamelessly taken off of the Mekanism repository written by aidancbrady
+ * https://github.com/aidancbrady/Mekanism


@author aidancbrady

Arcaratus added 2 commits November 8, 2016 15:43

Implement a functioning Blood Tank

3eb1f4d

Added a search bar to the Upgrade Tomes Creative Tab Updated some Altar fluid code (remove deprecated stuff) Moved Rendering classes into appropriate package Fix the localization errors on the Demon Crystals A few cleanups here and there

Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9

de0746f

TehNut requested changes Nov 8, 2016

View reviewed changes

Arcaratus added 2 commits November 8, 2016 17:30

Did the requested changes

b9a58f2

Merge remote-tracking branch 'origin/1.9' into 1.9

35a1523

TehNut approved these changes Nov 9, 2016

View reviewed changes

Arcaratus added 2 commits November 10, 2016 13:53

Add alpha rendering

b308e54

Merge remote-tracking branch 'origin/1.9' into 1.9

917b708

TehNut reviewed Nov 11, 2016

View reviewed changes

Arcaratus added 6 commits November 10, 2016 22:18

Do the fixes

69c00ab

Merge remote-tracking branch 'origin/1.9' into 1.9

45dbaeb

Update JEI compat

6e1e59b

Fixed JEI cheating in bug Updated fluid handling Removed unnecessary fluid methods in Utils

Added comparator output to the Blood Tank

0737dbb

Fixed the lighting bugs

Implement item-rendering for the Blood Tank

40f945e

Merge branch '1.9' of https://github.com/WayofTime/BloodMagic into 1.9

cef5272

TehNut requested changes Dec 3, 2016

View reviewed changes

Arcaratus added 3 commits December 2, 2016 21:03

Remove InventoryRenderHelper usage

61f71ac

Merge remote-tracking branch 'origin/1.9' into 1.9

cec748c

Moving files...

fa1f9b9

Merge remote-tracking branch 'origin/1.9' into 1.9

945e14a

TehNut approved these changes Dec 3, 2016

View reviewed changes

TehNut merged commit aac2623 into WayofTime:1.9 Dec 12, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement a functioning Blood Tank #969

Implement a functioning Blood Tank #969

Arcaratus commented Nov 8, 2016 •

edited

Loading

TehNut commented Nov 8, 2016

TehNut Nov 8, 2016

TehNut Nov 8, 2016

TehNut Nov 8, 2016

WayofTime commented Nov 9, 2016

TehNut commented Nov 9, 2016 •

edited

Loading

WayofTime commented Nov 10, 2016

TehNut commented Nov 10, 2016

TehNut Nov 11, 2016

TehNut Nov 11, 2016

TehNut Nov 11, 2016

TehNut Nov 11, 2016

TehNut commented Nov 11, 2016

WayofTime commented Nov 11, 2016

TehNut Dec 3, 2016

TehNut Dec 3, 2016

Implement a functioning Blood Tank #969

Implement a functioning Blood Tank #969

Conversation

Arcaratus commented Nov 8, 2016 • edited Loading

TehNut commented Nov 8, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WayofTime commented Nov 9, 2016

TehNut commented Nov 9, 2016 • edited Loading

WayofTime commented Nov 10, 2016

TehNut commented Nov 10, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

TehNut commented Nov 11, 2016

WayofTime commented Nov 11, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Arcaratus commented Nov 8, 2016 •

edited

Loading

TehNut commented Nov 9, 2016 •

edited

Loading