mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-19 19:59:36 +00:00
Use GTNHLib method over vanilla one
Also switch to shorts, matching Minecraft
This commit is contained in:
1 parent
3fa2240e61
commit
cf57347284
2 files changed
+15
-11
No files matched your search
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:Baubles-Expanded:2.2.14-GTNH:dev')
|
||||
api('com.github.GTNewHorizons:GTNHLib:0.9.62:dev')
|
||||
api('com.github.GTNewHorizons:GTNHLib:99.0.0:dev')
|
||||
|
||||
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.60:api') {transitive=false}
|
||||
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.10:dev') {transitive=false}
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
*/
|
||||
package vazkii.botania.common.block.tile;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.item.ItemStackNBT;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
@@ -277,10 +278,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
|
||||
break;
|
||||
}
|
||||
case 3 : { // Enchant
|
||||
if(stageTicks >= 100) {
|
||||
for(EnchantmentData data : enchants)
|
||||
if(EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0)
|
||||
itemToEnchant.addEnchantment(Enchantment.enchantmentsList[data.enchant], data.level);
|
||||
if (stageTicks >= 100) {
|
||||
for (EnchantmentData data : enchants)
|
||||
if (EnchantmentHelper.getEnchantmentLevel(data.enchant, itemToEnchant) == 0) {
|
||||
ItemStackNBT.enchant(itemToEnchant, data.enchant, data.level);
|
||||
}
|
||||
|
||||
enchants.clear();
|
||||
manaRequired = -1;
|
||||
@@ -388,12 +390,14 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
|
||||
|
||||
enchants.clear();
|
||||
String enchStr = cmp.getString(TAG_ENCHANTS);
|
||||
if(!enchStr.isEmpty()) {
|
||||
if (!enchStr.isEmpty()) {
|
||||
String[] enchTokens = enchStr.split(",");
|
||||
for(String token : enchTokens) {
|
||||
for (String token : enchTokens) {
|
||||
String[] entryTokens = token.split(":");
|
||||
int id = Integer.parseInt(entryTokens[0]);
|
||||
int lvl = Integer.parseInt(entryTokens[1]);
|
||||
short id = Short.parseShort(entryTokens[0]);
|
||||
short lvl = Short.parseShort(entryTokens[1]);
|
||||
|
||||
// Normally, I'd prefer writing these a
|
||||
enchants.add(new EnchantmentData(id, lvl));
|
||||
}
|
||||
}
|
||||
@@ -479,9 +483,9 @@ public class TileEnchanter extends TileMod implements ISparkAttachable {
|
||||
|
||||
private static class EnchantmentData {
|
||||
|
||||
public int enchant, level;
|
||||
public short enchant, level;
|
||||
|
||||
public EnchantmentData(int enchant, int level) {
|
||||
public EnchantmentData(short enchant, short level) {
|
||||
this.enchant = enchant;
|
||||
this.level = level;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user