Skip to content
This repository was archived by the owner on May 26, 2024. It is now read-only.

Cleaning! #881

Merged
merged 29 commits into from
May 22, 2024
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
8b82edb
Remove fluorite from sandstone references
GTNH-Colen May 14, 2024
db8b0f1
Remove some unused content, rogue useless configs
GTNH-Colen May 14, 2024
b7317d8
Remove more junk
GTNH-Colen May 14, 2024
dd3c63a
Remove more
GTNH-Colen May 14, 2024
3cd32e9
Remove RF converter, I think this is disabled anyway? Or should be?
GTNH-Colen May 14, 2024
c68519a
Opps missed this
GTNH-Colen May 14, 2024
ee88664
Cleaning
GTNH-Colen May 14, 2024
d244b7d
Remove sick blaze, I can't even get this to spawn? The spawn egg also…
GTNH-Colen May 14, 2024
cac8c16
Delete unused Australia textures
GTNH-Colen May 14, 2024
271e057
Unused texture loading
GTNH-Colen May 14, 2024
6ed131f
Bulk remove seemingly unused textures.
GTNH-Colen May 14, 2024
c39c3cf
Remove xpjuice, seemingly no use? Change the localised name of mobess…
GTNH-Colen May 14, 2024
e963a8f
Clean
GTNH-Colen May 14, 2024
14e054a
Unused tooltips
GTNH-Colen May 14, 2024
85168d6
Remove hydrogen blob
GTNH-Colen May 14, 2024
6285887
Spotless apply for branch Cleaning! for #881 (#882)
github-actions[bot] May 14, 2024
959cc22
More cleaning
GTNH-Colen May 14, 2024
a729c3e
Merge remote-tracking branch 'origin/Cleaning!' into Cleaning!
GTNH-Colen May 14, 2024
eeb8bd6
Lots of unused code.
GTNH-Colen May 16, 2024
c3dd25c
Some reflection cleanup
GTNH-Colen May 16, 2024
cf8bcd6
Revert "Remove sick blaze, I can't even get this to spawn? The spawn …
GTNH-Colen May 19, 2024
b61b3fd
Restore random conversion recipes
GTNH-Colen May 19, 2024
8745955
Unused texture
GTNH-Colen May 19, 2024
15fd005
Unused stuff
GTNH-Colen May 19, 2024
ca0485c
Restore some missing textures
GTNH-Colen May 20, 2024
e969b86
Spotless apply for branch Cleaning! for #881 (#883)
github-actions[bot] May 20, 2024
5e78c9e
Conditionally enable xpjuice recipe on OpenBlocks loaded
GTNH-Colen May 20, 2024
865dbc0
Spotless apply for branch Cleaning! for #881 (#884)
github-actions[bot] May 20, 2024
9f6f041
Merge branch 'master' into Cleaning!
Dream-Master May 22, 2024
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
Prev Previous commit
Next Next commit
More cleaning
GTNH-Colen committed May 14, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 959cc22547a4345e008f6e7279e6524a9dbf7a35
15 changes: 2 additions & 13 deletions src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
Original file line number Diff line number Diff line change
@@ -140,23 +140,12 @@ public int addArmor(final String armor) {
public void serverStarting(final FMLServerStartingEvent e) {}

public void onPreLoad() {
/*
* if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for
* (int i$ = 0; i$ < len$; i$++) { String tName = arr$[i$]; mCapeList.add(tName.toLowerCase()); } (new
* Thread(this)).start(); }
*/

}

@Override
public void run() {
/*
* try { if (ConfigSwitches.enableCustomCapes){ Logger.INFO("GT++ Mod: Downloading Cape List.");
* @SuppressWarnings("resource") Scanner tScanner = new Scanner(new
* URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream()); while
* (tScanner.hasNextLine()) { String tName = tScanner.nextLine(); if
* (!this.mCapeList.contains(tName.toLowerCase())) { this.mCapeList.add(tName.toLowerCase()); } } } } catch
* (Throwable e) { Logger.INFO("Failed to download GT++ cape list."); }
*/

}

@Override
64 changes: 0 additions & 64 deletions src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package gtPlusPlus.core.recipe;

import static gregtech.api.enums.Mods.BartWorks;
import static gregtech.api.enums.Mods.COFHCore;
import static gregtech.api.enums.Mods.EternalSingularity;
import static gregtech.api.enums.Mods.GoodGenerator;
import static gregtech.api.enums.Mods.GregTech;
@@ -115,67 +114,20 @@ public class RECIPES_Machines {
// Nuclear Salt Processing Plant
public static ItemStack RECIPE_SaltPlantController;

// Milling
public static ItemStack RECIPE_ISAMill_Controller;
public static ItemStack RECIPE_ISAMill_Gearbox;
public static ItemStack RECIPE_ISAMill_Casing;
public static ItemStack RECIPE_ISAMill_Hatch;
public static ItemStack RECIPE_Flotation_Controller;
public static ItemStack RECIPE_Flotation_Casing;

// Cyclotron
public static ItemStack RECIPE_CyclotronController;
public static ItemStack RECIPE_CyclotronOuterCasing;
public static ItemStack RECIPE_CyclotronInnerCoil;

// Buffer Cores
public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore1", 1);
public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1);
public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1);
public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore4", 1);
public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore5", 1);
public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore6", 1);
public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1);
public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1);
public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1);
public static ItemStack RECIPE_BufferCore_MAX = ItemUtils
.getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1);

// Wire
public static String wireTier1 = "wireGt08Lead";
public static String wireTier2 = "wireGt08Tin";
public static String wireTier3 = "wireGt08Copper";
public static String wireTier4 = "wireGt08Gold";
public static String wireTier5 = "wireGt08Aluminium";
public static String wireTier6 = "wireGt08Tungsten";
public static String wireTier7 = "wireGt08Naquadah";
public static String wireTier8 = "wireGt08Osmium";
public static String wireTier9 = "wireGt08Superconductor";
public static String wireTier10 = "wireGt16Superconductor";

// Wire
public static String cableTier1 = "cableGt04Lead";
public static String cableTier2 = "cableGt04Tin";
public static String cableTier3 = "cableGt04Copper";
public static String cableTier4 = "cableGt04Gold";
public static String cableTier5 = "cableGt04Aluminium";
public static String cableTier6 = "cableGt04Tungsten";
public static String cableTier7 = "cableGt04Naquadah";
public static String cableTier8 = "cableGt04Osmium";
public static String cableTier9 = "cableGt04NiobiumTitanium";
public static String cableTier10 = "cableGt08NiobiumTitanium";

public static String pipeTier1 = "pipeHuge" + "Clay";
public static String pipeTier2 = "pipeHuge" + "Potin";
public static String pipeTier3 = "pipeHuge" + "Steel";
public static String pipeTier4 = "pipeHuge" + "StainlessSteel";
public static String pipeTier5 = "pipeHuge" + "TungstenSteel";
public static String pipeTier6 = "pipeHuge" + "MaragingSteel300";
public static String pipeTier7 = "pipeHuge" + "Tantalloy60";
public static String pipeTier8 = "pipeHuge" + "Tantalloy61";
public static String pipeTier9 = "pipeHuge" + "Inconel792";
public static String pipeTier10 = "pipeHuge" + "HastelloyX";
public static String pipeTier11 = "pipeHuge" + "Europium";

// EV/IV MACHINES
public static ItemStack IV_MACHINE_Electrolyzer;
@@ -192,32 +144,16 @@ public class RECIPES_Machines {
public static ItemStack IV_MACHINE_AlloySmelter;
public static ItemStack IV_MACHINE_Mixer;
public static ItemStack EV_MACHINE_ChemicalBath;
// Cables
public static String cableGt02Electrum = "cableGt02Electrum";

// Plates
public static String plateElectricalSteel = "plateElectricalSteel";
public static String plateEnergeticAlloy = "plateEnergeticAlloy";
public static String plateCobalt = "plateCobalt";
public static String plateBronze = "plateBronze";
public static String plateSteel = "plateSteel";

// Pipes
public static String pipeLargeCopper = "pipeLargeCopper";
public static String pipeHugeSteel = "pipeHugeSteel";
public static String pipeHugeStainlessSteel = "pipeHugeStainlessSteel";
public static String pipeHugeTitanium = "pipeHugeTitanium";

// Lava Boiler
public static ItemStack boiler_Coal;
public static ItemStack blockBricks = ItemUtils.getItemStackFromFQRN("minecraft:brick_block", 1);

// Batteries
public static String batteryBasic = "batteryBasic";
public static String batteryAdvanced = "batteryAdvanced";
public static String batteryElite = "batteryElite";
public static String batteryMaster = "batteryMaster";
public static String batteryUltimate = "batteryUltimate";
public static ItemStack IC2MFE;
public static ItemStack IC2MFSU;

2 changes: 1 addition & 1 deletion src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ public List<GasSpargingRecipeNEI> getCache() {
if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) {
cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized
// by NEI
.sorted().map(temp -> { return createCachedRecipe(temp); }).collect(Collectors.toList());
.sorted().map(temp -> createCachedRecipe(temp)).collect(Collectors.toList());
// while the NEI parallelize handlers, for each individual handler it still uses sequential execution model
// so we do not need any synchronization here
mCachedRecipes = new SoftReference<>(cache);
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ public ResourceLocation getTextureFile() {

// Quantum Force Transformer Casing
// spotless:off
private static final CustomIcon Internal_Casing_QFT = mAnimated ? new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL") : new CustomIcon("TileEntites/MACHINE_CASING_QFT_COIL");
private static final CustomIcon Internal_Casing_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL");
public static final CustomIcon Casing_Coil_QFT = Internal_Casing_QFT;
public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon("NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic");
public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon("CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic");