Skip to content

Commit 4e786cd

Browse files
tier940tier940
authored
AE2 UEL: Extended support ends (#325)
1 parent bc5e02b commit 4e786cd

File tree

6 files changed

+3
-507
lines changed

6 files changed

+3
-507
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# 2.4.7
22
- Fix Draconium Casing Recycle [#324](https://github.com/GTModpackTeam/GTExpert-Core/pull/324)
3+
- AE2 UEL: Extended support ends [#325](https://github.com/GTModpackTeam/GTExpert-Core/pull/325)
34

45
* * *
56

‎dependencies.gradle‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,7 @@ dependencies {
5050
//devOnlyNonPublishable(rfg.deobf(project.files("libs/gregtech-1.12.2-2.8.9-beta-dev.jar"))) // CEu pr 2.8.10
5151
devOnlyNonPublishable(rfg.deobf("curse.maven:gregicality-multiblocks-564858:5508050")) // GCYM 1.2.10
5252
devOnlyNonPublishable(rfg.deobf("curse.maven:forgelin-continuous-456403:6142081")) // Forgelin-Continuous 2.1.10.0
53-
54-
// Switchable Dependencies
55-
if (project.useAE2uelExtended.toBoolean()) {
56-
devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-uel-extended-913322:5006535")) // AE2 UEL: Extended 0.55.30-0.4.0.2
57-
} else {
58-
devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5411078")) // AE2UEL 0.56.6
59-
}
53+
devOnlyNonPublishable(rfg.deobf("curse.maven:ae2-extended-life-570458:5378163")) // AE2UEL 0.56.5
6054

6155
// Debug GTWoodProcessing
6256
if (project.debug_all.toBoolean() || project.debug_gtwp.toBoolean()) {

‎gradle.properties‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ autoUpdateBuildScript = false
2020

2121
minecraftVersion = 1.12.2
2222

23-
# Switchable Dependencies
24-
# If 'useAE2uelExtended = true', AE2 UEL: Extended will be used
25-
# After enabling, change 'enableAE2UELExtended' in cfg(ae_integration.cfg)
26-
useAE2uelExtended = false
27-
2823
# Debug mod compatibility
2924
debug_all = false
3025
debug_gtwp = false

‎src/main/java/com/github/gtexpert/core/integration/ae/AEConfigHolder.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
category = "Applied Energistics 2")
1313
public class AEConfigHolder {
1414

15-
@Config.Comment({ "Change the recipe to use AE2 UEL: Extended by setting it to true.",
16-
"Changes are not recommended if you don't know what kind of mod it is.", "Default: false" })
17-
public static boolean enableAE2UELExtended = false;
18-
1915
@Config.Comment({ "The voltage at which AE can be started.",
2016
"The material is also adjusted to each voltage.", "Default: 3 (HV)" })
2117
@Config.RangeInt(min = 2, max = 10)

‎src/main/java/com/github/gtexpert/core/integration/ae/recipes/AEBlocksRecipe.java‎

Lines changed: 0 additions & 255 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.github.gtexpert.core.api.unification.material.GTEMaterials;
2323
import com.github.gtexpert.core.api.util.Mods;
2424
import com.github.gtexpert.core.common.GTEConfigHolder;
25-
import com.github.gtexpert.core.integration.ae.AEConfigHolder;
2625

2726
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
2827

@@ -90,96 +89,6 @@ public static void init() {
9089
" ", "I",
9190
'I', Mods.AppliedEnergistics2.getItem("fluid_interface"));
9291

93-
if (AEConfigHolder.enableAE2UELExtended) {
94-
// ME Delivery Interface
95-
ModHandler.removeRecipeByName(
96-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceimp_alt"));
97-
ModHandler.removeRecipeByName(
98-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceimp_part"));
99-
ModHandler.addShapedNBTClearingRecipe("interfaceimp_to_interfaceimp",
100-
Mods.AppliedEnergistics2.getItem("interfaceimp"),
101-
"I", " ",
102-
'I', Mods.AppliedEnergistics2.getItem("interfaceimp"));
103-
ModHandler.addShapedNBTClearingRecipe("interfaceimp_to_part_interfaceimp",
104-
Mods.AppliedEnergistics2.getItem("interfaceimp"),
105-
" ", "I",
106-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 620));
107-
ModHandler.addShapedNBTClearingRecipe("part_interfaceimp_to_part_interfaceimp",
108-
Mods.AppliedEnergistics2.getItem("part", 1, 620),
109-
"I", " ",
110-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 620));
111-
ModHandler.addShapedNBTClearingRecipe("part_interfaceimp_to_interfaceimp",
112-
Mods.AppliedEnergistics2.getItem("part", 1, 620),
113-
" ", "I",
114-
'I', Mods.AppliedEnergistics2.getItem("interfaceimp"));
115-
116-
// Advanced ME Delivery Interface
117-
ModHandler.removeRecipeByName(
118-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceadv_alt"));
119-
ModHandler.removeRecipeByName(
120-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceadv_part"));
121-
ModHandler.addShapedNBTClearingRecipe("interfaceadv_to_interfaceadv",
122-
Mods.AppliedEnergistics2.getItem("interfaceadv"),
123-
"I", " ",
124-
'I', Mods.AppliedEnergistics2.getItem("interfaceadv"));
125-
ModHandler.addShapedNBTClearingRecipe("interfaceadv_to_part_interfaceadv",
126-
Mods.AppliedEnergistics2.getItem("interfaceadv"),
127-
" ", "I",
128-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 621));
129-
ModHandler.addShapedNBTClearingRecipe("part_interfaceadv_to_part_interfaceadv",
130-
Mods.AppliedEnergistics2.getItem("part", 1, 621),
131-
"I", " ",
132-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 621));
133-
ModHandler.addShapedNBTClearingRecipe("part_interfaceadv_to_interfaceadv",
134-
Mods.AppliedEnergistics2.getItem("part", 1, 621),
135-
" ", "I",
136-
'I', Mods.AppliedEnergistics2.getItem("interfaceadv"));
137-
138-
// Perfect ME Delivery Interface
139-
ModHandler.removeRecipeByName(
140-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceper_alt"));
141-
ModHandler.removeRecipeByName(
142-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfaceper_part"));
143-
ModHandler.addShapedNBTClearingRecipe("interfaceper_to_interfaceper",
144-
Mods.AppliedEnergistics2.getItem("interfaceper"),
145-
"I", " ",
146-
'I', Mods.AppliedEnergistics2.getItem("interfaceper"));
147-
ModHandler.addShapedNBTClearingRecipe("interfaceper_to_part_interfaceper",
148-
Mods.AppliedEnergistics2.getItem("interfaceper"),
149-
" ", "I",
150-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 622));
151-
ModHandler.addShapedNBTClearingRecipe("part_interfaceper_to_part_interfaceper",
152-
Mods.AppliedEnergistics2.getItem("part", 1, 622),
153-
"I", " ",
154-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 622));
155-
ModHandler.addShapedNBTClearingRecipe("part_interfaceper_to_interfaceper",
156-
Mods.AppliedEnergistics2.getItem("part", 1, 622),
157-
" ", "I",
158-
'I', Mods.AppliedEnergistics2.getItem("interfaceper"));
159-
160-
// ME Patterns Interface
161-
ModHandler.removeRecipeByName(
162-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfacepatt_alt"));
163-
ModHandler.removeRecipeByName(
164-
Mods.AppliedEnergistics2.getResource("network/blocks/interfaces_interfacepatt_part"));
165-
ModHandler.addShapedNBTClearingRecipe("interfacepatt_to_interfacepatt",
166-
Mods.AppliedEnergistics2.getItem("interface_patterns"),
167-
"I", " ",
168-
'I', Mods.AppliedEnergistics2.getItem("interface_patterns"));
169-
ModHandler.addShapedNBTClearingRecipe("interfacepatt_to_part_interfacepatt",
170-
Mods.AppliedEnergistics2.getItem("interface_patterns"),
171-
" ", "I",
172-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 623));
173-
ModHandler.addShapedNBTClearingRecipe("part_interfacepatt_to_part_interfacepatt",
174-
Mods.AppliedEnergistics2.getItem("part", 1, 623),
175-
"I", " ",
176-
'I', Mods.AppliedEnergistics2.getItem("part", 1, 623));
177-
ModHandler.addShapedNBTClearingRecipe("part_interfacepatt_to_interfacepatt",
178-
Mods.AppliedEnergistics2.getItem("part", 1, 623),
179-
" ", "I",
180-
'I', Mods.AppliedEnergistics2.getItem("interface_patterns"));
181-
}
182-
18392
// ME Dual Interface
18493
if (Mods.AE2FluidCrafting.isModLoaded()) {
18594
ModHandler.removeRecipeByName(Mods.AE2FluidCrafting.getResource("dual_interface"));
@@ -492,56 +401,6 @@ public static void init() {
492401
Mods.AppliedEnergistics2.getItem("material", 1, 22),
493402
Mods.AppliedEnergistics2.getItem("material", 1, 24));
494403

495-
if (AEConfigHolder.enableAE2UELExtended) {
496-
// 4x Crafting Co-Processing Unit
497-
ModHandler.removeRecipeByName(
498-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_4x"));
499-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
500-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
501-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 35))
502-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_4x"))
503-
.duration(10).EUt(VA[ULV])
504-
.buildAndRegister();
505-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
506-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_4x"))
507-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
508-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 35))
509-
.duration(10).EUt(VA[ULV])
510-
.buildAndRegister();
511-
512-
// 16x Crafting Co-Processing Unit
513-
ModHandler.removeRecipeByName(
514-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_16x"));
515-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
516-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
517-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 36))
518-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_16x"))
519-
.duration(10).EUt(VA[ULV])
520-
.buildAndRegister();
521-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
522-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_16x"))
523-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
524-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 36))
525-
.duration(10).EUt(VA[ULV])
526-
.buildAndRegister();
527-
528-
// 64x Crafting Co-Processing Unit
529-
ModHandler.removeRecipeByName(
530-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_accelerator_64x"));
531-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
532-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
533-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 37))
534-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_64x"))
535-
.duration(10).EUt(VA[ULV])
536-
.buildAndRegister();
537-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
538-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator_64x"))
539-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_accelerator"))
540-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 37))
541-
.duration(10).EUt(VA[ULV])
542-
.buildAndRegister();
543-
}
544-
545404
// 1k Crafting Storage
546405
ModHandler.removeRecipeByName(
547406
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1k"));
@@ -605,119 +464,5 @@ public static void init() {
605464
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 38))
606465
.duration(10).EUt(VA[ULV])
607466
.buildAndRegister();
608-
609-
if (AEConfigHolder.enableAE2UELExtended) {
610-
// 1mb Crafting Storage
611-
ModHandler.removeRecipeByName(
612-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1mb"));
613-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
614-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
615-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 61))
616-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1mb"))
617-
.duration(10).EUt(VA[ULV])
618-
.buildAndRegister();
619-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
620-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1mb"))
621-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
622-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 61))
623-
.duration(10).EUt(VA[ULV])
624-
.buildAndRegister();
625-
626-
// 4mb Crafting Storage
627-
ModHandler.removeRecipeByName(
628-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_4mb"));
629-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
630-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
631-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 62))
632-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_4mb"))
633-
.duration(10).EUt(VA[ULV])
634-
.buildAndRegister();
635-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
636-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_4mb"))
637-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
638-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 62))
639-
.duration(10).EUt(VA[ULV])
640-
.buildAndRegister();
641-
642-
// 16mb Crafting Storage
643-
ModHandler.removeRecipeByName(
644-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_16mb"));
645-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
646-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
647-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 63))
648-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_16mb"))
649-
.duration(10).EUt(VA[ULV])
650-
.buildAndRegister();
651-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
652-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_16mb"))
653-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
654-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 63))
655-
.duration(10).EUt(VA[ULV])
656-
.buildAndRegister();
657-
658-
// 64mb Crafting Storage
659-
ModHandler.removeRecipeByName(
660-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_64mb"));
661-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
662-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
663-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 64))
664-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_64mb"))
665-
.duration(10).EUt(VA[ULV])
666-
.buildAndRegister();
667-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
668-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_64mb"))
669-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
670-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 64))
671-
.duration(10).EUt(VA[ULV])
672-
.buildAndRegister();
673-
674-
// 256mb Crafting Storage
675-
ModHandler.removeRecipeByName(
676-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_256mb"));
677-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
678-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
679-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 65))
680-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_256mb"))
681-
.duration(10).EUt(VA[ULV])
682-
.buildAndRegister();
683-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
684-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_256mb"))
685-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
686-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 65))
687-
.duration(10).EUt(VA[ULV])
688-
.buildAndRegister();
689-
690-
// 1gb Crafting Storage
691-
ModHandler.removeRecipeByName(
692-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_1gb"));
693-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
694-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
695-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 66))
696-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1gb"))
697-
.duration(10).EUt(VA[ULV])
698-
.buildAndRegister();
699-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
700-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_1gb"))
701-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
702-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 66))
703-
.duration(10).EUt(VA[ULV])
704-
.buildAndRegister();
705-
706-
// 2gb Crafting Storage
707-
ModHandler.removeRecipeByName(
708-
Mods.AppliedEnergistics2.getResource("network/crafting/cpu_crafting_storage_15gb"));
709-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
710-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
711-
.inputs(Mods.AppliedEnergistics2.getItem("material", 1, 67))
712-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_storage_15gb"))
713-
.duration(10).EUt(VA[ULV])
714-
.buildAndRegister();
715-
RecipeMaps.PACKER_RECIPES.recipeBuilder()
716-
.inputs(Mods.AppliedEnergistics2.getItem("crafting_storage_15gb"))
717-
.outputs(Mods.AppliedEnergistics2.getItem("crafting_unit"))
718-
.outputs(Mods.AppliedEnergistics2.getItem("material", 1, 67))
719-
.duration(10).EUt(VA[ULV])
720-
.buildAndRegister();
721-
}
722467
}
723468
}

0 commit comments

Comments
 (0)