aboutsummaryrefslogtreecommitdiff
path: root/src/functionalTest/java
diff options
context:
space:
mode:
authorNotAPenguin <michiel.vandeginste@gmail.com>2024-09-02 23:17:17 +0200
committerGitHub <noreply@github.com>2024-09-02 23:17:17 +0200
commit1b820de08a05070909a267e17f033fcf58ac8710 (patch)
tree02831a025986a06b20f87e5bcc69d1e0c639a342 /src/functionalTest/java
parentafd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff)
downloadGT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2
GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip
The Great Renaming (#3014)
* move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names
Diffstat (limited to 'src/functionalTest/java')
-rw-r--r--src/functionalTest/java/gregtech/test/GTParallelHelperTest.java28
-rw-r--r--src/functionalTest/java/gregtech/test/GTRecipeTest.java44
-rw-r--r--src/functionalTest/java/kubatech/test/EIGTests.java17
-rw-r--r--src/functionalTest/java/kubatech/test/kubatechTestMod.java6
4 files changed, 47 insertions, 48 deletions
diff --git a/src/functionalTest/java/gregtech/test/GTParallelHelperTest.java b/src/functionalTest/java/gregtech/test/GTParallelHelperTest.java
index 67abe8a5bd..a0242627f9 100644
--- a/src/functionalTest/java/gregtech/test/GTParallelHelperTest.java
+++ b/src/functionalTest/java/gregtech/test/GTParallelHelperTest.java
@@ -11,14 +11,14 @@ import org.junit.jupiter.api.Test;
import gregtech.api.enums.Materials;
import gregtech.api.enums.TierEU;
-import gregtech.api.util.GT_ParallelHelper;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTRecipe;
+import gregtech.api.util.GTUtility;
+import gregtech.api.util.ParallelHelper;
import gregtech.test.mock.MockIVoidableMachine;
public class GTParallelHelperTest {
- static GT_Recipe rubberRecipe;
+ static GTRecipe rubberRecipe;
static ItemStack[] inputItems;
static MockIVoidableMachine machine;
@@ -27,7 +27,7 @@ public class GTParallelHelperTest {
machine = new MockIVoidableMachine();
ItemStack rubberDust = Materials.RawRubber.getDust(1);
ItemStack sulfurDust = Materials.Sulfur.getDust(1);
- rubberRecipe = new GT_Recipe(
+ rubberRecipe = new GTRecipe(
new ItemStack[] { rubberDust.copy(), sulfurDust.copy() },
new ItemStack[] { Materials.Rubber.getDust(1), Materials.Rubber.getDustTiny(1) },
null,
@@ -38,15 +38,15 @@ public class GTParallelHelperTest {
1,
0);
- inputItems = new ItemStack[] { GT_Utility.copyAmountUnsafe(Integer.MAX_VALUE, rubberDust),
- GT_Utility.copyAmountUnsafe(Integer.MAX_VALUE, rubberDust),
- GT_Utility.copyAmountUnsafe(Integer.MAX_VALUE, sulfurDust),
- GT_Utility.copyAmountUnsafe(Integer.MAX_VALUE, sulfurDust) };
+ inputItems = new ItemStack[] { GTUtility.copyAmountUnsafe(Integer.MAX_VALUE, rubberDust),
+ GTUtility.copyAmountUnsafe(Integer.MAX_VALUE, rubberDust),
+ GTUtility.copyAmountUnsafe(Integer.MAX_VALUE, sulfurDust),
+ GTUtility.copyAmountUnsafe(Integer.MAX_VALUE, sulfurDust) };
}
@Test
void OutputsIntegerOverflow() {
- GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(rubberRecipe)
+ ParallelHelper helper = new ParallelHelper().setRecipe(rubberRecipe)
.setMachine(machine, false, false)
.setItemInputs(inputItems)
.setMaxParallel(4_000_000)
@@ -64,7 +64,7 @@ public class GTParallelHelperTest {
@Test
void parallelIntegerOverflow() {
// Without batch mode
- GT_ParallelHelper helperWithoutBatchMode = new GT_ParallelHelper().setRecipe(rubberRecipe)
+ ParallelHelper helperWithoutBatchMode = new ParallelHelper().setRecipe(rubberRecipe)
.setMachine(machine, false, false)
.setItemInputs(inputItems)
.setMaxParallel(Integer.MAX_VALUE)
@@ -74,7 +74,7 @@ public class GTParallelHelperTest {
assertEquals(Integer.MAX_VALUE, helperWithoutBatchMode.getCurrentParallel());
// With batch mode
- GT_ParallelHelper helperWithBatchMode = new GT_ParallelHelper().setRecipe(rubberRecipe)
+ ParallelHelper helperWithBatchMode = new ParallelHelper().setRecipe(rubberRecipe)
.setMachine(machine, false, false)
.setItemInputs(inputItems)
.setMaxParallel(Integer.MAX_VALUE / 50)
@@ -87,7 +87,7 @@ public class GTParallelHelperTest {
@Test
void chanceMultiplier() {
- GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(rubberRecipe)
+ ParallelHelper helper = new ParallelHelper().setRecipe(rubberRecipe)
.setMachine(machine, false, false)
.setItemInputs(inputItems)
.setMaxParallel(10)
@@ -106,7 +106,7 @@ public class GTParallelHelperTest {
@Test
void outputMultiplier() {
- GT_ParallelHelper helper = new GT_ParallelHelper().setRecipe(rubberRecipe)
+ ParallelHelper helper = new ParallelHelper().setRecipe(rubberRecipe)
.setMachine(machine, false, false)
.setItemInputs(inputItems)
.setMaxParallel(1)
diff --git a/src/functionalTest/java/gregtech/test/GTRecipeTest.java b/src/functionalTest/java/gregtech/test/GTRecipeTest.java
index 104228992e..281c6f9511 100644
--- a/src/functionalTest/java/gregtech/test/GTRecipeTest.java
+++ b/src/functionalTest/java/gregtech/test/GTRecipeTest.java
@@ -1,13 +1,13 @@
package gregtech.test;
-import static gregtech.api.GregTech_API.sBlockOres1;
-import static gregtech.api.enums.GT_Values.RA;
+import static gregtech.api.GregTechAPI.sBlockOres1;
+import static gregtech.api.enums.GTValues.RA;
import static gregtech.api.enums.ItemList.Circuit_Parts_Crystal_Chip_Master;
import static gregtech.api.enums.ItemList.IC2_LapotronCrystal;
import static gregtech.api.enums.OrePrefixes.circuit;
import static gregtech.api.enums.OrePrefixes.lens;
-import static gregtech.api.util.GT_OreDictUnificator.get;
-import static gregtech.api.util.GT_Utility.copyAmount;
+import static gregtech.api.util.GTOreDictUnificator.get;
+import static gregtech.api.util.GTUtility.copyAmount;
import static net.minecraft.init.Blocks.chest;
import static net.minecraft.init.Blocks.iron_ore;
import static net.minecraft.init.Blocks.lapis_block;
@@ -32,12 +32,12 @@ import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.recipe.RecipeMap;
import gregtech.api.recipe.RecipeMapBuilder;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GTRecipe;
class GTRecipeTest {
static RecipeMap<?> recipeMap;
- static GT_Recipe lapotronChipRecipe;
+ static GTRecipe lapotronChipRecipe;
@BeforeAll
static void setup() {
@@ -65,7 +65,7 @@ class GTRecipeTest {
.duration(0)
.eut(0)
.addTo(recipeMap)
- .toArray(new GT_Recipe[0])[0];
+ .toArray(new GTRecipe[0])[0];
RA.stdBuilder()
.itemInputs(new ItemStack(sBlockOres1, 1, 32))
@@ -115,12 +115,12 @@ class GTRecipeTest {
@Test
void findWithExactSameInputs() {
- GT_Recipe recipe = recipeMap.findRecipeQuery()
+ GTRecipe recipe = recipeMap.findRecipeQuery()
.items(new ItemStack(lapis_block, 1), get(circuit, Materials.HV, 1))
.find();
assertNotNull(recipe);
- GT_Recipe stoneRecipe = recipeMap.findRecipeQuery()
+ GTRecipe stoneRecipe = recipeMap.findRecipeQuery()
.items(new ItemStack(stone_slab, 128))
.find();
assertNotNull(stoneRecipe);
@@ -128,12 +128,12 @@ class GTRecipeTest {
@Test
void findWildcardWithExactSameInputs() {
- GT_Recipe chestRecipe = recipeMap.findRecipeQuery()
+ GTRecipe chestRecipe = recipeMap.findRecipeQuery()
.items(new ItemStack(log, 2, WILDCARD_VALUE), new ItemStack(planks, 2, WILDCARD_VALUE))
.find();
assertNotNull(chestRecipe);
- GT_Recipe lapotronChipRecipe = recipeMap.findRecipeQuery()
+ GTRecipe lapotronChipRecipe = recipeMap.findRecipeQuery()
.items(IC2_LapotronCrystal.getWildcard(1), copyAmount(0, get(lens, Materials.BlueTopaz, 1)))
.find();
assertNotNull(lapotronChipRecipe);
@@ -142,7 +142,7 @@ class GTRecipeTest {
@Test
void findWildcardWithDifferentMeta() {
// https://github.com/GTNewHorizons/GT5-Unofficial/pull/2364/commits/e7112fce5f24431f3a4ad19288d662b93cbb91f2
- GT_Recipe recipe = recipeMap.findRecipeQuery()
+ GTRecipe recipe = recipeMap.findRecipeQuery()
.items(new ItemStack(log, 2, 0), new ItemStack(planks, 2, 1))
.find();
assertNotNull(recipe);
@@ -155,7 +155,7 @@ class GTRecipeTest {
NBTTagCompound tag = new NBTTagCompound();
tag.setFloat("charge", 123456);
lapisBlock.stackTagCompound = tag;
- GT_Recipe recipe = recipeMap.findRecipeQuery()
+ GTRecipe recipe = recipeMap.findRecipeQuery()
.items(lapisBlock, get(circuit, Materials.HV, 1))
.find();
assertNotNull(recipe);
@@ -165,7 +165,7 @@ class GTRecipeTest {
NBTTagCompound glassTag = new NBTTagCompound();
glassTag.setInteger("integer", 123456);
glass.setTagCompound(glassTag);
- GT_Recipe nbtSensitiveRecipe = recipeMap.findRecipeQuery()
+ GTRecipe nbtSensitiveRecipe = recipeMap.findRecipeQuery()
.items(glass)
.find();
assertNotNull(nbtSensitiveRecipe);
@@ -175,7 +175,7 @@ class GTRecipeTest {
NBTTagCompound dataStickTag = new NBTTagCompound();
dataStickTag.setInteger("integer", 123456);
dataStick.setTagCompound(dataStickTag);
- GT_Recipe checkNBTRecipe = recipeMap.findRecipeQuery()
+ GTRecipe checkNBTRecipe = recipeMap.findRecipeQuery()
.items(dataStick)
.find();
assertNotNull(checkNBTRecipe);
@@ -183,12 +183,12 @@ class GTRecipeTest {
@Test
void rejectWithInsufficientAmount() {
- GT_Recipe recipe = recipeMap.findRecipeQuery()
+ GTRecipe recipe = recipeMap.findRecipeQuery()
.items(new ItemStack(log, 1, 0), new ItemStack(planks, 1, 0))
.find();
assertNull(recipe);
- GT_Recipe stoneRecipe = recipeMap.findRecipeQuery()
+ GTRecipe stoneRecipe = recipeMap.findRecipeQuery()
.items(new ItemStack(stone_slab, 127))
.find();
assertNull(stoneRecipe);
@@ -197,7 +197,7 @@ class GTRecipeTest {
@Test
void rejectWithoutNonConsumable() {
// https://github.com/GTNewHorizons/GT5-Unofficial/pull/2364/commits/bfc93bff7ed34616021e8c5b6dbdc50dd7096af5
- GT_Recipe recipe = recipeMap.findRecipeQuery()
+ GTRecipe recipe = recipeMap.findRecipeQuery()
.items(IC2_LapotronCrystal.get(1))
.cachedRecipe(lapotronChipRecipe)
.find();
@@ -207,13 +207,13 @@ class GTRecipeTest {
@Test
void rejectWithoutCorrectNBT() {
// For NBT sensitive recipes
- GT_Recipe nbtSensitiveRecipe = recipeMap.findRecipeQuery()
+ GTRecipe nbtSensitiveRecipe = recipeMap.findRecipeQuery()
.items(new ItemStack(glass_bottle, 2))
.find();
assertNull(nbtSensitiveRecipe);
// For items that need to check NBT, e.g. data sticks
- GT_Recipe checkNBTRecipe = recipeMap.findRecipeQuery()
+ GTRecipe checkNBTRecipe = recipeMap.findRecipeQuery()
.items(ItemList.Tool_DataStick.get(0))
.find();
assertNull(checkNBTRecipe);
@@ -225,12 +225,12 @@ class GTRecipeTest {
// We cannot use circuit assembling recipe like the issue mentioned above,
// as mUnificationTarget is not set for circuits in GT5.
// But it works in the same way; specific circuit -> GT ore block, unificated circuit -> vanilla ore block
- GT_Recipe recipeCorrectOre = recipeMap.findRecipeQuery()
+ GTRecipe recipeCorrectOre = recipeMap.findRecipeQuery()
.items(new ItemStack(sBlockOres1, 1, 32))
.find();
assertNotNull(recipeCorrectOre);
- GT_Recipe recipeWrongOre = recipeMap.findRecipeQuery()
+ GTRecipe recipeWrongOre = recipeMap.findRecipeQuery()
.items(new ItemStack(iron_ore, 1))
.find();
assertNull(recipeWrongOre);
diff --git a/src/functionalTest/java/kubatech/test/EIGTests.java b/src/functionalTest/java/kubatech/test/EIGTests.java
index 7cdfa8dae4..7ff95b168f 100644
--- a/src/functionalTest/java/kubatech/test/EIGTests.java
+++ b/src/functionalTest/java/kubatech/test/EIGTests.java
@@ -20,7 +20,7 @@
package kubatech.test;
-import static gregtech.api.util.GT_RecipeBuilder.HOURS;
+import static gregtech.api.util.GTRecipeBuilder.HOURS;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.File;
@@ -48,16 +48,16 @@ import net.minecraftforge.common.DimensionManager;
import org.junit.jupiter.api.Test;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.blocks.GT_Item_Machines;
+import gregtech.common.blocks.ItemMachines;
import ic2.api.crops.CropCard;
import ic2.api.crops.Crops;
import ic2.core.Ic2Items;
import ic2.core.crop.TileEntityCrop;
import ic2.core.item.ItemCropSeed;
import kubatech.api.eig.EIGDropTable;
-import kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeIndustrialGreenhouse;
+import kubatech.tileentity.gregtech.multiblock.MTEExtremeIndustrialGreenhouse;
import kubatech.tileentity.gregtech.multiblock.eigbuckets.EIGIC2Bucket;
public class EIGTests {
@@ -190,7 +190,7 @@ public class EIGTests {
return expected;
}
- EIGDropTable getEIGDrops(GT_MetaTileEntity_ExtremeIndustrialGreenhouse EIG, ItemStack stack) {
+ EIGDropTable getEIGDrops(MTEExtremeIndustrialGreenhouse EIG, ItemStack stack) {
EIGDropTable generated = new EIGDropTable();
EIGIC2Bucket bucket = new EIGIC2Bucket(stack, stack.stackSize, null, false);
bucket.revalidate(EIG);
@@ -208,7 +208,7 @@ public class EIGTests {
TileEntityCrop cropTile = (TileEntityCrop) myWorld.getTileEntity(10, 81, 0);
ItemStack ccStack = ItemCropSeed.generateItemStackFromValues(cc, (byte) 10, (byte) 10, (byte) 10, (byte) 1);
- GT_Item_Machines itemMachines = (GT_Item_Machines) Item.getItemFromBlock(GregTech_API.sBlockMachines);
+ ItemMachines itemMachines = (ItemMachines) Item.getItemFromBlock(GregTechAPI.sBlockMachines);
itemMachines.placeBlockAt(
new ItemStack(itemMachines, 1, EIG_CONTROLLER_METADATA),
null,
@@ -222,8 +222,7 @@ public class EIGTests {
0,
EIG_CONTROLLER_METADATA);
IGregTechTileEntity te = (IGregTechTileEntity) myWorld.getTileEntity(0, 81, 0);
- GT_MetaTileEntity_ExtremeIndustrialGreenhouse EIG = (GT_MetaTileEntity_ExtremeIndustrialGreenhouse) te
- .getMetaTileEntity();
+ MTEExtremeIndustrialGreenhouse EIG = (MTEExtremeIndustrialGreenhouse) te.getMetaTileEntity();
// update stats of crop TE to those provided by the EIG
cropTile.humidity = EIGIC2Bucket.getHumidity(EIG, false);
@@ -238,7 +237,7 @@ public class EIGTests {
xyz[1] += te.getYCoord();
xyz[2] += te.getZCoord();
- myWorld.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTech_API.sBlockCasings4, 1, 0);
+ myWorld.setBlock(xyz[0], xyz[1] - 2, xyz[2], GregTechAPI.sBlockCasings4, 1, 0);
myWorld.setBlock(xyz[0], xyz[1] - 1, xyz[2], Blocks.farmland, 0, 0);
ItemStack stackToTest = null;
diff --git a/src/functionalTest/java/kubatech/test/kubatechTestMod.java b/src/functionalTest/java/kubatech/test/kubatechTestMod.java
index bc68d3f203..5f0225d0ee 100644
--- a/src/functionalTest/java/kubatech/test/kubatechTestMod.java
+++ b/src/functionalTest/java/kubatech/test/kubatechTestMod.java
@@ -25,7 +25,7 @@ import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartedEvent;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
@Mod(
modid = "kubatech-tests",
@@ -37,8 +37,8 @@ public class kubatechTestMod {
@EventHandler
public void preInit(FMLPreInitializationEvent ev) {
// Disable GT5u messing with vanilla recipes for unit tests
- GT_Mod.gregtechproxy.mNerfedWoodPlank = false;
- GT_Mod.gregtechproxy.mNerfedVanillaTools = false;
+ GTMod.gregtechproxy.mNerfedWoodPlank = false;
+ GTMod.gregtechproxy.mNerfedVanillaTools = false;
}
@EventHandler