Skip to content

Commit 8c1e1ae

Browse files
committed
Version Bump for Release
1 parent 4fec1bd commit 8c1e1ae

File tree

4 files changed

+77
-8
lines changed

4 files changed

+77
-8
lines changed

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
minecraft_version=1.8.9
22
forge_version=11.15.1.1724
3-
mod_version=2.3.4
3+
mod_version=2.3.5
44
JEI_version=2.25.7.145
55
WAILA_version=1.6.0-B3_1.8.8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
package com.dyonovan.neotech.common.items
2+
3+
import com.teambr.bookshelf.client.gui.GuiTextFormat
4+
import net.minecraft.entity.EntityCreature
5+
import net.minecraft.entity.passive.EntityAnimal
6+
import net.minecraft.entity.player.EntityPlayer
7+
import net.minecraft.item.{EnumAction, ItemStack}
8+
import net.minecraft.nbt.NBTTagCompound
9+
import net.minecraft.util.MovingObjectPosition
10+
import net.minecraft.world.World
11+
import net.minecraftforge.fml.relauncher.{Side, SideOnly}
12+
13+
/**
14+
* This file was created for NeoTech
15+
*
16+
* NeoTech is licensed under the
17+
* Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License:
18+
* http://creativecommons.org/licenses/by-nc-sa/4.0/
19+
*
20+
* @author Dyonovan
21+
* @since 2/10/2016
22+
*/
23+
class ItemAnimalMover extends BaseItem("animalMover", 1) {
24+
25+
override def onItemRightClick(stack: ItemStack, world: World, player: EntityPlayer): ItemStack = {
26+
player.setItemInUse(stack, getMaxItemUseDuration(stack))
27+
stack
28+
}
29+
30+
override def getItemUseAction(stack: ItemStack): EnumAction = {
31+
EnumAction.BOW
32+
}
33+
34+
override def getMaxItemUseDuration(stack: ItemStack): Int = {
35+
7200
36+
}
37+
38+
override def hasEffect(stack: ItemStack) = stack.hasTagCompound
39+
40+
override def onPlayerStoppedUsing(stack: ItemStack, world: World, player: EntityPlayer, timeLeft: Int): Unit = {
41+
42+
if (timeLeft <= 7180) {
43+
val mop = getMovingObjectPositionFromPlayer(world, player, false)
44+
if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && !stack.hasTagCompound) {
45+
val entity = mop.entityHit
46+
entity match {
47+
case mob: EntityCreature =>
48+
val tag = new NBTTagCompound
49+
mob.writeEntityToNBT(tag)
50+
stack.writeToNBT(tag)
51+
case _ =>
52+
}
53+
} else if (stack.hasTagCompound) {
54+
val pos = mop.getBlockPos
55+
56+
}
57+
58+
}
59+
}
60+
61+
@SideOnly(Side.CLIENT)
62+
override def addInformation(stack: ItemStack, player: EntityPlayer, list: java.util.List[String], boolean: Boolean): Unit = {
63+
if (stack.hasTagCompound) {
64+
list.add(GuiTextFormat.ITALICS + "Type: " + stack.getTagCompound.getString("EntityId"))
65+
}
66+
}
67+
68+
}

src/main/scala/com/dyonovan/neotech/lib/Reference.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ package com.dyonovan.neotech.lib
1313
object Reference {
1414
final val MOD_NAME = "NeoTech"
1515
final val MOD_ID = "neotech"
16-
final val VERSION = "2.3.4"//@VERSION@"
17-
final val DEPENDENCIES = "required-after:Forge@[11.15.1.1724,);required-after:bookshelfapi@[2.2.9,)"
16+
final val VERSION = "2.3.5"//@VERSION@"
17+
final val DEPENDENCIES = "required-after:Forge@[11.15.1.1724,);required-after:bookshelfapi@[2.3.0,)"
1818
final val UPDATE_JSON = "https://raw.githubusercontent.com/TeamBR-Modding/NeoTech/1.8.9/update.json"
1919

2020
final val CONFIG_WORLD = "World Generation"

update.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"homepage": "http://minecraft.curseforge.com/projects/neotech/files",
33
"promos": {
4-
"1.8.9-latest": "2.3.4",
5-
"1.8.9-recommended": "2.3.4",
6-
"latest": "2.3.4",
7-
"recommended": "2.3.4"
4+
"1.8.9-latest": "2.3.5",
5+
"1.8.9-recommended": "2.3.5",
6+
"latest": "2.3.5",
7+
"recommended": "2.3.5"
88
},
99
"1.8.9": {
1010
"2.2.3": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog",
@@ -13,6 +13,7 @@
1313
"2.3.1": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog",
1414
"2.3.2": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog",
1515
"2.3.3": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog",
16-
"2.3.4": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog"
16+
"2.3.4": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog",
17+
"2.3.5": "See https://github.com/TeamBR-Modding/NeoTech/wiki/Changelog"
1718
}
1819
}

0 commit comments

Comments
 (0)