Skip to content

Make research EU/t long to be consistent with recipes using long #2723

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

Merged
Zorbatron merged 1 commit into from
Feb 14, 2025
Merged

Make research EU/t long to be consistent with recipes using long #2723

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
10 changes: 5 additions & 5 deletions src/main/java/gregtech/api/recipes/builders/AssemblyLineRecipeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static class ResearchRecipeEntry {
private final ItemStack dataStack;
private final boolean ignoreNBT;
private final int duration;
private final int EUt;
private final long EUt;
private final int CWUt;

/**
Expand All @@ -167,10 +167,10 @@ public static class ResearchRecipeEntry {
* @param CWUt how much computation per tick this recipe needs if in Research Station
* <p>
* By default, will ignore NBT on researchStack input. If NBT matching is desired, see
* {@link #ResearchRecipeEntry(String, ItemStack, ItemStack, boolean, int, int, int)}
* {@link #ResearchRecipeEntry(String, ItemStack, ItemStack, boolean, int, long, int)}
*/
public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack researchStack,
@NotNull ItemStack dataStack, int duration, int EUt, int CWUt) {
@NotNull ItemStack dataStack, int duration, long EUt, int CWUt) {
this.researchId = researchId;
this.researchStack = researchStack;
this.dataStack = dataStack;
Expand All @@ -189,7 +189,7 @@ public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack resear
* @param CWUt how much computation per tick this recipe needs if in Research Station
*/
public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack researchStack,
@NotNull ItemStack dataStack, boolean ignoreNBT, int duration, int EUt, int CWUt) {
@NotNull ItemStack dataStack, boolean ignoreNBT, int duration, long EUt, int CWUt) {
this.researchId = researchId;
this.researchStack = researchStack;
this.dataStack = dataStack;
Expand Down Expand Up @@ -222,7 +222,7 @@ public int getDuration() {
return duration;
}

public int getEUt() {
public long getEUt() {
return EUt;
}

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/api/recipes/builders/ResearchRecipeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public abstract class ResearchRecipeBuilder<T extends ResearchRecipeBuilder<T>>
protected ItemStack dataStack;
protected boolean ignoreNBT;
protected String researchId;
protected int eut;
protected long eut;

public T researchStack(@NotNull ItemStack researchStack) {
if (!researchStack.isEmpty()) {
Expand Down Expand Up @@ -47,7 +47,7 @@ public T researchId(String researchId) {
return (T) this;
}

public T EUt(int eut) {
public T EUt(long eut) {
this.eut = eut;
return (T) this;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/gregtech/api/util/AssemblyLineManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ public static void createDefaultResearchRecipe(@NotNull AssemblyLineRecipeBuilde
@Deprecated
@ApiStatus.ScheduledForRemoval(inVersion = "2.9")
public static void createDefaultResearchRecipe(@NotNull String researchId, @NotNull ItemStack researchItem,
@NotNull ItemStack dataItem, int duration, int EUt, int CWUt) {
@NotNull ItemStack dataItem, int duration, long EUt, int CWUt) {
createDefaultResearchRecipe(researchId, researchItem, dataItem, true, duration, EUt, CWUt);
}

public static void createDefaultResearchRecipe(@NotNull String researchId, @NotNull ItemStack researchItem,
@NotNull ItemStack dataItem, boolean ignoreNBT, int duration,
int EUt, int CWUt) {
long EUt, int CWUt) {
if (!ConfigHolder.machines.enableResearch) return;

NBTTagCompound compound = GTUtility.getOrCreateNbtCompound(dataItem);
Expand Down
Loading