Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
44 changed files
with
562 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,61 @@ | ||
package de.melanx.ultimatools.items; | ||
|
||
import de.melanx.ultimatools.items.crystals.*; | ||
import de.melanx.ultimatools.items.crystals.casual.*; | ||
import de.melanx.ultimatools.items.crystals.krypto.*; | ||
|
||
public class ModItems { | ||
|
||
public static CrystalCyan crystalCyan; | ||
public static CrystalLime crystalLime; | ||
public static CrystalGreen crystalGreen; | ||
public static CrystalBronze crystalBronze; | ||
public static CrystalSilver crystalSilver; | ||
public static CrystalGold crystalGold; | ||
public static CrystalPurple crystalPurple; | ||
public static CrystalPink crystalPink; | ||
public static CrystalRainbow crystalRainbow; | ||
public static CrystalBlack crystalBlack; | ||
public static CrystalGay crystalGay; | ||
public static CrystalGray crystalGray; | ||
// casual | ||
public static CrystalBeginner crystalBeginner; | ||
public static CrystalScholar crystalScholar; | ||
public static CrystalFarmer crystalFarmer; | ||
public static CrystalForestRunner crystalForestRunner; | ||
public static CrystalKnight crystalKnight; | ||
public static CrystalLighter crystalLighter; | ||
public static CrystalSoothsayer crystalSoothsayer; | ||
public static CrystalBloodMagician crystalBloodMagician; | ||
public static CrystalUltimaFighter crystalUltimaFighter; | ||
public static CrystalCursedKnight crystalCursedKnight; | ||
public static CrystalUltimaGod crystalUltimaGod; | ||
public static CrystalOreBetter crystalOreBetter; | ||
|
||
// krypto | ||
public static KryptoBeginner kryptoBeginner; | ||
public static KryptoScholar kryptoScholar; | ||
public static KryptoFarmer kryptoFarmer; | ||
// public static KryptoForestRunner kryptoForestRunner; | ||
// public static KryptoKnight kryptoKnight; | ||
// public static KryptoLighter kryptoLighter; | ||
public static KryptoSoothsayer kryptoSoothsayer; | ||
public static KryptoBloodMagician kryptoBloodMagician; | ||
public static KryptoCursedKnight kryptoCursedKnight; | ||
|
||
public static void init() { | ||
crystalCyan = new CrystalCyan(); | ||
crystalLime = new CrystalLime(); | ||
crystalGreen = new CrystalGreen(); | ||
crystalBronze = new CrystalBronze(); | ||
crystalSilver = new CrystalSilver(); | ||
crystalGold = new CrystalGold(); | ||
crystalPurple = new CrystalPurple(); | ||
crystalPink = new CrystalPink(); | ||
crystalRainbow = new CrystalRainbow(); | ||
crystalBlack = new CrystalBlack(); | ||
crystalGay = new CrystalGay(); | ||
crystalGray = new CrystalGray(); | ||
|
||
// casual | ||
crystalBeginner = new CrystalBeginner(); | ||
crystalScholar = new CrystalScholar(); | ||
crystalFarmer = new CrystalFarmer(); | ||
crystalForestRunner = new CrystalForestRunner(); | ||
crystalKnight = new CrystalKnight(); | ||
crystalLighter = new CrystalLighter(); | ||
crystalSoothsayer = new CrystalSoothsayer(); | ||
crystalBloodMagician = new CrystalBloodMagician(); | ||
crystalUltimaFighter = new CrystalUltimaFighter(); | ||
crystalCursedKnight = new CrystalCursedKnight(); | ||
crystalUltimaGod = new CrystalUltimaGod(); | ||
crystalOreBetter = new CrystalOreBetter(); | ||
|
||
// krypto | ||
kryptoBeginner = new KryptoBeginner(); | ||
kryptoScholar = new KryptoScholar(); | ||
kryptoFarmer = new KryptoFarmer(); | ||
// kryptoForestRunner = new KryptoForestRunner(); | ||
|
||
|
||
kryptoSoothsayer = new KryptoSoothsayer(); | ||
kryptoBloodMagician = new KryptoBloodMagician(); | ||
kryptoCursedKnight = new KryptoCursedKnight(); | ||
} | ||
|
||
} |
10 changes: 0 additions & 10 deletions
10
src/main/java/de/melanx/ultimatools/items/crystals/CrystalBronze.java
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
src/main/java/de/melanx/ultimatools/items/crystals/CrystalGold.java
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
src/main/java/de/melanx/ultimatools/items/crystals/CrystalSilver.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
src/main/java/de/melanx/ultimatools/items/crystals/casual/CrystalForestRunner.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package de.melanx.ultimatools.items.crystals.casual; | ||
|
||
import de.melanx.ultimatools.items.crystals.CrystalBase; | ||
|
||
public class CrystalForestRunner extends CrystalBase { | ||
|
||
public CrystalForestRunner() { | ||
super("forest_runner"); | ||
setContainerItem(this); | ||
} | ||
|
||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/de/melanx/ultimatools/items/crystals/casual/CrystalKnight.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package de.melanx.ultimatools.items.crystals.casual; | ||
|
||
import de.melanx.ultimatools.items.crystals.CrystalBase; | ||
|
||
public class CrystalKnight extends CrystalBase { | ||
|
||
public CrystalKnight() { | ||
super("knight"); | ||
setContainerItem(this); | ||
} | ||
|
||
} |
12 changes: 12 additions & 0 deletions
12
src/main/java/de/melanx/ultimatools/items/crystals/casual/CrystalLighter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
package de.melanx.ultimatools.items.crystals.casual; | ||
|
||
import de.melanx.ultimatools.items.crystals.CrystalBase; | ||
|
||
public class CrystalLighter extends CrystalBase { | ||
|
||
public CrystalLighter() { | ||
super("lighter"); | ||
setContainerItem(this); | ||
} | ||
|
||
} |
11 changes: 6 additions & 5 deletions
11
...timatools/items/crystals/CrystalGray.java → ...ems/crystals/casual/CrystalOreBetter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,22 @@ | ||
package de.melanx.ultimatools.items.crystals; | ||
package de.melanx.ultimatools.items.crystals.casual; | ||
|
||
import de.melanx.ultimatools.util.ToolUtil; | ||
import de.melanx.ultimatools.items.crystals.CrystalBase; | ||
import de.melanx.ultimatools.util.ChangeBlocks; | ||
import net.minecraft.entity.player.EntityPlayer; | ||
import net.minecraft.util.EnumActionResult; | ||
import net.minecraft.util.EnumFacing; | ||
import net.minecraft.util.EnumHand; | ||
import net.minecraft.util.math.BlockPos; | ||
import net.minecraft.world.World; | ||
|
||
public class CrystalGray extends CrystalBase { | ||
public class CrystalOreBetter extends CrystalBase { | ||
|
||
public CrystalGray() { | ||
public CrystalOreBetter() { | ||
super("ore_better"); | ||
} | ||
|
||
public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { | ||
return ToolUtil.upgradeOre(player, worldIn, pos, hand); | ||
return ChangeBlocks.upgradeOre(player, worldIn, pos, hand); | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.