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

Cleanup #763

Merged
merged 10 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.gradle
.settings
/.idea/
/.vscode/
/run/
/build/
/eclipse/
Expand All @@ -25,12 +26,13 @@ whitelist.json
*.iml
*.ipr
*.iws
src/main/resources/mixins.*.json
src/main/resources/mixins.*([!.]).json
*.bat
*.bak
/screenshots
/world
/saves
/asm
/.vscode
*.DS_Store
!gradlew.bat
.factorypath
addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
layout.json
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1696265388
//version: 1696952014
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -793,7 +793,7 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies"
}

dependencies {
def lwjgl3ifyVersion = '1.5.0'
def lwjgl3ifyVersion = '1.5.1'
if (modId != 'lwjgl3ify') {
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
}
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/gregtech/api/util/GTPP_Recipe.java
Original file line number Diff line number Diff line change
Expand Up @@ -271,22 +271,6 @@ public static class GTPP_Recipe_Map {
E,
true,
true).setUsualFluidInputCount(3).setUsualFluidOutputCount(3);
public static final GT_Recipe_Map sSteamTurbineFuels = new GT_Recipe_Map(
new HashSet<>(10),
"gtpp.recipe.steamturbinefuel",
"GeoThermal Fuel",
null,
"",
1,
1,
0,
0,
1,
"Fuel Value: ",
1000,
" EU",
true,
false).useModularUI(true);

// LFTR recipes
public static final GT_Recipe_Map sLiquidFluorineThoriumReactorRecipes = new GT_Recipe_Map_FluidOnly(
Expand Down
41 changes: 0 additions & 41 deletions src/main/java/gregtech/api/util/ThermalFuel.java

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/gtPlusPlus/GTplusplus.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import gtPlusPlus.core.handler.PacketHandler;
import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.handler.events.LoginEventHandler;
import gtPlusPlus.core.handler.events.MissingMappingsEvent;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
Expand Down Expand Up @@ -175,7 +174,6 @@ public void preInit(final FMLPreInitializationEvent event) {
// Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY);

Utils.registerEvent(new LoginEventHandler());
Utils.registerEvent(new MissingMappingsEvent());
Utils.registerEvent(new MobMentality());
Logger.INFO("Login Handler Initialized");

Expand Down
6 changes: 2 additions & 4 deletions src/main/java/gtPlusPlus/GenerateDictionaries.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Random;

import gtPlusPlus.api.objects.random.XSTR;
import gregtech.api.objects.XSTR;

public class GenerateDictionaries {

Expand Down Expand Up @@ -97,14 +96,13 @@ public static void main(String[] args) {
private static final class Utils {

private static final Charset utf8 = StandardCharsets.UTF_8;
private static final Random rand = new XSTR();

private static final void log(String s) {
System.out.println("[GTPP-Proguard] " + s);
}

public static int randInt(final int min, final int max) {
return rand.nextInt((max - min) + 1) + min;
return XSTR.XSTR_INSTANCE.nextInt((max - min) + 1) + min;
}

public static boolean doesFileExist(File f) {
Expand Down
47 changes: 0 additions & 47 deletions src/main/java/gtPlusPlus/RoadMap.java

This file was deleted.

80 changes: 0 additions & 80 deletions src/main/java/gtPlusPlus/api/helpers/MaterialHelper.java

This file was deleted.

20 changes: 0 additions & 20 deletions src/main/java/gtPlusPlus/api/interfaces/IEntityCatcher.java

This file was deleted.

22 changes: 0 additions & 22 deletions src/main/java/gtPlusPlus/api/interfaces/IToolable.java

This file was deleted.

25 changes: 0 additions & 25 deletions src/main/java/gtPlusPlus/api/objects/GregtechException.java

This file was deleted.

17 changes: 0 additions & 17 deletions src/main/java/gtPlusPlus/api/objects/data/ConcurrentHashSet.java

This file was deleted.

Loading