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 000000000..12c4b1897 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockBioReactor.png differ 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 000000000..6c3045e60 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/blocks/blockItemDistributor.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMiscCrystallizedCanolaSeed.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscCrystallizedCanolaSeed.png new file mode 100644 index 000000000..1e3408d11 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscCrystallizedCanolaSeed.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEmpoweredCanolaSeed.png b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEmpoweredCanolaSeed.png new file mode 100644 index 000000000..437ddd955 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/items/itemMiscEmpoweredCanolaSeed.png differ