curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-12 06:41:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

inventoryItem -> gameItem

Browse Source
This commit is contained in:
Song Minjae
2017-04-29 23:11:54 +09:00
parent 09b4e3719f
commit 9a819ffec3
17 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
assets/modules/basegame/items/malicious.groovy
View File

@@ -1,4 +1,4 @@
import net.torvald.terrarum.itemproperties.InventoryItem
import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.Material
import org.jetbrains.annotations.NotNull
import org.jetbrains.annotations.Nullable
@@ -7,9 +7,9 @@ import org.jetbrains.annotations.Nullable
* Created by SKYHi14 on 2017-04-28.
*/
static InventoryItem invoke(int id) {
static GameItem invoke(int id) {
return new InventoryItem() {
return new GameItem() {
@Override
int getDynamicID() {
return 0

8
assets/modules/basegame/items/testpick.groovy
View File

@@ -9,23 +9,21 @@ import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.gameactors.AVKey
import net.torvald.terrarum.gameactors.ActorWithPhysics
import net.torvald.terrarum.itemproperties.Calculate
import net.torvald.terrarum.itemproperties.InventoryItem
import net.torvald.terrarum.itemproperties.GameItem
import net.torvald.terrarum.itemproperties.Material
import net.torvald.terrarum.blockproperties.Block
// following two are NOT UNUSED!
import net.torvald.terrarum.itemproperties.InventoryItem.EquipPosition
import net.torvald.terrarum.itemproperties.InventoryItem.Category
import org.jetbrains.annotations.NotNull
import org.newdawn.slick.GameContainer
static InventoryItem invoke(int id) {
static GameItem invoke(int id) {
return new TestPick(id)
}
class TestPick extends InventoryItem {
class TestPick extends GameItem {
int originalID
int dynamicID