Skip to content

update to 1.7.0 #9

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.

Sign up for GitHub

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

Closed
YoungOnionMC wants to merge 1 commit into from
Closed

update to 1.7.0 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ org.gradle.jvmargs=-Xmx1G

# Dependencies
architectury_version=9.2.14
gtceu_version=1.6.4
ldlib_version=1.0.34
gtceu_version=1.7.0-SNAPSHOT
ldlib_version=1.0.39
registrate_version=MC1.20-1.3.11
rhino_version=2001.2.3-build.6
kubejs_version=2001.6.5-build.14
Expand Down
7 changes: 4 additions & 3 deletions src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void convertEnergyTick() {
FluidStack coolant = coolantHatch.tank.getFluidInTank(0);
if (coolant.getFluid() == UtilMaterials.QuantumCoolant.getFluid() && coolant.getAmount() >= coolantDrain) {
coolantHatch.tank.handleRecipe(IO.IN, null,
List.of(FluidIngredient.of(coolantDrain, UtilMaterials.QuantumCoolant.getFluid())), null,
List.of(FluidIngredient.of(coolantDrain, UtilMaterials.QuantumCoolant.getFluid())),
false);
} else {
if (!ConfigHolder.INSTANCE.machines.harmlessActiveTransformers) {
Expand Down Expand Up @@ -196,14 +196,15 @@ public void onStructureFormed() {
var handlerIO = handler.getHandlerIO();
// If IO not compatible
if (io != IO.BOTH && handlerIO != IO.BOTH && io != handlerIO) continue;
if (handler.getCapability() == EURecipeCapability.CAP &&
if (handler.hasCapability(EURecipeCapability.CAP) &&
handler instanceof IEnergyContainer) {
if (handlerIO == IO.IN) {
localPowerInput.add(part);
} else if (handlerIO == IO.OUT) {
localPowerOutput.add(part);
}
traitSubscriptions.add(handler.addChangedListener(converterSubscription::updateSubscription));
handler.subscribe(converterSubscription::updateSubscription);
// traitSubscriptions.add(handler.addChangedListener(converterSubscription::updateSubscription));
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import static com.gregtechceu.gtceu.common.data.GTBlocks.LASER_PIPES;
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES;
import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES;
import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.*;
import static com.gregtechceu.gtceu.data.recipe.GTCraftingComponents.*;
import static net.neganote.gtutilities.common.item.UtilItems.OMNIBREAKER;
import static net.neganote.gtutilities.common.machine.UtilMachines.ENERGY_CONVERTER_64A;

Expand All @@ -38,12 +38,12 @@ public static void init(Consumer<FinishedRecipe> provider) {
ASSEMBLY_LINE_RECIPES.recipeBuilder("pterb")
.inputItems(GTMultiMachines.ACTIVE_TRANSFORMER)
.inputItems(TagPrefix.plate, GTMaterials.Neutronium, 32)
.inputItems(SENSOR.getIngredient(GTValues.UV), 8)
.inputItems(EMITTER.getIngredient(GTValues.UV), 8)
.inputItems(FIELD_GENERATOR.getIngredient(GTValues.UV), 4)
.inputItems(SENSOR.get(GTValues.UV), 8)
.inputItems(EMITTER.get(GTValues.UV), 8)
.inputItems(FIELD_GENERATOR.get(GTValues.UV), 4)
.inputItems(CustomTags.UHV_CIRCUITS, 2)
.inputItems(TagPrefix.pipeLargeFluid, GTMaterials.Neutronium, 4)
.inputItems(CABLE_QUAD.getIngredient(GTValues.UV), 8)
.inputItems(CABLE_QUAD.get(GTValues.UV), 8)
.inputItems(LASER_PIPES[0], 8)
.inputFluids(GTMaterials.SolderingAlloy.getFluid(GTValues.L * 32))
.EUt(1_600_000L)
Expand All @@ -58,10 +58,10 @@ public static void init(Consumer<FinishedRecipe> provider) {
public static void register64AConverterRecipes(Consumer<FinishedRecipe> provider) {
for (int tier : GTValues.tiersBetween(GTValues.ULV, GTValues.MAX)) {
ASSEMBLER_RECIPES.recipeBuilder("converter_64a_" + GTValues.VN[tier])
.inputItems(HULL.getIngredient(tier))
.inputItems(CIRCUIT.getIngredient(tier))
.inputItems(CABLE_HEX.getIngredient(0), 4)
.inputItems(CABLE_HEX.getIngredient(tier), 16)
.inputItems(HULL.get(tier))
.inputItems(CIRCUIT.get(tier))
.inputItems(CABLE_HEX.get(0), 4)
.inputItems(CABLE_HEX.get(tier), 16)
.outputItems(ENERGY_CONVERTER_64A[tier])
.EUt(GTValues.VEX[tier]).duration(40)
.save(provider);
Expand All @@ -83,10 +83,10 @@ private static ItemStack getPowerUnit(int tier) {
public static void registerOmnitoolRecipe(Consumer<FinishedRecipe> provider) {
ASSEMBLER_RECIPES.recipeBuilder("omnibreaker")
.inputItems(getPowerUnit(UtilConfig.INSTANCE.features.omnibreakerTier))
.inputItems(CIRCUIT.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 2)
.inputItems(EMITTER.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 1)
.inputItems(CABLE_QUAD.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 3)
.inputItems(MOTOR.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 2)
.inputItems(CIRCUIT.get(UtilConfig.INSTANCE.features.omnibreakerTier), 2)
.inputItems(EMITTER.get(UtilConfig.INSTANCE.features.omnibreakerTier), 1)
.inputItems(CABLE_QUAD.get(UtilConfig.INSTANCE.features.omnibreakerTier), 3)
.inputItems(MOTOR.get(UtilConfig.INSTANCE.features.omnibreakerTier), 2)
.outputItems(OMNIBREAKER)
.EUt(GTValues.VEX[UtilConfig.INSTANCE.features.omnibreakerTier]).duration(20 * 60)
.save(provider);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/neganote/gtutilities/saveddata/PTERBSavedData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public EnergyContainerList getWirelessEnergyInputs(int freq) {
if (machine instanceof LaserHatchPartMachine hatch) {
// unfortunately the laser hatch's buffer is private, so I have to do this instead
for (var handler : hatch.getRecipeHandlers()) {
if (handler.getCapability() == EURecipeCapability.CAP &&
if (handler.hasCapability(EURecipeCapability.CAP) &&
handler instanceof IEnergyContainer container) {
energyContainerList.add(container);
}
Expand All @@ -277,7 +277,7 @@ public EnergyContainerList getWirelessEnergyOutputs(int freq) {
if (machine instanceof LaserHatchPartMachine hatch) {
// unfortunately the laser hatch's buffer is private, so I have to do this instead
for (var handler : hatch.getRecipeHandlers()) {
if (handler.getCapability() == EURecipeCapability.CAP &&
if (handler.hasCapability(EURecipeCapability.CAP) &&
handler instanceof IEnergyContainer container) {
energyContainerList.add(container);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/neganote/gtutilities/utils/EnergyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static EnergyContainerList getEnergyListFromMultiParts(List<IMultiPart> p
if (part instanceof LaserHatchPartMachine hatch) {
// unfortunately the laser hatch's buffer is private, so I have to do this instead
for (var handler : hatch.getRecipeHandlers()) {
if (handler.getCapability() == EURecipeCapability.CAP &&
if (handler.hasCapability(EURecipeCapability.CAP) &&
handler instanceof IEnergyContainer container) {
energyContainerList.add(container);
}
Expand Down
Loading