aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-16 00:53:18 +0200
committerGitHub <noreply@github.com>2024-09-15 22:53:18 +0000
commitb530fdac89f5d764613a6a69339e4324083c9895 (patch)
treea7c36051f84f8e4a7a654ec2266a3ea5a49a4ed8 /src/main/java/gtPlusPlus
parent43af160db2e04f06bba3792a11860ee42c3d1947 (diff)
downloadGT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.tar.gz
GT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.tar.bz2
GT5-Unofficial-b530fdac89f5d764613a6a69339e4324083c9895.zip
Remove GT++ AutoMap (#3199)
Diffstat (limited to 'src/main/java/gtPlusPlus')
-rw-r--r--src/main/java/gtPlusPlus/GTplusplus.java34
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/AutoMap.java356
-rw-r--r--src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java14
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java42
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java6
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java4
-rw-r--r--src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java13
-rw-r--r--src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java26
-rw-r--r--src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java9
-rw-r--r--src/main/java/gtPlusPlus/core/block/machine/BlockSuperJukebox.java6
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java59
-rw-r--r--src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java279
-rw-r--r--src/main/java/gtPlusPlus/core/common/CommonProxy.java6
-rw-r--r--src/main/java/gtPlusPlus/core/handler/CompatHandler.java10
-rw-r--r--src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java7
-rw-r--r--src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java13
-rw-r--r--src/main/java/gtPlusPlus/core/item/ModItems.java28
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java10
-rw-r--r--src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java19
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java71
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java33
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java4
-rw-r--r--src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java42
-rw-r--r--src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java5
-rw-r--r--src/main/java/gtPlusPlus/core/material/Material.java153
-rw-r--r--src/main/java/gtPlusPlus/core/material/MaterialGenerator.java4
-rw-r--r--src/main/java/gtPlusPlus/core/material/Particle.java7
-rw-r--r--src/main/java/gtPlusPlus/core/proxy/ClientProxy.java12
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java360
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java7
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java7
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java7
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityBaseFluidCollector.java6
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java13
-rw-r--r--src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java7
-rw-r--r--src/main/java/gtPlusPlus/core/util/data/StringUtils.java13
-rw-r--r--src/main/java/gtPlusPlus/core/util/math/MathUtils.java10
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java5
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java12
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java30
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java6
-rw-r--r--src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java13
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java39
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java4
-rw-r--r--src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java14
-rw-r--r--src/main/java/gtPlusPlus/plugin/manager/CoreManager.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchCatalysts.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchMillingBalls.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/MTEHatchNbtConsumable.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/render/CapeRenderer.java28
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/MTEAtmosphericReconditioner.java55
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java17
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java34
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAlloySmelter.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenAssembler.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenBlastSmelter.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenDustGeneration.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenExtruder.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluids.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluorite.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMaterialProcessing.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMetalRecipe.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenMultisUsingFluidInsteadOfCells.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenOre.java11
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlasma.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenPlates.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenShapedCrafting.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderAlgaeFarm.java68
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoaderLFTR.java15
-rw-r--r--src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/HandlerTinkers.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java2
-rw-r--r--src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java8
77 files changed, 840 insertions, 1333 deletions
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index ef6b1759e9..8823304e89 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -280,25 +280,25 @@ public class GTplusplus implements ActionListener {
}
private static void setupMaterialBlacklist() {
- Material.invalidMaterials.put(Materials._NULL);
- Material.invalidMaterials.put(Materials.Clay);
- Material.invalidMaterials.put(Materials.Phosphorus);
- Material.invalidMaterials.put(Materials.Steel);
- Material.invalidMaterials.put(Materials.Bronze);
- Material.invalidMaterials.put(Materials.Hydrogen);
+ Material.invalidMaterials.add(Materials._NULL);
+ Material.invalidMaterials.add(Materials.Clay);
+ Material.invalidMaterials.add(Materials.Phosphorus);
+ Material.invalidMaterials.add(Materials.Steel);
+ Material.invalidMaterials.add(Materials.Bronze);
+ Material.invalidMaterials.add(Materials.Hydrogen);
// Infused TC stuff
- Material.invalidMaterials.put(Materials.InfusedAir);
- Material.invalidMaterials.put(Materials.InfusedEarth);
- Material.invalidMaterials.put(Materials.InfusedFire);
- Material.invalidMaterials.put(Materials.InfusedWater);
+ Material.invalidMaterials.add(Materials.InfusedAir);
+ Material.invalidMaterials.add(Materials.InfusedEarth);
+ Material.invalidMaterials.add(Materials.InfusedFire);
+ Material.invalidMaterials.add(Materials.InfusedWater);
// EIO Materials
- Material.invalidMaterials.put(Materials.SoulSand);
- Material.invalidMaterials.put(Materials.EnderPearl);
- Material.invalidMaterials.put(Materials.EnderEye);
- Material.invalidMaterials.put(Materials.Redstone);
- Material.invalidMaterials.put(Materials.Glowstone);
- Material.invalidMaterials.put(Materials.Soularium);
- Material.invalidMaterials.put(Materials.PhasedIron);
+ Material.invalidMaterials.add(Materials.SoulSand);
+ Material.invalidMaterials.add(Materials.EnderPearl);
+ Material.invalidMaterials.add(Materials.EnderEye);
+ Material.invalidMaterials.add(Materials.Redstone);
+ Material.invalidMaterials.add(Materials.Glowstone);
+ Material.invalidMaterials.add(Materials.Soularium);
+ Material.invalidMaterials.add(Materials.PhasedIron);
}
diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
deleted file mode 100644
index 4de2e9ab78..0000000000
--- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java
+++ /dev/null
@@ -1,356 +0,0 @@
-package gtPlusPlus.api.objects.data;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Queue;
-import java.util.Set;
-
-public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collection<V>, Queue<V>, List<V> {
-
- /**
- * The Internal Map
- */
- protected final Map<Integer, V> mInternalMap;
-
- protected final Map<String, Integer> mInternalNameMap;
-
- /**
- * The Internal ID
- */
- private int mInternalID = 0;
-
- private static final long serialVersionUID = 3771412318075131790L;
-
- public AutoMap() {
- this(new LinkedHashMap<>());
- }
-
- public Map<Integer, V> getMap() {
- return mInternalMap;
- }
-
- public AutoMap(Map<Integer, V> defaultMapType) {
- mInternalMap = defaultMapType;
- mInternalNameMap = new LinkedHashMap<>();
- }
-
- /**
- * Generates an AutoMap from the List.
- *
- * @param aList - Data to be inserted into the AutoMap.
- */
- public AutoMap(List<V> aList) {
- mInternalMap = new LinkedHashMap<>();
- mInternalNameMap = new LinkedHashMap<>();
- if (aList != null && !aList.isEmpty()) {
- for (V obj : aList) {
- add(obj);
- }
- }
- }
-
- /**
- * Generates an AutoMap from a Set.
- *
- * @param aList - Data to be inserted into the AutoMap.
- */
- public AutoMap(Set<V> aList) {
- mInternalMap = new LinkedHashMap<>();
- mInternalNameMap = new LinkedHashMap<>();
- if (aList != null && !aList.isEmpty()) {
- for (V obj : aList) {
- add(obj);
- }
- }
- }
-
- /**
- * Generates an AutoMap from a Collection.
- *
- * @param aList - Data to be inserted into the AutoMap.
- */
- public AutoMap(Collection<V> aList) {
- mInternalMap = new LinkedHashMap<>();
- mInternalNameMap = new LinkedHashMap<>();
- if (aList != null && !aList.isEmpty()) {
- for (V obj : aList) {
- add(obj);
- }
- }
- }
-
- /**
- * Generates an AutoMap from a Array.
- *
- * @param aArray - Data to be inserted into the AutoMap.
- */
- public AutoMap(V[] aArray) {
- mInternalMap = new LinkedHashMap<>();
- mInternalNameMap = new LinkedHashMap<>();
- if (aArray != null) {
- for (V obj : aArray) {
- add(obj);
- }
- }
- }
-
- @Override
- public Iterator<V> iterator() {
- return values().iterator();
- }
-
- public synchronized boolean setValue(V object) {
- int mOriginalID = this.mInternalID;
- put(object);
- return this.mInternalMap.get(mOriginalID)
- .equals(object) || mOriginalID > this.mInternalID;
- }
-
- public synchronized V put(V object) {
- return set(object);
- }
-
- @Override
- public synchronized boolean add(V object) {
- return set(object) != null;
- }
-
- public synchronized V set(V object) {
- if (object == null) {
- return null;
- }
- mInternalNameMap.put("" + object.hashCode(), (mInternalID + 1));
- return mInternalMap.put(mInternalID++, object);
- }
-
- @Override
- public synchronized V get(int id) {
- return mInternalMap.get(id);
- }
-
- public synchronized Collection<V> values() {
- return mInternalMap.values();
- }
-
- @Override
- public synchronized int size() {
- return mInternalMap.size();
- }
-
- public synchronized int hashCode() {
- return mInternalMap.hashCode();
- }
-
- public synchronized boolean containsKey(int key) {
- return mInternalMap.containsKey(key);
- }
-
- public synchronized boolean containsValue(V value) {
- return mInternalMap.containsValue(value);
- }
-
- @Override
- public synchronized boolean isEmpty() {
- return mInternalMap.isEmpty();
- }
-
- @Override
- public synchronized void clear() {
- this.mInternalID = 0;
- this.mInternalMap.clear();
- this.mInternalNameMap.clear();
- }
-
- @Override
- @SuppressWarnings("unchecked")
- public V[] toArray() {
- V[] toR = (V[]) java.lang.reflect.Array.newInstance(
- mInternalMap.get(0)
- .getClass(),
- mInternalMap.size());
- for (int i = 0; i < mInternalMap.size(); i++) {
- toR[i] = mInternalMap.get(i);
- }
- return toR;
- }
-
- public final synchronized int getInternalID() {
- return mInternalID;
- }
-
- @Override
- public final synchronized boolean remove(Object value) {
- value.getClass();
- if (this.mInternalMap.containsValue(value)) {
- return this.mInternalMap.remove(mInternalNameMap.get("" + value.hashCode()), value);
- }
- return false;
- }
-
- @Override
- public boolean contains(Object o) {
- for (V g : this.mInternalMap.values()) {
- if (g.equals(o)) {
- return true;
- }
- }
- return false;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public <V> V[] toArray(V[] a) {
- return (V[]) toArray();
- }
-
- @Override
- public boolean containsAll(Collection<?> c) {
- boolean aTrue = true;
- for (Object g : c) {
- if (!this.contains(g)) {
- aTrue = false;
- }
- }
- return aTrue;
- }
-
- @Override
- public boolean addAll(Collection<? extends V> c) {
- boolean aTrue = true;
- for (V g : c) {
- if (!this.add(g)) {
- aTrue = false;
- }
- }
- return aTrue;
- }
-
- @Override
- public boolean removeAll(Collection<?> c) {
- boolean aTrue = true;
- for (Object g : c) {
- if (!this.remove(g)) {
- aTrue = false;
- }
- }
- return aTrue;
- }
-
- @Override
- public boolean retainAll(Collection<?> c) {
- AutoMap<?> aTempAllocation = new AutoMap<>();
- boolean aTrue = false;
- aTempAllocation = this;
- aTempAllocation.removeAll(c);
- aTempAllocation.clear();
- aTrue = aTempAllocation.isEmpty();
- aTempAllocation.clear();
- return aTrue;
- }
-
- @Override
- public boolean offer(V e) {
- return add(e);
- }
-
- @Override
- public V remove() {
- V y = this.get(0);
- if (remove(y)) return y;
- else return null;
- }
-
- @Override
- public V poll() {
- if (this.mInternalMap.isEmpty()) {
- return null;
- }
- return remove();
- }
-
- @Override
- public V element() {
- if (this.mInternalMap.isEmpty()) {
- return null;
- }
- return this.get(0);
- }
-
- @Override
- public V peek() {
- return element();
- }
-
- @Override
- public boolean addAll(int index, Collection<? extends V> c) {
- for (V y : c) {
- add(y);
- }
- return true;
- }
-
- @Override
- publi