From c4fa0812c02ae62cbf51ba1433b3cfdb5acb17b0 Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Tue, 20 Apr 2021 10:56:30 +0800 Subject: make .gitignore work and fix the fluid amount problem --- .gitignore | 1 + .idea/.gitignore | 3 - .idea/aws.xml | 11 --- .idea/codeStyles/Project.xml | 25 ------ .idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/compiler.xml | 6 -- .idea/gradle.xml | 17 ---- .idea/jarRepositories.xml | 65 ---------------- .idea/misc.xml | 5 -- .idea/modules/GoodGenerator.api.iml | 15 ---- .idea/modules/GoodGenerator.main.iml | 15 ---- .idea/modules/GoodGenerator.test.iml | 15 ---- .idea/vcs.xml | 6 -- gradlew.bat | 90 ---------------------- .../GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 14 ++++ 15 files changed, 15 insertions(+), 278 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/aws.xml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/gradle.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules/GoodGenerator.api.iml delete mode 100644 .idea/modules/GoodGenerator.main.iml delete mode 100644 .idea/modules/GoodGenerator.test.iml delete mode 100644 .idea/vcs.xml delete mode 100644 gradlew.bat diff --git a/.gitignore b/.gitignore index 09971f4e86..2f582fe46d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ Good-Generator.iml Good-Generator.ipr Good-Generator.iws +.idea/ diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521af..0000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/aws.xml b/.idea/aws.xml deleted file mode 100644 index b63b642cfb..0000000000 --- a/.idea/aws.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 80eafa9736..0000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a179b..0000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 61a9130cd9..0000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 310e0f26e1..0000000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index f504cb0b3e..0000000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0897f38a74..0000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/modules/GoodGenerator.api.iml b/.idea/modules/GoodGenerator.api.iml deleted file mode 100644 index 3db981f0de..0000000000 --- a/.idea/modules/GoodGenerator.api.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - MCP - - - - - - - \ No newline at end of file diff --git a/.idea/modules/GoodGenerator.main.iml b/.idea/modules/GoodGenerator.main.iml deleted file mode 100644 index 3db981f0de..0000000000 --- a/.idea/modules/GoodGenerator.main.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - MCP - - - - - - - \ No newline at end of file diff --git a/.idea/modules/GoodGenerator.test.iml b/.idea/modules/GoodGenerator.test.iml deleted file mode 100644 index 3db981f0de..0000000000 --- a/.idea/modules/GoodGenerator.test.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - MCP - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfbb..0000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 8a0b282aa6..0000000000 --- a/gradlew.bat +++ /dev/null @@ -1,90 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index fb00965600..cd1cbf41c3 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -16,6 +16,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockB import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; +import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; @@ -52,6 +53,19 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { ArrayList tFluids = getStoredFluids(); Collection tRecipes = MyRecipeAdder.instance.NqGFuels.mRecipeList; + for (int i = 0; i < tFluids.size() - 1; i++) { + for (int j = i + 1; j < tFluids.size(); j++) { + if (GT_Utility.areFluidsEqual(tFluids.get(i), tFluids.get(j))) { + if ((tFluids.get(i)).amount >= (tFluids.get(j)).amount) { + tFluids.remove(j--); + } else { + tFluids.remove(i--); + break; + } + } + } + } + FluidStack f1=null,f2=null; float booster = 1.0f; int times = 1; -- cgit