diff options
Diffstat (limited to 'src')
6 files changed, 21 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index fe28c237e5..25957078aa 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -1519,6 +1519,7 @@ public enum ItemList implements IItemContainer { IndustrialApiary_Upgrade_SKY, IndustrialApiary_Upgrade_HEATER, IndustrialApiary_Upgrade_SIEVE, + IndustrialApiary_Upgrade_UNLIGHT, Neutron_Reflector, diff --git a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java index b95fe437d3..4a89345670 100644 --- a/src/main/java/gregtech/api/util/GT_ApiaryModifier.java +++ b/src/main/java/gregtech/api/util/GT_ApiaryModifier.java @@ -12,6 +12,7 @@ public class GT_ApiaryModifier { public float geneticDecay = 1f; public boolean isSealed = false; public boolean isSelfLighted = false; + public boolean isSelfUnlighted = false; public boolean isSunlightSimulated = false; public boolean isAutomated = false; public boolean isCollectingPollen = false; diff --git a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java index d9f3040dd2..f64f7e6a78 100644 --- a/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java +++ b/src/main/java/gregtech/api/util/GT_ApiaryUpgrade.java @@ -108,6 +108,10 @@ public enum GT_ApiaryUpgrade { sieve(UNIQUE_INDEX.SIEVE_UPGRADE, 32229, 1, (mods, n) -> { mods.isCollectingPollen = true; mods.energy *= 1.05f; + }), + unlight(UNIQUE_INDEX.LIGHT_UPGRADE, 32231, 1, (mods, n) -> { + mods.isSelfUnlighted = true; + mods.energy *= 1.05f; }),; private enum UNIQUE_INDEX { @@ -115,7 +119,7 @@ public enum GT_ApiaryUpgrade { SPEED_UPGRADE, PRODUCTION_UPGRADE, PLAINS_UPGRADE, - LIGHT_UPGRADE, + LIGHT_UPGRADE, // also unlight FLOWERING_UPGRADE, WINTER_UPGRADE, DRYER_UPGRADE, diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java index 8e1d53f348..79c9ccc164 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java @@ -854,6 +854,12 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { "Sieve Upgrade", "Sieve upgrade for Industrial Apiary/n Maximum Installed: 1/n * Pollen Collection/n * Energy Consumption +25%", OrePrefixes.apiaryUpgrade.name())); + ItemList.IndustrialApiary_Upgrade_UNLIGHT.set( + addItem( + tLastID = 231, + "Night Upgrade", + "Night upgrade for Industrial Apiary/n Maximum Installed: 1/n * Internal Darkness/n * Energy Consumption +5%", + OrePrefixes.apiaryUpgrade.name())); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_1.get(1L)); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_Acceleration_2.get(1L)); @@ -885,6 +891,7 @@ public class GT_MetaGenerated_Item_03 extends GT_MetaGenerated_Item_X32 { OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SKY.get(1L)); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_HEATER.get(1L)); OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_SIEVE.get(1L)); + OrePrefixes.apiaryUpgrade.add(ItemList.IndustrialApiary_Upgrade_UNLIGHT.get(1L)); ItemList.NuclearStar.set( addItem( diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java index 67d008c60b..d9dc75822d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_IndustrialApiary.java @@ -894,6 +894,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM private float energyMod = 1f; private boolean sealedMod = false; private boolean selfLightedMod = false; + private boolean selfUnlightedMod = false; private boolean sunlightSimulatedMod = false; private BiomeGenBase biomeOverride = null; private float humidityMod = 0f; @@ -922,6 +923,7 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM energyMod = mods.energy; sealedMod = mods.isSealed; selfLightedMod = mods.isSelfLighted; + selfUnlightedMod = mods.isSelfUnlighted; sunlightSimulatedMod = mods.isSunlightSimulated; biomeOverride = mods.biomeOverride; humidityMod = mods.humidity; @@ -979,6 +981,11 @@ public class GT_MetaTileEntity_IndustrialApiary extends GT_MetaTileEntity_BasicM } @Override + public boolean isSelfUnlighted() { + return selfUnlightedMod; + } + + @Override public boolean isSunlightSimulated() { return sunlightSimulatedMod; } diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/231.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/231.png Binary files differnew file mode 100644 index 0000000000..bb4b031de4 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/231.png |
