From 1a7922a644b5a47902ae37b1ce0bca744dabf4b8 Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Tue, 6 Jun 2017 22:41:10 +0200 Subject: Oil Cracking Update from Johannes Gaessler --- misc/vector/crop_drop.rape.svg | 933 +++++++++++++++ misc/vector/recipe.distillation_tower.svg | 1259 ++++++++++++++++++++ misc/vector/recipe.nine_x_nine.svg | 189 +++ misc/vector/recipe.twelve_x_twelve.svg | 186 +++ src/main/java/gregtech/api/enums/ItemList.java | 1 + .../java/gregtech/api/enums/MaterialBuilder.java | 61 +- src/main/java/gregtech/api/enums/Materials.java | 161 ++- src/main/java/gregtech/api/enums/OrePrefixes.java | 10 +- .../api/interfaces/internal/IGT_RecipeAdder.java | 56 +- .../GT_MetaTileEntity_MultiBlockBase.java | 2 +- src/main/java/gregtech/api/util/GT_Recipe.java | 92 +- src/main/java/gregtech/common/GT_Proxy.java | 47 + src/main/java/gregtech/common/GT_RecipeAdder.java | 126 +- .../common/items/GT_MetaGenerated_Item_01.java | 21 +- .../common/items/GT_MetaGenerated_Item_02.java | 2 + .../multi/GT_MetaTileEntity_DistillationTower.java | 147 ++- .../multi/GT_MetaTileEntity_OilCracker.java | 100 +- .../loaders/oreprocessing/ProcessingDirty.java | 7 +- .../loaders/oreprocessing/ProcessingToolOther.java | 8 +- .../loaders/oreprocessing/ProcessingWire.java | 219 ++-- .../gregtech/loaders/postload/GT_CropLoader.java | 3 +- .../loaders/postload/GT_MachineRecipeLoader.java | 397 +++--- .../preload/GT_Loader_Item_Block_And_Fluid.java | 573 ++++----- .../textures/gui/basicmachines/Assembler.png | Bin 2387 -> 3124 bytes .../gui/basicmachines/DistillationTower.png | Bin 0 -> 2788 bytes .../textures/gui/basicmachines/NineXNine.png | Bin 0 -> 2631 bytes .../gregtech/textures/items/gt.metaitem.02/557.png | Bin 0 -> 621 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.1.png | Bin 0 -> 3115 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.2.png | Bin 0 -> 3171 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.3.png | Bin 0 -> 3302 bytes .../ic2/textures/blocks/crop/blockCrop.Rape.4.png | Bin 0 -> 705 bytes 31 files changed, 3818 insertions(+), 782 deletions(-) create mode 100644 misc/vector/crop_drop.rape.svg create mode 100644 misc/vector/recipe.distillation_tower.svg create mode 100644 misc/vector/recipe.nine_x_nine.svg create mode 100644 misc/vector/recipe.twelve_x_twelve.svg create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/DistillationTower.png create mode 100644 src/main/resources/assets/gregtech/textures/gui/basicmachines/NineXNine.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.metaitem.02/557.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.1.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.2.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.3.png create mode 100644 src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Rape.4.png diff --git a/misc/vector/crop_drop.rape.svg b/misc/vector/crop_drop.rape.svg new file mode 100644 index 0000000000..35db917110 --- /dev/null +++ b/misc/vector/crop_drop.rape.svg @@ -0,0 +1,933 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/misc/vector/recipe.distillation_tower.svg b/misc/vector/recipe.distillation_tower.svg new file mode 100644 index 0000000000..013bf2ee7c --- /dev/null +++ b/misc/vector/recipe.distillation_tower.svg @@ -0,0 +1,1259 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +