diff options
13 files changed, 85 insertions, 75 deletions
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java index cfdc0724cc..2ec4ffabb1 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -3,6 +3,7 @@ package com.github.technus.tectech.recipe; import static com.google.common.math.LongMath.pow; import static gregtech.api.util.GT_Utility.getPlasmaFuelValueInEUPerLiterFromMaterial; +import com.github.technus.tectech.util.ItemStackLong; import gregtech.api.enums.Materials; import java.util.*; import java.util.stream.Collectors; @@ -16,7 +17,7 @@ import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; public class EyeOfHarmonyRecipe { - private final List<Pair<ItemStack, Long>> outputItems; + private final List<ItemStackLong> outputItems; private final FluidStack[] outputFluids; private final long hydrogenRequirement; @@ -41,6 +42,7 @@ public class EyeOfHarmonyRecipe { long spacetimeCasingTierRequired, long euOutput, double baseSuccessChance) { + // 6 * 64 = 6 stacks/second for VM tier 3 + Og gas. ArrayList<Pair<Materials, Long>> materialList = processDimension(normalOreDimensionWrapper, smallOreDimensionWrapper, miningTimeSeconds, 6 * 64); @@ -65,12 +67,12 @@ public class EyeOfHarmonyRecipe { this.miningTimeSeconds = miningTimeSeconds; } - public List<Pair<ItemStack, Long>> getOutputItems() { + public List<ItemStackLong> getOutputItems() { return outputItems; } public FluidStack[] getOutputFluids() { - return outputFluids.clone(); + return outputFluids; } public long getHydrogenRequirement() { @@ -177,14 +179,14 @@ public class EyeOfHarmonyRecipe { return plasmaList.toArray(new FluidStack[0]); } - static ArrayList<Pair<ItemStack, Long>> validDustGenerator(final ArrayList<Pair<Materials, Long>> planetList) { + static ArrayList<ItemStackLong> validDustGenerator(final ArrayList<Pair<Materials, Long>> planetList) { - ArrayList<Pair<ItemStack, Long>> dustList = new ArrayList<>(); + ArrayList<ItemStackLong> dustList = new ArrayList<>(); for (Pair<Materials, Long> pair : planetList) { ItemStack dust = pair.getLeft().getDust(1); if (dust != null) { - dustList.add(Pair.of(dust, pair.getRight())); + dustList.add(new ItemStackLong(dust, pair.getRight())); } } return dustList; diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java index bfe88bdb93..1fc7db7821 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.recipe; +import com.google.common.math.LongMath; import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -11,12 +12,7 @@ import pers.gwyog.gtneioreplugin.util.GT5OreSmallHelper; public class EyeOfHarmonyRecipeStorage { - // static final long MILLION = LongMath.pow(10, 6); - // static final long BILLION = LongMath.pow(10, 9); - // static final long TRILLION = LongMath.pow(10, 12); - // static final long QUADRILLION = LongMath.pow(10, 15); - // static final long QUINTILLION = LongMath.pow(10, 18); - // static final long SEXTILLION = LongMath.pow(10, 21); + private static final long BILLION = LongMath.pow(10, 9); // Map is unique so this is fine. HashMap<Block, String> blocksMapInverted = new HashMap<Block, String>() { @@ -30,7 +26,8 @@ public class EyeOfHarmonyRecipeStorage { private final HashMap<String, EyeOfHarmonyRecipe> recipeHashMap = new HashMap<String, EyeOfHarmonyRecipe>() { { for (String dimAbbreviation : DimensionHelper.DimNameDisplayed) { - BlockDimensionDisplay blockDimensionDisplay = (BlockDimensionDisplay) ModBlocks.blocks.get(dimAbbreviation); + BlockDimensionDisplay blockDimensionDisplay = + (BlockDimensionDisplay) ModBlocks.blocks.get(dimAbbreviation); try { put( @@ -39,15 +36,20 @@ public class EyeOfHarmonyRecipeStorage { GT5OreLayerHelper.dimToOreWrapper.get(dimAbbreviation), GT5OreSmallHelper.dimToSmallOreWrapper.get(dimAbbreviation), 0.5 + blockDimensionDisplay.getDimensionRocketTier() / 10.0, - 1_000_000_000L * (blockDimensionDisplay.getDimensionRocketTier() + 1), - 1_000_000_000L * (blockDimensionDisplay.getDimensionRocketTier() + 1), + 100, + 100, // todo: DEBUG ONLY + // BILLION * + // (blockDimensionDisplay.getDimensionRocketTier() + 1), + // BILLION * + // (blockDimensionDisplay.getDimensionRocketTier() + 1), 36_000L, blockDimensionDisplay.getDimensionRocketTier(), 0, 1.0 - blockDimensionDisplay.getDimensionRocketTier() / 10.0)); } catch (Exception e) { e.printStackTrace(); - System.out.println(dimAbbreviation + " dimension not found in dimToOreWrapper"); + System.out.println( + dimAbbreviation + " dimension not found in dimToOreWrapper. Report error to GTNH team."); } } } @@ -57,13 +59,4 @@ public class EyeOfHarmonyRecipeStorage { String dimAbbreviation = blocksMapInverted.get(Block.getBlockFromItem(aStack.getItem())); return recipeHashMap.get(dimAbbreviation); } - - // public EyeOfHarmonyRecipe overworld = new EyeOfHarmonyRecipe(dimToOreWrapper.get("Ow"), - // 1.0, - // 100, - // 100, - // 36_000L, - // 0, - // 100 * 10, - // 0.4); } diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java index 538f296b95..effb946ba1 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -423,7 +423,6 @@ public enum CustomItemList implements IItemContainer { StabilisationFieldGeneratorTier7, StabilisationFieldGeneratorTier8; - private ItemStack mStack; private boolean mHasNotBeenSet = true; diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java index 2de2847a9c..a2b61b08bd 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsBA0.java @@ -30,8 +30,8 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { case 3: // "EV Superconductor Primary Tesla Windings" case 4: // "IV Superconductor Primary Tesla Windings" case 5: // "LuV Superconductor Primary Tesla Windings" - aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[aStack.getItemDamage() + 1]) - + " EU/t"); // Handles up to + aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + + formatNumbers(V[aStack.getItemDamage() + 1]) + " EU/t"); // Handles up to aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another calls the @@ -56,7 +56,8 @@ public class GT_Item_CasingsBA0 extends GT_Item_Casings_Abstract { + translateToLocal("gt.blockcasingsBA0.8.desc.1")); // Who wouldn't want a 32k epoxy multi? break; case 9: // "ZPM Superconductor Primary Tesla Windings" - aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[7]) + " EU/t"); // Handles up to + aList.add(translateToLocal("gt.blockcasingsBA0.0.desc.0") + " " + formatNumbers(V[7]) + + " EU/t"); // Handles up to aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockcasingsBA0.0.desc.1")); // What one man calls God, another calls the diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java index e1f16db3f9..dd7c6e5469 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Spacetime.java @@ -28,9 +28,10 @@ public class GT_Item_Casings_Spacetime extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add("Supports an internal spacetime volume of up to " + formatNumbers(pow(10, 5+aStack.getItemDamage())) + "km³."); - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD + "Capable of running recipes up to tier " + aStack.getItemDamage()); + aList.add("Supports an internal spacetime volume of up to " + + formatNumbers(pow(10, 5 + aStack.getItemDamage())) + "km³."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + "Capable of running recipes up to tier " + aStack.getItemDamage()); break; default: aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java index 6bee8ef2e9..2a97851788 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_Stabilisation.java @@ -1,17 +1,14 @@ package com.github.technus.tectech.thing.casing; +import static gregtech.api.enums.GT_Values.AuthorColen; + import gregtech.common.blocks.GT_Item_Casings_Abstract; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import java.util.List; - -import static com.google.common.math.LongMath.pow; -import static gregtech.api.enums.GT_Values.AuthorColen; -import static gregtech.api.util.GT_Utility.formatNumbers; - public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { public GT_Item_Casings_Stabilisation(Block par1) { super(par1); @@ -29,8 +26,8 @@ public class GT_Item_Casings_Stabilisation extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD + "Increases stability of spacetime field."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + + "Increases stability of spacetime field."); break; default: aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java index 696e5470de..69740d0516 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_Casings_TimeAcceleration.java @@ -1,15 +1,14 @@ package com.github.technus.tectech.thing.casing; +import static gregtech.api.enums.GT_Values.AuthorColen; + import gregtech.common.blocks.GT_Item_Casings_Abstract; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import java.util.List; - -import static gregtech.api.enums.GT_Values.AuthorColen; - public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { public GT_Item_Casings_TimeAcceleration(Block par1) { super(par1); @@ -27,9 +26,7 @@ public class GT_Item_Casings_TimeAcceleration extends GT_Item_Casings_Abstract { case 6: case 7: case 8: - aList.add(EnumChatFormatting.AQUA.toString() - + EnumChatFormatting.BOLD + - "Time dilation in a box."); + aList.add(EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + "Time dilation in a box."); break; default: aList.add(EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + "Error, report to GTNH team"); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java index 4b5afb6298..3ce8c755ed 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/SpacetimeCompressionFieldCasing.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - @SuppressWarnings("SpellCheckingInspection") public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { private static IIcon textureTier0; @@ -28,15 +27,19 @@ public class SpacetimeCompressionFieldCasing extends GT_Block_Casings_Abstract { private static final byte START_INDEX = 16; public SpacetimeCompressionFieldCasing() { - super(GT_Item_Casings_Spacetime.class, "gt.spacetime_compression_field_generator", GT_Material_Casings.INSTANCE); + super( + GT_Item_Casings_Spacetime.class, + "gt.spacetime_compression_field_generator", + GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } - for(int i = 0; i < maxBlockTier; i++) { + for (int i = 0; i < maxBlockTier; i++) { GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Spacetime Compression Field Generator"); + getUnlocalizedName() + "." + i + ".name", + EOH_TIER_FANCY_NAMES[i] + " Spacetime Compression Field Generator"); } CustomItemList.SpacetimeCompressionFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java index 43628df242..ec1af39d80 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/StabilisationFieldCasing.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - @SuppressWarnings("SpellCheckingInspection") public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { private static IIcon textureTier0; @@ -34,9 +33,10 @@ public class StabilisationFieldCasing extends GT_Block_Casings_Abstract { new GT_CopiedBlockTexture(this, 6, b); } - for(int i = 0; i < maxBlockTier; i++) { + for (int i = 0; i < maxBlockTier; i++) { GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Stabilisation Field Generator"); + getUnlocalizedName() + "." + i + ".name", + EOH_TIER_FANCY_NAMES[i] + " Stabilisation Field Generator"); } CustomItemList.StabilisationFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); diff --git a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java index cd2f0d5c44..6265084d5d 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/TimeAccelerationFieldCasing.java @@ -19,7 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - @SuppressWarnings("SpellCheckingInspection") public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { private static IIcon textureTier0; @@ -28,15 +27,19 @@ public class TimeAccelerationFieldCasing extends GT_Block_Casings_Abstract { private static final byte START_INDEX = 16; public TimeAccelerationFieldCasing() { - super(GT_Item_Casings_TimeAcceleration.class, "gt.time_acceleration_field_generator", GT_Material_Casings.INSTANCE); + super( + GT_Item_Casings_TimeAcceleration.class, + "gt.time_acceleration_field_generator", + GT_Material_Casings.INSTANCE); for (byte b = 0; b < 16; b = (byte) (b + 1)) { Textures.BlockIcons.casingTexturePages[texturePage][b + START_INDEX] = new GT_CopiedBlockTexture(this, 6, b); } - for(int i = 0; i < maxBlockTier; i++) { + for (int i = 0; i < maxBlockTier; i++) { GT_LanguageManager.addStringLocalization( - getUnlocalizedName() + "." + i + ".name", EOH_TIER_FANCY_NAMES[i] + " Time Dilation Field Generator"); + getUnlocalizedName() + "." + i + ".name", + EOH_TIER_FANCY_NAMES[i] + " Time Dilation Field Generator"); } CustomItemList.TimeAccelerationFieldGeneratorTier0.set(new ItemStack(this, 1, 0)); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index e34a944c8c..cdb02da345 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -17,6 +17,7 @@ import com.github.technus.tectech.thing.casing.TT_Block_TimeAccelerationFieldGen import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedExtendedFacingTexture; import com.github.technus.tectech.util.CommonValues; +import com.github.technus.tectech.util.ItemStackLong; import com.google.common.collect.ImmutableList; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -1356,7 +1357,6 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl TT_Block_TimeAccelerationFieldGenerators .TimeAccelerationFieldGenerator, 8)), - -1, (t, meta) -> t.timeAccelerationFieldMetadata = meta, t -> t.timeAccelerationFieldMetadata)) @@ -1387,7 +1387,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl // todo: make higher on final release. private static final long ticksBetweenHatchDrain = 20; - List<Pair<ItemStack, Long>> outputItems; + List<ItemStackLong> outputItems; private void calculateHydrogenHeliumInputExcessValues( long hydrogen_recipe_requirement, long helium_recipe_requirement) { @@ -1698,7 +1698,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl calculateHydrogenHeliumInputExcessValues( recipeObject.getHydrogenRequirement(), recipeObject.getHeliumRequirement()); - // DEBUG ! DELETE THESE TWO LINES: + // todo: DEBUG ! DELETE THESE TWO LINES: hydrogenOverflowProbabilityAdjustment = 0; heliumOverflowProbabilityAdjustment = 0; @@ -1716,23 +1716,22 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl double yield = recipeYieldCalculator(); - List<Pair<ItemStack, Long>> tmpItemsOutput = new ArrayList<>(); - FluidStack[] tmpFluidsOutput = recipeObject.getOutputFluids().clone(); + outputItems = new ArrayList<>(); + mOutputFluids = recipeObject.getOutputFluids().clone(); if (yield != 1.0) { // Iterate over item output list and apply yield values. - for (Pair<ItemStack, Long> pair : recipeObject.getOutputItems()) { - tmpItemsOutput.add(Pair.of(pair.getLeft(), (long) (pair.getRight() * yield))); + for (ItemStackLong itemStack : recipeObject.getOutputItems()) { + itemStack.stackSize *= yield; + outputItems.add(itemStack); } // Iterate over fluid output list and apply yield values. - for (FluidStack fluidStack : tmpFluidsOutput) { + for (FluidStack fluidStack : mOutputFluids) { fluidStack.amount *= yield; } } - outputItems = tmpItemsOutput; - mOutputFluids = tmpFluidsOutput; updateSlots(); recipeRunning = true; @@ -1761,8 +1760,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl addEUToGlobalEnergyMap(userUUID, euOutput); euOutput = 0; - for (Pair<ItemStack, Long> itemPair : outputItems) { - outputItemToAENetwork(itemPair.getLeft(), itemPair.getRight()); + for (ItemStackLong itemStack : outputItems) { + outputItemToAENetwork(itemStack.itemStack, itemStack.stackSize); } super.outputAfterRecipe_EM(); @@ -1785,7 +1784,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl userName = getBaseMetaTileEntity().getOwnerName(); strongCheckOrAddUser(userUUID, userName); - // Move into tick == 1 after debug. + // If no multi exists this will set the recipe storage. + // This must be done after game load otherwise it fails. if (recipes == null) { recipes = new EyeOfHarmonyRecipeStorage(); } diff --git a/src/main/java/com/github/technus/tectech/util/CommonValues.java b/src/main/java/com/github/technus/tectech/util/CommonValues.java index b057a115f8..a42ffa7f9b 100644 --- a/src/main/java/com/github/technus/tectech/util/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/util/CommonValues.java @@ -6,15 +6,13 @@ import net.minecraft.util.EnumChatFormatting; /** * Created by danie_000 on 11.01.2017. */ - @SuppressWarnings("SpellCheckingInspection") public final class CommonValues { public static final String TEC_MARK_SHORT = EnumChatFormatting.BLUE + "Tec" + EnumChatFormatting.DARK_BLUE + "Tech"; public static final String TEC_MARK_GENERAL = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Interdimensional"; public static final String TEC_MARK_EM = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Elemental Matter"; public static final String THETA_MOVEMENT = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Theta Movement"; - public static final String COSMIC_MARK = TEC_MARK_SHORT + EnumChatFormatting.BLUE - + ": Cosmic"; // TODO get a better name than cosmic for *UNDEFINED* thing + public static final String COSMIC_MARK = TEC_MARK_SHORT + EnumChatFormatting.BLUE + ": Cosmic"; public static final byte DECAY_AT = 0; // hatches compute decays public static final byte MULTI_PURGE_1_AT = 2; // multiblocks clean their hatches 1 @@ -33,7 +31,9 @@ public final class CommonValues { public static final String[] VN = GT_Values.VN; public static final long[] V = GT_Values.V; - public static final String[] EOH_TIER_FANCY_NAMES = {"Crude", "Primitive", "Stable", "Advanced", "Superb", "Exotic", "Perfect", "Tipler", "Gallifreyan"}; + public static final String[] EOH_TIER_FANCY_NAMES = { + "Crude", "Primitive", "Stable", "Advanced", "Superb", "Exotic", "Perfect", "Tipler", "Gallifreyan" + }; private CommonValues() {} } diff --git a/src/main/java/com/github/technus/tectech/util/ItemStackLong.java b/src/main/java/com/github/technus/tectech/util/ItemStackLong.java new file mode 100644 index 0000000000..e245cc94bf --- /dev/null +++ b/src/main/java/com/github/technus/tectech/util/ItemStackLong.java @@ -0,0 +1,14 @@ +package com.github.technus.tectech.util; + +import net.minecraft.item.ItemStack; + +public class ItemStackLong { + + public final ItemStack itemStack; + public long stackSize; + + public ItemStackLong(ItemStack itemStack, long stackSize) { + this.itemStack = itemStack; + this.stackSize = stackSize; + } +} |