diff options
| -rw-r--r-- | dependencies.gradle | 7 | ||||
| -rw-r--r-- | gradle.properties | 19 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43453 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | settings.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/com/detrav/DetravScannerMod.java | 13 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java | 12 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java | 109 | ||||
| -rw-r--r-- | src/main/java/com/detrav/net/ProspectingPacket.java | 7 |
9 files changed, 59 insertions, 112 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 848d8c9941..09771c542c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,7 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.25:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.33:dev') - compileOnly('com.github.GTNewHorizons:NewHorizonsCoreMod:2.3.11:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:bartworks:0.9.4:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:GTplusplus:1.11.13:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:VisualProspecting:1.2.4:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:VisualProspecting:1.2.11:dev') { transitive = false } } diff --git a/gradle.properties b/gradle.properties index 60b18c5a21..256ed6587a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,7 +33,7 @@ channel = stable mappingsVersion = 12 # Defines other MCP mappings for dependency deobfuscation. -remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ +remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/ # Select a default username for testing your mod. You can always override this per-run by running # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE. @@ -50,10 +50,10 @@ enableGenericInjection = false # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = com.detrav.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION +gradleTokenVersion = VERSION # [DEPRECATED] Mod ID replacement token. gradleTokenModId = @@ -61,13 +61,16 @@ gradleTokenModId = # [DEPRECATED] Mod name replacement token. gradleTokenModName = +# [DEPRECATED] Mod Group replacement token. +gradleTokenGroupName = + # [DEPRECATED] # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java # public static final String VERSION = "GRADLETOKEN_VERSION"; # The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's # version in @Mod([...], version = VERSION, [...]). # Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = DetravScannerMod.java +replaceGradleTokenInFile = # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. @@ -114,7 +117,7 @@ minimizeShadowedDependencies = true # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories. +# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. @@ -123,7 +126,7 @@ includeWellKnownRepositories = true usesMavenPublishing = true # Maven repository to publish the mod to. -# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/ +# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/ # Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token. # @@ -173,7 +176,7 @@ customArchiveBaseName = GT Scanner Mod # disableSpotless = true # Uncomment this to disable Checkstyle checks (currently wildcard import check). -disableCheckstyle = true +# disableCheckstyle = true # Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle" # (force use delegated build). @@ -187,5 +190,3 @@ disableCheckstyle = true # This is meant to be set in $HOME/.gradle/gradle.properties. # ideaCheckSpotlessOnBuild = true -# Non-GTNH properties -gradleTokenGroupName = diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex d64cd49177..e6441136f3 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a80b22ce5c..b82aa23a4f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index e8946ada27..94c2daf35c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' } diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index a30dabe74d..8d6b24077e 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -1,10 +1,10 @@ package com.detrav; +import static com.detrav.Tags.VERSION; + import net.minecraft.creativetab.CreativeTabs; import net.minecraftforge.common.config.Configuration; -import org.apache.logging.log4j.LogManager; - import com.detrav.net.DetravNetwork; import com.detrav.proxies.CommonProxy; import com.detrav.utils.DetravCreativeTab; @@ -23,21 +23,17 @@ import gregtech.api.GregTech_API; @Mod( modid = DetravScannerMod.MODID, - version = DetravScannerMod.VERSION, + version = VERSION, dependencies = "required-after:IC2;required-after:gregtech;after:miscutils;after:bartworks") public class DetravScannerMod { public static final String MODID = "detravscannermod"; - public static final String VERSION = "GRADLETOKEN_VERSION"; - public static final String DEBUGOVERRIDE = "@false"; - public static final boolean DEBUGBUILD = Boolean.parseBoolean(DEBUGOVERRIDE.substring(1)); + public static final boolean DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("com.detrav.debug", "false")); public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); public static boolean isDreamcraftLoaded = false; public static boolean isBartWorksLoaded = false; public static boolean isGTppLoaded = false; - public static final org.apache.logging.log4j.Logger Logger = LogManager.getLogger("GT Scanner Mod"); - @SidedProxy(clientSide = "com.detrav.proxies.ClientProxy", serverSide = "com.detrav.proxies.ServerProxy") public static CommonProxy proxy; @@ -77,5 +73,4 @@ public class DetravScannerMod { if (isGTppLoaded) GTppHelper.generate_OreIDs(); FluidColors.makeColors(); } - } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index 216e8c7cd7..f6f6350020 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -1,6 +1,10 @@ package com.detrav.items.behaviours; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.SplittableRandom; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -140,7 +144,7 @@ public class BehaviourDetravToolProspector extends Behaviour_None { break; } } - if (DetravScannerMod.DEBUGBUILD) aPlayer.addChatMessage( + if (DetravScannerMod.DEBUG_ENABLED) aPlayer.addChatMessage( new ChatComponentText( EnumChatFormatting.YELLOW + "Chunk at " + aX @@ -348,7 +352,7 @@ public class BehaviourDetravToolProspector extends Behaviour_None { return; } else { - if (DetravScannerMod.DEBUGBUILD) + if (DetravScannerMod.DEBUG_ENABLED) aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + " Failed on this chunk")); badluck++; if (!aPlayer.capabilities.isCreativeMode) aItem.doDamage(aStack, this.mCosts / 4); @@ -366,7 +370,7 @@ public class BehaviourDetravToolProspector extends Behaviour_None { // the // ore if (!ores.containsKey(oreDistance)) { - if (DetravScannerMod.DEBUGBUILD) aPlayer.addChatMessage( + if (DetravScannerMod.DEBUG_ENABLED) aPlayer.addChatMessage( new ChatComponentText(EnumChatFormatting.GREEN + " Adding to oremap " + oreDistance)); ores.put(oreDistance, 1); } else { diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java index c6ea1dfb46..cc4bc7c081 100644 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java +++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java @@ -1,14 +1,12 @@ package com.detrav.items.processing; -import static com.detrav.DetravScannerMod.DEBUGBUILD; +import static com.detrav.DetravScannerMod.DEBUG_ENABLED; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; import com.detrav.items.DetravMetaGeneratedTool01; -import com.dreammaster.gthandler.CustomItemList; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -23,10 +21,10 @@ public class ProcessingDetravToolProspector implements gregtech.api.interfaces.I OrePrefixes.toolHeadPickaxe.add(this); } - public void registerOre(OrePrefixes aPrefix, Materials aMaterial, String aOreDictName, String aModName, + public void registerOre(OrePrefixes aPrefix, Materials material, String aOreDictName, String aModName, ItemStack aStack) { - if (!aPrefix.doGenerateItem(aMaterial)) return; - if (DEBUGBUILD) return; + if (!aPrefix.doGenerateItem(material)) return; + if (DEBUG_ENABLED) return; try { // ULV disabled // GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(0, 1, aMaterial, @@ -34,134 +32,81 @@ public class ProcessingDetravToolProspector implements gregtech.api.interfaces.I // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new // Object[]{"SHE","CPC","PXP",'E',OreDictionary.getOres("cellSulfuricAcid").get(0),'S',OreDictionary.getOres("cellHydroxide").get(0),'H',OrePrefixes.toolHeadDrill.get(aMaterial),'P',OrePrefixes.plate.get(aMaterial),'C',OrePrefixes.circuit.get(Materials.Primitive),'X',gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList.Sensor_ULV}); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid").get(0), 'S', - OreDictionary.getOres("cellHydroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', - OrePrefixes.circuit.get(Materials.Basic), 'X', ItemList.Sensor_LV }); + OreDictionary.getOres("cellHydroxide").get(0), 'H', OrePrefixes.toolHeadDrill.get(material), + 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Basic), 'X', + ItemList.Sensor_LV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid").get(0), 'S', - OreDictionary.getOres("cellHydroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', - OrePrefixes.circuit.get(Materials.Good), 'X', ItemList.Sensor_MV }); + OreDictionary.getOres("cellHydroxide").get(0), 'H', OrePrefixes.toolHeadDrill.get(material), + 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Good), 'X', + ItemList.Sensor_MV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Advanced), 'X', ItemList.Sensor_HV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Data), 'X', ItemList.Sensor_EV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Elite), 'X', ItemList.Sensor_IV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(12, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(12, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Master), 'X', ItemList.Sensor_LuV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(14, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(14, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Ultimate), 'X', ItemList.Sensor_ZPM }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(16, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(16, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', - OrePrefixes.circuit.get(Materials.Superconductor), 'X', ItemList.Sensor_UV }); + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'X', ItemList.Sensor_UV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(18, 1, aMaterial, Materials.Steel, null), + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(18, 1, material, Materials.Steel, null), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', OreDictionary.getOres("cellHydrogenPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'P', OrePrefixes.plate.get(aMaterial), 'C', + OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Infinite), 'X', ItemList.Sensor_UHV }); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats( - 100, - 1, - aMaterial, - Materials.Iridium, - new long[] { 102400000L, GT_Values.V[6], 6L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_LuV, 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'E', ItemList.Emitter_LuV, 'C', - OrePrefixes.circuit.get(Materials.Master), 'P', OrePrefixes.plate.get(Materials.Iridium), - 'B', CustomItemList.BatteryHull_LuV_Full.get(1L) }); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats( - 102, - 1, - aMaterial, - Materials.Osmium, - new long[] { 409600000L, GT_Values.V[7], 7L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_ZPM, 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'E', ItemList.Emitter_ZPM, 'C', - OrePrefixes.circuit.get(Materials.Ultimate), 'P', OrePrefixes.plate.get(Materials.Osmium), - 'B', CustomItemList.BatteryHull_ZPM_Full.get(1L) }); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats( - 104, - 1, - aMaterial, - Materials.Neutronium, - new long[] { 1638400000L, GT_Values.V[8], 8L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UV, 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'E', ItemList.Emitter_UV, 'C', - OrePrefixes.circuit.get(Materials.Superconductor), 'P', - OrePrefixes.plate.get(Materials.Neutronium), 'B', - CustomItemList.BatteryHull_UV_Full.get(1L) }); - GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats( - 106, - 1, - aMaterial, - Materials.Infinity, - new long[] { 6553600000L, GT_Values.V[9], 9L, -1L }), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "EHR", "CSC", "PBP", 'S', ItemList.Cover_Screen, 'R', ItemList.Sensor_UHV, 'H', - OrePrefixes.toolHeadDrill.get(aMaterial), 'E', ItemList.Emitter_UHV, 'C', - OrePrefixes.circuit.get(Materials.Infinite), 'P', OrePrefixes.plate.get(Materials.Infinity), - 'B', CustomItemList.BatteryHull_UHV_Full.get(1L) }); } catch (Exception ignored) {} } diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index 1d48c6a765..bc2f1bc9f2 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -1,6 +1,11 @@ package com.detrav.net; -import java.io.*; +import java.io.DataInput; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.HashMap; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; |