Skip to content

Commit

Permalink
Merge branch 'master' into deprecations-cleanup/render
Browse files Browse the repository at this point in the history
  • Loading branch information
@serenibyss
serenibyss authored Jan 25, 2025
2 parents d3c6c46 + 21a7322 commit cacdbdc
Show file tree
Hide file tree
Showing 63 changed files with 473 additions and 280 deletions.
12 changes: 6 additions & 6 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
dependencies {
api("com.github.GTNewHorizons:StructureLib:1.4.2:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.23-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.7.25-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
api("com.github.GTNewHorizons:GTNHLib:0.6.3:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.8.2:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-523-GTNH:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-527-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.23-gtnh:dev")
api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
api("com.github.GTNewHorizons:Postea:1.0.13:dev")
Expand Down Expand Up @@ -72,15 +72,15 @@ dependencies {
compileOnly('com.github.GTNewHorizons:VisualProspecting:1.4.0:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.106-GTNH:dev") { transitive = false }

compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.3-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.3.4-GTNH:dev") { transitive = false }
implementation("com.github.GTNewHorizons:TinkersConstruct:1.13.7-GTNH:dev")

compileOnly("com.github.GTNewHorizons:Chisel:2.16.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Translocators:1.3.0:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.17:dev")
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.20:dev")
compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false }
compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
Expand All @@ -89,7 +89,7 @@ dependencies {
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.5-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")
Expand Down
8 changes: 8 additions & 0 deletions src/main/java/bartworks/API/recipe/BacterialVatFrontend.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package bartworks.API.recipe;

import static gregtech.api.util.GTRecipeConstants.GLASS;
import static gregtech.api.util.GTUtility.getTierNameWithParentheses;
import static gregtech.api.util.GTUtility.trans;

import java.util.List;

Expand All @@ -16,6 +18,7 @@
import gregtech.api.recipe.NEIRecipePropertiesBuilder;
import gregtech.api.recipe.RecipeMapFrontend;
import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.GTUtility;
import gregtech.api.util.MethodsReturnNonnullByDefault;
import gregtech.api.util.recipe.Sievert;
import gregtech.nei.GTNEIDefaultHandler;
Expand Down Expand Up @@ -76,10 +79,15 @@ private void drawFluidOverlay(GTNEIDefaultHandler.FixedPositionedStack stack) {

@Override
protected void drawEnergyInfo(RecipeDisplayInfo recipeInfo) {
long eut = recipeInfo.recipe.mEUt;
long duration = recipeInfo.recipe.mDuration;
int glassTier = recipeInfo.recipe.getMetadataOrDefault(GLASS, 3);
Sievert data = recipeInfo.recipe.getMetadataOrDefault(GTRecipeConstants.SIEVERT, new Sievert(0, false));
int sievert = data.sievert;
boolean isExact = data.isExact;
recipeInfo.drawText(trans("152", "Total: ") + GTUtility.formatNumbers(eut * duration) + " EU");
recipeInfo.drawText(
trans("153", "Usage: ") + GTUtility.formatNumbers(eut) + " EU/t" + getTierNameWithParentheses(eut));
recipeInfo.drawText(StatCollector.translateToLocalFormatted("nei.biovat.0.name", GTValues.VN[glassTier]));
if (sievert != 0) {
if (!isExact) {
Expand Down
50 changes: 20 additions & 30 deletions src/main/java/bartworks/common/loaders/recipes/CraftingRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.StainlessSteel, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Kanthal, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 1L), 'C',
ItemList.MACHINE_HULLS[3].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.HV,
'C', ItemList.MACHINE_HULLS[3].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_EV.ID, "bw.biolabEV", StatCollector.translateToLocal("tile.biolab.name"), 4)
Expand All @@ -421,9 +420,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Titanium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Nichrome, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 1L), 'C',
ItemList.MACHINE_HULLS[4].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.EV,
'C', ItemList.MACHINE_HULLS[4].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_IV.ID, "bw.biolabIV", StatCollector.translateToLocal("tile.biolab.name"), 5)
Expand All @@ -433,9 +431,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.TPV, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.IV, 1L), 'C',
ItemList.MACHINE_HULLS[5].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.IV,
'C', ItemList.MACHINE_HULLS[5].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_LuV.ID, "bw.biolabLuV", StatCollector.translateToLocal("tile.biolab.name"), 6)
Expand All @@ -444,9 +441,8 @@ public void run() {
new Object[] { "PFP", "WCW", "OGO", 'F', GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Chrome, 1L),
'W', GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.HSSG, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LuV, 1L), 'C',
ItemList.MACHINE_HULLS[6].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.LuV,
'C', ItemList.MACHINE_HULLS[6].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_ZPM.ID, "bw.biolabZPM", StatCollector.translateToLocal("tile.biolab.name"), 7)
Expand All @@ -456,9 +452,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Iridium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Naquadah, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.ZPM, 1L), 'C',
ItemList.MACHINE_HULLS[7].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.ZPM,
'C', ItemList.MACHINE_HULLS[7].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UV.ID, "bw.biolabUV", StatCollector.translateToLocal("tile.biolab.name"), 8)
Expand All @@ -467,9 +462,8 @@ public void run() {
new Object[] { "PFP", "WCW", "OGO", 'F', GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Osmium, 1L),
'W', GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.NaquadahAlloy, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UV, 1L), 'C',
ItemList.MACHINE_HULLS[8].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UV,
'C', ItemList.MACHINE_HULLS[8].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UHV.ID, "bw.biolabUHV", StatCollector.translateToLocal("tile.biolab.name"), 9)
Expand All @@ -479,9 +473,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Neutronium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.ElectrumFlux, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UHV, 1L), 'C',
ItemList.MACHINE_HULLS[9].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UHV,
'C', ItemList.MACHINE_HULLS[9].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UEV.ID, "bw.biolabUEV", StatCollector.translateToLocal("tile.biolab.name"), 10)
Expand All @@ -491,9 +484,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Bedrockium, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.DraconiumAwakened, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UEV, 1L), 'C',
ItemList.MACHINE_HULLS[10].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UEV,
'C', ItemList.MACHINE_HULLS[10].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UIV.ID, "bw.biolabUIV", StatCollector.translateToLocal("tile.biolab.name"), 11)
Expand All @@ -503,9 +495,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.TranscendentMetal, 1L), 'W',
GTOreDictUnificator.get(OrePrefixes.wireGt01, Materials.Infinity, 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UIV, 1L), 'C',
ItemList.MACHINE_HULLS[11].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UIV,
'C', ItemList.MACHINE_HULLS[11].get(1L) });

GTModHandler.addCraftingRecipe(
new MTEBioLab(BioLab_UMV.ID, "bw.biolabUMV", StatCollector.translateToLocal("tile.biolab.name"), 12)
Expand All @@ -515,9 +506,8 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.frameGt, MaterialsUEVplus.SpaceTime, 1L), 'W',
GTOreDictUnificator.get("wireGt01Hypogen", 1L), 'P',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polytetrafluoroethylene, 1L), 'O',
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G',
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 1L), 'C',
ItemList.MACHINE_HULLS[12].get(1L) });
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Polystyrene, 1L), 'G', "circuit" + Materials.UMV,
'C', ItemList.MACHINE_HULLS[12].get(1L) });

// Radio Hatches
GTModHandler.addCraftingRecipe(
Expand Down
20 changes: 15 additions & 5 deletions src/main/java/bartworks/system/material/Werkstoff.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -695,7 +695,7 @@ public static class GenerationFeatures {
/*
* dust 1 metal 10 (ingot, nugget) gem 100 ore 1000 cell 10000 plasma 100000 molten 1000000 crafting metal
* 10000000 (sticks, plates) meta crafting metal 100000000 (gears, screws, bolts, springs) multiple ingotWorth
* stuff 1000000000 (double, triple, quadruple, ingot/plates)
* stuff 1000000000 (double and dense plates) 1000000000 (triple, quadruple and quintuple plates)
*/
private boolean isExtension;
private static final NonNullWrappedHashMap<OrePrefixes, Integer> prefixLogic = new NonNullWrappedHashMap<>(0);
Expand Down Expand Up @@ -759,10 +759,12 @@ public static void initPrefixLogic() {
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.wireFine, 0b100000000);

Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateDouble, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateTriple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuadruple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuintuple, 0x200);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateDense, 0x200);

Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateTriple, 0x400);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuadruple, 0x400);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.plateQuintuple, 0x400);

Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasing, 0x380);
Werkstoff.GenerationFeatures.prefixLogic.put(OrePrefixes.blockCasingAdvanced, 0x380);
}
Expand Down Expand Up @@ -969,11 +971,19 @@ public Werkstoff.GenerationFeatures addCraftingMetalWorkingItems() {
return this;
}

public Werkstoff.GenerationFeatures addMultipleIngotMetalWorkingItems() {
public Werkstoff.GenerationFeatures addDoubleAndDensePlates() {
this.toGenerate = this.toGenerate | 0x200;
return this;
}

/**
* Due to rebolted casings, double plates had to be excluded from this
*/
public Werkstoff.GenerationFeatures addMultiPlates() {
this.toGenerate = this.toGenerate | 0x400;
return this;
}

public Werkstoff.GenerationFeatures addPrefix(OrePrefixes prefixes) {
this.toGenerate = this.toGenerate | getPrefixDataRaw(prefixes);
return this;
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/bartworks/system/material/WerkstoffLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ public static void setUp() {
.addMixerRecipes((short) 1)
.addSimpleMetalWorkingItems()
.addCraftingMetalWorkingItems()
.addMultipleIngotMetalWorkingItems()
.addDoubleAndDensePlates()
.addMetaSolidifierRecipes()
.addMetalCraftingSolidifierRecipes(),
88,
Expand Down Expand Up @@ -1385,7 +1385,7 @@ public static void setUp() {
.addMixerRecipes((short) 1)
.addSimpleMetalWorkingItems()
.addCraftingMetalWorkingItems()
.addMultipleIngotMetalWorkingItems()
.addDoubleAndDensePlates()
.addMetaSolidifierRecipes()
.addMetalCraftingSolidifierRecipes(),
90,
Expand Down Expand Up @@ -1417,7 +1417,7 @@ public static void setUp() {
.addMixerRecipes()
.addSimpleMetalWorkingItems()
.addCraftingMetalWorkingItems()
.addMultipleIngotMetalWorkingItems()
.addDoubleAndDensePlates()
.addMetaSolidifierRecipes()
.addMetalCraftingSolidifierRecipes(),
92,
Expand Down Expand Up @@ -1480,7 +1480,7 @@ public static void setUp() {
.addCraftingMetalWorkingItems()
.addMolten()
.addSimpleMetalWorkingItems()
.addMultipleIngotMetalWorkingItems()
.addDoubleAndDensePlates()
.addMetaSolidifierRecipes()
.addMetalCraftingSolidifierRecipes(),
96,
Expand Down Expand Up @@ -1968,11 +1968,13 @@ private static void addItemsForGeneration() {
WerkstoffLoader.items.put(wireFine, new BWMetaGeneratedItems(wireFine));
}
if ((WerkstoffLoader.toGenerateGlobal & 0b1000000000) != 0) {
WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense));;
}
if ((WerkstoffLoader.toGenerateGlobal & 0b10000000000) != 0) {
WerkstoffLoader.items.put(plateDouble, new BWMetaGeneratedItems(plateDouble));
WerkstoffLoader.items.put(plateTriple, new BWMetaGeneratedItems(plateTriple));
WerkstoffLoader.items.put(plateQuadruple, new BWMetaGeneratedItems(plateQuadruple));
WerkstoffLoader.items.put(plateQuintuple, new BWMetaGeneratedItems(plateQuintuple));
WerkstoffLoader.items.put(plateDense, new BWMetaGeneratedItems(plateDense));;
}
ENABLED_ORE_PREFIXES.addAll(WerkstoffLoader.items.keySet());
ENABLED_ORE_PREFIXES.add(ore);
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/goodgenerator/blocks/tileEntity/MTEPreciseAssembler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ public IStructureDefinition<MTEPreciseAssembler> getStructureDefinition() {
withChannel(
"machine casing",
StructureUtility.ofBlocksTiered(
(block, meta) -> block == GregTechAPI.sBlockCasings1 ? meta : -2,
(block, meta) -> (block == GregTechAPI.sBlockCasings1 && meta >= 0 && meta <= 9) ? meta
: -2,
IntStream.range(0, 10)
.mapToObj(
meta -> org.apache.commons.lang3.tuple.Pair.of(GregTechAPI.sBlockCasings1, meta))
Expand Down
Loading

0 comments on commit cacdbdc

Please sign in to comment.