diff --git a/.gradle/6.8.1/executionHistory/executionHistory.bin b/.gradle/6.8.1/executionHistory/executionHistory.bin new file mode 100644 index 0000000..63c3ea6 Binary files /dev/null and b/.gradle/6.8.1/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.8.1/executionHistory/executionHistory.lock b/.gradle/6.8.1/executionHistory/executionHistory.lock new file mode 100644 index 0000000..c0b14cd Binary files /dev/null and b/.gradle/6.8.1/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.8.1/fileChanges/last-build.bin b/.gradle/6.8.1/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/6.8.1/fileChanges/last-build.bin differ diff --git a/.gradle/6.8.1/fileHashes/fileHashes.bin b/.gradle/6.8.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000..03e9373 Binary files /dev/null and b/.gradle/6.8.1/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.8.1/fileHashes/fileHashes.lock b/.gradle/6.8.1/fileHashes/fileHashes.lock new file mode 100644 index 0000000..3f91b4d Binary files /dev/null and b/.gradle/6.8.1/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.8.1/gc.properties b/.gradle/6.8.1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/6.8.1/javaCompile/classAnalysis.bin b/.gradle/6.8.1/javaCompile/classAnalysis.bin new file mode 100644 index 0000000..2dfa4d1 Binary files /dev/null and b/.gradle/6.8.1/javaCompile/classAnalysis.bin differ diff --git a/.gradle/6.8.1/javaCompile/javaCompile.lock b/.gradle/6.8.1/javaCompile/javaCompile.lock new file mode 100644 index 0000000..630a2e0 Binary files /dev/null and b/.gradle/6.8.1/javaCompile/javaCompile.lock differ diff --git a/.gradle/6.8.1/javaCompile/taskHistory.bin b/.gradle/6.8.1/javaCompile/taskHistory.bin new file mode 100644 index 0000000..95238c0 Binary files /dev/null and b/.gradle/6.8.1/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000..46ba165 Binary files /dev/null and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..ecc497a --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Mon Aug 01 11:48:01 CST 2022 +gradle.version=6.8.1 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000..c01fb00 Binary files /dev/null and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock new file mode 100644 index 0000000..fbcd043 Binary files /dev/null and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin new file mode 100644 index 0000000..6c24bec Binary files /dev/null and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin new file mode 100644 index 0000000..a9f6052 Binary files /dev/null and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/.gradle/configuration-cache/gc.properties b/.gradle/configuration-cache/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1a83b6c --- /dev/null +++ b/build.gradle @@ -0,0 +1,160 @@ + + +//version of mod. +version = '3.0.2.1' + + + + +buildscript { + repositories { + maven { url = 'https://maven.minecraftforge.net' } + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '4.1.+', changing: true + } +} + +apply plugin: 'net.minecraftforge.gradle' + +group = 'TechnicalEngineering3' +archivesBaseName = 'TechnicalEngineering3' + +java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. + +minecraft { + // The mappings can be changed at any time, and must be in the following format. + // Channel: Version: + // snapshot YYYYMMDD Snapshot are built nightly. + // stable # Stables are built at the discretion of the MCP team. + // official MCVersion Official field/method names from Mojang mapping files + // + // You must be aware of the Mojang license when using the 'official' mappings. + // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + // + // Use non-default mappings at your own risk. they may not always work. + // Simply re-run your setup task after changing the mappings to update your workspace. + mappings channel: 'snapshot', version: '20210309-1.16.5' + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be changed as needed. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + mods { + ten3 { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be changed as needed. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + mods { + ten3 { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment + // The markers can be changed as needed. + // "SCAN": For mods scan. + // "REGISTRIES": For firing of registry events. + // "REGISTRYDUMP": For getting the contents of all registries. + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + // You can set various levels here. + // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', 'ten3', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + ten3 { + source sourceSets.main + } + } + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +dependencies { + // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed + // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied. + // The userdev artifact is a special name and will get all sorts of transformations applied to it. + minecraft 'net.minecraftforge:forge:1.16.5-36.2.20' + + // You may put jars on which you depend on in ./libs or you may define them like so.. + // compile "some.group:artifact:version:classifier" + // compile "some.group:artifact:version" + + // Real examples + // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // These dependencies get remapped to your current MCP mappings + // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // For more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// Example for how to get properties into the manifest for reading by the runtime.. +jar { + manifest { + attributes([ + "Specification-Title" : "ten3", + //"Specification-Vendor": "ten3 authors", + "Specification-Version" : "1", // We are version 1 of ourselves + "Implementation-Title" : project.name, + "Implementation-Version" : project.version, + //"Implementation-Vendor": "ten3 authors", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +jar.finalizedBy('reobfJar') diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..29b2ac4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +org.gradle.jvmargs=-Xmx3G +org.gradle.daemon=false diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d8e369f --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'TechnicalEngineering3' diff --git a/src/main/java/ten3/lib/tile/CmTileMachine.java b/src/main/java/ten3/lib/tile/CmTileMachine.java index 933d6d9..e38eb17 100644 --- a/src/main/java/ten3/lib/tile/CmTileMachine.java +++ b/src/main/java/ten3/lib/tile/CmTileMachine.java @@ -427,6 +427,9 @@ public boolean energySupportRun() { public boolean effectApplyTickOn(double min, double max) { + min *= 20; + max *= 20;//s + if(typeOf() != Type.MACHINE_EFFECT) return true; int k22 = ((int) ((1 - getActualPercent()) * max + min * (1 - efficientIn / (double)initialEfficientIn))); diff --git a/src/main/resources/assets/ten3/textures/gui/mob_ripper.png b/src/main/resources/assets/ten3/textures/gui/mob_ripper.png new file mode 100644 index 0000000..115d162 Binary files /dev/null and b/src/main/resources/assets/ten3/textures/gui/mob_ripper.png differ diff --git a/src/main/resources/assets/ten3/textures/machine/mob_ripper.png b/src/main/resources/assets/ten3/textures/machine/mob_ripper.png new file mode 100644 index 0000000..9e3c2e7 Binary files /dev/null and b/src/main/resources/assets/ten3/textures/machine/mob_ripper.png differ diff --git a/src/main/resources/assets/ten3/textures/machine/mob_ripper_active.png b/src/main/resources/assets/ten3/textures/machine/mob_ripper_active.png new file mode 100644 index 0000000..8ba1b18 Binary files /dev/null and b/src/main/resources/assets/ten3/textures/machine/mob_ripper_active.png differ