From 05b61e2ccb2930149dce4e893180758f256fd677 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Wed, 23 Jan 2019 13:00:12 +0100 Subject: [PATCH] finish the mover cart except for textures --- .../entities/EntityMoverMinecart.java | 8 +++++ .../assets/naturesaura/lang/en_US.lang | 1 + .../en_us/entries/devices/mover_cart.json | 21 ++++++++++++ .../naturesaura/recipes/mover_cart.json | 32 +++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/devices/mover_cart.json create mode 100644 src/main/resources/assets/naturesaura/recipes/mover_cart.json diff --git a/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java b/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java index 9c2e719d..45a529ee 100644 --- a/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java +++ b/src/main/java/de/ellpeck/naturesaura/entities/EntityMoverMinecart.java @@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagLong; +import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; @@ -79,6 +80,13 @@ public class EntityMoverMinecart extends EntityMinecart { } } + @Override + public void killMinecart(DamageSource source) { + this.setDead(); + if (this.world.getGameRules().getBoolean("doEntityDrops")) + this.entityDropItem(new ItemStack(ModItems.MOVER_MINECART), 0); + } + @Override protected void writeEntityToNBT(NBTTagCompound compound) { super.writeEntityToNBT(compound); diff --git a/src/main/resources/assets/naturesaura/lang/en_US.lang b/src/main/resources/assets/naturesaura/lang/en_US.lang index 695ec11f..1c608127 100644 --- a/src/main/resources/assets/naturesaura/lang/en_US.lang +++ b/src/main/resources/assets/naturesaura/lang/en_US.lang @@ -72,6 +72,7 @@ item.naturesaura.infused_iron_shoes.name=Botanist's Shoes item.naturesaura.effect_powder.naturesaura:plant_boost.name=Powder of Steady Growth item.naturesaura.effect_powder.naturesaura:cache_recharge.name=Powder of no Storage item.naturesaura.effect_powder.naturesaura:animal.name=Powder of Chastity +item.naturesaura.mover_cart.name=Aura Attraction Cart container.naturesaura.tree_ritual.name=Ritual of the Forest container.naturesaura.altar.name=Natural Altar Infusion diff --git a/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/devices/mover_cart.json b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/devices/mover_cart.json new file mode 100644 index 00000000..1d95be9d --- /dev/null +++ b/src/main/resources/assets/naturesaura/patchouli_books/book/en_us/entries/devices/mover_cart.json @@ -0,0 +1,21 @@ +{ + "name": "Aura Attraction Cart", + "icon": "naturesaura:mover_cart", + "category": "devices", + "advancement": "naturesaura:aura_bottle_end", + "pages": [ + { + "type": "text", + "text": "One of the problems many $(aura) researchers face is that, while it's plentiful and easy to access, it's not necessarily easy to $(thing)move around$(). For this, the $(item)Aura Attraction Cart$() was developed: Its sole purpose is to provide the ability for $(aura) to be moved around the world easily. For that, all that is required is an excess amount of $(aura) in the starting area and some $(item)rails$()." + }, + { + "type": "text", + "text": "To use the $(item)Aura Attraction Cart$(), one needs to place it on a rail. To cause it to hook on to $(aura) in the area around it and to make it able to move it around, it needs to pass a powered $(item)Activator Rail$(). It will then pick up the $(aura) around it and pull it along with it until it reaches an unpowered $(item)Activator Rail$(), at which point it will let go of the $(aura).$(p)It should be noted that, during the process of moving $(aura) in this manner, some of the excess is $(thing)$(t:| || || |_)lost$()." + }, + { + "type": "crafting", + "text": "Creating the $(item)Aura Attraction Cart$()", + "recipe": "naturesaura:mover_cart" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/naturesaura/recipes/mover_cart.json b/src/main/resources/assets/naturesaura/recipes/mover_cart.json new file mode 100644 index 00000000..467d35c7 --- /dev/null +++ b/src/main/resources/assets/naturesaura/recipes/mover_cart.json @@ -0,0 +1,32 @@ +{ + "type": "forge:ore_shaped", + "pattern": [ + "EBE", + "SIS", + " C " + ], + "key": { + "B": { + "type": "minecraft:item_nbt", + "item": "naturesaura:aura_bottle", + "nbt": { + "stored_type": "naturesaura:end" + } + }, + "I": { + "item": "naturesaura:infused_iron" + }, + "S": { + "item": "naturesaura:sky_ingot" + }, + "E": { + "item": "minecraft:ender_eye" + }, + "C": { + "item": "minecraft:minecart" + } + }, + "result": { + "item": "naturesaura:mover_cart" + } +} \ No newline at end of file