diff --git a/build.gradle b/build.gradle index 591ed359e..8795dfd2f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,26 @@ buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } + repositories { + mavenCentral() maven { - name = "Modmuss50" - url = "http://maven.modmuss50.me/" - } + name = "forge" + url = "http://files.minecraftforge.net/maven" + } maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' - classpath "gradle.plugin.net.minecrell:licenser:0.2.1" - } + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + maven { + name = "Modmuss50" + url = "http://maven.modmuss50.me/" + } + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath "gradle.plugin.net.minecrell:licenser:0.2.1" + } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -34,76 +34,77 @@ targetCompatibility = 1.8 repositories { - maven { - name = "Modmuss50" - url = "http://maven.modmuss50.me/" - } - maven { - name "TiC" - url "http://dvs1.progwml6.com/files/maven" - } - maven { - name = "Amadornes" - url "http://maven.amadornes.com/" - } + maven { + name = "Modmuss50" + url = "http://maven.modmuss50.me/" + } + maven { + name "TiC" + url "http://dvs1.progwml6.com/files/maven" + } + maven { + name = "Amadornes" + url "http://maven.amadornes.com/" + } ivy { name "CraftTweaker" artifactPattern "https://addons-origin.cursecdn.com/files/2392/421/[module]-[revision](-[classifier]).[ext]" } - maven { - url 'http://maven.epoxide.xyz' - } - maven { - url "http://maven.tterrag.com/" - } - maven { - name = "ic2" - url = "http://maven.ic2.player.to/" - } + maven { + url 'http://maven.epoxide.xyz' + } + maven { + url "http://maven.tterrag.com/" + } + maven { + name = "ic2" + url = "http://maven.ic2.player.to/" + } - maven {// HWYLA - name "TehNut" - url "http://tehnut.info/maven/" - } - maven { + maven { + // HWYLA + name "TehNut" + url "http://tehnut.info/maven/" + } + maven { name 'CB Repo' url "http://chickenbones.net/maven/" } } configurations { - shade - compile.extendsFrom shade + shade + compile.extendsFrom shade } -version = "2.1.11" +version = "2.2.0" def ENV = System.getenv() if (ENV.BUILD_NUMBER) { - version = version + "." + "${System.getenv().BUILD_NUMBER}" + version = version + "." + "${System.getenv().BUILD_NUMBER}" } minecraft { version = "1.11.2-13.20.0.2255" mappings = "snapshot_20161220" - replace "@MODVERSION@", project.version - // makeObfSourceJar = false - useDepAts = true - runDir = "run" + replace "@MODVERSION@", project.version + // makeObfSourceJar = false + useDepAts = true + runDir = "run" } license { - header file('HEADER') - include '**/*.java' - ignoreFailures = true //Stops the build from failing if a file does not have a license header + header file('HEADER') + include '**/*.java' + ignoreFailures = true //Stops the build from failing if a file does not have a license header } group = 'TechReborn' dependencies { - deobfCompile ('RebornCore:RebornCore-1.11.2:+:universal'){ + deobfCompile('RebornCore:RebornCore-1.11.2:+:universal') { transitive = false } deobfCompile "mezz.jei:jei_1.11.2:+" @@ -115,13 +116,13 @@ dependencies { //deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170" deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46" compile "CraftTweaker:CraftTweaker:1.11.2-3.0.24" - compile ("codechicken:CodeChickenLib:1.11.2-+:deobf"){ + compile("codechicken:CodeChickenLib:1.11.2-+:deobf") { transitive = false } - compile ("codechicken:NotEnoughItems:1.11.2-+:deobf"){ + compile("codechicken:NotEnoughItems:1.11.2-+:deobf") { transitive = false } - compile ("codechicken:ForgeMultipart:1.11.2-+:deobf"){ + compile("codechicken:ForgeMultipart:1.11.2-+:deobf") { transitive = false } compileOnly 'net.industrial-craft:industrialcraft-2:2.6.129-ex110' @@ -129,58 +130,58 @@ dependencies { processResources - { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include 'mcmod.info' + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include 'mcmod.info' - // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version - } + // replace version and mcversion + expand 'version': project.version, 'mcversion': project.minecraft.version + } - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude 'mcmod.info' - } - } + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude 'mcmod.info' + } + } task deobfJar(type: Jar) { - from sourceSets.main.output - exclude "**/*.psd" - classifier = 'dev' + from sourceSets.main.output + exclude "**/*.psd" + classifier = 'dev' } jar { - exclude "**/*.psd" - classifier = 'universal' -// configurations.shade.each { dep -> -// from(project.zipTree(dep)){ -// include 'ic2/api/' -// include 'forestry/api/fuels/' -// exclude 'META-INF', 'META-INF/**', '**/*.java' -// } -// } + exclude "**/*.psd" + classifier = 'universal' + // configurations.shade.each { dep -> + // from(project.zipTree(dep)){ + // include 'ic2/api/' + // include 'forestry/api/fuels/' + // exclude 'META-INF', 'META-INF/**', '**/*.java' + // } + // } } task apiJar(type: Jar) { - from sourceSets.main.allSource - from sourceSets.main.output - include 'techreborn/api/**/*' + from sourceSets.main.allSource + from sourceSets.main.output + include 'techreborn/api/**/*' - classifier = "api" + classifier = "api" } apiJar.mustRunAfter deobfJar artifacts { - archives deobfJar - archives apiJar + archives deobfJar + archives apiJar } build.dependsOn deobfJar, apiJar @@ -188,105 +189,102 @@ build.dependsOn deobfJar, apiJar uploadArchives { - repositories { - mavenDeployer { - //This is used when the build is done on a slave node - if (project.hasProperty('mavenPass')) - { - println 'Uploading to remote Maven Repo' - repository(url: "http://mavenupload.modmuss50.me/") { - authentication(userName: "buildslave", password: project.getProperty('mavenPass')) - } - } - else - { - //this is when the build is executed on the master node - println 'Uploading to local Maven Repo' - repository(url: "file:///var/www/maven/") - } - pom { - groupId = "TechReborn" - version = project.version - artifactId = project.archivesBaseName - project { - name project.archivesBaseName - packaging 'jar' - description 'TechReborn' - url 'https://github.com/TechReborn/TechReborn' - scm { - url 'https://github.com/TechReborn/TechReborn' - connection 'scm:git:git@github.com:TechReborn/TechReborn.git' - developerConnection 'scm:git:git@github.com:TechReborn/TechReborn.git' - } - issueManagement { - system 'github' - url 'https://github.com/TechReborn/TechReborn/issues' - } - licenses { - license { - name 'License' - url 'https://raw.githubusercontent.com/TechReborn/TechReborn/master/LICENSE.md' - distribution 'repo' - } - } - developers { - developer { - id 'modmuss50' - name 'modmuss50' - roles { role 'developer' } - } - developer { - id 'Gigabit101' - name 'Gigabit101' - roles { role 'developer' } - } - } - } - } - } - } + repositories { + mavenDeployer { + //This is used when the build is done on a slave node + if (project.hasProperty('mavenPass')) { + println 'Uploading to remote Maven Repo' + repository(url: "http://mavenupload.modmuss50.me/") { + authentication(userName: "buildslave", password: project.getProperty('mavenPass')) + } + } else { + //this is when the build is executed on the master node + println 'Uploading to local Maven Repo' + repository(url: "file:///var/www/maven/") + } + pom { + groupId = "TechReborn" + version = project.version + artifactId = project.archivesBaseName + project { + name project.archivesBaseName + packaging 'jar' + description 'TechReborn' + url 'https://github.com/TechReborn/TechReborn' + scm { + url 'https://github.com/TechReborn/TechReborn' + connection 'scm:git:git@github.com:TechReborn/TechReborn.git' + developerConnection 'scm:git:git@github.com:TechReborn/TechReborn.git' + } + issueManagement { + system 'github' + url 'https://github.com/TechReborn/TechReborn/issues' + } + licenses { + license { + name 'License' + url 'https://raw.githubusercontent.com/TechReborn/TechReborn/master/LICENSE.md' + distribution 'repo' + } + } + developers { + developer { + id 'modmuss50' + name 'modmuss50' + roles {role 'developer'} + } + developer { + id 'Gigabit101' + name 'Gigabit101' + roles {role 'developer'} + } + } + } + } + } + } } task wrapper(type: Wrapper) { - //To update the wrapper change the version bellow then run: gradle wrapper - gradleVersion = '2.13' + //To update the wrapper change the version bellow then run: gradle wrapper + gradleVersion = '2.13' } //Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853 task updateMappings(dependsOn: sourceJar) { - def remapped = file('src_remapped/main/java') - def methods = file('methods.csv') - def fields = file('fields.csv') + def remapped = file('src_remapped/main/java') + def methods = file('methods.csv') + def fields = file('fields.csv') - doLast { + doLast { - Map map = new HashMap<>() - methods.eachLine {line -> - String[] pts = line.split(",") - map.put(pts[0], pts[1]) - } - fields.eachLine {line -> - String[] pts = line.split(",") - map.put(pts[0], pts[1]) - } + Map map = new HashMap<>() + methods.eachLine {line -> + String[] pts = line.split(",") + map.put(pts[0], pts[1]) + } + fields.eachLine {line -> + String[] pts = line.split(",") + map.put(pts[0], pts[1]) + } - copy { - from zipTree(sourceJar.archivePath) - into remapped - include '**/*.java' + copy { + from zipTree(sourceJar.archivePath) + into remapped + include '**/*.java' - filter { javaLine -> - map.entrySet().each { entry -> - javaLine = javaLine.replace(entry.getKey(), entry.getValue()) - } - return javaLine - } + filter {javaLine -> + map.entrySet().each {entry -> + javaLine = javaLine.replace(entry.getKey(), entry.getValue()) + } + return javaLine + } - includeEmptyDirs = false - eachFile { println "Processing: $it.name" } - } - } + includeEmptyDirs = false + eachFile {println "Processing: $it.name"} + } + } } @@ -310,33 +308,34 @@ build.dependsOn signJar apply from: 'https://github.com/FabricMC/fabric-docs/raw/master/gradle/ideconfig.gradle' -import org.apache.commons.io.FileUtils; -import groovy.util.XmlSlurper; -import java.io.File; +import groovy.util.XmlSlurper +import org.apache.commons.io.FileUtils task curseTools { doLast { - def cacheFiles = new File(".gradle/curseTools") - if (!cacheFiles.exists()) cacheFiles.mkdirs() + def cacheFiles = new File(".gradle/curseTools") + if (!cacheFiles.exists()) { + cacheFiles.mkdirs() + } - def mavenMetadata = new File(cacheFiles, "maven-metadata.xml") + def mavenMetadata = new File(cacheFiles, "maven-metadata.xml") - logger.lifecycle(":downloading curseTools metadata") - FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata) + logger.lifecycle(":downloading curseTools metadata") + FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/maven-metadata.xml"), mavenMetadata) - def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata)) - def curseToolsVersion = metadata.versioning.release + def metadata = new XmlSlurper().parseText(FileUtils.readFileToString(mavenMetadata)) + def curseToolsVersion = metadata.versioning.release - def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar") + def curseTools = new File(cacheFiles, "${curseToolsVersion}.jar") - logger.lifecycle(":downloading CurseTools") - FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools) + logger.lifecycle(":downloading CurseTools") + FileUtils.copyURLToFile(new URL("http://maven.modmuss50.me/CurseTools/CurseTools/${curseToolsVersion}/CurseTools-${curseToolsVersion}.jar"), curseTools) - logger.lifecycle(":launching CurseTools") - ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) { - arg(value: jar.archivePath.getAbsolutePath()) - arg(value: deobfJar.archivePath.getAbsolutePath()) - arg(value: apiJar.archivePath.getAbsolutePath()) - } + logger.lifecycle(":launching CurseTools") + ant.java(jar: curseTools.getAbsolutePath(), fork: true, spawn: false) { + arg(value: jar.archivePath.getAbsolutePath()) + arg(value: deobfJar.archivePath.getAbsolutePath()) + arg(value: apiJar.archivePath.getAbsolutePath()) + } } } diff --git a/src/main/java/techreborn/config/ConfigTechReborn.java b/src/main/java/techreborn/config/ConfigTechReborn.java index 99f967094..f2a880487 100644 --- a/src/main/java/techreborn/config/ConfigTechReborn.java +++ b/src/main/java/techreborn/config/ConfigTechReborn.java @@ -254,7 +254,7 @@ public class ConfigTechReborn { AesuMaxStorage = config.get(CATEGORY_POWER, "AESU Max Storage", 30, "Set the max Storage for the AESU") .getInt(); - pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How mutch eu should the pump use to extract the fluid") + pumpExtractEU = config.get(CATEGORY_POWER, "Pump extract eu", 20, "How much eu should the pump use to extract the fluid") .getInt(); //Transformers @@ -332,13 +332,13 @@ public class ConfigTechReborn { ThermalGeneratorCharge = config.get(CATEGORY_POWER, "ThermalGenerator MaxCharge", 1000000, "Set the max charge for the ThermalGenerator").getInt(); - AverageEuOutTickTime = config.get(CATEGORY_POWER, "config.techreborn.AverageEuOutTickTime", 100, - "config.techreborn.AverageEuOutTickTime.tooltip").getInt(); + AverageEuOutTickTime = config.get(CATEGORY_POWER, "Average EU-out Tick Time", 100, + "Set the average EU-out tick time").getInt(); LesuStoragePerBlock = config.get(CATEGORY_POWER, "LESU Storage Block Amount", 1000000, "The Amount of energy storage added per Storage block").getInt(); - BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU befor upgrades") + BaseLesuOutput = config.get(CATEGORY_POWER, "LESU base output", 16, "The output of the LESU before upgrades") .getInt(); ExtraOutputPerLesuBlock = config.get(CATEGORY_POWER, "Extra output on Storage Blocks", 8, "").getInt(); @@ -435,7 +435,7 @@ public class ConfigTechReborn { .getBoolean(true); REMOVE_DUPLICATES = config - .get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This atempts to fully intergrate TR with ic2 recipes (Beta)") + .get(CATEGORY_CRAFTING, "Remove Duplicates when IC2 is installed", false, "This attempts to fully integrate TR with ic2 recipes (Beta)") .getBoolean(false); disableRailcraftSteelNuggetRecipe = config.get(CATEGORY_CRAFTING, "Disable Railcraft's Steel nugget recipe", false, "When true TechReborn will remove Railcrafts Iron Nugget to steel nuggert recipe.").getBoolean(false); @@ -592,13 +592,13 @@ public class ConfigTechReborn { .getBoolean(true); // Integration - AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP suport") + AllowBOPRecipes = config.get(CATEGORY_INTEGRATION, "Allow Bop Recipes", true, "Add BOP support") .getBoolean(true); - AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry suport") + AllowForestryRecipes = config.get(CATEGORY_INTEGRATION, "Allow Forestry Recipes", true, "Add Forestry support") .getBoolean(true); - AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura suport") + AllowNaturaRecipes = config.get(CATEGORY_INTEGRATION, "Allow Natura Recipes", true, "Add Natura support") .getBoolean(true); if (config.hasChanged()) { diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 437c79169..a208e8d1b 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -107,7 +107,7 @@ public class TileMatterFabricator extends TilePowerAcceptor if (!super.world.isRemote) { for (int i = 0; i < 6; i++) { final ItemStack stack = this.inventory.getStackInSlot(i); - if (!stack.isEmpty()) { + if (!stack.isEmpty() && spaceForOutput()) { final int amp = this.getValue(stack); if (amp != 0 && this.canUseEnergy(85)) { this.useEnergy(85); diff --git a/src/main/resources/assets/techreborn/blockstates/fluids.json b/src/main/resources/assets/techreborn/blockstates/fluids.json index bb4c5c896..5bb6f7bc6 100644 --- a/src/main/resources/assets/techreborn/blockstates/fluids.json +++ b/src/main/resources/assets/techreborn/blockstates/fluids.json @@ -19,18 +19,48 @@ "fluid": "fluidcalciumcarbonate" } }, + "techreborn.carbon": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidcarbon" + } + }, + "techreborn.carbonfiber": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidcarbonfiber" + } + }, "techreborn.chlorite": { "model": "forge:fluid", "custom": { "fluid": "fluidchlorite" } }, + "techreborn.compressedair": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidcompressedair" + } + }, "techreborn.deuterium": { "model": "forge:fluid", "custom": { "fluid": "fluiddeuterium" } }, + "techreborn.diesel": { + "model": "forge:fluid", + "custom": { + "fluid": "fluiddiesel" + } + }, + "techreborn.electrolyzedwater": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidelectrolyzedwater" + } + }, "techreborn.glyceryl": { "model": "forge:fluid", "custom": { @@ -79,12 +109,24 @@ "fluid": "fluidmethane" } }, + "techreborn.nitrocarbon": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidnitrocarbon" + } + }, "techreborn.nitrocoalfuel": { "model": "forge:fluid", "custom": { "fluid": "fluidnitrocoalfuel" } }, + "techreborn.nitrodiesel": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidnitrodiesel" + } + }, "techreborn.nitrofuel": { "model": "forge:fluid", "custom": { @@ -103,6 +145,12 @@ "fluid": "fluidnitrogendioxide" } }, + "techreborn.oil": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidoil" + } + }, "techreborn.potassium": { "model": "forge:fluid", "custom": { @@ -127,6 +175,24 @@ "fluid": "fluidsodiumpersulfate" } }, + "techreborn.sodiumsulfide": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidsodiumsulfide" + } + }, + "techreborn.sulfur": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidsulfur" + } + }, + "techreborn.sulfuricacid": { + "model": "forge:fluid", + "custom": { + "fluid": "fluidsulfuricacid" + } + }, "techreborn.tritium": { "model": "forge:fluid", "custom": { diff --git a/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json b/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json index b2216b02e..adc22c8c9 100644 --- a/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json +++ b/src/main/resources/assets/techreborn/blockstates/items/misc/upgrades.json @@ -1,4 +1,4 @@ -{ + { "forge_marker": 1, "defaults": { "model": "builtin/generated", diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index d1d07f960..e09469b8c 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -972,8 +972,9 @@ death.attack.shock=%s was electrocuted #Entitys -entity.techreborn.nuke.name=Nuke +entity.nuke.name=Nuke +#Tooltips tooltip.wip=WIP Coming Soon tooltip.upBroken=Upgrades DO NOT function! tooltip.ingredient=Currently only a crafting ingredient diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png new file mode 100644 index 000000000..d659fb199 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbon_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png new file mode 100644 index 000000000..3b68ff259 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/carbonfiber_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png new file mode 100644 index 000000000..3f02d9037 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/compressedair_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png new file mode 100644 index 000000000..3fe30e1da Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/diesel_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png new file mode 100644 index 000000000..ebef06022 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/electrolyzedwater_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png new file mode 100644 index 000000000..cf2b7b7ac Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrocarbon_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png new file mode 100644 index 000000000..b22e2fc45 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/nitrodiesel_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png index d659fb199..2fbdf04cc 100644 Binary files a/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png and b/src/main/resources/assets/techreborn/textures/blocks/fluids/oil_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png new file mode 100644 index 000000000..e595a673c Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/sodiumsulfide_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png new file mode 100644 index 000000000..7d83305ac Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png.mcmeta new file mode 100644 index 000000000..87c542d29 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfur_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":1 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png new file mode 100644 index 000000000..bda7e3824 Binary files /dev/null and b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png differ diff --git a/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png.mcmeta b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png.mcmeta new file mode 100644 index 000000000..0df7234a7 --- /dev/null +++ b/src/main/resources/assets/techreborn/textures/blocks/fluids/sulfuricacid_flowing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":2 + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png b/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png index 2e217674a..862bf808d 100644 Binary files a/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png and b/src/main/resources/assets/techreborn/textures/gui/gui_sheet.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/upgrade/ejection_upgrade.png b/src/main/resources/assets/techreborn/textures/items/upgrade/ejection_upgrade.png index d36a2311c..5672bc176 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/upgrade/ejection_upgrade.png and b/src/main/resources/assets/techreborn/textures/items/upgrade/ejection_upgrade.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/upgrade/injection_upgrade.png b/src/main/resources/assets/techreborn/textures/items/upgrade/injection_upgrade.png index 6d8147632..1bc35f853 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/upgrade/injection_upgrade.png and b/src/main/resources/assets/techreborn/textures/items/upgrade/injection_upgrade.png differ diff --git a/src/main/resources/assets/techreborn/textures/items/upgrade/overclocker_upgrade.png b/src/main/resources/assets/techreborn/textures/items/upgrade/overclocker_upgrade.png index 396654d42..191f2dacf 100644 Binary files a/src/main/resources/assets/techreborn/textures/items/upgrade/overclocker_upgrade.png and b/src/main/resources/assets/techreborn/textures/items/upgrade/overclocker_upgrade.png differ