From 93af178db9c7d457a22a39cb93229e40362ffd34 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Fri, 10 Apr 2020 17:58:28 +0200
Subject: Added all Ores to Voidminer in DeepDark + removed Infinity Ore
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
src/main/java/gregtech/api/util/GT_BartWorks_Compat.java | 11 +++++++++++
1 file changed, 11 insertions(+)
(limited to 'src/main/java/gregtech/api/util')
diff --git a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
index 742e4358ad..f090a9f8d3 100644
--- a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
+++ b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
@@ -1,9 +1,12 @@
package gregtech.api.util;
+import com.github.bartimaeusnek.bartworks.API.VoidMinerDropAdder;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAPI;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import gregtech.api.enums.Materials;
+import gregtech.api.interfaces.ISubTagContainer;
+import java.lang.reflect.InvocationTargetException;
import java.util.Optional;
public class GT_BartWorks_Compat {
@@ -30,4 +33,12 @@ public class GT_BartWorks_Compat {
return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffHashMap.get((short) id)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL);
}
+ public static void addVoidMinerDropsToDimension(int dimID, ISubTagContainer material, float chance){
+ try {
+ VoidMinerDropAdder.addDropsToDim(dimID, material, chance);
+ } catch (InvocationTargetException | IllegalAccessException e) {
+ e.printStackTrace();
+ }
+ }
+
}
\ No newline at end of file
--
cgit
From e53d92257d2ce0f37dabb9f99d73fa2719c36823 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Fri, 10 Apr 2020 18:02:06 +0200
Subject: renormalize line endings
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
src/main/java/gregtech/api/GregTech_API.java | 1458 ++++----
.../java/gregtech/api/enums/MaterialBuilder.java | 520 +--
src/main/java/gregtech/api/enums/OrePrefixes.java | 2236 ++++++------
src/main/java/gregtech/api/enums/TextureSet.java | 366 +-
src/main/java/gregtech/api/enums/Textures.java | 3362 +++++++++---------
.../interfaces/metatileentity/IConnectable.java | 38 +-
.../metatileentity/IMetaTileEntityItemPipe.java | 202 +-
.../gregtech/api/items/GT_CoolantCell_Item.java | 170 +-
.../java/gregtech/api/items/GT_Generic_Item.java | 322 +-
.../java/gregtech/api/items/GT_MetaBase_Item.java | 1232 +++----
.../api/items/GT_MetaGenerated_Item_X01.java | 380 +-
.../api/items/GT_MetaGenerated_Item_X32.java | 394 +--
.../gregtech/api/items/GT_MetaGenerated_Tool.java | 1448 ++++----
.../api/items/GT_RadioactiveCell_Item.java | 324 +-
.../api/metatileentity/BaseMetaPipeEntity.java | 2864 +++++++--------
.../api/metatileentity/MetaPipeEntity.java | 1686 ++++-----
.../implementations/GT_MetaPipeEntity_Cable.java | 1192 +++----
.../implementations/GT_MetaPipeEntity_Fluid.java | 1316 +++----
src/main/java/gregtech/api/util/GT_Recipe.java | 3664 ++++++++++----------
src/main/java/gregtech/common/GT_Client.java | 1374 ++++----
src/main/java/gregtech/common/GT_RecipeAdder.java | 2766 +++++++--------
.../gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 872 ++---
.../java/gregtech/common/GT_Worldgenerator.java | 1044 +++---
.../gregtech/common/blocks/GT_Block_Casings8.java | 94 +-
.../common/blocks/GT_Block_Casings_Abstract.java | 244 +-
.../gregtech/common/blocks/GT_Block_Machines.java | 1096 +++---
.../gregtech/common/blocks/GT_Block_Metal.java | 86 +-
.../common/blocks/GT_Block_Ores_Abstract.java | 552 +--
.../common/blocks/GT_Block_Stones_Abstract.java | 300 +-
.../gregtech/common/blocks/GT_Item_Casings8.java | 20 +-
.../gregtech/common/blocks/GT_Item_Machines.java | 406 +--
.../java/gregtech/common/blocks/GT_Item_Ores.java | 108 +-
.../gregtech/common/blocks/GT_Item_Storage.java | 80 +-
.../gregtech/common/covers/GT_Cover_ItemMeter.java | 158 +-
.../common/gui/GT_Container_Regulator.java | 334 +-
.../gregtech/common/items/GT_FluidDisplayItem.java | 184 +-
.../common/items/GT_IntegratedCircuit_Item.java | 224 +-
.../common/items/GT_MetaGenerated_Item_02.java | 962 ++---
.../common/items/GT_MetaGenerated_Item_03.java | 480 +--
.../common/items/GT_MetaGenerated_Tool_01.java | 364 +-
.../gregtech/common/items/GT_SensorCard_Item.java | 192 +-
.../items/behaviors/Behaviour_Plunger_Fluid.java | 128 +-
.../common/items/behaviors/Behaviour_Sense.java | 94 +-
.../automation/GT_MetaTileEntity_Regulator.java | 274 +-
.../automation/GT_MetaTileEntity_TypeFilter.java | 284 +-
.../boilers/GT_MetaTileEntity_Boiler_Lava.java | 294 +-
.../boilers/GT_MetaTileEntity_Boiler_Steel.java | 136 +-
.../GT_MetaTileEntity_DieselGenerator.java | 264 +-
.../generators/GT_MetaTileEntity_SteamTurbine.java | 272 +-
.../basic/GT_MetaTileEntity_Disassembler.java | 214 +-
.../basic/GT_MetaTileEntity_Massfabricator.java | 250 +-
.../basic/GT_MetaTileEntity_Replicator.java | 222 +-
.../machines/basic/GT_MetaTileEntity_Scanner.java | 732 ++--
.../GT_MetaTileEntity_BronzeBlastFurnace.java | 120 +-
.../multi/GT_MetaTileEntity_OilDrill2.java | 100 +-
.../multi/GT_MetaTileEntity_OilDrill3.java | 100 +-
.../steam/GT_MetaTileEntity_Compressor_Bronze.java | 178 +-
.../steam/GT_MetaTileEntity_Compressor_Steel.java | 178 +-
.../steam/GT_MetaTileEntity_Extractor_Bronze.java | 178 +-
.../steam/GT_MetaTileEntity_Extractor_Steel.java | 178 +-
.../steam/GT_MetaTileEntity_Macerator_Steel.java | 242 +-
.../java/gregtech/common/tools/GT_Tool_Scoop.java | 216 +-
.../java/gregtech/loaders/load/GT_FuelLoader.java | 122 +-
.../loaders/oreprocessing/ProcessingPipe.java | 114 +-
.../loaders/postload/GT_Worldgenloader.java | 622 ++--
.../loaders/preload/GT_Loader_ItemData.java | 354 +-
.../preload/GT_Loader_MetaTileEntities.java | 3372 +++++++++---------
.../loaders/preload/GT_Loader_OreProcessing.java | 232 +-
.../java/gregtech/nei/GT_NEI_AssLineHandler.java | 836 ++---
.../java/gregtech/nei/GT_NEI_DefaultHandler.java | 1692 ++++-----
70 files changed, 23556 insertions(+), 23556 deletions(-)
(limited to 'src/main/java/gregtech/api/util')
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java
index b42c7768c8..dac494d9bc 100644
--- a/src/main/java/gregtech/api/GregTech_API.java
+++ b/src/main/java/gregtech/api/GregTech_API.java
@@ -1,729 +1,729 @@
-package gregtech.api;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IDamagableItem;
-import gregtech.api.interfaces.ITexture;
-import gregtech.api.interfaces.internal.IGT_RecipeAdder;
-import gregtech.api.interfaces.internal.IThaumcraftCompat;
-import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
-import gregtech.api.items.GT_CoolantCellIC_Item;
-import gregtech.api.items.GT_CoolantCell_Item;
-import gregtech.api.items.GT_Tool_Item;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.objects.GT_Cover_Default;
-import gregtech.api.objects.GT_Cover_None;
-import gregtech.api.objects.GT_HashSet;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
-import gregtech.api.util.*;
-import gregtech.api.world.GT_Worldgen;
-import net.minecraft.block.Block;
-import net.minecraft.client.renderer.texture.IIconRegister;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
-import net.minecraftforge.fluids.Fluid;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static gregtech.api.enums.GT_Values.*;
-
-/**
- * Please do not include this File in your Mod-download as it ruins compatiblity, like with the IC2-API
- * You may just copy those Functions into your Code, or better call them via reflection.
- *
- * The whole API is the basic construct of my Mod. Everything is dependent on it.
- * I change things quite often so please don't include any File inside your Mod, even if it is an Interface.
- * Since some Authors were stupid enough to break this simple Rule, I added Version checks to enforce it.
- *
- * In these Folders are many useful Functions. You can use them via reflection if you want.
- * I know not everything is compilable due to API's of other Mods, but these are easy to fix in your Setup.
- *
- * You can use this to learn about Modding, but I would recommend simpler Mods.
- * You may even copypaste Code from these API-Files into your Mod, as I have nothing against that, but you should look exactly at what you are copying.
- *
- * @author Gregorius Techneticies
- */
-@SuppressWarnings("ALL")
-public class GregTech_API {
-
- @Deprecated
- public static final long MATERIAL_UNIT = M, FLUID_MATERIAL_UNIT = L;
- /**
- * Fixes the HashMap Mappings for ItemStacks once the Server started
- */
- public static final Collection