mirror of
https://github.com/GTNewHorizons/Electro-Magic-Tools.git
synced 2026-11-21 04:22:09 +00:00
[ci skip] spotlessApply with the new settings
This commit is contained in:
1 parent
c312069d28
commit
6bdb2c0b96
100 files changed
+3171
-3401
No files matched your search
@@ -2,17 +2,21 @@ package emt.tile.solar;
|
||||
|
||||
import static thaumcraft.api.aspects.Aspect.*;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import emt.init.EMTBlocks;
|
||||
import emt.util.EMTConfigHandler;
|
||||
import gregtech.api.enums.GT_Values;
|
||||
import gregtech.api.enums.Materials;
|
||||
import java.util.LinkedHashMap;
|
||||
import javax.annotation.Nullable;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
|
||||
// Solar Factory
|
||||
public enum Solars {
|
||||
|
||||
// compability to older versions
|
||||
Compressed(EMTConfigHandler.compressedSolarOutput, null, 0, 0, "solar.compressed"),
|
||||
Double_Compressed(EMTConfigHandler.doubleCompressedSolarOutput, null, 0, 1, "solar.doublecompressed"),
|
||||
@@ -38,68 +42,67 @@ public enum Solars {
|
||||
|
||||
// New Solars
|
||||
Quadruple_Compressed(EMTConfigHandler.quadrupleCompressedSolarOutput, null, 2, 0, "Quadruple_Compressed_Solar"),
|
||||
Quadruple_Compressed_Ordo(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, ORDER, 2, 1, "Quadruple_Compressed_Ordo_Solar"),
|
||||
Quadruple_Compressed_Perditio(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, ENTROPY, 2, 2, "Quadruple_Compressed_Perditio_Solar"),
|
||||
Quadruple_Compressed_Aer(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, AIR, 2, 3, "Quadruple_Compressed_Aer_Solar"),
|
||||
Quadruple_Compressed_Terra(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, EARTH, 2, 4, "Quadruple_Compressed_Terra_Solar"),
|
||||
Quadruple_Compressed_Aqua(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, WATER, 2, 5, "Quadruple_Compressed_Aqua_Solar"),
|
||||
Quadruple_Compressed_Ignis(
|
||||
EMTConfigHandler.quadrupleCompressedSolarOutput, FIRE, 2, 6, "Quadruple_Compressed_Ignis_Solar"),
|
||||
Quadruple_Compressed_Ordo(EMTConfigHandler.quadrupleCompressedSolarOutput, ORDER, 2, 1,
|
||||
"Quadruple_Compressed_Ordo_Solar"),
|
||||
Quadruple_Compressed_Perditio(EMTConfigHandler.quadrupleCompressedSolarOutput, ENTROPY, 2, 2,
|
||||
"Quadruple_Compressed_Perditio_Solar"),
|
||||
Quadruple_Compressed_Aer(EMTConfigHandler.quadrupleCompressedSolarOutput, AIR, 2, 3,
|
||||
"Quadruple_Compressed_Aer_Solar"),
|
||||
Quadruple_Compressed_Terra(EMTConfigHandler.quadrupleCompressedSolarOutput, EARTH, 2, 4,
|
||||
"Quadruple_Compressed_Terra_Solar"),
|
||||
Quadruple_Compressed_Aqua(EMTConfigHandler.quadrupleCompressedSolarOutput, WATER, 2, 5,
|
||||
"Quadruple_Compressed_Aqua_Solar"),
|
||||
Quadruple_Compressed_Ignis(EMTConfigHandler.quadrupleCompressedSolarOutput, FIRE, 2, 6,
|
||||
"Quadruple_Compressed_Ignis_Solar"),
|
||||
Quintuple_Compressed(EMTConfigHandler.quintupleCompressedSolarOutput, null, 2, 7, "Quintuple_Compressed_Solar"),
|
||||
Quintuple_Compressed_Ordo(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, ORDER, 2, 8, "Quintuple_Compressed_Ordo_Solar"),
|
||||
Quintuple_Compressed_Perditio(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, ENTROPY, 2, 9, "Quintuple_Compressed_Perditio_Solar"),
|
||||
Quintuple_Compressed_Aer(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, AIR, 2, 10, "Quintuple_Compressed_Aer_Solar"),
|
||||
Quintuple_Compressed_Terra(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, EARTH, 2, 11, "Quintuple_Compressed_Terra_Solar"),
|
||||
Quintuple_Compressed_Aqua(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, WATER, 2, 12, "Quintuple_Compressed_Aqua_Solar"),
|
||||
Quintuple_Compressed_Ignis(
|
||||
EMTConfigHandler.quintupleCompressedSolarOutput, FIRE, 2, 13, "Quintuple_Compressed_Ignis_Solar"),
|
||||
Quintuple_Compressed_Ordo(EMTConfigHandler.quintupleCompressedSolarOutput, ORDER, 2, 8,
|
||||
"Quintuple_Compressed_Ordo_Solar"),
|
||||
Quintuple_Compressed_Perditio(EMTConfigHandler.quintupleCompressedSolarOutput, ENTROPY, 2, 9,
|
||||
"Quintuple_Compressed_Perditio_Solar"),
|
||||
Quintuple_Compressed_Aer(EMTConfigHandler.quintupleCompressedSolarOutput, AIR, 2, 10,
|
||||
"Quintuple_Compressed_Aer_Solar"),
|
||||
Quintuple_Compressed_Terra(EMTConfigHandler.quintupleCompressedSolarOutput, EARTH, 2, 11,
|
||||
"Quintuple_Compressed_Terra_Solar"),
|
||||
Quintuple_Compressed_Aqua(EMTConfigHandler.quintupleCompressedSolarOutput, WATER, 2, 12,
|
||||
"Quintuple_Compressed_Aqua_Solar"),
|
||||
Quintuple_Compressed_Ignis(EMTConfigHandler.quintupleCompressedSolarOutput, FIRE, 2, 13,
|
||||
"Quintuple_Compressed_Ignis_Solar"),
|
||||
Sextuple_Compressed(EMTConfigHandler.sextupleCompressedSolarOutput, null, 2, 14, "Sextuple_Compressed_Solar"),
|
||||
Sextuple_Compressed_Ordo(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, ORDER, 2, 15, "Sextuple_Compressed_Ordo_Solar"),
|
||||
Sextuple_Compressed_Perditio(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, ENTROPY, 3, 0, "Sextuple_Compressed_Perditio_Solar"),
|
||||
Sextuple_Compressed_Ordo(EMTConfigHandler.sextupleCompressedSolarOutput, ORDER, 2, 15,
|
||||
"Sextuple_Compressed_Ordo_Solar"),
|
||||
Sextuple_Compressed_Perditio(EMTConfigHandler.sextupleCompressedSolarOutput, ENTROPY, 3, 0,
|
||||
"Sextuple_Compressed_Perditio_Solar"),
|
||||
Sextuple_Compressed_Aer(EMTConfigHandler.sextupleCompressedSolarOutput, AIR, 3, 1, "Sextuple_Compressed_Aer_Solar"),
|
||||
Sextuple_Compressed_Terra(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, EARTH, 3, 2, "Sextuple_Compressed_Terra_Solar"),
|
||||
Sextuple_Compressed_Aqua(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, WATER, 3, 3, "Sextuple_Compressed_Aqua_Solar"),
|
||||
Sextuple_Compressed_Ignis(
|
||||
EMTConfigHandler.sextupleCompressedSolarOutput, FIRE, 3, 4, "Sextuple_Compressed_Ignis_Solar"),
|
||||
Sextuple_Compressed_Terra(EMTConfigHandler.sextupleCompressedSolarOutput, EARTH, 3, 2,
|
||||
"Sextuple_Compressed_Terra_Solar"),
|
||||
Sextuple_Compressed_Aqua(EMTConfigHandler.sextupleCompressedSolarOutput, WATER, 3, 3,
|
||||
"Sextuple_Compressed_Aqua_Solar"),
|
||||
Sextuple_Compressed_Ignis(EMTConfigHandler.sextupleCompressedSolarOutput, FIRE, 3, 4,
|
||||
"Sextuple_Compressed_Ignis_Solar"),
|
||||
Septuple_Compressed(EMTConfigHandler.septupleCompressedSolarOutput, null, 3, 5, "Septuple_Compressed_Solar"),
|
||||
Septuple_Compressed_Ordo(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, ORDER, 3, 6, "Septuple_Compressed_Ordo_Solar"),
|
||||
Septuple_Compressed_Perditio(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, ENTROPY, 3, 7, "Septuple_Compressed_Perditio_Solar"),
|
||||
Septuple_Compressed_Ordo(EMTConfigHandler.septupleCompressedSolarOutput, ORDER, 3, 6,
|
||||
"Septuple_Compressed_Ordo_Solar"),
|
||||
Septuple_Compressed_Perditio(EMTConfigHandler.septupleCompressedSolarOutput, ENTROPY, 3, 7,
|
||||
"Septuple_Compressed_Perditio_Solar"),
|
||||
Septuple_Compressed_Aer(EMTConfigHandler.septupleCompressedSolarOutput, AIR, 3, 8, "Septuple_Compressed_Aer_Solar"),
|
||||
Septuple_Compressed_Terra(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, EARTH, 3, 9, "Septuple_Compressed_Terra_Solar"),
|
||||
Septuple_Compressed_Aqua(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, WATER, 3, 10, "Septuple_Compressed_Aqua_Solar"),
|
||||
Septuple_Compressed_Ignis(
|
||||
EMTConfigHandler.septupleCompressedSolarOutput, FIRE, 3, 11, "Septuple_Compressed_Ignis_Solar"),
|
||||
Septuple_Compressed_Terra(EMTConfigHandler.septupleCompressedSolarOutput, EARTH, 3, 9,
|
||||
"Septuple_Compressed_Terra_Solar"),
|
||||
Septuple_Compressed_Aqua(EMTConfigHandler.septupleCompressedSolarOutput, WATER, 3, 10,
|
||||
"Septuple_Compressed_Aqua_Solar"),
|
||||
Septuple_Compressed_Ignis(EMTConfigHandler.septupleCompressedSolarOutput, FIRE, 3, 11,
|
||||
"Septuple_Compressed_Ignis_Solar"),
|
||||
Octuple_Compressed(EMTConfigHandler.octupleCompressedSolarOutput, null, 3, 12, "Octuple_Compressed_Solar"),
|
||||
Octuple_Compressed_Ordo(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, ORDER, 3, 13, "Octuple_Compressed_Ordo_Solar"),
|
||||
Octuple_Compressed_Perditio(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, ENTROPY, 3, 14, "Octuple_Compressed_Perditio_Solar"),
|
||||
Octuple_Compressed_Ordo(EMTConfigHandler.octupleCompressedSolarOutput, ORDER, 3, 13,
|
||||
"Octuple_Compressed_Ordo_Solar"),
|
||||
Octuple_Compressed_Perditio(EMTConfigHandler.octupleCompressedSolarOutput, ENTROPY, 3, 14,
|
||||
"Octuple_Compressed_Perditio_Solar"),
|
||||
Octuple_Compressed_Aer(EMTConfigHandler.octupleCompressedSolarOutput, AIR, 3, 15, "Octuple_Compressed_Aer_Solar"),
|
||||
Octuple_Compressed_Terra(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, EARTH, 4, 0, "Octuple_Compressed_Terra_Solar"),
|
||||
Octuple_Compressed_Aqua(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, WATER, 4, 1, "Octuple_Compressed_Aqua_Solar"),
|
||||
Octuple_Compressed_Ignis(
|
||||
EMTConfigHandler.octupleCompressedSolarOutput, FIRE, 4, 2, "Octuple_Compressed_Ignis_Solar"),
|
||||
;
|
||||
Octuple_Compressed_Terra(EMTConfigHandler.octupleCompressedSolarOutput, EARTH, 4, 0,
|
||||
"Octuple_Compressed_Terra_Solar"),
|
||||
Octuple_Compressed_Aqua(EMTConfigHandler.octupleCompressedSolarOutput, WATER, 4, 1,
|
||||
"Octuple_Compressed_Aqua_Solar"),
|
||||
Octuple_Compressed_Ignis(EMTConfigHandler.octupleCompressedSolarOutput, FIRE, 4, 2,
|
||||
"Octuple_Compressed_Ignis_Solar"),;
|
||||
|
||||
private static final LinkedHashMap<Long, Solars> cachemap = new LinkedHashMap<>();
|
||||
final int instance, meta;
|
||||
@@ -136,7 +139,9 @@ public enum Solars {
|
||||
new ItemStack(EMTBlocks.solars[s.instance], 1, s.meta),
|
||||
Materials.Chlorine.getGas(1000),
|
||||
new ItemStack(
|
||||
EMTBlocks.solars[getBaseSolar(s.output).instance], 1, getBaseSolar(s.output).meta),
|
||||
EMTBlocks.solars[getBaseSolar(s.output).instance],
|
||||
1,
|
||||
getBaseSolar(s.output).meta),
|
||||
null,
|
||||
null,
|
||||
null,
|
||||
|
||||
Reference in new issue
Block a user