Compare commits

...
8 Commits
Author SHA1 Message Date
boubou19 53d085d292 Cache more enum .values() (#67) 2026-08-11 02:54:09 +02:00
boubou19 4345981958 Cache enum .values() (#66) 2026-08-10 21:01:38 +02:00
__felix__andgithub-actions[bot] 1dd3f7342e fix gt loader check (#64)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-07-29 11:53:40 -04:00
Eldrinn-Elantey f88d1f8c96 Fix magic apiary GUI bypassing claim protection (#63) 2026-05-04 16:39:06 +02:00
Ranzu 59aa1ce79c Fix gui crop and localize Inventory title (#61) 2026-04-13 19:24:25 +02:00
Ranzu d571f64b14 Un-hide Hives (#62) 2026-04-13 17:32:48 +02:00
Martin Robertz f3cf6407cf update+gradle+deps+bs 2026-03-10 20:03:01 +01:00
EricC808andMartin Robertz e3460d5dbc Clarified tool tip for each blood frame to reflect actual use (#58)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
2026-03-09 23:32:27 -04:00
27 changed files with 103 additions and 78 deletions

No files matched your search

+6 -6
View File
@@ -1,14 +1,14 @@
// Add your dependencies here
dependencies {
api('com.github.GTNewHorizons:ForestryMC:4.11.7:dev')
api('com.github.GTNewHorizons:ForestryMC:4.11.8:dev')
compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.12:dev')
compileOnly('com.github.GTNewHorizons:BloodMagic:1.8.14:dev')
compileOnly('com.github.GTNewHorizons:ThaumicHorizons:1.8.11:dev')
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.9-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Botania:1.13.15-GTNH:api') {transitive = false}
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:Botania:1.13.16-GTNH:api') {transitive = false}
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.331:dev')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.31-GTNH:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.347:dev')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.34-GTNH:dev')
}
+10 -10
View File
@@ -1,12 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d6690dfd71c4c91e08577437b5b2beb0/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/0ef34dd9312b12d61ba1b8e66126d140/redirect
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/cd495626d2ee49a75447e3fdc6afb287/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3689d0bcdd77ac01674ba3c9dbbe94d0/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
toolchainVersion=25
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+1 -1
View File
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.21'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.24'
}
@@ -19,7 +19,7 @@ public class BeeGenomeManager {
// Basic genome for All thaumic bees.
private static IAllele[] getTemplateModBase() {
IAllele[] genome = new IAllele[EnumBeeChromosome.values().length];
IAllele[] genome = new IAllele[EnumBeeChromosome.VALUES.length];
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.MYSTICAL.getSpecies();
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlowest");
@@ -261,11 +261,11 @@ public class BeeProductHelper {
}
public static void initOreDictSProducts() {
boolean isGTLoaded = Config.isGTNHCoreModLoaded;
boolean isGTNHCoreModLoaded = Config.isGTNHCoreModLoaded;
SILVER.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetSilver").size() > 0) {
SILVER.addSpecialty(
isGTLoaded ? Materials.Silver.getNuggets(1) : OreDictionary.getOres("nuggetSilver").get(0),
isGTNHCoreModLoaded ? Materials.Silver.getNuggets(1) : OreDictionary.getOres("nuggetSilver").get(0),
0.16f);
} else {
SILVER.setInactive();
@@ -274,7 +274,7 @@ public class BeeProductHelper {
LEAD.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetLead").size() > 0) {
LEAD.addSpecialty(
isGTLoaded ? Materials.Lead.getNuggets(1) : OreDictionary.getOres("nuggetLead").get(0),
isGTNHCoreModLoaded ? Materials.Lead.getNuggets(1) : OreDictionary.getOres("nuggetLead").get(0),
0.17f);
} else {
LEAD.setInactive();
@@ -291,7 +291,8 @@ public class BeeProductHelper {
TE_PLATINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetPlatinum").size() > 0) {
TE_PLATINUM.addSpecialty(
isGTLoaded ? Materials.Platinum.getNuggets(1) : OreDictionary.getOres("nuggetPlatinum").get(0),
isGTNHCoreModLoaded ? Materials.Platinum.getNuggets(1)
: OreDictionary.getOres("nuggetPlatinum").get(0),
0.18f);
} else {
TE_PLATINUM.setInactive();
@@ -300,7 +301,7 @@ public class BeeProductHelper {
TE_NICKEL.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetNickel").size() > 0) {
TE_NICKEL.addSpecialty(
isGTLoaded ? Materials.Nickel.getNuggets(1) : OreDictionary.getOres("nuggetNickel").get(0),
isGTNHCoreModLoaded ? Materials.Nickel.getNuggets(1) : OreDictionary.getOres("nuggetNickel").get(0),
0.18f);
} else {
TE_NICKEL.setInactive();
@@ -309,7 +310,7 @@ public class BeeProductHelper {
ARDITE.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetArdite").size() > 0) {
ARDITE.addSpecialty(
isGTLoaded ? Materials.Ardite.getNuggets(1) : OreDictionary.getOres("nuggetArdite").get(0),
isGTNHCoreModLoaded ? Materials.Ardite.getNuggets(1) : OreDictionary.getOres("nuggetArdite").get(0),
0.18f);
} else {
ARDITE.setInactive();
@@ -318,7 +319,7 @@ public class BeeProductHelper {
COBALT.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetCobalt").size() > 0) {
COBALT.addSpecialty(
isGTLoaded ? Materials.Cobalt.getNuggets(1) : OreDictionary.getOres("nuggetCobalt").get(0),
isGTNHCoreModLoaded ? Materials.Cobalt.getNuggets(1) : OreDictionary.getOres("nuggetCobalt").get(0),
0.18f);
} else {
COBALT.setInactive();
@@ -327,7 +328,7 @@ public class BeeProductHelper {
TE_BRONZE.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetBronze").size() > 0) {
TE_BRONZE.addSpecialty(
isGTLoaded ? Materials.Bronze.getNuggets(1) : OreDictionary.getOres("nuggetBronze").get(0),
isGTNHCoreModLoaded ? Materials.Bronze.getNuggets(1) : OreDictionary.getOres("nuggetBronze").get(0),
0.18f);
} else {
TE_BRONZE.setInactive();
@@ -336,7 +337,7 @@ public class BeeProductHelper {
TE_INVAR.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetInvar").size() > 0) {
TE_INVAR.addSpecialty(
isGTLoaded ? Materials.Invar.getNuggets(1) : OreDictionary.getOres("nuggetInvar").get(0),
isGTNHCoreModLoaded ? Materials.Invar.getNuggets(1) : OreDictionary.getOres("nuggetInvar").get(0),
0.18f);
} else {
TE_INVAR.setInactive();
@@ -345,7 +346,8 @@ public class BeeProductHelper {
TE_ELECTRUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetElectrum").size() > 0) {
TE_ELECTRUM.addSpecialty(
isGTLoaded ? Materials.Electrum.getNuggets(1) : OreDictionary.getOres("nuggetElectrum").get(0),
isGTNHCoreModLoaded ? Materials.Electrum.getNuggets(1)
: OreDictionary.getOres("nuggetElectrum").get(0),
0.18f);
} else {
TE_ELECTRUM.setInactive();
@@ -354,7 +356,8 @@ public class BeeProductHelper {
MANYULLYN.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
if (OreDictionary.getOres("nuggetManyullyn").size() > 0) {
MANYULLYN.addSpecialty(
isGTLoaded ? Materials.Manyullyn.getNuggets(1) : OreDictionary.getOres("nuggetManyullyn").get(0),
isGTNHCoreModLoaded ? Materials.Manyullyn.getNuggets(1)
: OreDictionary.getOres("nuggetManyullyn").get(0),
0.18f);
} else {
MANYULLYN.setInactive();
@@ -36,7 +36,9 @@ public class BlockEffectJar extends BlockContainer {
boolean activate = false;
if (!player.isSneaking()) {
player.openGui(MagicBees.object, UIScreens.EFFECT_JAR.ordinal(), world, x, y, z);
if (!world.isRemote) {
player.openGui(MagicBees.object, UIScreens.EFFECT_JAR.ordinal(), world, x, y, z);
}
activate = true;
}
+3 -3
View File
@@ -43,7 +43,7 @@ public class BlockHive extends Block {
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z) {
int meta = world.getBlockMetadata(x, y, z);
if (meta < 0 || meta > HiveType.values().length) {
if (meta < 0 || meta > HiveType.VALUES.length) {
meta = 0;
}
return HiveType.getHiveFromMeta(meta).getLightValue();
@@ -54,7 +54,7 @@ public class BlockHive extends Block {
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List itemsList) {
// Java bitches about raw types & types not being checked. Sorry, but the API sucks.
for (HiveType type : HiveType.values()) {
for (HiveType type : HiveType.VALUES) {
if (type.show || Config.forestryDebugEnabled) {
itemsList.add(new ItemStack(this, 1, type.ordinal()));
}
@@ -75,7 +75,7 @@ public class BlockHive extends Block {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
if (meta < 0 || meta > HiveType.values().length) {
if (meta < 0 || meta > HiveType.VALUES.length) {
meta = 0;
}
return HiveType.getHiveFromMeta(meta).getIconForSide(side);
@@ -40,7 +40,9 @@ public class BlockMagicApiary extends BlockContainer {
boolean activate = false;
if (!player.isSneaking()) {
player.openGui(MagicBees.object, UIScreens.THAUMIC_APIARY.ordinal(), world, x, y, z);
if (!world.isRemote) {
player.openGui(MagicBees.object, UIScreens.THAUMIC_APIARY.ordinal(), world, x, y, z);
}
activate = true;
}
@@ -25,9 +25,11 @@ public enum HiveType {
CURIOUS("curious", BeeSpecies.MYSTICAL, 12, true),
UNUSUAL("unusual", BeeSpecies.UNUSUAL, 12, true),
RESONANT("resonant", BeeSpecies.SORCEROUS, 12, true),
DEEP("deep", BeeSpecies.ATTUNED, 4, false),
INFERNAL("infernal", BeeSpecies.INFERNAL, 15, false),
OBLIVION("oblivion", BeeSpecies.OBLIVION, 7, false),;
DEEP("deep", BeeSpecies.ATTUNED, 4, true),
INFERNAL("infernal", BeeSpecies.INFERNAL, 15, true),
OBLIVION("oblivion", BeeSpecies.OBLIVION, 7, true),;
public static final HiveType[] VALUES = values();
private static String[] nameList;
@@ -43,8 +45,8 @@ public enum HiveType {
public static HiveType getHiveFromMeta(int meta) {
HiveType type = CURIOUS;
if (meta > 0 && meta < HiveType.values().length) {
type = HiveType.values()[meta];
if (meta > 0 && meta < HiveType.VALUES.length) {
type = HiveType.VALUES[meta];
}
return type;
@@ -96,7 +98,7 @@ public enum HiveType {
@SideOnly(Side.CLIENT)
public static void registerIcons(IIconRegister register) {
for (HiveType type : HiveType.values()) {
for (HiveType type : HiveType.VALUES) {
type.icons = new IIcon[2];
type.icons[0] = register.registerIcon(CommonProxy.DOMAIN + ":beehive." + type.ordinal() + ".top");
@@ -167,9 +169,9 @@ public enum HiveType {
}
private static String[] generateNames() {
String[] names = new String[values().length];
String[] names = new String[VALUES.length];
for (int i = 0; i < names.length; ++i) {
names[i] = values()[i].name;
names[i] = VALUES[i].name;
}
return names;
}
@@ -3,6 +3,7 @@ package magicbees.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
@@ -36,7 +37,7 @@ public class GUIEffectJar extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
fontRendererObj.drawString("Inventory", 9, 63, 0);
fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 9, 63, 0);
}
@Override
@@ -4,6 +4,7 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11;
@@ -20,7 +21,7 @@ public class GuiMagicApiary extends GuiContainer {
CommonProxy.GUI_TEXTURE + "apiary.png");
private static final int WIDTH = 176;
private static final int HEIGHT = 190;
private static final int HEIGHT = 192;
private static final int LIFEBAR_WIDTH = 2;
private static final int LIFEBAR_HEIGHT = 46;
@@ -67,7 +68,7 @@ public class GuiMagicApiary extends GuiContainer {
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
fontRendererObj.drawString("Inventory", 9, 99, 0);
fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 9, 99, 0);
}
@Override
+5 -5
View File
@@ -37,7 +37,7 @@ public class ItemDrop extends Item {
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (DropType type : DropType.values()) {
for (DropType type : DropType.VALUES) {
list.add(this.getStackForType(type));
}
}
@@ -70,11 +70,11 @@ public class ItemDrop extends Item {
@Override
@SideOnly(Side.CLIENT)
public int getColorFromItemStack(ItemStack stack, int pass) {
int meta = Math.max(0, Math.min(DropType.values().length - 1, stack.getItemDamage()));
int colour = DropType.values()[meta].combColour[0];
int meta = Math.max(0, Math.min(DropType.VALUES.length - 1, stack.getItemDamage()));
int colour = DropType.VALUES[meta].combColour[0];
if (pass >= 1) {
colour = DropType.values()[meta].combColour[1];
colour = DropType.VALUES[meta].combColour[1];
}
return colour;
@@ -82,6 +82,6 @@ public class ItemDrop extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return DropType.values()[stack.getItemDamage()].getName();
return DropType.VALUES[stack.getItemDamage()].getName();
}
}
+6 -6
View File
@@ -37,7 +37,7 @@ public class ItemNugget extends Item {
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tab, List list) {
for (NuggetType type : NuggetType.values()) {
for (NuggetType type : NuggetType.VALUES) {
if (type.isActive()) {
list.add(new ItemStack(item, 1, type.ordinal()));
}
@@ -46,12 +46,12 @@ public class ItemNugget extends Item {
@SideOnly(Side.CLIENT)
public void registerIcons(IIconRegister par1IconRegister) {
this.icons = new IIcon[NuggetType.values().length];
for (int i = 0; i < NuggetType.values().length; i++) {
this.icons = new IIcon[NuggetType.VALUES.length];
for (int i = 0; i < NuggetType.VALUES.length; i++) {
this.icons[i] = par1IconRegister.registerIcon(
CommonProxy.DOMAIN + ":nugget"
+ NuggetType.values()[i].name().substring(0, 1)
+ NuggetType.values()[i].name().substring(1).toLowerCase());
+ NuggetType.VALUES[i].name().substring(0, 1)
+ NuggetType.VALUES[i].name().substring(1).toLowerCase());
}
}
@@ -63,6 +63,6 @@ public class ItemNugget extends Item {
@Override
public String getItemStackDisplayName(ItemStack stack) {
return NuggetType.values()[stack.getItemDamage()].getName();
return NuggetType.VALUES[stack.getItemDamage()].getName();
}
}
@@ -36,7 +36,7 @@ public class ItemPropolis extends Item {
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (PropolisType type : PropolisType.values()) {
for (PropolisType type : PropolisType.VALUES) {
list.add(this.getStackForType(type));
}
}
@@ -50,14 +50,14 @@ public class ItemPropolis extends Item {
public int getColorFromItemStack(ItemStack stack, int pass) {
int colour = 0xffffff;
int meta = stack.getItemDamage();
if (meta >= 0 && meta < PropolisType.values().length) {
colour = PropolisType.values()[meta].colour;
if (meta >= 0 && meta < PropolisType.VALUES.length) {
colour = PropolisType.VALUES[meta].colour;
}
return colour;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return PropolisType.values()[stack.getItemDamage()].getName();
return PropolisType.VALUES[stack.getItemDamage()].getName();
}
}
+5 -5
View File
@@ -45,14 +45,14 @@ public class ItemWax extends Item {
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconFromDamage(int meta) {
return (WaxType.values()[meta].sparkly) ? this.itemIcon : this.secondaryIcon;
return (WaxType.VALUES[meta].sparkly) ? this.itemIcon : this.secondaryIcon;
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "unchecked", "rawtypes" })
public void getSubItems(Item item, CreativeTabs tabs, List list) {
for (WaxType type : WaxType.values()) {
for (WaxType type : WaxType.VALUES) {
list.add(this.getStackForType(type));
}
}
@@ -62,14 +62,14 @@ public class ItemWax extends Item {
public int getColorFromItemStack(ItemStack stack, int pass) {
int colour = 0xffffff;
int meta = stack.getItemDamage();
if (meta >= 0 && meta < WaxType.values().length) {
colour = WaxType.values()[meta].colour;
if (meta >= 0 && meta < WaxType.VALUES.length) {
colour = WaxType.VALUES[meta].colour;
}
return colour;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
return WaxType.values()[stack.getItemDamage()].getName();
return WaxType.VALUES[stack.getItemDamage()].getName();
}
}
@@ -11,7 +11,9 @@ public enum DropType {
LUX("lux", 0xF5F3A4, 0xC9C87D),
ENDEARING("endearing", 0x12E3D9, 0x069E97),;
private DropType(String pName, int colourA, int colourB) {
public static final DropType[] VALUES = values();
DropType(String pName, int colourA, int colourB) {
this.name = pName;
this.combColour[0] = colourA;
this.combColour[1] = colourB;
@@ -15,6 +15,8 @@ public enum NuggetType {
EMERALD,
APATITE,;
public static final NuggetType[] VALUES = values();
private Item targetIngot;
private boolean active;
@@ -13,7 +13,9 @@ public enum PropolisType {
ORDER("dull", 0xDDDDFF),
CHAOS("magic", 0x555577),;
private PropolisType(String pName, int overlayColour) {
public static final PropolisType[] VALUES = values();
PropolisType(String pName, int overlayColour) {
this.name = pName;
this.colour = overlayColour;
}
@@ -8,7 +8,9 @@ public enum WaxType {
SOUL("soul", false, 0x967C63),
AMNESIC("amnesic", true, 0x856DFF);
private WaxType(String n, boolean sp, int c) {
public static final WaxType[] VALUES = values();
WaxType(String n, boolean sp, int c) {
this.name = n;
this.sparkly = sp;
this.colour = c;
+3 -3
View File
@@ -165,7 +165,7 @@ public class Config {
public static Configuration configuration;
// ---- Loaded mods -----------------------------------------
public static boolean isGTLoaded = Loader.isModLoaded("gregtech");
public static boolean isGT5uNHLoaded = Loader.isModLoaded("gregtech_nh");
public static boolean isGTNHCoreModLoaded = Loader.isModLoaded("gregtech") && Loader.isModLoaded("dreamcraft");
public static boolean isThaumicEnergisticsLoaded = Loader.isModLoaded("thaumicenergistics");
@@ -442,7 +442,7 @@ public class Config {
hive = new BlockHive();
GameRegistry.registerBlock(hive, ItemMagicHive.class, "hive");
for (HiveType t : HiveType.values()) {
for (HiveType t : HiveType.VALUES) {
hive.setHarvestLevel("scoop", 0, t.ordinal());
}
}
@@ -462,7 +462,7 @@ public class Config {
private void setupNuggets() {
nuggets = new ItemNugget();
String item;
for (NuggetType type : NuggetType.values()) {
for (NuggetType type : NuggetType.VALUES) {
LogHelper.info("Found nugget of type " + type.toString());
item = type.toString().toLowerCase();
item = Character.toString(item.charAt(0)).toUpperCase() + item.substring(1);
@@ -90,8 +90,8 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame {
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(StatCollector.translateToLocal("You feel gross touching this"));
par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle"));
par3List.add(StatCollector.translateToLocal("tooltip.bloodBaseFrame.desc"));
par3List.add(StatCollector.translateToLocalFormatted("tooltip.bloodFrame.cost", energyUsed));
if (par1ItemStack.hasTagCompound()) {
par3List.add(
@@ -91,7 +91,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame {
@SuppressWarnings({ "unchecked", "rawtypes" })
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(StatCollector.translateToLocal("tooltip.bloodframe.desc"));
par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle"));
par3List.add(StatCollector.translateToLocalFormatted("tooltip.bloodFrame.cost", energyUsed));
if (par1ItemStack.hasTagCompound()) {
par3List.add(
@@ -90,8 +90,8 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame {
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) {
par3List.add(StatCollector.translateToLocal("MAY CHAOS TAKE THE WORLD"));
par3List.add(StatCollector.translateToLocal("Uses " + String.valueOf(energyUsed) + " LP per cycle"));
par3List.add(StatCollector.translateToLocal("tooltip.FrenziedFlame.desc"));
par3List.add(StatCollector.translateToLocalFormatted("tooltip.bloodFrame.cost", energyUsed));
if (par1ItemStack.hasTagCompound()) {
par3List.add(
@@ -158,6 +158,12 @@ item.bloodFrame.name=Sanguis Artus
item.frenziedFrame.name=Maddening Frame of Frenzy
item.bloodSoakedFrame.name=Blood Frame
#Tooltips
tooltip.bloodBaseFrame.desc=You feel gross touching this
tooltip.bloodFrame.desc=Stirs Bees into a frenzy
tooltip.FrenziedFlame.desc=MAY CHAOS TAKE THE WORLD
tooltip.bloodFrame.cost=Uses %d LP per bee tick
#Capsules
item.capsule.magic.name=Magic Capsule
capsule.magic=%s Magic Capsule