From 822aed6bb4793b5ec45bac22650d2d313b51230b Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 12 Apr 2021 17:55:49 +0800 Subject: Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000000..6d3a1dc787 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# GoodGenerator \ No newline at end of file -- cgit From 2680cc32802159ff58ea7bb919dfdde497c48e43 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Mon, 12 Apr 2021 17:56:34 +0800 Subject: Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6d3a1dc787..5f8db4d4eb 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ -# GoodGenerator \ No newline at end of file +# GoodGenerator + +add some muiltbolck generators for GTNH -- cgit From 6485ddebf3cc2e6834bbc8e53b3f860a5df9301e Mon Sep 17 00:00:00 2001 From: GlodBlock <1356392126@qq.com> Date: Mon, 12 Apr 2021 23:15:15 +0800 Subject: init --- build.gradle | 105 +++++++++ gradle.properties | 8 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 164 ++++++++++++++ gradlew.bat | 90 ++++++++ .../GoodGenerator/Blocks/RegularBlock/Casing.java | 96 ++++++++ .../GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 242 +++++++++++++++++++++ .../java/GoodGenerator/Client/ClientProxy.java | 21 ++ .../java/GoodGenerator/Common/CommonProxy.java | 11 + .../java/GoodGenerator/Items/MyItemBlocks.java | 52 +++++ src/main/java/GoodGenerator/Items/MyItems.java | 26 +++ src/main/java/GoodGenerator/Loader/Loaders.java | 31 +++ .../java/GoodGenerator/Main/GoodGenerator.java | 42 ++++ src/main/java/GoodGenerator/Tabs/MyTabs.java | 16 ++ .../goodgenerator/textures/blocks/MAR_Casing.png | Bin 0 -> 1878 bytes .../assets/goodgenerator/textures/items/test2.png | Bin 0 -> 666 bytes .../assets/goodgenerator/textures/items/test3.png | Bin 0 -> 666 bytes src/main/resources/mcmod.info | 16 ++ 19 files changed, 925 insertions(+) create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java create mode 100644 src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java create mode 100644 src/main/java/GoodGenerator/Client/ClientProxy.java create mode 100644 src/main/java/GoodGenerator/Common/CommonProxy.java create mode 100644 src/main/java/GoodGenerator/Items/MyItemBlocks.java create mode 100644 src/main/java/GoodGenerator/Items/MyItems.java create mode 100644 src/main/java/GoodGenerator/Loader/Loaders.java create mode 100644 src/main/java/GoodGenerator/Main/GoodGenerator.java create mode 100644 src/main/java/GoodGenerator/Tabs/MyTabs.java create mode 100644 src/main/resources/assets/goodgenerator/textures/blocks/MAR_Casing.png create mode 100644 src/main/resources/assets/goodgenerator/textures/items/test2.png create mode 100644 src/main/resources/assets/goodgenerator/textures/items/test3.png create mode 100644 src/main/resources/mcmod.info diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000000..7a2dedb14f --- /dev/null +++ b/build.gradle @@ -0,0 +1,105 @@ +import java.util.concurrent.TimeUnit + +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "jitpack" + url = "https://jitpack.io" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + dependencies { + //Defaults to Java 8 & UTF-8 encoding + classpath "com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT" + } +} + +plugins { + id("org.ajoberstar.grgit") version("3.1.1") +} + +apply plugin: 'forge' +apply plugin: 'idea' + +idea { + module { + inheritOutputDirs = true + downloadJavadoc = true + downloadSources = true + } +} + +configurations.all { + resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS) +} + +sourceCompatibility = targetCompatibility = 1.8 + +version = modVersion +group= modGroup +archivesBaseName = modId + +minecraft { + version = "${minecraftVersion}-${forgeVersion}-${minecraftVersion}" + runDir = "run" +} + +repositories { + jcenter() + maven { + name = "CodeChicken" + url = "http://chickenbones.net/maven/" + } + maven { + url = "https://jitpack.io" + } + maven { + name = "ic2" + url = "http://maven.ic2.player.to/" + } + maven { + name = "appleCore" + url = "http://www.ryanliptak.com/maven/" + } + ivy { + name = "gtnh_download_source" + artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]") + } + maven { + name = "UsrvDE/GTNH" + url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/" + } + maven { + name = "gt" + url = "https://gregtech.overminddl1.com/" + } +} + +dependencies { + compile("com.github.GTNewHorizons:GT5-Unofficial:experimental-SNAPSHOT:dev") { + setChanging(true) + } + compile files('libs/TecTech-1.7.10-4.10.4-d35bc08e.jar') + runtime("eu.usrv:YAMCore:${minecraftVersion}-${yamcoreVersion}:deobf"); +} + +processResources +{ + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' + expand 'version':project.version, 'mcversion':project.minecraft.version + } + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000000..3327bef031 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +modId = GoodGenerator +modGroup = GoodGenerator +modVersion = 0.0.1 + +minecraftVersion=1.7.10 +forgeVersion=10.13.4.1614 + +yamcoreVersion=0.5.78 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..fd7e590e51 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..2d80b69a76 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000000..91a7e269e1 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..8a0b282aa6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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/RegularBlock/Casing.java b/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java new file mode 100644 index 0000000000..f6f9eb32ae --- /dev/null +++ b/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java @@ -0,0 +1,96 @@ +package GoodGenerator.Blocks.RegularBlock; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.GregTech_API; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.util.IIcon; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +public class Casing extends Block { + + @SideOnly(Side.CLIENT) + protected IIcon[] texture; + String[] textureNames; + protected String name; + + public Casing(String name, String[] texture, CreativeTabs Tab){ + super(Material.iron); + this.setHardness(18.0F); + this.setResistance(10.0F); + this.name = name; + this.textureNames = texture; + GregTech_API.registerMachineBlock(this, -1); + } + + public Casing(String name, String[] texture, CreativeTabs Tab,Material material){ + super(material); + this.setHardness(18.0F); + this.setResistance(10.0F); + this.name = name; + this.textureNames = texture; + GregTech_API.registerMachineBlock(this, -1); + } + + @Override + public int damageDropped(int meta) { + return meta; + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) { + return meta < this.texture.length ? this.texture[meta] : this.texture[0]; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1IconRegister) { + this.texture = new IIcon[this.textureNames.length]; + for (int i = 0; i < this.textureNames.length; i++) { + this.texture[i] = par1IconRegister.registerIcon(this.textureNames[i]); + } + } + + @Override + public void onBlockAdded(World aWorld, int aX, int aY, int aZ) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } + + @Override + public void breakBlock(World aWorld, int aX, int aY, int aZ, Block aBlock, int aMetaData) { + if (GregTech_API.isMachineBlock(this, aWorld.getBlockMetadata(aX, aY, aZ))) { + GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ); + } + } + + @Override + public String getUnlocalizedName() { + return this.name; + } + + @Override + public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) { + return false; + } + + @Override + public boolean canEntityDestroy(IBlockAccess world, int x, int y, int z, Entity entity) { + return false; + } + + @Override + public boolean canCreatureSpawn(EnumCreatureType type, IBlockAccess world, int x, int y, int z) { + return false; + } + + +} diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java new file mode 100644 index 0000000000..eac1ac67c9 --- /dev/null +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -0,0 +1,242 @@ +package GoodGenerator.Blocks.TEs; + +import GoodGenerator.Loader.Loaders; +import GoodGenerator.Main.GoodGenerator; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Dyes; +import gregtech.api.enums.Materials; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; +import gregtech.api.objects.GT_RenderedTexture; +import ic2.core.Ic2Fluid; +import ic2.core.init.InternalName; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import java.util.ArrayList; + +public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { + + @SideOnly(Side.CLIENT) + protected IIcon[] texture; + protected String textureNames; + protected String name; + private static final IIcon[] iIcons = new IIcon[4]; + private static final IIconContainer[] iIconContainers = new IIconContainer[4]; + private static final ITexture[][] iTextures = new ITexture[4][1]; + public ItemStack[] circuits = new ItemStack[5]; + private long mStorage; + + public MultiNqGenerator(String name){super(name);} + + public MultiNqGenerator(int id, String name, String nameRegional){ + super(id,name,nameRegional); + this.name = name; + textureNames = GoodGenerator.MOD_ID+":"+name; + } + + + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister aBlockIconRegister) { + + for (int i = 0; i < MultiNqGenerator.iTextures.length; i++) { + MultiNqGenerator.iIcons[i] = aBlockIconRegister.registerIcon(GoodGenerator.MOD_ID + ":test"); + int finalI = i; + MultiNqGenerator.iIconContainers[i] = new IIconContainer() { + @Override + public IIcon getIcon() { + return MultiNqGenerator.iIcons[finalI]; + } + + @Override + public IIcon getOverlayIcon() { + return MultiNqGenerator.iIcons[finalI]; + } + + @Override + public ResourceLocation getTextureFile() { + return new ResourceLocation(GoodGenerator.MOD_ID + ":test"); + } + }; + } + + } + + @Override + public boolean isCorrectMachinePart(ItemStack aStack) { + return true; + } + + @Override + public boolean checkRecipe(ItemStack aStack) { + + ArrayList tFluids = getStoredFluids(); + + FluidStack f1=null,f2=null; + float booster = 1.0f; + int times = 1; + if(tFluids.size() > 0){ + if(tFluids.contains(Materials.Cryotheum.getFluid(2L))){ + booster = 2.75f; + f1=Materials.Cryotheum.getFluid(2L); + } + else if(tFluids.contains(Materials.SuperCoolant.getFluid(2L))){ + booster = 1.5f; + f1=Materials.SuperCoolant.getFluid(2L); + } + else if(tFluids.contains(FluidRegistry.getFluidStack("ic2coolant",2))){ + booster = 1.05f; + f1=FluidRegistry.getFluidStack("ic2coolant",2); + } + } + + if(tFluids.size() > 0){ + if (tFluids.contains(Materials.Caesium.getMolten(9L))){ + times = 2; + f2=Materials.Caesium.getMolten(9L); + } + else if(tFluids.contains(Materials.Uranium235.getMolten(9L))){ + times = 3; + f2=Materials.Uranium235.getMolten(9L); + } + else if(tFluids.contains(Materials.Naquadah.getMolten(1L))){ + times = 4; + f2=Materials.Naquadah.getMolten(1L); + } + } + + if(tFluids.size()>0){ + if(tFluids.contains(Materials.NaquadahEnriched.getMolten(times))){ + if(f1 != null) + depleteInput(f1); + if(f2 != null) + depleteInput(f2); + if(mRuntime == 0 || mRuntime%1200 == 0){ + depleteInput(Materials.NaquadahEnriched.getMolten(times)); + this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; + } + else this.mOutputFluids = null; + addEnergyOutput((long)(32768*times*booster)); + this.mEUt = (int)(32768*times*booster); + this.mProgresstime = 1; + this.mMaxProgresstime = 1; + return true; + } + if(tFluids.contains(Materials.Naquadria.getMolten(times))){ + if(f1 != null) + depleteInput(f1); + if(f2 != null) + depleteInput(f2); + if(mRuntime == 0 || mRuntime%300 == 0){ + depleteInput(Materials.Naquadria.getMolten(times)); + this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; + } + else this.mOutputFluids = null; + addEnergyOutput((long)(524288*times*booster)); + this.mEUt = (int)(524288*times*booster); + this.mProgresstime = 1; + this.mMaxProgresstime = 1; + return true; + } + } + + this.mEUt = 0; + return false; + } + + @Override + public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { + int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX * 2; + int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ * 2; + int casingAmount = 0; + for (int x = -2; x <= 2; x++) { + for (int z = -2; z <= 2; z++) { + for (int y = 0; y <= 8; y++) { + if (x + xDir == 0 && y == 0 && z + zDir == 0) { + continue; + } + IGregTechTileEntity tileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(x + xDir, y, z + zDir); + Block block = aBaseMetaTileEntity.getBlockOffset(x + xDir, y, z + zDir); + + if (y != 0 && y != 8 && x != -2 && x != 2 && z != -2 && z != 2) { + if (block == Blocks.air) continue; + else return false; + } + + if (y != 0){ + if(block == Loaders.MAR_Casing) continue; + else return false; + } + + if (!addInputToMachineList(tileEntity, 44) && !addOutputToMachineList(tileEntity, 44) + && !addMaintenanceToMachineList(tileEntity, 44) + && !addDynamoToMachineList(tileEntity,44)) { + if (block == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(xDir + x, y, zDir + z) == 12) { + casingAmount++; + } else { + return false; + } + } + } + } + } + return casingAmount >= 10 && mDynamoHatches.size() == 1 ; + } + + @Override + public int getMaxEfficiency(ItemStack aStack) { + return 0; + } + + @Override + public int getPollutionPerTick(ItemStack aStack) { + return 0; + } + + @Override + public int getDamageToComponent(ItemStack aStack) { + return 0; + } + + @Override + public boolean explodesOnComponentBreak(ItemStack aStack) { + return false; + } + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new MultiNqGenerator(this.mName); + } + + @Override + public String[] getDescription() { + return new String[0]; + } + + @Override + @SuppressWarnings("ALL") + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { + if(aSide == aFacing){ + if(aActive) return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44],new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT_ACTIVE)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44],new GT_RenderedTexture(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_FRONT)}; + } + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[44]}; + } +} diff --git a/src/main/java/GoodGenerator/Client/ClientProxy.java b/src/main/java/GoodGenerator/Client/ClientProxy.java new file mode 100644 index 0000000000..837f7fdcc6 --- /dev/null +++ b/src/main/java/GoodGenerator/Client/ClientProxy.java @@ -0,0 +1,21 @@ +package GoodGenerator.Client; + +import GoodGenerator.Common.CommonProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class ClientProxy extends CommonProxy { + @Override + public void preInit(FMLPreInitializationEvent event){ + super.preInit(event); + } + @Override + public void init(FMLInitializationEvent event){ + super.init(event); + } + @Override + public void postInit(FMLPostInitializationEvent event){ + super.postInit(event); + } +} diff --git a/src/main/java/GoodGenerator/Common/CommonProxy.java b/src/main/java/GoodGenerator/Common/CommonProxy.java new file mode 100644 index 0000000000..28e9063294 --- /dev/null +++ b/src/main/java/GoodGenerator/Common/CommonProxy.java @@ -0,0 +1,11 @@ +package GoodGenerator.Common; + +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; + +public class CommonProxy { + public void preInit(FMLPreInitializationEvent event){} + public void init(FMLInitializationEvent event){} + public void postInit(FMLPostInitializationEvent event){} +} diff --git a/src/main/java/GoodGenerator/Items/MyItemBlocks.java b/src/main/java/GoodGenerator/Items/MyItemBlocks.java new file mode 100644 index 0000000000..38082cda0b --- /dev/null +++ b/src/main/java/GoodGenerator/Items/MyItemBlocks.java @@ -0,0 +1,52 @@ +package GoodGenerator.Items; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import GoodGenerator.Main.GoodGenerator; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class MyItemBlocks extends ItemBlock { + private final String mNoMobsToolTip = GT_LanguageManager.addStringLocalization("gt.nomobspawnsonthisblock", "Mobs cannot Spawn on this Block"); + private final String mNoTileEntityToolTip = GT_LanguageManager.addStringLocalization("gt.notileentityinthisblock", "This is NOT a TileEntity!"); + + + public MyItemBlocks(Block block){ + super(block); + this.setMaxDamage(0); + this.setHasSubtypes(true); + this.setCreativeTab(GoodGenerator.GG); + } + + @Override + public int getMetadata(int aMeta) { + return aMeta; + } + + @Override + public String getUnlocalizedName(ItemStack aStack) { + return this.field_150939_a.getUnlocalizedName() + "." + this.getDamage(aStack); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int pass) { + return this.field_150939_a.getIcon(0, stack.getItemDamage()); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) { + return this.getIcon(stack, renderPass); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) { + return this.field_150939_a.getIcon(0, p_77618_2_); + } +} diff --git a/src/main/java/GoodGenerator/Items/MyItems.java b/src/main/java/GoodGenerator/Items/MyItems.java new file mode 100644 index 0000000000..126880a247 --- /dev/null +++ b/src/main/java/GoodGenerator/Items/MyItems.java @@ -0,0 +1,26 @@ +package GoodGenerator.Items; + +import GoodGenerator.Main.GoodGenerator; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MyItems extends Item { + + private final String tex; + + public MyItems(String name, CreativeTabs Tab){ + this.setUnlocalizedName(name); + this.setCreativeTab(Tab); + this.tex = name; + } + + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) { + this.itemIcon = iconRegister.registerIcon(GoodGenerator.MOD_ID + ":" + this.tex); + } + + +} diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java new file mode 100644 index 0000000000..11f2a9b183 --- /dev/null +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -0,0 +1,31 @@ +package GoodGenerator.Loader; + +import GoodGenerator.Blocks.RegularBlock.Casing; +import GoodGenerator.Blocks.TEs.MultiNqGenerator; +import GoodGenerator.Items.MyItemBlocks; +import GoodGenerator.Items.MyItems; +import GoodGenerator.Main.GoodGenerator; +import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.GT_Values; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + +public class Loaders { + + public static final Item test2 = new MyItems("test2",GoodGenerator.GG); + public static final Item test3 = new MyItems("test3",GoodGenerator.GG); + public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{ + GoodGenerator.MOD_ID+":MAR_Casing", + },GoodGenerator.GG); + public static ItemStack MAR; + + public static void Register(){ + GameRegistry.registerItem(test2,"test2"); + GameRegistry.registerItem(test3,"test3"); + GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class,"MAR_Casing"); + + Loaders.MAR = new MultiNqGenerator(12600+ (GT_Values.VN.length+5) * 8 + 1,"NaG","great naquadah reactor ").getStackForm(1L); + + } +} diff --git a/src/main/java/GoodGenerator/Main/GoodGenerator.java b/src/main/java/GoodGenerator/Main/GoodGenerator.java new file mode 100644 index 0000000000..908cf9f243 --- /dev/null +++ b/src/main/java/GoodGenerator/Main/GoodGenerator.java @@ -0,0 +1,42 @@ +package GoodGenerator.Main; + +import GoodGenerator.Common.CommonProxy; +import GoodGenerator.Loader.Loaders; +import GoodGenerator.Tabs.MyTabs; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import net.minecraft.creativetab.CreativeTabs; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.event.FMLInitializationEvent; + +@SuppressWarnings("ALL") +@Mod(modid = GoodGenerator.MOD_ID, version = GoodGenerator.VERSION) +public final class GoodGenerator { + public static final String MOD_ID = "GoodGenerator"; + public static final String VERSION = "1.0"; + + public static final CreativeTabs GG = new MyTabs("Good Generator"); + + @SidedProxy(clientSide = "GoodGenerator.Client.ClientProxy",serverSide = "GoodGenerator.Common.CommonProxy") + public static CommonProxy proxy; + + @Mod.Instance(GoodGenerator.MOD_ID) + public static GoodGenerator instance; + + @Mod.EventHandler + public static void preInit(FMLPreInitializationEvent event){ + proxy.preInit(event); + } + @Mod.EventHandler + public static void init(FMLInitializationEvent event){ + proxy.init(event); + Loaders.Register(); + } + @Mod.EventHandler + public static void postInit(FMLPostInitializationEvent event){ + proxy.postInit(event); + } + + +} diff --git a/src/main/java/GoodGenerator/Tabs/MyTabs.java b/src/main/java/GoodGenerator/Tabs/MyTabs.java new file mode 100644 index 0000000000..4a98e6ed29 --- /dev/null +++ b/src/main/java/GoodGenerator/Tabs/MyTabs.java @@ -0,0 +1,16 @@ +package GoodGenerator.Tabs; + +import GoodGenerator.Loader.Loaders; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MyTabs extends CreativeTabs { + public MyTabs(String name){ + super(name); + } + + @Override + public Item getTabIconItem() { + return Loaders.test2; + } +} diff --git a/src/main/resources/assets/goodgenerator/textures/blocks/MAR_Casing.png b/src/main/resources/assets/goodgenerator/textures/blocks/MAR_Casing.png new file mode 100644 index 0000000000..c59b86c91a Binary files /dev/null and b/src/main/resources/assets/goodgenerator/textures/blocks/MAR_Casing.png differ diff --git a/src/main/resources/assets/goodgenerator/textures/items/test2.png b/src/main/resources/assets/goodgenerator/textures/items/test2.png new file mode 100644 index 0000000000..0fd516231e Binary files /dev/null and b/src/main/resources/assets/goodgenerator/textures/items/test2.png differ diff --git a/src/main/resources/assets/goodgenerator/textures/items/test3.png b/src/main/resources/assets/goodgenerator/textures/items/test3.png new file mode 100644 index 0000000000..0fd516231e Binary files /dev/null and b/src/main/resources/assets/goodgenerator/textures/items/test3.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info new file mode 100644 index 0000000000..f480667560 --- /dev/null +++ b/src/main/resources/mcmod.info @@ -0,0 +1,16 @@ +[ +{ + "modid": "examplemod", + "name": "Example Mod", + "description": "Example placeholder mod.", + "version": "${version}", + "mcversion": "${mcversion}", + "url": "", + "updateUrl": "", + "authorList": ["ExampleDude"], + "credits": "The Forge and FML guys, for making this example", + "logoFile": "", + "screenshots": [], + "dependencies": [] +} +] -- cgit From 06fd91aaf71ec7e7c72451ff68521d72d0125904 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:33:30 +0800 Subject: remove creative tab --- src/main/java/GoodGenerator/Tabs/MyTabs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/GoodGenerator/Tabs/MyTabs.java b/src/main/java/GoodGenerator/Tabs/MyTabs.java index 4a98e6ed29..7f66e47599 100644 --- a/src/main/java/GoodGenerator/Tabs/MyTabs.java +++ b/src/main/java/GoodGenerator/Tabs/MyTabs.java @@ -11,6 +11,6 @@ public class MyTabs extends CreativeTabs { @Override public Item getTabIconItem() { - return Loaders.test2; + return null; } } -- cgit From a562ca5183cb3634f2b71adcd622b93a7b2698c1 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:34:45 +0800 Subject: remove test items --- src/main/java/GoodGenerator/Loader/Loaders.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java index 11f2a9b183..7a4cdac328 100644 --- a/src/main/java/GoodGenerator/Loader/Loaders.java +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -13,16 +13,12 @@ import net.minecraft.item.ItemStack; public class Loaders { - public static final Item test2 = new MyItems("test2",GoodGenerator.GG); - public static final Item test3 = new MyItems("test3",GoodGenerator.GG); public static final Block MAR_Casing = new Casing("MAR_Casing",new String[]{ GoodGenerator.MOD_ID+":MAR_Casing", - },GoodGenerator.GG); + }); public static ItemStack MAR; public static void Register(){ - GameRegistry.registerItem(test2,"test2"); - GameRegistry.registerItem(test3,"test3"); GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class,"MAR_Casing"); Loaders.MAR = new MultiNqGenerator(12600+ (GT_Values.VN.length+5) * 8 + 1,"NaG","great naquadah reactor ").getStackForm(1L); -- cgit From 18ff066b11121322e79879c359dcd38f4c31f92c Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:35:50 +0800 Subject: add a new construct methed --- src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java b/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java index f6f9eb32ae..cf2e3d8b52 100644 --- a/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java +++ b/src/main/java/GoodGenerator/Blocks/RegularBlock/Casing.java @@ -29,6 +29,15 @@ public class Casing extends Block { GregTech_API.registerMachineBlock(this, -1); } + public Casing(String name, String[] texture){ + super(Material.iron); + this.setHardness(18.0F); + this.setResistance(10.0F); + this.name = name; + this.textureNames = texture; + GregTech_API.registerMachineBlock(this, -1); + } + public Casing(String name, String[] texture, CreativeTabs Tab,Material material){ super(material); this.setHardness(18.0F); -- cgit From ceda7489a9a6a06e29db35fe0c2321c20fa77914 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Wed, 14 Apr 2021 18:37:37 +0800 Subject: add liquid air input --- src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index eac1ac67c9..4686446977 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -149,8 +149,14 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; } else this.mOutputFluids = null; - addEnergyOutput((long)(524288*times*booster)); - this.mEUt = (int)(524288*times*booster); + if(tFluids.contains(Materials.LiquidAir.getFluid(2))){ + depleteInput(Materials.LiquidAir.getFluid(2)); + addEnergyOutput((long)(32768*times*booster)); + this.mEUt = (int)(32768*times*booster); + } + else{ + this.mEUt = 0; + } this.mProgresstime = 1; this.mMaxProgresstime = 1; return true; -- cgit From a77a93073008d64f158e93ceef1d7e259b6297e2 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Wed, 14 Apr 2021 23:07:10 +0800 Subject: forget to add another recipeļ¼ˆ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index 4686446977..e16191f810 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -133,8 +133,14 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; } else this.mOutputFluids = null; - addEnergyOutput((long)(32768*times*booster)); - this.mEUt = (int)(32768*times*booster); + if(tFluids.contains(Materials.LiquidAir.getFluid(20))){ + depleteInput(Materials.LiquidAir.getFluid(20)); + addEnergyOutput((long)(32768*times*booster)); + this.mEUt = (int)(32768*times*booster); + } + else{ + this.mEUt = 0; + } this.mProgresstime = 1; this.mMaxProgresstime = 1; return true; @@ -149,10 +155,10 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; } else this.mOutputFluids = null; - if(tFluids.contains(Materials.LiquidAir.getFluid(2))){ - depleteInput(Materials.LiquidAir.getFluid(2)); - addEnergyOutput((long)(32768*times*booster)); - this.mEUt = (int)(32768*times*booster); + if(tFluids.contains(Materials.LiquidAir.getFluid(20))){ + depleteInput(Materials.LiquidAir.getFluid(20)); + addEnergyOutput((long)(524288*times*booster)); + this.mEUt = (int)(524288*times*booster); } else{ this.mEUt = 0; -- cgit From e9b229ec205d150e95cfc9b555e24ed78803a048 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:14:33 +0800 Subject: add License --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..50820cfca8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 GlodBlock + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. -- cgit From 379096e987e324a3649953195c238da493fbeb8c Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:20:03 +0800 Subject: remove useless texture --- .../assets/goodgenerator/textures/items/test2.png | Bin 666 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/goodgenerator/textures/items/test2.png diff --git a/src/main/resources/assets/goodgenerator/textures/items/test2.png b/src/main/resources/assets/goodgenerator/textures/items/test2.png deleted file mode 100644 index 0fd516231e..0000000000 Binary files a/src/main/resources/assets/goodgenerator/textures/items/test2.png and /dev/null differ -- cgit From 82726abfdb76ec23157d90cb0355171784902ef5 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:20:25 +0800 Subject: remove useless texture --- .../assets/goodgenerator/textures/items/test3.png | Bin 666 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/resources/assets/goodgenerator/textures/items/test3.png diff --git a/src/main/resources/assets/goodgenerator/textures/items/test3.png b/src/main/resources/assets/goodgenerator/textures/items/test3.png deleted file mode 100644 index 0fd516231e..0000000000 Binary files a/src/main/resources/assets/goodgenerator/textures/items/test3.png and /dev/null differ -- cgit From d6fc85a7b9847470ce0bea24b8128bc775d021f6 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:27:15 +0800 Subject: fix the id conflict --- src/main/java/GoodGenerator/Loader/Loaders.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/GoodGenerator/Loader/Loaders.java b/src/main/java/GoodGenerator/Loader/Loaders.java index 7a4cdac328..086e16eabd 100644 --- a/src/main/java/GoodGenerator/Loader/Loaders.java +++ b/src/main/java/GoodGenerator/Loader/Loaders.java @@ -21,7 +21,7 @@ public class Loaders { public static void Register(){ GameRegistry.registerBlock(MAR_Casing, MyItemBlocks.class,"MAR_Casing"); - Loaders.MAR = new MultiNqGenerator(12600+ (GT_Values.VN.length+5) * 8 + 1,"NaG","great naquadah reactor ").getStackForm(1L); + Loaders.MAR = new MultiNqGenerator(12732,"NaG","great naquadah reactor").getStackForm(1L); } } -- cgit From e2a33478a36a6c19108c0174d2dd69765b811d84 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 12:36:42 +0800 Subject: remove useless method --- .../GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 44 ---------------------- 1 file changed, 44 deletions(-) diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index e16191f810..9e063259e8 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -2,29 +2,19 @@ package GoodGenerator.Blocks.TEs; import GoodGenerator.Loader.Loaders; import GoodGenerator.Main.GoodGenerator; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; -import gregtech.api.enums.Dyes; import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; -import ic2.core.Ic2Fluid; -import ic2.core.init.InternalName; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -34,14 +24,8 @@ import java.util.ArrayList; public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { @SideOnly(Side.CLIENT) - protected IIcon[] texture; protected String textureNames; protected String name; - private static final IIcon[] iIcons = new IIcon[4]; - private static final IIconContainer[] iIconContainers = new IIconContainer[4]; - private static final ITexture[][] iTextures = new ITexture[4][1]; - public ItemStack[] circuits = new ItemStack[5]; - private long mStorage; public MultiNqGenerator(String name){super(name);} @@ -51,34 +35,6 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { textureNames = GoodGenerator.MOD_ID+":"+name; } - - - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister aBlockIconRegister) { - - for (int i = 0; i < MultiNqGenerator.iTextures.length; i++) { - MultiNqGenerator.iIcons[i] = aBlockIconRegister.registerIcon(GoodGenerator.MOD_ID + ":test"); - int finalI = i; - MultiNqGenerator.iIconContainers[i] = new IIconContainer() { - @Override - public IIcon getIcon() { - return MultiNqGenerator.iIcons[finalI]; - } - - @Override - public IIcon getOverlayIcon() { - return MultiNqGenerator.iIcons[finalI]; - } - - @Override - public ResourceLocation getTextureFile() { - return new ResourceLocation(GoodGenerator.MOD_ID + ":test"); - } - }; - } - - } - @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; -- cgit From ec5c6df44ed959eae65f98540e12dfda132e9edb Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 13:51:11 +0800 Subject: fix --- .../GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 47 +++++++++++----------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index 9e063259e8..6f8c1ec6da 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -49,37 +49,37 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { float booster = 1.0f; int times = 1; if(tFluids.size() > 0){ - if(tFluids.contains(Materials.Cryotheum.getFluid(2L))){ + if(tFluids.contains(Materials.Cryotheum.getFluid(50L)) && tFluids.get(tFluids.indexOf(Materials.Cryotheum.getFluid(50L))).amount >= 50){ booster = 2.75f; - f1=Materials.Cryotheum.getFluid(2L); + f1=Materials.Cryotheum.getFluid(50L); } - else if(tFluids.contains(Materials.SuperCoolant.getFluid(2L))){ + else if(tFluids.contains(Materials.SuperCoolant.getFluid(50L)) && tFluids.get(tFluids.indexOf(Materials.SuperCoolant.getFluid(50L))).amount >= 50){ booster = 1.5f; - f1=Materials.SuperCoolant.getFluid(2L); + f1=Materials.SuperCoolant.getFluid(50L); } - else if(tFluids.contains(FluidRegistry.getFluidStack("ic2coolant",2))){ + else if(tFluids.contains(FluidRegistry.getFluidStack("ic2coolant",50)) && tFluids.get(tFluids.indexOf(FluidRegistry.getFluidStack("ic2coolant",50))).amount >= 50){ booster = 1.05f; - f1=FluidRegistry.getFluidStack("ic2coolant",2); + f1=FluidRegistry.getFluidStack("ic2coolant",50); } } if(tFluids.size() > 0){ - if (tFluids.contains(Materials.Caesium.getMolten(9L))){ - times = 2; - f2=Materials.Caesium.getMolten(9L); + if(tFluids.contains(Materials.Naquadah.getMolten(1L)) && tFluids.get(tFluids.indexOf(Materials.Naquadah.getMolten(1L))).amount >= 1){ + times = 4; + f2=Materials.Naquadah.getMolten(1L); } - else if(tFluids.contains(Materials.Uranium235.getMolten(9L))){ + else if(tFluids.contains(Materials.Uranium235.getMolten(9L)) && tFluids.get(tFluids.indexOf(Materials.Uranium235.getMolten(9L))).amount >= 9){ times = 3; f2=Materials.Uranium235.getMolten(9L); } - else if(tFluids.contains(Materials.Naquadah.getMolten(1L))){ - times = 4; - f2=Materials.Naquadah.getMolten(1L); + else if (tFluids.contains(Materials.Caesium.getMolten(9L)) && tFluids.get(tFluids.indexOf(Materials.Caesium.getMolten(9L))).amount >= 9){ + times = 2; + f2=Materials.Caesium.getMolten(9L); } } if(tFluids.size()>0){ - if(tFluids.contains(Materials.NaquadahEnriched.getMolten(times))){ + if(tFluids.contains(Materials.NaquadahEnriched.getMolten(times)) && tFluids.get(tFluids.indexOf(Materials.NaquadahEnriched.getMolten(times))).amount >= times){ if(f1 != null) depleteInput(f1); if(f2 != null) @@ -89,34 +89,36 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; } else this.mOutputFluids = null; - if(tFluids.contains(Materials.LiquidAir.getFluid(20))){ - depleteInput(Materials.LiquidAir.getFluid(20)); + if(tFluids.contains(Materials.LiquidAir.getFluid(120)) && tFluids.get(tFluids.indexOf(Materials.LiquidAir.getFluid(120))).amount >= 120){ + depleteInput(Materials.LiquidAir.getFluid(120)); addEnergyOutput((long)(32768*times*booster)); this.mEUt = (int)(32768*times*booster); } else{ + addEnergyOutput(0); this.mEUt = 0; } this.mProgresstime = 1; this.mMaxProgresstime = 1; return true; } - if(tFluids.contains(Materials.Naquadria.getMolten(times))){ + if(tFluids.contains(Materials.Naquadria.getMolten(times)) && tFluids.get(tFluids.indexOf(Materials.Naquadria.getMolten(times))).amount >= times){ if(f1 != null) depleteInput(f1); if(f2 != null) depleteInput(f2); - if(mRuntime == 0 || mRuntime%300 == 0){ + if(mRuntime == 0 || mRuntime%100 == 0){ depleteInput(Materials.Naquadria.getMolten(times)); this.mOutputFluids = new FluidStack[]{Materials.Naquadah.getMolten(times)}; } else this.mOutputFluids = null; - if(tFluids.contains(Materials.LiquidAir.getFluid(20))){ - depleteInput(Materials.LiquidAir.getFluid(20)); - addEnergyOutput((long)(524288*times*booster)); - this.mEUt = (int)(524288*times*booster); + if(tFluids.contains(Materials.LiquidAir.getFluid(120)) && tFluids.get(tFluids.indexOf(Materials.LiquidAir.getFluid(120))).amount >= 120){ + depleteInput(Materials.LiquidAir.getFluid(120)); + addEnergyOutput((long)(262144*times*booster)); + this.mEUt = (int)(262144*times*booster); } else{ + addEnergyOutput(0); this.mEUt = 0; } this.mProgresstime = 1; @@ -124,7 +126,6 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { return true; } } - this.mEUt = 0; return false; } -- cgit From 79046da64aec480eb87d89e30864f0fdc9618d84 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 23:50:41 +0800 Subject: add description method all the major bugs seem to have been fixed --- .../java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java index 6f8c1ec6da..4a96999d7b 100644 --- a/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java +++ b/src/main/java/GoodGenerator/Blocks/TEs/MultiNqGenerator.java @@ -15,9 +15,11 @@ import gregtech.api.objects.GT_RenderedTexture; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import org.lwjgl.input.Keyboard; import java.util.ArrayList; @@ -49,9 +51,9 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { float booster = 1.0f; int times = 1; if(tFluids.size() > 0){ - if(tFluids.contains(Materials.Cryotheum.getFluid(50L)) && tFluids.get(tFluids.indexOf(Materials.Cryotheum.getFluid(50L))).amount >= 50){ + if(tFluids.contains(FluidRegistry.getFluidStack("cryotheum", 50)) && tFluids.get(tFluids.indexOf(FluidRegistry.getFluidStack("cryotheum", 50))).amount >= 50){ booster = 2.75f; - f1=Materials.Cryotheum.getFluid(50L); + f1=FluidRegistry.getFluidStack("cryotheum", 50); } else if(tFluids.contains(Materials.SuperCoolant.getFluid(50L)) && tFluids.get(tFluids.indexOf(Materials.SuperCoolant.getFluid(50L))).amount >= 50){ booster = 1.5f; @@ -196,7 +198,16 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiBlockBase { @Override public String[] getDescription() { - return new String[0]; + String[] des = new String[9]; + String[] construct = new String[8]; + for(int i = 0; i <= 8; i++) + des[i] = StatCollector.translateToLocal("tooltip.tile.nag."+i+".name"); + for(int i = 1; i <= 8; i++) + construct[i-1] = StatCollector.translateToLocal("tooltip.tile.nag.2"+i+".name"); + if (!Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) + return des; + else + return construct; } @Override -- cgit From 16a824ec02b15e638f9b7015c4a1ca2dca60e03e Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Thu, 15 Apr 2021 23:59:20 +0800 Subject: Create en_US.lang --- src/main/resources/en_US.lang | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 src/main/resources/en_US.lang diff --git a/src/main/resources/en_US.lang b/src/main/resources/en_US.lang new file mode 100644 index 0000000000..b3b78f5d07 --- /dev/null +++ b/src/main/resources/en_US.lang @@ -0,0 +1,21 @@ + +tooltip.tile.nag.0.name=environmental friendly! +tooltip.tile.nag.1.name=generate power with the High-energy molten metal +tooltip.tile.nag.2.name=input molten naquadria or enriched naquadah +tooltip.tile.nag.3.name=consume coolant 50mb/t to increase the efficiency: +tooltip.tile.nag.4.name=IC2 Coolant 105%, Super Coolant 150%, Cryotheum 275% +tooltip.tile.nag.5.name=consume excited liquid to increase the output voltage: +tooltip.tile.nag.6.name=molten caesium | 2x output | 9mb/t +tooltip.tile.nag.7.name=molten uranium-235 | 3x output | 9mb/t +tooltip.tile.nag.8.name=molten naquadah | 4x output | 1mb/t + +tooltip.tile.nag.21.name=size(WxHxD): 15x20x15 (hollow) +tooltip.tile.nag.22.name=bottom is radiation proof machine casing,at least 10 +tooltip.tile.nag.23.name=fill the rest part of machine is field restricting casing block +tooltip.tile.nag.24.name=all of the hatch should be placed at the bottom +tooltip.tile.nag.25.name=1x maintenance hatch +tooltip.tile.nag.26.name=2-4x input hatch +tooltip.tile.nag.27.name=0-1x output hatch +tooltip.tile.nag.28.name=1x dynamo hatch (only accept ONE!) + +MAR_Casing.0.name=field restricting casing block -- cgit From 545ce7f1a0ed5febaf7242575044dda00c76f7c1 Mon Sep 17 00:00:00 2001 From: GlodBlock <60341015+GlodBlock@users.noreply.github.com> Date: Fri, 16 Apr 2021 00:03:02 +0800 Subject: move the lang file blame the lag :( --- .../resources/assets/goodgenerator/lang/en_US.lang | 21 +++++++++++++++++++++ src/main/resources/en_US.lang | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-) create mode 100644 src/main/resources/assets/goodgenerator/lang/en_US.lang delete mode 100644 src/main/resources/en_US.lang diff --git a/src/main/resources/assets/goodgenerator/lang/en_US.lang b/src/main/resources/assets/goodgenerator/lang/en_US.lang new file mode 100644 index 0000000000..b3b78f5d07 --- /dev/null +++ b/src/main/resources/assets/goodgenerator/lang/en_US.lang @@ -0,0 +1,21 @@ + +tooltip.tile.nag.0.name=environmental friendly! +tooltip.tile.nag.1.name=generate power with the High-energy molten metal +tooltip.tile.nag.2.name=input molten naquadria or enriched naquadah +tooltip.tile.nag.3.name=consume coolant 50mb/t to increase the efficiency: +tooltip.tile.nag.4.name=IC2 Coolant 105%, Super Coolant 150%, Cryotheum 275% +tooltip.tile.nag.5.name=consume excited liquid to increase the output voltage: +tooltip.tile.nag.6.name=molten caesium | 2x output | 9mb/t +tooltip.tile.nag.7.name=molten uranium-235 | 3x output | 9mb/t +tooltip.tile.nag.8.name=molten naquadah | 4x output | 1mb/t + +tooltip.tile.nag.21.name=size(WxHxD): 15x20x15 (hollow) +tooltip.tile.nag