aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-09 19:17:23 +0100
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2019-01-09 19:17:23 +0100
commit82bd52008b663bd38e96472c5d12a3db8bca63b3 (patch)
tree0fdffcfce6e9d3e163d0bcdf9cbc681153860986
parentb1e249a5d28a0fcc72943042866580147b6efb40 (diff)
downloadGT5-Unofficial-82bd52008b663bd38e96472c5d12a3db8bca63b3.tar.gz
GT5-Unofficial-82bd52008b663bd38e96472c5d12a3db8bca63b3.tar.bz2
GT5-Unofficial-82bd52008b663bd38e96472c5d12a3db8bca63b3.zip
Bio Cultre System!
-Added the Bio Cultre System -Added the Bio Vat, Bio Lab and custom Glas types -Updated Copyright on the Files -Added a shitton of ressources -Added an API to for the Bio Cultre System -Added a Phyton Script for the ease of adding Glas Types to the Bio Vat -Fixed Spawning on custom blocks -Fixed Nuggets giving out boni in the windmill -Fixed tooltip again for the Windmill -Added dimensionsIDs to the BlockCoord class -Added apiJar, sourceJar, devJar to the grandlew output
-rw-r--r--.gitignore5
-rw-r--r--BlockAdderGenerator/biovatgen.py68
-rw-r--r--BlockAdderGenerator/csv.csv28
-rw-r--r--buid.bat2
-rw-r--r--build.gradle25
-rw-r--r--build.properties24
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/API_REFERENCE.java27
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java125
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectGetter.java122
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/BioRecipeAdder.java124
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/API/BioVatLogicAdder.java197
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/GuiHandler.java53
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/MainMod.java62
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/BioTab.java39
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/GT2Tab.java24
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/creativetabs/bartworksTab.java24
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RadLevel.java60
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_RotorBlock.java27
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/BW_GUIContainer_Windmill.java39
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_CircuitProgrammer.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_Destructopack.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_LESU.java47
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/gui/GT_GUIContainer_RadioHatch.java77
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/client/renderer/RendererSwitchingColorFluid.java298
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/ConfigHandler.java34
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_Blocks.java68
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_GlasBlocks.java65
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BW_TileEntityContainer.java41
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/blocks/BioFluidBlock.java98
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java65
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_ItemBlocks.java36
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/BW_Stonage_Rotors.java42
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/Circuit_Programmer.java36
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Destructopack_Item.java31
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Rockcutter_Item.java72
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/GT_Teslastaff_Item.java38
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabModule.java46
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/LabParts.java135
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleIconItem.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/items/SimpleSubItemClass.java52
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioCultureLoader.java60
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioItemList.java140
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioLabLoader.java42
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java375
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java85
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/GTNHBlocks.java96
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ItemRegistry.java117
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/LoaderRegistry.java34
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java190
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/net/BW_Network.java128
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/net/RendererPacket.java112
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/BWTileEntityDimIDBridge.java28
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/BW_RotorBlock.java26
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_BioLab.java263
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_Diode.java29
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_EnergyDistributor.java26
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_MetaTileEntity_RadioHatch.java315
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_BioVat.java674
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_DEHP.java23
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_LESU.java115
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_ManualTrafo.java295
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/tileentities/GT_TileEntity_Windmill.java90
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/BW_Container_RadioHatch.java216
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_CircuitProgrammer.java83
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_Item_Destructopack.java37
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_LESU.java22
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/server/container/GT_Container_RadioHatch.java155
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BWRecipes.java580
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BW_Util.java122
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioCulture.java189
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioDNA.java63
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioData.java171
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/BioPlasmid.java62
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/ChatColorHelper.java22
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/ConnectedBlocksChecker.java129
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/Coords.java63
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/util/NEIbartworksConfig.java30
-rw-r--r--src/main/resources/assets/bartworks/lang/en_US.lang27
-rw-r--r--src/main/resources/assets/bartworks/textures/GUI/GUI_RSC.pngbin0 -> 2599 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/GUI/RadHatch.pngbin0 -> 2270 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlock.pngbin0 -> 177 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/BoronSilicateGlassBlockRand.pngbin0 -> 184 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/ChromeReinforcedBoronSilicateGlassBlock.pngbin0 -> 199 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/IridiumReinforcedBoronSilicateGlassBlock.pngbin0 -> 196 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/NickelReinforcedBoronSilicateGlassBlock.pngbin0 -> 201 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/OsmiumReinforcedBoronSilicateGlassBlock.pngbin0 -> 211 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/TungstenReinforcedBoronSilicateGlassBlock.pngbin0 -> 198 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/blocks/brick.pngbin506 -> 0 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/Agarose.pngbin0 -> 259 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/ClonalCellularSynthesisModule.pngbin0 -> 481 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/DNAExtractionModule.pngbin0 -> 525 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/DNASampleFlask.pngbin0 -> 253 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/DetergentPowder.pngbin0 -> 261 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/IncubationModule.pngbin0 -> 623 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/PCRThermoclyclingModule.pngbin0 -> 566 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/PlasmaMembrane.pngbin0 -> 2522 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/PlasmidCell.pngbin0 -> 288 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/PlasmidSynthesisModule.pngbin0 -> 499 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/TransformationModule.pngbin0 -> 529 bytes
-rw-r--r--src/main/resources/assets/bartworks/textures/items/petriDish.pngbin0 -> 3033 bytes
-rw-r--r--src/main/resources/assets/gregtech/textures/GUI/basicmachines/BW.GUI.BioLab.pngbin0 -> 3151 bytes
101 files changed, 7040 insertions, 634 deletions
diff --git a/.gitignore b/.gitignore
index 181e20b1b3..317f54dbb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,11 +25,12 @@
*.rar
*.bin
*.lock
-
+*.sqlite
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
/eclipse
/build
/out
-/.gradle \ No newline at end of file
+/.gradle
+/venv \ No newline at end of file
diff --git a/BlockAdderGenerator/biovatgen.py b/BlockAdderGenerator/biovatgen.py
new file mode 100644
index 0000000000..650cc52de7
--- /dev/null
+++ b/BlockAdderGenerator/biovatgen.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Jan 2 19:11:07 2019
+
+Copyright (c) 2019 boubou_19, 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.
+
+@author: boubou_19, bartimaeusnek
+"""
+
+import os
+import datetime
+import time
+name="GTNHBlocks" #change the name of the output file here
+ending=".java"
+csv_path = os.getcwd()+os.sep+"csv.csv" # change the name of the csv here
+output_file_path = os.getcwd()+os.sep+name+ending
+code_list = [] #will store all the lines of code
+max_meta = []
+with open(csv_path, "r") as file:#open the file and automatically close it when it leaves the scope
+ code_list.append("import com.github.bartimaeusnek.bartworks.API.BioVatLogicAdder;\n")
+ code_list.append("\n")
+ code_list.append("//Autogenerated run file, script Created on Wed Jan 2 19:11:07 2019 by boubou_19 and bartimaeusnek\n")
+ code_list.append("//Executed on "+datetime.datetime.fromtimestamp(time.time()).strftime('%Y-%m-%d %H:%M:%S')+"\n")
+ code_list.append("public class "+name+" implements Runnable {\n")
+ code_list.append("\n")
+ code_list.append(" @Override\n")
+ code_list.append(" public void run(){\n")
+ file.readline() #skip the first line of the file
+
+ for line in file:
+ line = line.split(";") #turns the string into a list of strings using the ";" separator
+ line[4] = line[4].strip("\n") #it remove the \n at the end of a csv line otherwise it will do shit in the string later
+ if line[3] == "-1" or line[3] == "0":
+ code_list.append(" BioVatLogicAdder.BioVatGlass.addCustomGlass(\"{0}\",\"{1}\",{2},{3});\n".format(line[0],line[1],line[2],line[4]))
+ else:
+ if line[3] == "15" and line[2] == "0":
+ max_meta.append(" BioVatLogicAdder.BioVatGlass.addCustomGlass(\"{0}\",\"{1}\",i,{3});\n".format(line[0],line[1],line[2],line[4]))
+ else:
+ code_list.append("\n for (int i = {0}; i <= {1};++i)\n".format(line[2],line[3]))
+ code_list.append(" BioVatLogicAdder.BioVatGlass.addCustomGlass(\"{0}\",\"{1}\",i,{3});\n\n".format(line[0],line[1],line[2],line[4]))
+
+ # for i in range(int(line[2]),int(line[3])+1): #the +1 is here because range instruction always exclude the last number
+ code_list.append("\n for (int i = 0; i <= 15;++i;){\n")
+ for line in max_meta:
+ code_list.append(line)
+ code_list.append(" }\n")
+ code_list.append(" }\n")
+ code_list.append("}\n")
+with open(output_file_path,"w") as out:
+ out.writelines(code_list)
+
diff --git a/BlockAdderGenerator/csv.csv b/BlockAdderGenerator/csv.csv
new file mode 100644
index 0000000000..2f1ee7ef53
--- /dev/null
+++ b/BlockAdderGenerator/csv.csv
@@ -0,0 +1,28 @@
+mod;unlocalised name;meta start;meta end;tier
+minecraft;stained_glass;0;15;3
+minecraft;glass;0;-1;3
+BloodArsenal;blood_stained_glass;0;-1;3
+Botany;stained;0;0;3
+EnderIO;blockFusedQuartz;0;5;3
+ExtraUtilities;decorativeBlock1;9;-1;3
+ExtraUtilities;decorativeBlock2;0;11;3
+ExtraUtilities;etherealglass;0;5;3
+GalaxySpace;futureglasses;0;15;3
+GalaxySpace;futureglass;0;-1;3
+HardcoreEnderExpension;laboratory_glass;0;-1;3
+IC2;blockAlloyGlass;0;-1;4
+Natura;NetherGlass;0;1;3
+Railcraft;glass;0;15;3
+RandomThings;spectreGlass;0;-1;3
+TConstruct;GlassBlock;0;-1;3
+TConstruct;GlassBlock.StainedClear;0;15;3
+Ztones;tile.glaxx;0;15;3
+chisel;glass;0;15;3
+chisel;stained_glass_white;0;15;3
+chisel;stained_glass_yellow;0;15;3
+chisel;stained_glass_lightgray;0;15;3
+chisel;stained_glass_brown;0;15;3
+chisel;glass2;0;-1;3
+chisel;stained_glass_forestry;0;15;3
+tectech;tile.quantumGlass;0;-1;5
+witchery;shadedglass;0;15;3
diff --git a/buid.bat b/buid.bat
new file mode 100644
index 0000000000..3c93bfe30e
--- /dev/null
+++ b/buid.bat
@@ -0,0 +1,2 @@
+call gradlew.bat build
+pause \ No newline at end of file
diff --git a/build.gradle b/build.gradle
index c20193c1ec..0c65172e39 100644
--- a/build.gradle
+++ b/