Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Godforge finale #3080

Merged
merged 112 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
4987ff4
remove multi-step and t4+ plasmas from exotic module plasma pool
GDCloudstrike Sep 3, 2024
fd14a60
fix missing word
GDCloudstrike Sep 3, 2024
3eda767
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 3, 2024
31a99ba
adjust upgrade costs
GDCloudstrike Sep 4, 2024
52eef47
Godforge Renderer (#3054)
CookieBrigade Sep 4, 2024
9138d73
another missing word
GDCloudstrike Sep 4, 2024
164f9db
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 5, 2024
a8f5425
fix auutobuild not working while formed
GDCloudstrike Sep 5, 2024
28925f9
output bus has to be ME variant
GDCloudstrike Sep 5, 2024
b51ae1b
fix dot
GDCloudstrike Sep 6, 2024
fa46ce2
fix first ring materializing out of nowhere when controller is broken
GDCloudstrike Sep 6, 2024
24ca67a
spotless
GDCloudstrike Sep 6, 2024
941095f
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 6, 2024
87915b4
Merge branch 'master' into godforge_finale
Dream-Master Sep 6, 2024
93d29ca
Merge branch 'master' into godforge_finale
Dream-Master Sep 6, 2024
13914ad
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 6, 2024
3675f4d
typo
GDCloudstrike Sep 6, 2024
97657fe
typo 213124
GDCloudstrike Sep 6, 2024
c0e0eef
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 6, 2024
02346a5
fix recipes not loading
GDCloudstrike Sep 6, 2024
547a239
Merge branch 'master' into godforge_finale
Dream-Master Sep 6, 2024
82de25c
load everything godforge related
GDCloudstrike Sep 6, 2024
bae1c01
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 6, 2024
520299b
disable debug
GDCloudstrike Sep 6, 2024
acb5591
Merge branch 'master' into godforge_finale
Dream-Master Sep 6, 2024
1a52489
decouple exotic module automation from parallel
GDCloudstrike Sep 7, 2024
cdd1837
enforce output bus and hatch on exotic module
GDCloudstrike Sep 7, 2024
9486203
wrong module
GDCloudstrike Sep 7, 2024
19c2d23
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 7, 2024
377236a
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 7, 2024
df6a17b
shuffle structurecheck around so it actually works
GDCloudstrike Sep 7, 2024
065398c
Merge branch 'master' into godforge_finale
Dream-Master Sep 7, 2024
bbfb935
Merge branch 'master' into godforge_finale
Dream-Master Sep 7, 2024
dab0a9d
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 7, 2024
67e758c
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 7, 2024
adc625a
adjust button textures a little
GDCloudstrike Sep 7, 2024
e478c0c
Merge branch 'master' into godforge_finale
Dream-Master Sep 7, 2024
e85fb4b
Temp fix attempt (#3103)
CookieBrigade Sep 7, 2024
b69e047
buff magmatter
GDCloudstrike Sep 7, 2024
6537c66
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 7, 2024
2fb7d0c
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 7, 2024
7422102
Gorge render attempt #2 (#3109)
CookieBrigade Sep 7, 2024
2226599
spotless
GDCloudstrike Sep 7, 2024
5398ac6
lock render spawner behind debug mode
GDCloudstrike Sep 7, 2024
7ee3842
add alternate phonon crystal solution recipe
GDCloudstrike Sep 7, 2024
5d21dc8
Gorge fixed with jank (#3111)
CookieBrigade Sep 8, 2024
333bdb4
spotless
GDCloudstrike Sep 8, 2024
da0b837
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 8, 2024
d162ddf
Merge branch 'master' into godforge_finale
GDCloudstrike Sep 8, 2024
fcfbcc9
curium can be solidified now
GDCloudstrike Sep 8, 2024
8cdc0e1
fix eu/t and parallel not resetting
GDCloudstrike Sep 8, 2024
b37c98a
fix milestone window bg not resetting
GDCloudstrike Sep 8, 2024
9041e87
Merge branch 'master' into godforge_finale
GDCloudstrike Sep 8, 2024
38bfcd4
tie debug mode to config
GDCloudstrike Sep 8, 2024
1b259c3
Gorge fixed with jank part 2 (#3129)
CookieBrigade Sep 8, 2024
187a5ea
Merge branch 'master' into godforge_finale
GDCloudstrike Sep 8, 2024
b1ebb8a
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 9, 2024
7b9335a
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 9, 2024
60fcc76
missed oxygen plasma
GDCloudstrike Sep 9, 2024
b72b21c
rework parallel bonus calcs a bit
GDCloudstrike Sep 9, 2024
81dcd62
Fix upgrade window rendering, allow nei functions
serenibyss Sep 9, 2024
62a1cc5
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 9, 2024
473d577
Gorge stuttering fix (#3136)
CookieBrigade Sep 9, 2024
4771674
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 9, 2024
5473952
Merge branch 'master' into godforge_finale
Dream-Master Sep 10, 2024
65a9590
decrease smelting module nei priority
GDCloudstrike Sep 10, 2024
df32c89
make upgrade deconstruction more lenient and fix some structure updat…
GDCloudstrike Sep 10, 2024
dfefc5d
display different text when respec-ing upgrades
GDCloudstrike Sep 10, 2024
3b3d2ca
fix neighboring upgrades not being reset
GDCloudstrike Sep 10, 2024
ec24e50
respec localization
GDCloudstrike Sep 10, 2024
f451eef
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 10, 2024
9bcc50f
make exotic module power consumption scale with parallel and add expe…
GDCloudstrike Sep 11, 2024
ed17be1
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 11, 2024
1d89ff8
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 11, 2024
100a9c0
Merge branch 'master' into godforge_finale
Dream-Master Sep 11, 2024
3a768f6
switch specialvalue to metadata and add alternate molten -> plasma re…
GDCloudstrike Sep 12, 2024
889930a
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 12, 2024
3865d1c
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 12, 2024
eba27b8
Merge branch 'master' into godforge_finale
Dream-Master Sep 12, 2024
6a799b6
Merge branch 'master' into godforge_finale
Dream-Master Sep 12, 2024
bf6cbd8
Merge branch 'master' into godforge_finale
Dream-Master Sep 12, 2024
772036b
make plasma module use recipe metadata
GDCloudstrike Sep 12, 2024
bae3f9e
refactor exotic module processing logic a bit and add recipe reset bu…
GDCloudstrike Sep 12, 2024
cc2e1fa
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 12, 2024
2f00d83
Merge branch 'master' into godforge_finale
Dream-Master Sep 12, 2024
8772633
Merge branch 'master' into godforge_finale
Dream-Master Sep 13, 2024
3d8113c
Merge branch 'master' into godforge_finale
Dream-Master Sep 13, 2024
5ef9d0b
Rewrite Helioflux Module, add NEI support (#3174)
serenibyss Sep 13, 2024
ffd398e
fix merge conflicts
GDCloudstrike Sep 13, 2024
250b5e7
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 13, 2024
a7f704f
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 13, 2024
04c68f6
Merge branch 'master' into godforge_finale
Dream-Master Sep 13, 2024
12afb66
add contributors window
GDCloudstrike Sep 13, 2024
009f18a
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 13, 2024
1cdfa02
Merge branch 'master' into godforge_finale
Dream-Master Sep 13, 2024
c31221a
add crude lines
GDCloudstrike Sep 14, 2024
27198c0
Merge remote-tracking branch 'origin/godforge_finale' into godforge_f…
GDCloudstrike Sep 14, 2024
df49da8
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 14, 2024
787b393
Gorge render mem leak - hopeful fix (#3184)
CookieBrigade Sep 14, 2024
34b5862
Merge branch 'master' into godforge_finale
Dream-Master Sep 14, 2024
8cee9c6
Merge branch 'master' into godforge_finale
Dream-Master Sep 14, 2024
ff34eed
fix duplicated molten module recipes
serenibyss Sep 14, 2024
52b418d
Fix various UI issues
serenibyss Sep 14, 2024
3ede39d
Merge branch 'master' into godforge_finale
Dream-Master Sep 14, 2024
324434d
Merge branch 'master' into godforge_finale
Dream-Master Sep 14, 2024
9fe90fd
attempt to fix merge conflict
GDCloudstrike Sep 14, 2024
461b765
attempt #2
GDCloudstrike Sep 14, 2024
3a13e52
fix logic
GDCloudstrike Sep 14, 2024
69cb31a
Merge remote-tracking branch 'origin/master' into godforge_finale
GDCloudstrike Sep 14, 2024
e7dee63
Merge branch 'master' into godforge_finale
Dream-Master Sep 15, 2024
e91fdeb
Merge branch 'master' into godforge_finale
Dream-Master Sep 15, 2024
6731ae7
reviews
serenibyss Sep 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/main/java/bartworks/MainMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
import gregtech.api.enums.Mods;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.check.CheckRecipeResultRegistry;
import tectech.loader.recipe.Godforge;

@Mod(
modid = MainMod.MOD_ID,
Expand Down Expand Up @@ -202,13 +203,17 @@ public static void runOnPlayerJoined(boolean classicMode, boolean disableExtraGa
BioVatLogicAdder.RadioHatch.runBasicItemIntegration();
if (!recipesAdded) {
StaticRecipeChangeLoaders.addEBFGasRecipes();
recipesAdded = true;
}

// Accept recipe map changes into Buffers
RecipeMap.ALL_RECIPE_MAPS.values()
.forEach(
map -> map.getBackend()
.reInit());

// because the above code runs so late that I couldn't find anywhere else to call this
if (!recipesAdded) Godforge.initMoltenModuleRecipes();

recipesAdded = true;
}
}
6 changes: 6 additions & 0 deletions src/main/java/gregtech/api/util/GTRecipeConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@ public class GTRecipeConstants {
public static final RecipeMetadataKey<Integer> FOG_PLASMA_TIER = SimpleRecipeMetadataKey
.create(Integer.class, "fog_plasma_tier");

/**
* FOG Plasma multistep requirement.
*/
public static final RecipeMetadataKey<Boolean> FOG_PLASMA_MULTISTEP = SimpleRecipeMetadataKey
.create(Boolean.class, "fog_plasma_multistep");

/**
* DEFC Casing tier.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import net.minecraftforge.fluids.FluidStack;

import bartworks.system.material.WerkstoffLoader;
import goodgenerator.items.GGMaterial;
import gregtech.GTMod;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.ItemList;
Expand Down Expand Up @@ -664,6 +665,20 @@ public void registerBlastFurnaceRecipes() {
.metadata(COIL_HEAT, 17000)
.addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
ItemList.Phononic_Seed_Crystal.get(2),
MaterialsUEVplus.Eternity.getDust(8),
GGMaterial.shirabon.get(OrePrefixes.dust, 8),
GTUtility.getIntegratedCircuit(2))
.fluidInputs(MaterialsUEVplus.Mellion.getMolten(512 * 144L))
.fluidOutputs(MaterialsUEVplus.PhononCrystalSolution.getFluid(3000))
.duration(200 * SECONDS)
.eut((int) TierEU.RECIPE_UXV)
.metadata(COIL_HEAT, 50000)
.noOptimize()
.addTo(blastFurnaceRecipes);

GTValues.RA.stdBuilder()
.itemInputs(MaterialsUEVplus.Mellion.getDust(1), GTUtility.getIntegratedCircuit(11))
.itemOutputs(GTOreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.Mellion, 1))
Expand Down
5 changes: 0 additions & 5 deletions src/main/java/tectech/loader/TecTechConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ public TecTechConfig(File pConfigBaseDirectory, String pModCollectionDirectory,
// final static to allow compiler to remove the debug code when this is false
public static boolean DEBUG_MODE = false;
public static boolean POWERLESS_MODE = false;
/**
* Not complete; enabled by default only in dev env
*/
public boolean ENABLE_GOD_FORGE;

public boolean BOOM_ENABLE;
public boolean DISABLE_BLOCK_HARDNESS_NERF;
public boolean EASY_SCAN;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/tectech/loader/recipe/BaseRecipeLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public void run() {
new Crafting().run();
new Extractor().run();
new ResearchStationAssemblyLine().run();
} else {
new Godforge().run();
}
}
Expand Down
398 changes: 273 additions & 125 deletions src/main/java/tectech/loader/recipe/Godforge.java

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions src/main/java/tectech/recipe/GodforgePlasmaFrontend.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package tectech.recipe;

import static gregtech.api.util.GTRecipeConstants.FOG_PLASMA_MULTISTEP;
import static gregtech.api.util.GTRecipeConstants.FOG_PLASMA_TIER;
import static gregtech.api.util.GTUtility.trans;
import static net.minecraft.util.StatCollector.translateToLocal;

Expand Down Expand Up @@ -52,11 +54,10 @@ protected void drawEnergyInfo(RecipeDisplayInfo recipeInfo) {
long eut = recipeInfo.recipe.mEUt;
long duration = recipeInfo.recipe.mDuration;
String multistep = "No";
if (recipeInfo.recipe.mSpecialItems.toString()
.equals("true")) {
if (recipeInfo.recipe.getMetadataOrDefault(FOG_PLASMA_MULTISTEP, false)) {
multistep = "Yes";
}
String requiredUpgrade = switch (recipeInfo.recipe.mSpecialValue) {
String requiredUpgrade = switch (recipeInfo.recipe.getMetadataOrDefault(FOG_PLASMA_TIER, 0)) {
case 1 -> "T4-T5";
case 2 -> "Exotic";
default -> "T1-T3";
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/tectech/recipe/TecTechRecipeMaps.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import gregtech.api.recipe.RecipeMapBackend;
import gregtech.api.recipe.RecipeMapBuilder;
import gregtech.api.util.GTRecipe;
import gregtech.nei.formatter.HeatingCoilSpecialValueFormatter;
import tectech.thing.CustomItemList;
import tectech.thing.gui.TecTechUITextures;

Expand Down Expand Up @@ -74,5 +75,14 @@ public static void init() {}
.neiTransferRect(78, 33, 20, 20)
.frontend(GodforgeExoticFrontend::new)
.build();
public static final RecipeMap<RecipeMapBackend> godforgeMoltenRecipes = RecipeMapBuilder.of("gt.recipe.fog_molten")
.maxIO(6, 6, 1, 2)
.minInputs(1, 0)
.progressBar(TecTechUITextures.PROGRESSBAR_GODFORGE_PLASMA, ProgressBar.Direction.RIGHT)
.neiSpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE)
.logo(TecTechUITextures.PICTURE_GODFORGE_LOGO)
.logoSize(18, 18)
.logoPos(151, 63)
.build();

}
Loading