aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorglowredman <35727266+glowredman@users.noreply.github.com>2023-04-21 21:22:42 +0200
committerglowredman <35727266+glowredman@users.noreply.github.com>2023-04-21 21:22:42 +0200
commitfa0e78aabdae9435a403a823b8e9d0dec3019161 (patch)
tree81ab521819bf1c5f4a851ddd9cb9c10661d5aecd
parente7d20f7d6e982e59f0816b114c6a5442b4cc31eb (diff)
downloadGT5-Unofficial-fa0e78aabdae9435a403a823b8e9d0dec3019161.tar.gz
GT5-Unofficial-fa0e78aabdae9435a403a823b8e9d0dec3019161.tar.bz2
GT5-Unofficial-fa0e78aabdae9435a403a823b8e9d0dec3019161.zip
Use Attuned Tengam
-rw-r--r--build.gradle4
-rw-r--r--src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java3
3 files changed, 7 insertions, 6 deletions
diff --git a/build.gradle b/build.gradle
index f82d369676..74899dc97b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1681680742
+//version: 1682104756
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
@@ -73,7 +73,7 @@ plugins {
id 'com.diffplug.spotless' version '6.7.2' apply false
id 'com.modrinth.minotaur' version '2.+' apply false
id 'com.matthewprenger.cursegradle' version '1.4.0' apply false
- id 'com.gtnewhorizons.retrofuturagradle' version '1.2.5'
+ id 'com.gtnewhorizons.retrofuturagradle' version '1.2.7'
}
boolean settingsupdated = verifySettingsGradle()
settingsupdated = verifyGitAttributes() || settingsupdated
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
index 25724194a0..9905f834cd 100644
--- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
+++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java
@@ -1633,7 +1633,7 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 8L),
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TengamAttuned, 8L),
GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Infinity, 16L),
GT_OreDictUnificator.get(OrePrefixes.ring, Materials.Infinity, 8L),
GT_OreDictUnificator.get(OrePrefixes.round, Materials.Infinity, 32L),
@@ -1849,7 +1849,7 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 16L),
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TengamAttuned, 16L),
GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.TranscendentMetal, 16L),
GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.TranscendentMetal, 8L),
GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.TranscendentMetal, 32L),
@@ -2072,7 +2072,7 @@ public class ResearchStationAssemblyLine implements Runnable {
comp_per_second,
research_eu_per_tick,
research_amperage,
- new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.SamariumMagnetic, 32L),
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.TengamAttuned, 32L),
GT_OreDictUnificator.get(OrePrefixes.stickLong, MaterialsUEVplus.SpaceTime, 16L),
GT_OreDictUnificator.get(OrePrefixes.ring, MaterialsUEVplus.SpaceTime, 8L),
GT_OreDictUnificator.get(OrePrefixes.round, MaterialsUEVplus.SpaceTime, 32L),
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
index 78f10c0a1c..a9259018ac 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java
@@ -56,6 +56,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_Rend
import com.github.technus.tectech.util.CommonValues;
import com.github.technus.tectech.util.ItemStackLong;
import com.google.common.collect.ImmutableList;
+import com.google.common.math.LongMath;
import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable;
import com.gtnewhorizon.structurelib.structure.IItemSource;
@@ -1345,7 +1346,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl
+ " L");
}
long euPerTick = euOutput / maxProgresstime();
- if (euPerTick < Math.pow(10, 12)) {
+ if (euPerTick < LongMath.pow(10, 12)) {
str.add("Estimated EU/t: " + RED + formatNumbers(euOutput / maxProgresstime()) + RESET + " EU/t");
} else {
str.add(