From ea982f025e9ea974be1c939f8f14d53449852c95 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Sat, 17 Sep 2016 12:24:49 +0200 Subject: [PATCH] Added textures for stuff that doesn't have any yet --- .../actuallyadditions/mod/items/ItemMisc.java | 5 +++++ .../blockstates/blockBioReactor.json | 14 ++++++++++++++ .../blockstates/blockDistributorItem.json | 14 ++++++++++++++ .../assets/actuallyadditions/lang/en_US.lang | 1 + .../item/itemMiscCrystallizedCanolaSeed.json | 6 ++++++ .../models/item/itemMiscEmpoweredCanolaSeed.json | 6 ++++++ .../textures/blocks/blockBioReactor.png | Bin 0 -> 819 bytes .../textures/blocks/blockItemDistributor.png | Bin 0 -> 574 bytes .../items/itemMiscCrystallizedCanolaSeed.png | Bin 0 -> 256 bytes .../items/itemMiscEmpoweredCanolaSeed.png | Bin 0 -> 260 bytes 10 files changed, 46 insertions(+) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockBioReactor.json create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/blockDistributorItem.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/itemMiscCrystallizedCanolaSeed.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/itemMiscEmpoweredCanolaSeed.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockBioReactor.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/blocks/blockItemDistributor.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMiscCrystallizedCanolaSeed.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/itemMiscEmpoweredCanolaSeed.png diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index 596cf016d..9947f586e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -98,4 +98,9 @@ public class ItemMisc extends ItemBase{ return super.onEntityItemUpdate(entity); } + + @Override + public boolean hasEffect(ItemStack stack){ + return stack.getItemDamage() == TheMiscItems.EMPOWERED_CANOLA_SEED.ordinal(); + } } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockBioReactor.json b/src/main/resources/assets/actuallyadditions/blockstates/blockBioReactor.json new file mode 100644 index 000000000..58438052b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockBioReactor.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockBioReactor" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/blockstates/blockDistributorItem.json b/src/main/resources/assets/actuallyadditions/blockstates/blockDistributorItem.json new file mode 100644 index 000000000..aa09ba60f --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/blockDistributorItem.json @@ -0,0 +1,14 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "textures": { + "all": "actuallyadditions:blocks/blockItemDistributor" + }, + "transform": "forge:default-block" + }, + "variants": { + "normal": [{}], + "inventory": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 173402bc9..83920417c 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -628,6 +628,7 @@ container.actuallyadditions.laserRelayItemWhitelist.name=Laser Relay container.actuallyadditions.filter.name=Item Filter container.actuallyadditions.bag.name=Traveler's Sack container.actuallyadditions.voidBag.name=Void Sack +container.actuallyadditions.bioReactor.name=Bio Reactor #Update Information info.actuallyadditions.update.generic=[{"text":"There is an Update for "},{"text":"Actually Additions ","color":"dark_green"},{"text":"available!","color":"none"}] diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscCrystallizedCanolaSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCrystallizedCanolaSeed.json new file mode 100644 index 000000000..5bb3c1847 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscCrystallizedCanolaSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standardItem", + "textures": { + "layer0": "actuallyadditions:items/itemMiscCrystallizedCanolaSeed" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/itemMiscEmpoweredCanolaSeed.json b/src/main/resources/assets/actuallyadditions/models/item/itemMiscEmpoweredCanolaSeed.json new file mode 100644 index 000000000..a0d72b913 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/itemMiscEmpoweredCanolaSeed.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standardItem", + "textures": { + "layer0": "actuallyadditions:items/itemMiscEmpoweredCanolaSeed" + } +} diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockBioReactor.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockBioReactor.png new file mode 100644 index 0000000000000000000000000000000000000000..12c4b18973bf093639f33760ccd07646dc605b21 GIT binary patch literal 819 zcmV-31I+x1P)JNR5(vPQ%g@%VG#X(0t+|B zXk#>}(V!5^tJT&Dl$O5kqxZJG5Om>M7wlP>7#A87H=3BJ(Vz(mgokMaL=;H_K1u?F zfKe8(Ao?SYbH4Vvn9RL1bLPzJQ@bk>{9FoSYoP<{@7u689mKbZ7Oae3z?YFGe13io z3s25q?$IffA2wp<{z**UJ&v*40gMhGh1##iU>OE1(}bDHz^IEYwtO~=Vm^<8;qD})7rk9w=!?hUFoA&blGw9txML9w9xRn`t-oI< zn7(%c>d$r@1qmXfkxrxWW&qI#=i!KrAbt}_J$$_b1BC(xJx}}DlG2k?(%WBdf3KKISflNa2I1dtv zEIvI8wONV660j~=vgc$TOhTZ~Osy-bx8hnBiW0jlTT(w3BYJ2VDTysG(33$qp(C}D z#l{Lv*?{l2>)Tj;(+ssT8%8FPfFVJg0~vtcH` z1T{C_UOO5QI$U2%J3cdS!;nE|r0hgbk4{pQLH@2>hANM?>AjjFyt{|aN?r5P9|`KjRb6gRqzH#cCgtEHSsbi z6&U)_Q1nem09mr!j%Wt^{WB4zD3$)*i9@}8b`j$*f|wd<#mwtgu%+3tc6^xVz^AEB xa7&eP7+>cvVNGskb2*Bg)fjfGSFyj*jepkY6Qe3&-7f$D002ovPDHLkV1hHmVm<%> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/blocks/blockItemDistributor.png b/src/main/resources/assets/actuallyadditions/textures/blocks/blockItemDistributor.png new file mode 100644 index 0000000000000000000000000000000000000000..6c3045e60cd96b9ccb0d598d10eb8254c8a2dca9 GIT binary patch literal 574 zcmV-E0>S->P)CR_4?e}sCK|WOQUDb}S)|gw{S`N7( zk5R5_Sg+Tz+wEk#-I`8f^#_2!0y`%$fb{@Mw>h262mnD;CfS951o|%k+@q~)S*=!< zj1V}V&mSzjAMUpz3PA5d)K7gl^r#vPkS93(vMgn>SeTE0^t1ND0GPr>8F)3EMNvr9 z-Z&6bnM@`&3BO*e3<`}2pm;J)uS#N~;K(x@;#|+wZVcSv;thKiuk3zKy8>gZvC}AKI6v=qN!Uafuw57tnh2N!0zmTs#Yc?! zbXyB$W~&SX0vIJi6|at^?xq>3g6b9!9GV2IH;k>@mTL z>R!3iiZuJKey&VT3Impbc|r#%^&il;(a260-b~3;S3Mbzds~e13pBQj)c}!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7Z*@9L#?Na zV~BDK!;-!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P_o1|q9iy!t)x7$D3zfgF*C13FE6!3!9>qM&(L5k7Z*@9L!+mQ zV~BSHyn$tdQxUS*mzmaQc}! zkF{7rT~yu_p5rmv$0Xt+#j!2%)EU{Smhy~D^&f>#eAe2_)R*Qd$7HgL^@oug{}qj< zsLicuja$P6BN)vaOQ$PsU^?)syI~{K{eT?|XZaqpMA+^&06K=j)78&qol`;+0P@;Z ACIA2c literal 0 HcmV?d00001