Skip to content

Commit a95ea1d

Browse files
authored
Make research EU/t long to be consistent with recipes using long (#2723)
1 parent 1edca92 commit a95ea1d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/main/java/gregtech/api/recipes/builders/AssemblyLineRecipeBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public static class ResearchRecipeEntry {
155155
private final ItemStack dataStack;
156156
private final boolean ignoreNBT;
157157
private final int duration;
158-
private final int EUt;
158+
private final long EUt;
159159
private final int CWUt;
160160

161161
/**
@@ -167,10 +167,10 @@ public static class ResearchRecipeEntry {
167167
* @param CWUt how much computation per tick this recipe needs if in Research Station
168168
* <p>
169169
* By default, will ignore NBT on researchStack input. If NBT matching is desired, see
170-
* {@link #ResearchRecipeEntry(String, ItemStack, ItemStack, boolean, int, int, int)}
170+
* {@link #ResearchRecipeEntry(String, ItemStack, ItemStack, boolean, int, long, int)}
171171
*/
172172
public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack researchStack,
173-
@NotNull ItemStack dataStack, int duration, int EUt, int CWUt) {
173+
@NotNull ItemStack dataStack, int duration, long EUt, int CWUt) {
174174
this.researchId = researchId;
175175
this.researchStack = researchStack;
176176
this.dataStack = dataStack;
@@ -189,7 +189,7 @@ public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack resear
189189
* @param CWUt how much computation per tick this recipe needs if in Research Station
190190
*/
191191
public ResearchRecipeEntry(@NotNull String researchId, @NotNull ItemStack researchStack,
192-
@NotNull ItemStack dataStack, boolean ignoreNBT, int duration, int EUt, int CWUt) {
192+
@NotNull ItemStack dataStack, boolean ignoreNBT, int duration, long EUt, int CWUt) {
193193
this.researchId = researchId;
194194
this.researchStack = researchStack;
195195
this.dataStack = dataStack;
@@ -222,7 +222,7 @@ public int getDuration() {
222222
return duration;
223223
}
224224

225-
public int getEUt() {
225+
public long getEUt() {
226226
return EUt;
227227
}
228228

src/main/java/gregtech/api/recipes/builders/ResearchRecipeBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public abstract class ResearchRecipeBuilder<T extends ResearchRecipeBuilder<T>>
1717
protected ItemStack dataStack;
1818
protected boolean ignoreNBT;
1919
protected String researchId;
20-
protected int eut;
20+
protected long eut;
2121

2222
public T researchStack(@NotNull ItemStack researchStack) {
2323
if (!researchStack.isEmpty()) {
@@ -47,7 +47,7 @@ public T researchId(String researchId) {
4747
return (T) this;
4848
}
4949

50-
public T EUt(int eut) {
50+
public T EUt(long eut) {
5151
this.eut = eut;
5252
return (T) this;
5353
}

src/main/java/gregtech/api/util/AssemblyLineManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@ public static void createDefaultResearchRecipe(@NotNull AssemblyLineRecipeBuilde
129129
@Deprecated
130130
@ApiStatus.ScheduledForRemoval(inVersion = "2.9")
131131
public static void createDefaultResearchRecipe(@NotNull String researchId, @NotNull ItemStack researchItem,
132-
@NotNull ItemStack dataItem, int duration, int EUt, int CWUt) {
132+
@NotNull ItemStack dataItem, int duration, long EUt, int CWUt) {
133133
createDefaultResearchRecipe(researchId, researchItem, dataItem, true, duration, EUt, CWUt);
134134
}
135135

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

141141
NBTTagCompound compound = GTUtility.getOrCreateNbtCompound(dataItem);

0 commit comments

Comments
 (0)