aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author‭huajijam <strhuaji@gmail.com>2019-04-13 11:05:03 +0800
committer‭huajijam <strhuaji@gmail.com>2019-04-13 11:05:03 +0800
commit98c00c93f331d6a4520fb207d015635d4a997ccb (patch)
tree9859aad3fce4ced498edd23474c71b8d4cbb4aaa
parentd7fcfa0ad111a73ab29a2f3fcead3c45615bd6cc (diff)
parent3ac6ce92d641fdaec86a1aa39a17250944931bcc (diff)
downloadGT5-Unofficial-98c00c93f331d6a4520fb207d015635d4a997ccb.tar.gz
GT5-Unofficial-98c00c93f331d6a4520fb207d015635d4a997ccb.tar.bz2
GT5-Unofficial-98c00c93f331d6a4520fb207d015635d4a997ccb.zip
Automatic synchronization
Former-commit-id: 06caaed4ca97e13d334bb05cfdc2cc6020c199de
-rw-r--r--build.gradle39
-rw-r--r--build.properties10
-rw-r--r--src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java64
-rw-r--r--src/main/java/com/github/bartimaeusnek/ASM/BWCore.java72
-rw-r--r--src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java82
-rw-r--r--src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java29
-rw-r--r--src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java205
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java8
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/ITileDropsContent.java32
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/WerkstoffAdderRegistry.java48
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java86
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/ClientEventHandler/ClientEventHandler.java75
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_RadioHatch.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/BW_Renderer_Block_Ores.java92
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java19
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java14
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_SimpleWindMeter.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java9
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java25
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/net/OrePacket.java95
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_ExperimentalFloodGate.java205
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_HeatedWaterPump.java5
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/classic/BW_TileEntity_InfinityTank.java17
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_BioVat.java8
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_CrackingDistillTower.java26
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ElectricImplosionCompressor.java92
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_ManualTrafo.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_Windmill.java12
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaBlastFurnace.java47
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaProcessingArray.java14
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/multis/mega/GT_TileEntity_MegaVacuumFreezer.java35
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_AcidGenerator.java4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_BioLab.java10
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_Diode.java18
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_EnergyDistributor.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java13
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioLabHandler.java6
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_BioVatHandler.java25
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/BW_NEI_OreHandler.java253
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/neiHandler/NEI_BW_Config.java1
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/BW_Container_HeatedWaterPump.java3
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_Item_Destructopack.java17
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/Slots/BW_DelSlot.java40
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/Slots/BW_FuelSlot.java39
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/log/DebugLog.java68
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOreTE.java97
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGeneratedOre_Item.java67
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Items.java169
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/BW_MetaGenerated_Ores.java175
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/OreDictHandler.java52
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/ThreadedLoader.java80
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/Werkstoff.java523
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java809
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/processingLoaders/AdditionalRecipes.java46
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java17
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BW_ColorUtil.java284
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java70
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java39
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java8
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/Pair.java82
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/BartWorksCrossmod.java64
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/GalacticraftProxy.java96
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/UniversalTeleportType.java81
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/blocks/UniversalSpaceBlocks.java46
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/creativetabs/SpaceTab.java45
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_OreLayer.java150
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WordGenerator.java126
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/oregen/BW_WorldGenRoss128.java69
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/worldprovider/ChunkProviderRoss128b.java178
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/worldprovider/SkyProviderRoss128b.java33
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/planets/ross128/world/worldprovider/WorldProviderRoss128b.java175
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/galacticraft/solarsystems/Ross128SolarSystem.java88
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/CustomAspects.java59
-rw-r--r--src/main/java/com/github/bartimaeusnek/crossmod/thaumcraft/util/ThaumcraftHandler.java117
-rw-r--r--src/main/resources/assets/bartworks/lang/en_US.lang10
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ThoriumYttriumGlass.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128.pngbin0 -> 934 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128b.pngbin0 -> 1048 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/MapObjs/Ross128ba.pngbin0 -> 990 bytes
-rw-r--r--src/main/resources/assets/bartworkscrossmod/galacticraft/Ross128b/World/SunRoss128.pngbin0 -> 1260 bytes
92 files changed, 5514 insertions, 365 deletions
diff --git a/build.gradle b/build.gradle
index ae10e3f9a3..229a4f71c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,14 @@ plugins {
}
apply plugin: 'forge'
-apply plugin: 'idea'
apply plugin: 'signing'
+apply plugin: 'idea'
+idea{
+ module {
+ downloadJavadoc = true
+ downloadSources = true
+ }
+}
import de.undercouch.gradle.tasks.download.Download
@@ -61,10 +67,34 @@ repositories {
name = "ic2"
url = "http://maven.ic2.player.to/"
}
+ maven { // AppleCore
+ url "http://www.ryanliptak.com/maven/"
+ }
+ maven { // GalacticGreg, YAMCore,..
+ name 'UsrvDE'
+ url "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/"
+ }
+ ivy {
+ name 'gtnh_download_source_stupid_underscore_typo'
+ artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]"
+ }
+ ivy {
+ name 'gtnh_download_source'
+ artifactPattern "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]"
+ }
+ maven {
+ name = "gt"
+ url = "https://gregtech.overminddl1.com/"
+ }
+
}
dependencies {
compile "net.industrial-craft:industrialcraft-2:${config.ic2.version}:dev"
+ compileOnly "applecore:AppleCore:${config.applecore.version}:api"
+ compile "micdoodle8.mods:MicdoodleCore:${config.galacticraft.version}:Dev"
+ compile "micdoodle8.mods:GalacticraftCore:${config.galacticraft.version}:Dev"
+ compile "micdoodle8.mods:Galacticraft-Planets:${config.galacticraft.version}:Dev"
}
//task getGregTech(type: Download) {
@@ -102,6 +132,13 @@ processResources
}
}
+jar {
+ manifest {
+ attributes 'FMLCorePlugin': 'com.github.bartimaeusnek.ASM.BWCorePlugin',
+ 'FMLCorePluginContainsFMLMod': 'true'
+ }
+}
+
task apiJar(type: Jar){
from(sourceSets.main.output) {
include 'com/github/bartimaeusnek/bartworks/API/**'
diff --git a/build.properties b/build.properties
index 72b745fd12..22690fd078 100644
--- a/build.properties
+++ b/build.properties
@@ -22,9 +22,11 @@
mc_version=1.7.10
majorUpdate=0
-minorUpdate=3
-buildNumber=24
-APIVersion=4
+minorUpdate=4
+buildNumber=7
+APIVersion=6
ic2.version=2.2.828-experimental
gregtech.version=5.09.32.36
-gregtech.jenkinsbuild=143 \ No newline at end of file
+gregtech.jenkinsbuild=143
+applecore.version=1.7.10-3.1.1
+galacticraft.version=1.7-3.0.12.504 \ No newline at end of file
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java b/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java
new file mode 100644
index 0000000000..f4b61a17ba
--- /dev/null
+++ b/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019 bartimaeusnek
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.github.bartimaeusnek.ASM;
+
+import org.objectweb.asm.tree.MethodNode;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class ASMUtils {
+
+ public static String matchAny(String toCompare, String... args) {
+ for (int i = 0; i < args.length; i++) {
+ if (toCompare.equalsIgnoreCase(args[i]))
+ return args[i];
+ }
+ return "";
+ }
+
+ /**
+ * Call this Method twice, one time for the Descriptor and one time for the Name.
+ */
+ public static boolean isCorrectMethod(MethodNode methodNode, String... args) {
+ for (int i = 0; i < args.length; i++) {
+ if (methodNode.name.equalsIgnoreCase(args[i]) || methodNode.desc.equalsIgnoreCase(args[i]))
+ return true;
+ }
+ return false;
+ }
+
+ public static boolean writeClassToDisk(byte[] towrite, String Classname, String Path) {
+ try {
+ OutputStream os = new FileOutputStream(new File(Path + Classname + ".class"));
+ os.write(towrite);
+ } catch (IOException e) {
+ e.printStackTrace();
+ return false;
+ }
+ return true;
+ }
+
+}
diff --git a/src