This commit is contained in:
DrMangoTea
2024-07-04 20:07:35 +02:00
parent d2d65ee2e5
commit b711aa2dc3
281 changed files with 4590 additions and 7178 deletions

View File

@@ -4,11 +4,15 @@ buildscript {
maven { url = 'https://maven.minecraftforge.net' }
mavenCentral()
jcenter()
maven { url = 'https://maven.parchmentmc.org' }
maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
}
dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath "org.parchmentmc:librarian:${librarian_version}"
classpath "org.spongepowered:mixingradle:0.7-SNAPSHOT"
}
}
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
@@ -18,12 +22,14 @@ plugins {
id 'com.matthewprenger.cursegradle' version '1.4.0'
}
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.parchmentmc.librarian.forgegradle'
apply plugin: 'org.spongepowered.mixin'
//mixin {
// add sourceSets.main, "createindustry.refmap.json"
//}
version = '0.7.0c-1.19.2'
version = '0.9.0b-1.19.2'
group = 'com.drmangotea.createindustry' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'createindustry'
@@ -32,7 +38,8 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
minecraft {
mappings channel: 'official', version: '1.19.2'
mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
@@ -101,7 +108,12 @@ sourceSets.main.resources { srcDir 'src/generated/resources' }
repositories {
maven {
url = 'https://www.cursemaven.com'
content {
includeGroup "curse.maven"
}
}
maven {
// location of the maven that hosts JEI files since January 2023
// location of the maven for Vazkii's mods
@@ -119,12 +131,25 @@ repositories {
dependencies {
minecraft 'net.minecraftforge:forge:1.19.2-43.2.3'
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
compileOnly fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${minecraft_version}:${flywheel_version}")
implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:all") { transitive = false }
implementation fg.deobf("com.simibubi.create:create-${minecraft_version}:${create_version}:all") { transitive = false }
implementation fg.deobf("curse.maven:createaddition-439890:5070245")
implementation fg.deobf("curse.maven:zinclib-968773:5110339")
implementation fg.deobf("curse.maven:mekanism-268560:4644795")
implementation fg.deobf("curse.maven:selene-499980:4983974")
implementation fg.deobf("curse.maven:spark-361579:4505309")
//implementation fg.deobf("curse.maven:create-steam-n-rails-688231:5246888")
compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-common-api:${jei_version}")
compileOnly fg.deobf("mezz.jei:jei-${jei_minecraft_version}-forge-api:${jei_version}")

View File

@@ -3,10 +3,12 @@ org.gradle.daemon=false
jei_minecraft_version = 1.19.2
jei_version = 11.4.0.274
forge_version = 43.2.8
create_minecraft_version = 1.19.2
flywheel_minecraft_version = 1.19.2
minecraft_version = 1.19.2
flywheel_version = 0.6.10-20
create_version = 0.5.1.f-45
librarian_version = 1.+
parchment_version = 2022.11.27
registrate_version = MC1.19-1.1.5

View File

@@ -2,5 +2,8 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven { url = 'https://maven.minecraftforge.net/' }
}
}
}

View File

@@ -1,2 +1,2 @@
// 1.19.2 2024-01-12T20:54:31.7261534 Create: The Factory Must Grow's lang merger
98af1b1ba96b233fd0d321a932d7f5dcde5e7f19 assets/createindustry/lang/en_us.json
// 1.19.2 2024-07-03T15:07:29.6924992 Create: The Factory Must Grow's lang merger
33a8f334cb21003d00d77f8789288b83dd2bbb60 assets/createindustry/lang/en_us.json

View File

@@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "createindustry:block/cast_iron_distillation_controller/block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "createindustry:block/cast_iron_distillation_output/block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "createindustry:block/caution_block"
}
}
}

View File

@@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "createindustry:block/crude_oil_fluid"
}
}
}

View File

@@ -1,7 +1,19 @@
{
"variants": {
"": {
"facing=east": {
"model": "createindustry:block/red_caution_block",
"y": 90
},
"facing=north": {
"model": "createindustry:block/red_caution_block"
},
"facing=south": {
"model": "createindustry:block/red_caution_block",
"y": 180
},
"facing=west": {
"model": "createindustry:block/red_caution_block",
"y": 270
}
}
}

View File

@@ -1,57 +1,19 @@
{
"variants": {
"face=ceiling,facing=east": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 180,
"y": 270
},
"face=ceiling,facing=north": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 180,
"y": 180
},
"face=ceiling,facing=south": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 180
},
"face=ceiling,facing=west": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 180,
"y": 90
},
"face=floor,facing=east": {
"facing=east": {
"model": "createindustry:block/steel_distillation_controller/block",
"y": 90
},
"face=floor,facing=north": {
"facing=north": {
"model": "createindustry:block/steel_distillation_controller/block"
},
"face=floor,facing=south": {
"facing=south": {
"model": "createindustry:block/steel_distillation_controller/block",
"y": 180
},
"face=floor,facing=west": {
"facing=west": {
"model": "createindustry:block/steel_distillation_controller/block",
"y": 270
},
"face=wall,facing=east": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 90,
"y": 90
},
"face=wall,facing=north": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 90
},
"face=wall,facing=south": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "createindustry:block/steel_distillation_controller/block",
"x": 90,
"y": 270
}
}
}

View File

@@ -1,295 +0,0 @@
{
"block.createindustry.air_intake": "ǝʞɐʇuI ɹıⱯ",
"block.createindustry.aluminum_bars": "sɹɐᗺ ɯnuıɯnןⱯ",
"block.createindustry.aluminum_block": "ɯnuıɯnןⱯ ɟo ʞɔoןᗺ",
"block.createindustry.aluminum_fluid_valve": "ǝʌןɐΛ pınןɯnuıɯnןⱯ",
"block.createindustry.aluminum_flywheel": "ןǝǝɥʍʎןℲ ɯnuıɯnןⱯ",
"block.createindustry.aluminum_ladder": "ɹǝppɐꞀ ɯnuıɯnןⱯ",
"block.createindustry.aluminum_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ɯnuıɯnןⱯ",
"block.createindustry.aluminum_pipe": "ǝdıԀ ɯnuıɯnןⱯ",
"block.createindustry.aluminum_scaffolding": "buıpןoɟɟɐɔS ɯnuıɯnןⱯ",
"block.createindustry.aluminum_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ɯnuıɯnןⱯ",
"block.createindustry.aluminum_truss": "ssnɹ⟘ ɯnuıɯnןⱯ",
"block.createindustry.asphalt": ןɐɥdsⱯ",
"block.createindustry.bauxite": "ǝʇıxnɐᗺ",
"block.createindustry.bauxite_pillar": "ɹɐןןıԀ ǝʇıxnɐᗺ",
"block.createindustry.black_concrete": "ǝʇǝɹɔuoƆ ʞɔɐןᗺ",
"block.createindustry.black_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʞɔɐןᗺ",
"block.createindustry.black_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʞɔɐןᗺ",
"block.createindustry.black_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʞɔɐןᗺ",
"block.createindustry.blast_furnace_output": "ʇndʇnO ǝɔɐuɹnℲ ʇsɐןᗺ",
"block.createindustry.blue_concrete": "ǝʇǝɹɔuoƆ ǝnןᗺ",
"block.createindustry.blue_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝnןᗺ",
"block.createindustry.blue_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝnןᗺ",
"block.createindustry.blue_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝnןᗺ",
"block.createindustry.brass_fluid_valve": "ǝʌןɐΛ pınןℲ ssɐɹᗺ",
"block.createindustry.brass_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ssɐɹᗺ",
"block.createindustry.brass_pipe": "ǝdıԀ ssɐɹᗺ",
"block.createindustry.brass_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ssɐɹᗺ",
"block.createindustry.brown_concrete": "ǝʇǝɹɔuoƆ uʍoɹᗺ",
"block.createindustry.brown_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uʍoɹᗺ",
"block.createindustry.brown_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uʍoɹᗺ",
"block.createindustry.brown_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uʍoɹᗺ",
"block.createindustry.cast_iron_block": "uoɹI ʇsɐƆ ɟo ʞɔoןᗺ",
"block.createindustry.cast_iron_distillation_controller": "ɹǝןןoɹʇuoƆ uoıʇɐןןıʇsıᗡ uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_distillation_output": "ʇndʇnO uoıʇɐןןıʇsıᗡ uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_fluid_valve": "ǝʌןɐΛ pınןℲ uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_flywheel": "ןǝǝɥʍʎןℲ uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_mechanical_pump": "dɯןɐɔıuɐɥɔǝW uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_pipe": "ǝdıԀ uoɹI ʇsɐƆ",
"block.createindustry.cast_iron_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS uoɹI ʇsɐƆ",
"block.createindustry.casting_basin": "uısɐᗺ buıʇsɐƆ",
"block.createindustry.casting_spout": "ʇnodS buıʇsɐƆ",
"block.createindustry.caution_block": "ʞɔoןᗺ uoıʇnɐƆ",
"block.createindustry.cement": "ʇuǝɯǝƆ",
"block.createindustry.coal_coke_block": "ǝʞoƆ ןɐoƆ ɟo ʞɔoןᗺ",
"block.createindustry.coke_oven": "uǝʌO ǝʞoƆ",
"block.createindustry.compact_engine": "ǝuıbuƎ ʇɔɐdɯoƆ",
"block.createindustry.concrete": "ǝʇǝɹɔuoƆ",
"block.createindustry.concrete_slab": "qɐןS ǝʇǝɹɔuoƆ",
"block.createindustry.concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ",
"block.createindustry.concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ",
"block.createindustry.cooling_fluid": "pınןℲ buıןooƆ",
"block.createindustry.copper_encased_aluminum_pipe": "ǝdıԀ ɯnuıɯnןⱯ pǝsɐɔuƎ ɹǝddoƆ",
"block.createindustry.copper_encased_brass_pipe": "ǝdıԀ ssɐɹᗺ pǝsɐɔuƎ ɹǝddoƆ",
"block.createindustry.copper_encased_cast_iron_pipe": "ǝdıԀ uoɹI ʇsɐƆ pǝsɐɔuƎ ɹǝddoƆ",
"block.createindustry.copper_encased_plastic_pipe": "ǝdıԀ ɔıʇsɐןԀ pǝsɐɔuƎ ɹǝddoƆ",
"block.createindustry.copper_encased_steel_pipe": "ǝdıԀ ןǝǝʇS pǝsɐɔuƎ ɹǝddoƆ",
"block.createindustry.creosote": "ǝʇosoǝɹƆ",
"block.createindustry.crude_oil_fluid": "pınןןıO ǝpnɹƆ",
"block.createindustry.cut_bauxite": "ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_brick_slab": "qɐןS ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_bricks": "sʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cut_bauxite_wall": "ןןɐM ǝʇıxnɐᗺ ʇnƆ",
"block.createindustry.cyan_concrete": "ǝʇǝɹɔuoƆ uɐʎƆ",
"block.createindustry.cyan_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uɐʎƆ",
"block.createindustry.cyan_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uɐʎƆ",
"block.createindustry.cyan_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uɐʎƆ",
"block.createindustry.diesel": "ןǝsǝıᗡ",
"block.createindustry.diesel_engine": "ǝuıbuƎ ןǝsǝıᗡ",
"block.createindustry.diesel_engine_expansion": "uoısuɐdxƎ ǝuıbuƎ ןǝsǝıᗡ",
"block.createindustry.exhaust": "ʇsnɐɥxƎ",
"block.createindustry.factory_floor": "ɹooןℲ ʎɹoʇɔɐℲ",
"block.createindustry.factory_floor_slab": "qɐןS ɹooןℲ ʎɹoʇɔɐℲ",
"block.createindustry.factory_floor_stairs": "sɹıɐʇS ɹooןℲ ʎɹoʇɔɐℲ",
"block.createindustry.fireclay": "ʎɐןɔǝɹıℲ",
"block.createindustry.fireproof_brick_reinforcement": "ʇuǝɯǝɔɹoɟuıǝᴚ ʞɔıɹᗺ ɟooɹdǝɹıℲ",
"block.createindustry.fireproof_bricks": "sʞɔıɹᗺ ɟooɹdǝɹıℲ",
"block.createindustry.flarestack": "ʞɔɐʇsǝɹɐןℲ",
"block.createindustry.formwork_block": "ʞɔoןᗺ ʞɹoʍɯɹoℲ",
"block.createindustry.fossilstone": "ǝuoʇsןıssoℲ",
"block.createindustry.gasoline": "ǝuıןosɐ⅁",
"block.createindustry.gasoline_engine": "ǝuıbuƎ ǝuıןosɐ⅁",
"block.createindustry.gasoline_engine_back": "ʞɔɐᗺ ǝuıbuƎ ǝuıןosɐ⅁",
"block.createindustry.glass_aluminum_pipe": "ǝdıԀ ɯnuıɯnןⱯ ssɐן⅁",
"block.createindustry.glass_brass_pipe": "ǝdıԀ ssɐɹᗺ ssɐן⅁",
"block.createindustry.glass_cast_iron_pipe": "ǝdıԀ uoɹI ʇsɐƆ ssɐן⅁",
"block.createindustry.glass_plastic_pipe": "ǝdıԀ ɔıʇsɐןԀ ssɐן⅁",
"block.createindustry.glass_steel_pipe": "ǝdıԀ ןǝǝʇS ssɐן⅁",
"block.createindustry.gray_concrete": "ǝʇǝɹɔuoƆ ʎɐɹ⅁",
"block.createindustry.gray_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʎɐɹ⅁",
"block.createindustry.gray_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʎɐɹ⅁",
"block.createindustry.gray_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʎɐɹ⅁",
"block.createindustry.green_concrete": "ǝʇǝɹɔuoƆ uǝǝɹ⅁",
"block.createindustry.green_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ uǝǝɹ⅁",
"block.createindustry.green_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ uǝǝɹ⅁",
"block.createindustry.green_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ uǝǝɹ⅁",
"block.createindustry.hardened_planks": "sʞuɐןԀ pǝuǝpɹɐH",
"block.createindustry.heavy_casing_door": "ɹooᗡ buısɐƆ ʎʌɐǝH",
"block.createindustry.heavy_machinery_casing": "buısɐƆ ʎɹǝuıɥɔɐW ʎʌɐǝH",
"block.createindustry.heavy_oil": "ןıO ʎʌɐǝH",
"block.createindustry.industrial_pipe": "ǝdıԀ ןɐıɹʇsnpuI",
"block.createindustry.kerosene": "ǝuǝsoɹǝʞ",
"block.createindustry.large_pumpjack_hammer_connector": "ɹoʇɔǝuuoƆ ɹǝɯɯɐH ʞɔɐظdɯnԀ ǝbɹɐꞀ",
"block.createindustry.large_pumpjack_hammer_head": "pɐǝH ɹǝɯɯɐH ʞɔɐظdɯnԀ ǝbɹɐꞀ",
"block.createindustry.large_pumpjack_hammer_part": "ʇɹɐԀ ɹǝɯɯɐH ʞɔɐظdɯnԀ ǝbɹɐꞀ",
"block.createindustry.large_radial_engine": "ǝuıbuƎ ןɐıpɐᴚ ǝbɹɐꞀ",
"block.createindustry.layered_bauxite": "ǝʇıxnɐᗺ pǝɹǝʎɐꞀ",
"block.createindustry.light_blue_concrete": "ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ",
"block.createindustry.light_blue_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ",
"block.createindustry.light_blue_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ",
"block.createindustry.light_blue_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝnןᗺ ʇɥbıꞀ",
"block.createindustry.light_gray_concrete": "ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ",
"block.createindustry.light_gray_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ",
"block.createindustry.light_gray_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ",
"block.createindustry.light_gray_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʎɐɹ⅁ ʇɥbıꞀ",
"block.createindustry.lignite": "ǝʇıubıꞀ",
"block.createindustry.lime_concrete": "ǝʇǝɹɔuoƆ ǝɯıꞀ",
"block.createindustry.lime_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝɯıꞀ",
"block.createindustry.lime_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝɯıꞀ",
"block.createindustry.lime_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝɯıꞀ",
"block.createindustry.liquid_asphalt": ןɐɥdsⱯ pınbıꞀ",
"block.createindustry.liquid_concrete": "ǝʇǝɹɔuoƆ pınbıꞀ",
"block.createindustry.liquid_plastic": ıʇsɐןԀ pınbıꞀ",
"block.createindustry.lpg_engine": "ǝuıbuƎ bdꞀ",
"block.createindustry.lpg_engine_back": "ʞɔɐᗺ ǝuıbuƎ bdꞀ",
"block.createindustry.lubrication_oil": "ןıO uoıʇɐɔıɹqnꞀ",
"block.createindustry.machine_input": "ʇnduI ǝuıɥɔɐW",
"block.createindustry.magenta_concrete": "ǝʇǝɹɔuoƆ ɐʇuǝbɐW",
"block.createindustry.magenta_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ɐʇuǝbɐW",
"block.createindustry.magenta_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɐʇuǝbɐW",
"block.createindustry.magenta_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɐʇuǝbɐW",
"block.createindustry.molten_metal": "ןɐʇǝW uǝʇןoW",
"block.createindustry.molten_slag": "bɐןS uǝʇןoW",
"block.createindustry.molten_steel": "ןǝǝʇS uǝʇןoW",
"block.createindustry.napalm": "ɯןɐdɐN",
"block.createindustry.napalm_bomb": "qɯoᗺ ɯןɐdɐN",
"block.createindustry.naphtha": "ɐɥʇɥdɐN",
"block.createindustry.oil_deposit": ısodǝᗡ ןıO",
"block.createindustry.orange_concrete": "ǝʇǝɹɔuoƆ ǝbuɐɹO",
"block.createindustry.orange_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝbuɐɹO",
"block.createindustry.orange_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝbuɐɹO",
"block.createindustry.orange_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝbuɐɹO",
"block.createindustry.pink_concrete": "ǝʇǝɹɔuoƆ ʞuıԀ",
"block.createindustry.pink_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʞuıԀ",
"block.createindustry.pink_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʞuıԀ",
"block.createindustry.pink_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʞuıԀ",
"block.createindustry.plastic_block": ıʇsɐןԀ ɟo ʞɔoןᗺ",
"block.createindustry.plastic_fluid_valve": "ǝʌןɐΛ pınןℲ ɔıʇsɐןԀ",
"block.createindustry.plastic_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ɔıʇsɐןԀ",
"block.createindustry.plastic_pipe": "ǝdıԀ ɔıʇsɐןԀ",
"block.createindustry.plastic_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ɔıʇsɐןԀ",
"block.createindustry.polished_cut_bauxite": "ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ",
"block.createindustry.polished_cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ",
"block.createindustry.polished_cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ",
"block.createindustry.polished_cut_bauxite_wall": "ןןɐM ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ",
"block.createindustry.pumpjack_base": "ǝsɐᗺ ʞɔɐظdɯnԀ",
"block.createindustry.pumpjack_crank": "ʞuɐɹƆ ʞɔɐظdɯnԀ",
"block.createindustry.pumpjack_hammer": "ɹǝpןoH ɹǝɯɯɐH ʞɔɐظdɯnԀ",
"block.createindustry.pumpjack_hammer_connector": "ɹoʇɔǝuuoƆ ɹǝɯɯɐH ʞɔɐظdɯnԀ",
"block.createindustry.pumpjack_hammer_head": "pɐǝH ɹǝɯɯɐH ʞɔɐظdɯnԀ",
"block.createindustry.pumpjack_hammer_part": "ʇɹɐԀ ɹǝɯɯɐH ʞɔɐظdɯnԀ",
"block.createindustry.purple_concrete": "ǝʇǝɹɔuoƆ ǝןdɹnԀ",
"block.createindustry.purple_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝןdɹnԀ",
"block.createindustry.purple_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝןdɹnԀ",
"block.createindustry.purple_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝןdɹnԀ",
"block.createindustry.radial_engine": "ǝuıbuƎ ןɐıpɐᴚ",
"block.createindustry.radial_engine_input": "ʇnduI ǝuıbuƎ ןɐıpɐᴚ",
"block.createindustry.radial_engine_input_ponder": "ɹǝpuoԀ ʇnduI ǝuıbuƎ ןɐıpɐᴚ",
"block.createindustry.rebar_concrete": "ǝʇǝɹɔuoƆ ɹɐqǝᴚ",
"block.createindustry.rebar_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ɹɐqǝᴚ",
"block.createindustry.rebar_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ɹɐqǝᴚ",
"block.createindustry.rebar_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ɹɐqǝᴚ",
"block.createindustry.rebar_formwork_block": "ʞɔoןᗺ ʞɹoʍɯɹoℲ ɹɐqǝᴚ",
"block.createindustry.red_caution_block": "ʞɔoןᗺ uoıʇnɐƆ pǝᴚ",
"block.createindustry.red_concrete": "ǝʇǝɹɔuoƆ pǝᴚ",
"block.createindustry.red_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ pǝᴚ",
"block.createindustry.red_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ pǝᴚ",
"block.createindustry.red_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ pǝᴚ",
"block.createindustry.small_bauxite_brick_slab": "qɐןS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS",
"block.createindustry.small_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS",
"block.createindustry.small_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS",
"block.createindustry.small_bauxite_bricks": "sʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS",
"block.createindustry.steel_bars": "sɹɐᗺ ןǝǝʇS",
"block.createindustry.steel_block": "ןǝǝʇS ɟo ʞɔoןᗺ",
"block.createindustry.steel_casing": "buısɐƆ ןǝǝʇS",
"block.createindustry.steel_distillation_controller": "ɹǝןןoɹʇuoƆ uoıʇɐןןıʇsıןǝǝʇS",
"block.createindustry.steel_distillation_output": "ʇndʇnO uoıʇɐןןıʇsıןǝǝʇS",
"block.createindustry.steel_door": "ɹooᗡ ןǝǝʇS",
"block.createindustry.steel_fluid_tank": "ʞuɐ⟘ pınןןǝǝʇS",
"block.createindustry.steel_fluid_valve": "ǝʌןɐΛ pınןןǝǝʇS",
"block.createindustry.steel_flywheel": "ןǝǝɥʍʎןℲ ןǝǝʇS",
"block.createindustry.steel_frame": "ǝɯɐɹℲ ןǝǝʇS",
"block.createindustry.steel_ladder": "ɹǝppɐꞀ ןǝǝʇS",
"block.createindustry.steel_mechanical_pump": "dɯןɐɔıuɐɥɔǝW ןǝǝʇS",
"block.createindustry.steel_pipe": "ǝdıԀ ןǝǝʇS",
"block.createindustry.steel_scaffolding": "buıpןoɟɟɐɔS ןǝǝʇS",
"block.createindustry.steel_smart_fluid_pipe": "ǝdıԀ pınןℲ ʇɹɐɯS ןǝǝʇS",
"block.createindustry.steel_truss": "ssnɹ⟘ ןǝǝʇS",
"block.createindustry.sulfur": "ɹnɟןnS",
"block.createindustry.surface_scanner": "ɹǝuuɐɔS ǝɔɐɟɹnS",
"block.createindustry.turbine_engine": "ǝuıbuƎ ǝuıqɹn⟘",
"block.createindustry.turbine_engine_back": "ʞɔɐᗺ ǝuıbuƎ ǝuıqɹn⟘",
"block.createindustry.white_concrete": "ǝʇǝɹɔuoƆ ǝʇıɥM",
"block.createindustry.white_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ǝʇıɥM",
"block.createindustry.white_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ǝʇıɥM",
"block.createindustry.white_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ǝʇıɥM",
"block.createindustry.yellow_concrete": "ǝʇǝɹɔuoƆ ʍoןןǝʎ",
"block.createindustry.yellow_concrete_slab": "qɐןS ǝʇǝɹɔuoƆ ʍoןןǝʎ",
"block.createindustry.yellow_concrete_stairs": "sɹıɐʇS ǝʇǝɹɔuoƆ ʍoןןǝʎ",
"block.createindustry.yellow_concrete_wall": "ןןɐM ǝʇǝɹɔuoƆ ʍoןןǝʎ",
"entity.createindustry.blue_spark": "ʞɹɐdS ǝnןᗺ",
"entity.createindustry.copper_grenade": "ǝpɐuǝɹ⅁ ɹǝddoƆ",
"entity.createindustry.green_spark": "ʞɹɐdS uǝǝɹ⅁",
"entity.createindustry.napalm_bomb_entity": "ʎʇıʇuƎ qɯoᗺ ɯןɐdɐN",
"entity.createindustry.spark": "ʞɹɐdS",
"entity.createindustry.thermite_grenade": "ǝpɐuǝɹ⅁ ǝʇıɯɹǝɥ⟘",
"entity.createindustry.zin_grenade": "ǝpɐuǝɹ⅁ uıZ",
"fluid.createindustry.air": "ɹıⱯ",
"fluid.createindustry.butane": "ǝuɐʇnᗺ",
"fluid.createindustry.carbon_dioxide": "ǝpıxoıᗡ uoqɹɐƆ",
"fluid.createindustry.cooling_fluid": "pınןℲ buıןooƆ",
"fluid.createindustry.creosote": "ǝʇosoǝɹƆ",
"fluid.createindustry.crude_oil_fluid": "ןıO ǝpnɹƆ",
"fluid.createindustry.diesel": "ןǝsǝıᗡ",
"fluid.createindustry.ethylene": "ǝuǝןʎɥʇƎ",
"fluid.createindustry.gasoline": "ǝuıןosɐ⅁",
"fluid.createindustry.heavy_oil": "ןıO ʎʌɐǝH",
"fluid.createindustry.kerosene": "ǝuǝsoɹǝʞ",
"fluid.createindustry.liquid_asphalt": ןɐɥdsⱯ pınbıꞀ",
"fluid.createindustry.liquid_concrete": "ǝʇǝɹɔuoƆ pınbıꞀ",
"fluid.createindustry.liquid_plastic": ıʇsɐןԀ pınbıꞀ",
"fluid.createindustry.lpg": "⅁ԀꞀ",
"fluid.createindustry.lubrication_oil": "ןıO uoıʇɐɔıɹqnꞀ",
"fluid.createindustry.molten_slag": "bɐןS uǝʇןoW",
"fluid.createindustry.molten_steel": "ןǝǝʇS uǝʇןoW",
"fluid.createindustry.napalm": "ɯןɐdɐN",
"fluid.createindustry.naphtha": "ɐɥʇɥdɐN",
"fluid.createindustry.propane": "ǝuɐdoɹԀ",
"fluid.createindustry.propylene": "ǝuǝןʎdoɹԀ",
"item.createindustry.aluminum_ingot": "ʇobuI ɯnuıɯnןⱯ",
"item.createindustry.bitumen": "uǝɯıᗺ",
"item.createindustry.blasting_mixture": "ǝɹnʇxıW buıʇsɐןᗺ",
"item.createindustry.block_mold": "pןoW ʞɔoןᗺ",
"item.createindustry.cast_iron_ingot": "ʇobuI uoɹI ʇsɐƆ",
"item.createindustry.coal_coke": "ǝʞoƆ ןɐoƆ",
"item.createindustry.coal_coke_dust": "ʇsnᗡ ǝʞoƆ ןɐoƆ",
"item.createindustry.concrete_mixture": "ǝɹnʇxıW ǝʇǝɹɔuoƆ",
"item.createindustry.cooling_fluid_bucket": "ʇǝʞɔnᗺ pınןℲ buıןooƆ",
"item.createindustry.copper_grenade": "ǝpɐuǝɹ⅁ ɹǝddoƆ",
"item.createindustry.creosote_bucket": "ʇǝʞɔnᗺ ǝʇosoǝɹƆ",
"item.createindustry.crude_oil_fluid_bucket": "ʇǝʞɔnᗺ pınןןıO ǝpnɹƆ",
"item.createindustry.diesel_bucket": "ʇǝʞɔnᗺ ןǝsǝıᗡ",
"item.createindustry.engine_base": "ǝsɐᗺ ǝuıbuƎ",
"item.createindustry.engine_chamber": "ɹǝqɯɐɥƆ ǝuıbuƎ",
"item.createindustry.fireclay_ball": "ןןɐᗺ ʎɐןɔǝɹıℲ",
"item.createindustry.fireproof_brick": "ʞɔıɹᗺ ɟooɹdǝɹıℲ",
"item.createindustry.gasoline_bucket": "ʇǝʞɔnᗺ ǝuıןosɐ⅁",
"item.createindustry.heavy_oil_bucket": "ʇǝʞɔnᗺ ןıO ʎʌɐǝH",
"item.createindustry.heavy_plate": "ǝʇɐןԀ ʎʌɐǝH",
"item.createindustry.ingot_mold": "pןoW ʇobuI",
"item.createindustry.kerosene_bucket": "ʇǝʞɔnᗺ ǝuǝsoɹǝʞ",
"item.createindustry.limesand": "puɐsǝɯıꞀ",
"item.createindustry.liquid_asphalt_bucket": "ʇǝʞɔnᗺ ʇןɐɥdsⱯ pınbıꞀ",
"item.createindustry.liquid_concrete_bucket": "ʇǝʞɔnᗺ ǝʇǝɹɔuoƆ pınbıꞀ",
"item.createindustry.liquid_plastic_bucket": "ʇǝʞɔnᗺ ɔıʇsɐןԀ pınbıꞀ",
"item.createindustry.lubrication_oil_bucket": "ʇǝʞɔnᗺ ןıO uoıʇɐɔıɹqnꞀ",
"item.createindustry.molten_slag_bucket": "ʇǝʞɔnᗺ bɐןS uǝʇןoW",
"item.createindustry.molten_steel_bucket": "ʇǝʞɔnᗺ ןǝǝʇS uǝʇןoW",
"item.createindustry.napalm_bucket": "ʇǝʞɔnᗺ ɯןɐdɐN",
"item.createindustry.naphtha_bucket": "ʇǝʞɔnᗺ ɐɥʇɥdɐN",
"item.createindustry.nitrate_dust": "ʇsnᗡ ǝʇɐɹʇıN",
"item.createindustry.plastic_sheet": "ʇǝǝɥS ɔıʇsɐןԀ",
"item.createindustry.quad_potato_cannon": "uouuɐƆ oʇɐʇoԀ pɐnὉ",
"item.createindustry.rebar": "ɹɐqǝᴚ",
"item.createindustry.screw": "ʍǝɹɔS",
"item.createindustry.screwdriver": "ɹǝʌıɹpʍǝɹɔS",
"item.createindustry.slag": "bɐןS",
"item.createindustry.spark_plug": "bnןԀ ʞɹɐdS",
"item.createindustry.steel_ingot": "ʇobuI ןǝǝʇS",
"item.createindustry.steel_mechanism": "ɯsıuɐɥɔǝW ןǝǝʇS",
"item.createindustry.sulfur_dust": "ʇsnᗡ ɹnɟןnS",
"item.createindustry.thermite_grenade": "ǝpɐuǝɹ⅁ ǝʇıɯɹǝɥ⟘",
"item.createindustry.thermite_powder": "ɹǝpʍoԀ ǝʇıɯɹǝɥ⟘",
"item.createindustry.turbine_blade": "ǝpɐןᗺ ǝuıqɹn⟘",
"item.createindustry.unfinished_gasoline_engine": "ǝuıbuƎ ǝuıןosɐ⅁ pǝɥsıuıɟu∩",
"item.createindustry.unfinished_lpg_engine": "ǝuıbuƎ bdꞀ pǝɥsıuıɟu∩",
"item.createindustry.unfinished_steel_mechanism": "ɯsıuɐɥɔǝW ןǝǝʇS pǝɥsıuıɟu∩",
"item.createindustry.unfinished_turbine_engine": "ǝuıbuƎ ǝuıqɹn⟘ pǝɥsıuıɟu∩",
"item.createindustry.unprocessed_heavy_plate": "ǝʇɐןԀ ʎʌɐǝH pǝssǝɔoɹdu∩",
"item.createindustry.zinc_grenade": "ǝpɐuǝɹ⅁ ɔuıZ"
}

View File

@@ -1,458 +0,0 @@
{
"_": "->------------------------] Game Elements [------------------------<-",
"block.createindustry.air_intake": "Air Intake",
"block.createindustry.aluminum_bars": "Aluminum Bars",
"block.createindustry.aluminum_block": "Block of Aluminum",
"block.createindustry.aluminum_fluid_valve": "Aluminum Fluid Valve",
"block.createindustry.aluminum_flywheel": "Aluminum Flywheel",
"block.createindustry.aluminum_ladder": "Aluminum Ladder",
"block.createindustry.aluminum_mechanical_pump": "Aluminum Mechanical Pump",
"block.createindustry.aluminum_pipe": "Aluminum Pipe",
"block.createindustry.aluminum_scaffolding": "Aluminum Scaffolding",
"block.createindustry.aluminum_smart_fluid_pipe": "Aluminum Smart Fluid Pipe",
"block.createindustry.aluminum_truss": "Aluminum Truss",
"block.createindustry.asphalt": "Asphalt",
"block.createindustry.bauxite": "Bauxite",
"block.createindustry.bauxite_pillar": "Bauxite Pillar",
"block.createindustry.black_concrete": "Black Concrete",
"block.createindustry.black_concrete_slab": "Black Concrete Slab",
"block.createindustry.black_concrete_stairs": "Black Concrete Stairs",
"block.createindustry.black_concrete_wall": "Black Concrete Wall",
"block.createindustry.blast_furnace_output": "Blast Furnace Output",
"block.createindustry.blue_concrete": "Blue Concrete",
"block.createindustry.blue_concrete_slab": "Blue Concrete Slab",
"block.createindustry.blue_concrete_stairs": "Blue Concrete Stairs",
"block.createindustry.blue_concrete_wall": "Blue Concrete Wall",
"block.createindustry.brass_fluid_valve": "Brass Fluid Valve",
"block.createindustry.brass_mechanical_pump": "Brass Mechanical Pump",
"block.createindustry.brass_pipe": "Brass Pipe",
"block.createindustry.brass_smart_fluid_pipe": "Brass Smart Fluid Pipe",
"block.createindustry.brown_concrete": "Brown Concrete",
"block.createindustry.brown_concrete_slab": "Brown Concrete Slab",
"block.createindustry.brown_concrete_stairs": "Brown Concrete Stairs",
"block.createindustry.brown_concrete_wall": "Brown Concrete Wall",
"block.createindustry.cast_iron_block": "Block of Cast Iron",
"block.createindustry.cast_iron_distillation_controller": "Cast Iron Distillation Controller",
"block.createindustry.cast_iron_distillation_output": "Cast Iron Distillation Output",
"block.createindustry.cast_iron_fluid_valve": "Cast Iron Fluid Valve",
"block.createindustry.cast_iron_flywheel": "Cast Iron Flywheel",
"block.createindustry.cast_iron_mechanical_pump": "Cast Iron Mechanical Pump",
"block.createindustry.cast_iron_pipe": "Cast Iron Pipe",
"block.createindustry.cast_iron_smart_fluid_pipe": "Cast Iron Smart Fluid Pipe",
"block.createindustry.casting_basin": "Casting Basin",
"block.createindustry.casting_spout": "Casting Spout",
"block.createindustry.caution_block": "Caution Block",
"block.createindustry.cement": "Cement",
"block.createindustry.coal_coke_block": "Block of Coal Coke",
"block.createindustry.coke_oven": "Coke Oven",
"block.createindustry.compact_engine": "Compact Engine",
"block.createindustry.concrete": "Concrete",
"block.createindustry.concrete_slab": "Concrete Slab",
"block.createindustry.concrete_stairs": "Concrete Stairs",
"block.createindustry.concrete_wall": "Concrete Wall",
"block.createindustry.cooling_fluid": "Cooling Fluid",
"block.createindustry.copper_encased_aluminum_pipe": "Copper Encased Aluminum Pipe",
"block.createindustry.copper_encased_brass_pipe": "Copper Encased Brass Pipe",
"block.createindustry.copper_encased_cast_iron_pipe": "Copper Encased Cast Iron Pipe",
"block.createindustry.copper_encased_plastic_pipe": "Copper Encased Plastic Pipe",
"block.createindustry.copper_encased_steel_pipe": "Copper Encased Steel Pipe",
"block.createindustry.creosote": "Creosote",
"block.createindustry.crude_oil_fluid": "Crude Oil Fluid",
"block.createindustry.cut_bauxite": "Cut Bauxite",
"block.createindustry.cut_bauxite_brick_slab": "Cut Bauxite Brick Slab",
"block.createindustry.cut_bauxite_brick_stairs": "Cut Bauxite Brick Stairs",
"block.createindustry.cut_bauxite_brick_wall": "Cut Bauxite Brick Wall",
"block.createindustry.cut_bauxite_bricks": "Cut Bauxite Bricks",
"block.createindustry.cut_bauxite_slab": "Cut Bauxite Slab",
"block.createindustry.cut_bauxite_stairs": "Cut Bauxite Stairs",
"block.createindustry.cut_bauxite_wall": "Cut Bauxite Wall",
"block.createindustry.cyan_concrete": "Cyan Concrete",
"block.createindustry.cyan_concrete_slab": "Cyan Concrete Slab",
"block.createindustry.cyan_concrete_stairs": "Cyan Concrete Stairs",
"block.createindustry.cyan_concrete_wall": "Cyan Concrete Wall",
"block.createindustry.diesel": "Diesel",
"block.createindustry.diesel_engine": "Diesel Engine",
"block.createindustry.diesel_engine_expansion": "Diesel Engine Expansion",
"block.createindustry.exhaust": "Exhaust",
"block.createindustry.factory_floor": "Factory Floor",
"block.createindustry.factory_floor_slab": "Factory Floor Slab",
"block.createindustry.factory_floor_stairs": "Factory Floor Stairs",
"block.createindustry.fireclay": "Fireclay",
"block.createindustry.fireproof_brick_reinforcement": "Fireproof Brick Reinforcement",
"block.createindustry.fireproof_bricks": "Fireproof Bricks",
"block.createindustry.flarestack": "Flarestack",
"block.createindustry.formwork_block": "Formwork Block",
"block.createindustry.fossilstone": "Fossilstone",
"block.createindustry.gasoline": "Gasoline",
"block.createindustry.gasoline_engine": "Gasoline Engine",
"block.createindustry.gasoline_engine_back": "Gasoline Engine Back",
"block.createindustry.glass_aluminum_pipe": "Glass Aluminum Pipe",
"block.createindustry.glass_brass_pipe": "Glass Brass Pipe",
"block.createindustry.glass_cast_iron_pipe": "Glass Cast Iron Pipe",
"block.createindustry.glass_plastic_pipe": "Glass Plastic Pipe",
"block.createindustry.glass_steel_pipe": "Glass Steel Pipe",
"block.createindustry.gray_concrete": "Gray Concrete",
"block.createindustry.gray_concrete_slab": "Gray Concrete Slab",
"block.createindustry.gray_concrete_stairs": "Gray Concrete Stairs",
"block.createindustry.gray_concrete_wall": "Gray Concrete Wall",
"block.createindustry.green_concrete": "Green Concrete",
"block.createindustry.green_concrete_slab": "Green Concrete Slab",
"block.createindustry.green_concrete_stairs": "Green Concrete Stairs",
"block.createindustry.green_concrete_wall": "Green Concrete Wall",
"block.createindustry.hardened_planks": "Hardened Planks",
"block.createindustry.heavy_casing_door": "Heavy Casing Door",
"block.createindustry.heavy_machinery_casing": "Heavy Machinery Casing",
"block.createindustry.heavy_oil": "Heavy Oil",
"block.createindustry.industrial_pipe": "Industrial Pipe",
"block.createindustry.kerosene": "Kerosene",
"block.createindustry.large_pumpjack_hammer_connector": "Large Pumpjack Hammer Connector",
"block.createindustry.large_pumpjack_hammer_head": "Large Pumpjack Hammer Head",
"block.createindustry.large_pumpjack_hammer_part": "Large Pumpjack Hammer Part",
"block.createindustry.large_radial_engine": "Large Radial Engine",
"block.createindustry.layered_bauxite": "Layered Bauxite",
"block.createindustry.light_blue_concrete": "Light Blue Concrete",
"block.createindustry.light_blue_concrete_slab": "Light Blue Concrete Slab",
"block.createindustry.light_blue_concrete_stairs": "Light Blue Concrete Stairs",
"block.createindustry.light_blue_concrete_wall": "Light Blue Concrete Wall",
"block.createindustry.light_gray_concrete": "Light Gray Concrete",
"block.createindustry.light_gray_concrete_slab": "Light Gray Concrete Slab",
"block.createindustry.light_gray_concrete_stairs": "Light Gray Concrete Stairs",
"block.createindustry.light_gray_concrete_wall": "Light Gray Concrete Wall",
"block.createindustry.lignite": "Lignite",
"block.createindustry.lime_concrete": "Lime Concrete",
"block.createindustry.lime_concrete_slab": "Lime Concrete Slab",
"block.createindustry.lime_concrete_stairs": "Lime Concrete Stairs",
"block.createindustry.lime_concrete_wall": "Lime Concrete Wall",
"block.createindustry.liquid_asphalt": "Liquid Asphalt",
"block.createindustry.liquid_concrete": "Liquid Concrete",
"block.createindustry.liquid_plastic": "Liquid Plastic",
"block.createindustry.lpg_engine": "Lpg Engine",
"block.createindustry.lpg_engine_back": "Lpg Engine Back",
"block.createindustry.lubrication_oil": "Lubrication Oil",
"block.createindustry.machine_input": "Machine Input",
"block.createindustry.magenta_concrete": "Magenta Concrete",
"block.createindustry.magenta_concrete_slab": "Magenta Concrete Slab",
"block.createindustry.magenta_concrete_stairs": "Magenta Concrete Stairs",
"block.createindustry.magenta_concrete_wall": "Magenta Concrete Wall",
"block.createindustry.molten_metal": "Molten Metal",
"block.createindustry.molten_slag": "Molten Slag",
"block.createindustry.molten_steel": "Molten Steel",
"block.createindustry.napalm": "Napalm",
"block.createindustry.napalm_bomb": "Napalm Bomb",
"block.createindustry.naphtha": "Naphtha",
"block.createindustry.oil_deposit": "Oil Deposit",
"block.createindustry.orange_concrete": "Orange Concrete",
"block.createindustry.orange_concrete_slab": "Orange Concrete Slab",
"block.createindustry.orange_concrete_stairs": "Orange Concrete Stairs",
"block.createindustry.orange_concrete_wall": "Orange Concrete Wall",
"block.createindustry.pink_concrete": "Pink Concrete",
"block.createindustry.pink_concrete_slab": "Pink Concrete Slab",
"block.createindustry.pink_concrete_stairs": "Pink Concrete Stairs",
"block.createindustry.pink_concrete_wall": "Pink Concrete Wall",
"block.createindustry.plastic_block": "Block of Plastic",
"block.createindustry.plastic_fluid_valve": "Plastic Fluid Valve",
"block.createindustry.plastic_mechanical_pump": "Plastic Mechanical Pump",
"block.createindustry.plastic_pipe": "Plastic Pipe",
"block.createindustry.plastic_smart_fluid_pipe": "Plastic Smart Fluid Pipe",
"block.createindustry.polished_cut_bauxite": "Polished Cut Bauxite",
"block.createindustry.polished_cut_bauxite_slab": "Polished Cut Bauxite Slab",
"block.createindustry.polished_cut_bauxite_stairs": "Polished Cut Bauxite Stairs",
"block.createindustry.polished_cut_bauxite_wall": "Polished Cut Bauxite Wall",
"block.createindustry.pumpjack_base": "Pumpjack Base",
"block.createindustry.pumpjack_crank": "Pumpjack Crank",
"block.createindustry.pumpjack_hammer": "Pumpjack Hammer Holder",
"block.createindustry.pumpjack_hammer_connector": "Pumpjack Hammer Connector",
"block.createindustry.pumpjack_hammer_head": "Pumpjack Hammer Head",
"block.createindustry.pumpjack_hammer_part": "Pumpjack Hammer Part",
"block.createindustry.purple_concrete": "Purple Concrete",
"block.createindustry.purple_concrete_slab": "Purple Concrete Slab",
"block.createindustry.purple_concrete_stairs": "Purple Concrete Stairs",
"block.createindustry.purple_concrete_wall": "Purple Concrete Wall",
"block.createindustry.radial_engine": "Radial Engine",
"block.createindustry.radial_engine_input": "Radial Engine Input",
"block.createindustry.radial_engine_input_ponder": "Radial Engine Input Ponder",
"block.createindustry.rebar_concrete": "Rebar Concrete",
"block.createindustry.rebar_concrete_slab": "Rebar Concrete Slab",
"block.createindustry.rebar_concrete_stairs": "Rebar Concrete Stairs",
"block.createindustry.rebar_concrete_wall": "Rebar Concrete Wall",
"block.createindustry.rebar_formwork_block": "Rebar Formwork Block",
"block.createindustry.red_caution_block": "Red Caution Block",
"block.createindustry.red_concrete": "Red Concrete",
"block.createindustry.red_concrete_slab": "Red Concrete Slab",
"block.createindustry.red_concrete_stairs": "Red Concrete Stairs",
"block.createindustry.red_concrete_wall": "Red Concrete Wall",
"block.createindustry.small_bauxite_brick_slab": "Small Bauxite Brick Slab",
"block.createindustry.small_bauxite_brick_stairs": "Small Bauxite Brick Stairs",
"block.createindustry.small_bauxite_brick_wall": "Small Bauxite Brick Wall",
"block.createindustry.small_bauxite_bricks": "Small Bauxite Bricks",
"block.createindustry.steel_bars": "Steel Bars",
"block.createindustry.steel_block": "Block of Steel",
"block.createindustry.steel_casing": "Steel Casing",
"block.createindustry.steel_distillation_controller": "Steel Distillation Controller",
"block.createindustry.steel_distillation_output": "Steel Distillation Output",
"block.createindustry.steel_door": "Steel Door",
"block.createindustry.steel_fluid_tank": "Steel Fluid Tank",
"block.createindustry.steel_fluid_valve": "Steel Fluid Valve",
"block.createindustry.steel_flywheel": "Steel Flywheel",
"block.createindustry.steel_frame": "Steel Frame",
"block.createindustry.steel_ladder": "Steel Ladder",
"block.createindustry.steel_mechanical_pump": "Steel Mechanical Pump",
"block.createindustry.steel_pipe": "Steel Pipe",
"block.createindustry.steel_scaffolding": "Steel Scaffolding",
"block.createindustry.steel_smart_fluid_pipe": "Steel Smart Fluid Pipe",
"block.createindustry.steel_truss": "Steel Truss",
"block.createindustry.sulfur": "Sulfur",
"block.createindustry.surface_scanner": "Surface Scanner",
"block.createindustry.turbine_engine": "Turbine Engine",
"block.createindustry.turbine_engine_back": "Turbine Engine Back",
"block.createindustry.white_concrete": "White Concrete",
"block.createindustry.white_concrete_slab": "White Concrete Slab",
"block.createindustry.white_concrete_stairs": "White Concrete Stairs",
"block.createindustry.white_concrete_wall": "White Concrete Wall",
"block.createindustry.yellow_concrete": "Yellow Concrete",
"block.createindustry.yellow_concrete_slab": "Yellow Concrete Slab",
"block.createindustry.yellow_concrete_stairs": "Yellow Concrete Stairs",
"block.createindustry.yellow_concrete_wall": "Yellow Concrete Wall",
"entity.createindustry.blue_spark": "Blue Spark",
"entity.createindustry.copper_grenade": "Copper Grenade",
"entity.createindustry.green_spark": "Green Spark",
"entity.createindustry.napalm_bomb_entity": "Napalm Bomb Entity",
"entity.createindustry.spark": "Spark",
"entity.createindustry.thermite_grenade": "Thermite Grenade",
"entity.createindustry.zin_grenade": "Zin Grenade",
"fluid.createindustry.air": "Air",
"fluid.createindustry.butane": "Butane",
"fluid.createindustry.carbon_dioxide": "Carbon Dioxide",
"fluid.createindustry.cooling_fluid": "Cooling Fluid",
"fluid.createindustry.creosote": "Creosote",
"fluid.createindustry.crude_oil_fluid": "Crude Oil",
"fluid.createindustry.diesel": "Diesel",
"fluid.createindustry.ethylene": "Ethylene",
"fluid.createindustry.gasoline": "Gasoline",
"fluid.createindustry.heavy_oil": "Heavy Oil",
"fluid.createindustry.kerosene": "Kerosene",
"fluid.createindustry.liquid_asphalt": "Liquid Asphalt",
"fluid.createindustry.liquid_concrete": "Liquid Concrete",
"fluid.createindustry.liquid_plastic": "Liquid Plastic",
"fluid.createindustry.lpg": "LPG",
"fluid.createindustry.lubrication_oil": "Lubrication Oil",
"fluid.createindustry.molten_slag": "Molten Slag",
"fluid.createindustry.molten_steel": "Molten Steel",
"fluid.createindustry.napalm": "Napalm",
"fluid.createindustry.naphtha": "Naphtha",
"fluid.createindustry.propane": "Propane",
"fluid.createindustry.propylene": "Propylene",
"item.createindustry.aluminum_ingot": "Aluminum Ingot",
"item.createindustry.bitumen": "Bitumen",
"item.createindustry.blasting_mixture": "Blasting Mixture",
"item.createindustry.block_mold": "Block Mold",
"item.createindustry.cast_iron_ingot": "Cast Iron Ingot",
"item.createindustry.coal_coke": "Coal Coke",
"item.createindustry.coal_coke_dust": "Coal Coke Dust",
"item.createindustry.concrete_mixture": "Concrete Mixture",
"item.createindustry.cooling_fluid_bucket": "Cooling Fluid Bucket",
"item.createindustry.copper_grenade": "Copper Grenade",
"item.createindustry.creosote_bucket": "Creosote Bucket",
"item.createindustry.crude_oil_fluid_bucket": "Crude Oil Fluid Bucket",
"item.createindustry.diesel_bucket": "Diesel Bucket",
"item.createindustry.engine_base": "Engine Base",
"item.createindustry.engine_chamber": "Engine Chamber",
"item.createindustry.fireclay_ball": "Fireclay Ball",
"item.createindustry.fireproof_brick": "Fireproof Brick",
"item.createindustry.gasoline_bucket": "Gasoline Bucket",
"item.createindustry.heavy_oil_bucket": "Heavy Oil Bucket",
"item.createindustry.heavy_plate": "Heavy Plate",
"item.createindustry.ingot_mold": "Ingot Mold",
"item.createindustry.kerosene_bucket": "Kerosene Bucket",
"item.createindustry.limesand": "Limesand",
"item.createindustry.liquid_asphalt_bucket": "Liquid Asphalt Bucket",
"item.createindustry.liquid_concrete_bucket": "Liquid Concrete Bucket",
"item.createindustry.liquid_plastic_bucket": "Liquid Plastic Bucket",
"item.createindustry.lubrication_oil_bucket": "Lubrication Oil Bucket",
"item.createindustry.molten_slag_bucket": "Molten Slag Bucket",
"item.createindustry.molten_steel_bucket": "Molten Steel Bucket",
"item.createindustry.napalm_bucket": "Napalm Bucket",
"item.createindustry.naphtha_bucket": "Naphtha Bucket",
"item.createindustry.nitrate_dust": "Nitrate Dust",
"item.createindustry.plastic_sheet": "Plastic Sheet",
"item.createindustry.quad_potato_cannon": "Quad Potato Cannon",
"item.createindustry.rebar": "Rebar",
"item.createindustry.screw": "Screw",
"item.createindustry.screwdriver": "Screwdriver",
"item.createindustry.slag": "Slag",
"item.createindustry.spark_plug": "Spark Plug",
"item.createindustry.steel_ingot": "Steel Ingot",
"item.createindustry.steel_mechanism": "Steel Mechanism",
"item.createindustry.sulfur_dust": "Sulfur Dust",
"item.createindustry.thermite_grenade": "Thermite Grenade",
"item.createindustry.thermite_powder": "Thermite Powder",
"item.createindustry.turbine_blade": "Turbine Blade",
"item.createindustry.unfinished_gasoline_engine": "Unfinished Gasoline Engine",
"item.createindustry.unfinished_lpg_engine": "Unfinished Lpg Engine",
"item.createindustry.unfinished_steel_mechanism": "Unfinished Steel Mechanism",
"item.createindustry.unfinished_turbine_engine": "Unfinished Turbine Engine",
"item.createindustry.unprocessed_heavy_plate": "Unprocessed Heavy Plate",
"item.createindustry.zinc_grenade": "Zinc Grenade",
"_": "->------------------------] UI & Messages [------------------------<-",
"itemGroup.createindustry.base": "Create: The Factory Must Grow",
"itemGroup.createindustry.building": "Create: TFMG Building Blocks",
"create.goggles.misc.number": "%1$s",
"create.goggles.misc.percent_symbol": "%",
"create.goggles.misc.dot_one": ".",
"create.goggles.misc.dot_two": "..",
"create.goggles.misc.dot_three": "...",
"create.goggles.misc.storage_info": "Storage Info:",
"create.goggles.fluid_in_tank": "Tank Contents:",
"create.goggles.surface_scanner.no_rotation": "Machine Unpowered",
"create.goggles.surface_scanner.no_deposit": "No Deposit Found",
"create.goggles.surface_scanner.deposit_found": "Deposit Located!",
"create.goggles.surface_scanner.distance": "Distance: %1$s Blocks",
"create.goggles.surface_scanner.scanning_surface": "Scanning The Surface...",
"create.goggles.distillation_tower.status": "Distillation Tower Info:",
"create.goggles.distillation_tower.tank_not_found": "Steel Fluid Tank Not Found",
"create.goggles.distillation_tower.not_tall_enough": "The Fluid Tank is Too Short",
"create.goggles.distillation_tower.level": "Distillation Tower Level: %1$s",
"create.goggles.distillation_tower.found_outputs": "Number of Outputs: %1$s",
"create.goggles.distillation_tower.no_outputs": "No Output Blocks Found",
"create.goggles.blast_furnace.stats": "Blast Furnace:",
"create.distillation_tower.size": "Size",
"create.distillation_tower.heat": "Heat",
"create.goggles.blast_furnace.fuel_amount": "Fuel Amount: %1$s",
"create.goggles.blast_furnace.item_count": "Item Count: %1$s",
"create.goggles.blast_furnace.height": "Height: %1$s",
"create.goggles.blast_furnace.nothing_lol": "",
"create.goggles.blast_furnace.status.off": "Status: Idle",
"create.goggles.blast_furnace.status.running": "Status: Running",
"create.goggles.blast_furnace.diameter.one": "Diameter: 1",
"create.goggles.blast_furnace.diameter.two": "Diameter: 2",
"create.goggles.blast_furnace.invalid": "Blast Furnace Invalid",
"create.goggles.coke_oven.status": "Coke Oven:",
"create.goggles.coke_oven.fluid_amount_output": "Internal Tank Contents: %1$s mb",
"create.goggles.coke_oven.fluid_amount_exhaust": "Carbon Dioxide: %1$s mb",
"create.goggles.coke_oven.item_count": "Internal Storage Item Count: %1$s",
"create.goggles.coke_oven.invalid": "Coke Oven Invalid",
"create.goggles.coke_oven.tank_full": "An Internal Tank is Full",
"create.goggles.coke_oven.progress": "Progress: %1$s",
"create.goggles.engine_stats": "Engine Stats:",
"create.goggles.engine_exhaust_stats": "Engine Exhaust Stats:",
"create.goggles.fuel_container": "Fluid Storage",
"create.goggles.engine.backpartmissing": "Back Part Missing:",
"create.goggles.engine_redstone_input": "Speed:",
"create.goggles.engine.efficiency": "Efficiency:",
"create.tooltip.engine_analog_strength": "%1$s/15",
"create.goggles.get_engine_efficiency": "%1$s",
"create.goggles.engine.stress": "%1$ssu",
"create.goggles.diesel_engine.info": "Diesel Engine:",
"create.goggles.pumpjack_info": "Pumpjack Info:",
"create.goggles.pumpjack.part_missing": "Hammer or Crank Missing",
"create.goggles.pumpjack.wrong_rotation1": "The Pumpjack Base is oriented incorrectly, the red marker must",
"create.goggles.pumpjack.wrong_rotation2": "face away from the Pumpjack Hammer Holder",
"create.goggles.pumpjack_fluid_storage": "Fluid Tank Info:",
"create.pumpjack_deposit_amount": "%1$s Buckets",
"create.goggles.pumpjack.deposit_info": "Deposit Info:",
"create.goggles.zero": "No Deposit Found",
"create.goggles.pumpjack.fluid_amount": "Fluid Amount:",
"create.goggles.machine_input.info": "Machine Input Info",
"create.goggles.machine_input.no_rot": "No Rotation Provided!",
"create.goggles.machine_input.power_level": "Power Level: ",
"create.recipe.distillation": "Distillation",
"create.recipe.advanced_distillation": "Advanced Distillation",
"create.recipe.industrial_blasting": "Industrial Blasting",
"create.recipe.casting": "Casting",
"create.recipe.coking": "Coking",
"createindustry.subtitle.engine_sounds": "Engine Sounds",
"createindustry.subtitle.diesel_engine_sounds": "Diesel Engine Sounds",
"_": "->------------------------] Ponders [------------------------<-",
"createindustry.ponder.small_engines.text_1": "To create a small engine, place the front and back parts adjacent to eachother",
"createindustry.ponder.small_engines.text_2": "Fuel is inputted into the front part, and exhaust must be removed from the back part using pipes and an exhaust block",
"createindustry.ponder.small_engines.text_3": "Applying a redstone signal to the front part starts the engine",
"createindustry.ponder.small_engines.text_4": "Small engines include LPG, kerosene and gasoline engines",
"createindustry.ponder.diesel_engine.text_1": "Diesel Engines are assembled by placing a shaft infront of a Diesel Engine block",
"createindustry.ponder.diesel_engine.text_2": "The engine produces exhaust gas which has to be removed with pipes and an exhaust block",
"createindustry.ponder.diesel_engine.text_3": "Air is needed for the engine to run, so an Air Intake is required",
"createindustry.ponder.diesel_engine_expansion.text_1": "Diesel Engine Expansions can give a Diesel Engine two new input slots, for lubrication and radiator fluids",
"createindustry.ponder.surface_scanner.text_1": "The Surface Scanner is used to locate crude oil deposits",
"createindustry.ponder.surface_scanner.text_2": "Providing the machine with rotational power makes it scan for the nearest deposit",
"createindustry.ponder.surface_scanner.text_3": "If a deposit is found, the compass will point towards its location",
"createindustry.ponder.pumpjack.text_1": "To start extracting Oil, you must first build a pipeline on top of a deposit using Industrial Pipes",
"createindustry.ponder.pumpjack.text_2": "Then, construct a Pumpjack on top of the pipeline by first placing down a Pumpjack Base...",
"createindustry.ponder.pumpjack.text_3": "Placing the Pumpjack Hammer behind it...",
"createindustry.ponder.pumpjack.text_4": "Next step is building the Connector And the Head of the Pumpjack above the crank and the base",
"createindustry.ponder.pumpjack.text_5": "Now they need to be connected with Pumpjack Pammer Parts, keep in mind that superglue is needed to finish the structure",
"createindustry.ponder.pumpjack.text_6": "And finally, placing the Machine Input with a Pumpjack Crank above it, as shown in the scene",
"createindustry.ponder.distillation_tower.text_1": "A sufficiently large Steel Fluid Tank can be turned into a Distillation Tower",
"createindustry.ponder.distillation_tower.text_2": "The tower is assembled by first placing a Steel Distillation Tower Controller next to the tank...",
"createindustry.ponder.distillation_tower.text_3": "And placing up to 6 Distillation Tower Outputs, all connected with Industrial Pipes",
"createindustry.ponder.distillation_tower.text_4": "Blaze Burners are required to run the Distillation Tower. The dial displays current power levels",
"createindustry.ponder.distillation_tower.text_5": "To input Crude Oil, it must be pumped into the controller block",
"createindustry.ponder.distillation_tower.text_6": "Each output block provides one of the Oil byproducts",
"createindustry.ponder.distillation_tower.text_7": "LPG",
"createindustry.ponder.distillation_tower.text_8": "Gasoline",
"createindustry.ponder.distillation_tower.text_9": "Naphtha",
"createindustry.ponder.distillation_tower.text_10": "Kerosene",
"createindustry.ponder.distillation_tower.text_11": "Diesel",
"createindustry.ponder.distillation_tower.text_12": "Heavy Oil",
"createindustry.ponder.blast_furnace.text_1": "The base of the Blast Furnace is a Blast Furnace Output block",
"createindustry.ponder.blast_furnace.text_2": "To assemble a Blast Furnace, construct a chimney using Fireproof Bricks as shown in the scene",
"createindustry.ponder.blast_furnace.text_3": "The bottom half of the chimney requires to be reinforced",
"createindustry.ponder.blast_furnace.text_4": "Fuel and other items are inserted through the opening at the top",
"createindustry.ponder.coke_oven.text_1": "The Coke Oven is built by placing Coke Oven blocks as shown in the scene, and clicking its side with a wrench",
"createindustry.ponder.coke_oven.text_2": "The process of coking is slow, so it is more efficient to have long arrays of ovens working simultaneously",
"createindustry.ponder.coke_oven.text_3": "Coal can be inputted from any side",
"createindustry.ponder.coke_oven.text_4": "While running, the oven produces Creosote and CO2 which have to be pumped out for it to function",
"createindustry.ponder.coke_oven.text_5": "Once done, Coal Coke will drop out of the opening",
"createindustry.ponder.casting.text_1": "Casting is the process of pouring liquid metal into a Casting Basin using a Casting Spout",
"createindustry.ponder.casting.text_2": "The Casting Basin, obviously, requires a mold to function",
"createindustry.ponder.radial_engines.text_1": "Radial Engines are a special Type of Engine that doesn't require an exhaust block and has a shaft from both sides",
"createindustry.ponder.radial_engines.text_2": "Clicking the Engine from one of its sides will spawn an input slot that can accept fuel and redstone signals",
"createindustry.ponder.radial_engines.text_3": "Regular Radial Engines uses gasoline as fuel",
"createindustry.ponder.radial_engines.text_4": "Engine will start when redstone signal is applied to the input slot or the block itself",
"createindustry.ponder.radial_engines.text_5": "The second variant of a radial is The Large Radial Engine which uses kerosene as fuel",
"createindustry.ponder.distillation_tower.header": "Distillation Tower Setup",
"createindustry.ponder.pumpjack.header": "Building Pumpjacks",
"createindustry.ponder.surface_scanner.header": "Locating Oil",
"createindustry.ponder.diesel_engine.header": "Building a Diesel Engine",
"createindustry.ponder.diesel_engine_expansion.header": "Expanding Diesel Engines",
"createindustry.ponder.small_engines.header": "Building Small Engines",
"createindustry.ponder.radial_engines.header": "Using Radial Engines",
"createindustry.ponder.coke_oven.header": "Building a Coke Oven",
"createindustry.ponder.blast_furnace.header": "Building a Blast Furnace",
"createindustry.ponder.casting.header": "Casting Metal",
"createindustry.ponder.tag.oil": "Oil Related Machines",
"createindustry.ponder.tag.metallurgy": "Metal Working Machines",
"createindustry.ponder.tag.oil.description": "Machines that extract, process or use Crude Oil and its byproducts",
"createindustry.ponder.tag.metallurgy.description": "Machines that produce, process or use Metal and raw materials as such",
"_": "Thank you for translating Create: The Factory Must Grow!"
}

View File

@@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "createindustry:block/caution_block"
}
}

View File

@@ -1,5 +0,0 @@
{
"textures": {
"particle": "createindustry:fluid/crude_oil_still"
}
}

View File

@@ -1,6 +1,7 @@
{
"parent": "minecraft:block/cube_all",
"parent": "createindustry:block/caution_block",
"textures": {
"all": "createindustry:block/red_caution_block"
"0": "createindustry:block/caution_block/red",
"particle": "createindustry:block/caution_block/red"
}
}

View File

@@ -1,3 +0,0 @@
{
"parent": "createindustry:block/cast_iron_distillation_controller/block"
}

View File

@@ -1,3 +0,0 @@
{
"parent": "createindustry:block/cast_iron_distillation_output/block"
}

View File

@@ -1,3 +0,0 @@
{
"parent": "createindustry:block/caution_block"
}

View File

@@ -1,6 +0,0 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "createindustry:item/crude_oil_fluid_bucket"
}
}

View File

@@ -1,6 +1,7 @@
{
"values": [
"createindustry:steel_casing",
"createindustry:heavy_machinery_casing"
"createindustry:heavy_machinery_casing",
"createindustry:electric_casing"
]
}

View File

@@ -1,6 +1,10 @@
{
"values": [
"createindustry:copycat_cable_base",
"createindustry:steel_bars",
"createindustry:aluminum_bars"
"createindustry:aluminum_bars",
"createindustry:cast_iron_bars",
"createindustry:lead_bars",
"createindustry:nickel_bars"
]
}

View File

@@ -11,6 +11,7 @@
"createindustry:large_radial_engine",
"createindustry:radial_engine_input",
"createindustry:radial_engine_input_ponder",
"createindustry:compact_engine"
"createindustry:compact_engine",
"createindustry:low_grade_fuel_engine"
]
}

View File

@@ -1,6 +1,9 @@
{
"values": [
"createindustry:steel_bars",
"createindustry:aluminum_bars"
"createindustry:aluminum_bars",
"createindustry:cast_iron_bars",
"createindustry:lead_bars",
"createindustry:nickel_bars"
]
}

View File

@@ -1,6 +1,7 @@
{
"values": [
"createindustry:steel_casing",
"createindustry:heavy_machinery_casing"
"createindustry:heavy_machinery_casing",
"createindustry:electric_casing"
]
}

View File

@@ -3,6 +3,9 @@
"createindustry:steel_ingot",
"createindustry:cast_iron_ingot",
"createindustry:aluminum_ingot",
"createindustry:plastic_sheet"
"createindustry:plastic_sheet",
"createindustry:lead_ingot",
"createindustry:nickel_ingot",
"createindustry:lithium_ingot"
]
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_aluminum": {
"conditions": {
"items": [
{
"tag": "forge:ingots/aluminum"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:aluminum_bars_from_ingots_aluminum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_aluminum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:aluminum_bars_from_ingots_aluminum_stonecutting"
]
}
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_aluminum": {
"conditions": {
"items": [
{
"tag": "forge:ingots/aluminum"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:aluminum_ladder_from_ingots_aluminum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_aluminum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:aluminum_ladder_from_ingots_aluminum_stonecutting"
]
}
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_aluminum": {
"conditions": {
"items": [
{
"tag": "forge:ingots/aluminum"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:aluminum_scaffolding_from_ingots_aluminum_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_aluminum",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:aluminum_scaffolding_from_ingots_aluminum_stonecutting"
]
}
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_steel": {
"conditions": {
"items": [
{
"tag": "forge:ingots/steel"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:steel_bars_from_ingots_steel_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_steel",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:steel_bars_from_ingots_steel_stonecutting"
]
}
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_steel": {
"conditions": {
"items": [
{
"tag": "forge:ingots/steel"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:steel_ladder_from_ingots_steel_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_steel",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:steel_ladder_from_ingots_steel_stonecutting"
]
}
}

View File

@@ -1,32 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_ingots_steel": {
"conditions": {
"items": [
{
"tag": "forge:ingots/steel"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "createindustry:steel_scaffolding_from_ingots_steel_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_ingots_steel",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"createindustry:steel_scaffolding_from_ingots_steel_stonecutting"
]
}
}

View File

@@ -1,20 +0,0 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "createindustry:cast_iron_distillation_controller"
}
],
"rolls": 1.0
}
]
}

View File

@@ -1,20 +0,0 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "createindustry:cast_iron_distillation_output"
}
],
"rolls": 1.0
}
]
}

View File

@@ -1,20 +0,0 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "createindustry:caution_block"
}
],
"rolls": 1.0
}
]
}

View File

@@ -11,7 +11,7 @@
"entries": [
{
"type": "minecraft:item",
"name": "createindustry:red_caution_block"
"name": "minecraft:air"
}
],
"rolls": 1.0

View File

@@ -4,6 +4,9 @@
"createindustry:cast_iron_block",
"createindustry:aluminum_block",
"createindustry:plastic_block",
"createindustry:lead_block",
"createindustry:nickel_block",
"createindustry:lithium_block",
"createindustry:coal_coke_block"
]
}

View File

@@ -1,6 +1,5 @@
{
"values": [
"createindustry:crude_oil_fluid_bucket",
"createindustry:gasoline_bucket"
]
}

View File

@@ -4,6 +4,9 @@
"createindustry:cast_iron_block",
"createindustry:aluminum_block",
"createindustry:plastic_block",
"createindustry:lead_block",
"createindustry:nickel_block",
"createindustry:lithium_block",
"createindustry:coal_coke_block"
]
}

View File

@@ -1,5 +1,6 @@
{
"values": [
"createindustry:bauxite"
"createindustry:bauxite",
"createindustry:galena"
]
}

View File

@@ -2,6 +2,9 @@
"values": [
"createindustry:steel_block",
"createindustry:cast_iron_block",
"createindustry:aluminum_block"
"createindustry:aluminum_block",
"createindustry:lead_block",
"createindustry:nickel_block",
"createindustry:lithium_block"
]
}

View File

@@ -3,6 +3,9 @@
"createindustry:steel_scaffolding",
"createindustry:aluminum_scaffolding",
"createindustry:steel_ladder",
"createindustry:aluminum_ladder"
"createindustry:aluminum_ladder",
"createindustry:cast_iron_ladder",
"createindustry:lead_ladder",
"createindustry:nickel_ladder"
]
}

View File

@@ -1,5 +1,6 @@
{
"values": [
"createindustry:bauxite"
"createindustry:bauxite",
"createindustry:galena"
]
}

View File

@@ -1,5 +1,6 @@
{
"values": [
"createindustry:bauxite"
"createindustry:bauxite",
"createindustry:galena"
]
}

View File

@@ -1,14 +1,37 @@
{
"values": [
"createindustry:steel_gearbox",
"createindustry:steel_casing",
"createindustry:heavy_machinery_casing",
"createindustry:electric_casing",
"createindustry:copycat_cable_block",
"createindustry:formwork_block",
"createindustry:rebar_formwork_block",
"createindustry:machine_input",
"createindustry:steel_cogwheel",
"createindustry:large_steel_cogwheel",
"createindustry:aluminum_cogwheel",
"createindustry:large_aluminum_cogwheel",
"createindustry:hardened_planks",
"createindustry:steel_flywheel",
"createindustry:aluminum_flywheel",
"createindustry:cast_iron_flywheel",
"createindustry:formwork_block",
"createindustry:rebar_formwork_block",
"createindustry:machine_input",
"createindustry:lead_flywheel",
"createindustry:nickel_flywheel",
"createindustry:steel_encased_shaft",
"createindustry:heavy_casing_encased_shaft",
"createindustry:steel_encased_cogwheel",
"createindustry:heavy_casing_encased_cogwheel",
"createindustry:steel_encased_large_cogwheel",
"createindustry:heavy_casing_encased_large_cogwheel",
"createindustry:steel_encased_steel_cogwheel",
"createindustry:heavy_casing_encased_steel_cogwheel",
"createindustry:steel_encased_large_steel_cogwheel",
"createindustry:heavy_casing_encased_large_steel_cogwheel",
"createindustry:steel_encased_aluminum_cogwheel",
"createindustry:heavy_casing_encased_aluminum_cogwheel",
"createindustry:steel_encased_large_aluminum_cogwheel",
"createindustry:heavy_casing_encased_large_aluminum_cogwheel",
"createindustry:copper_encased_steel_pipe",
"createindustry:copper_encased_cast_iron_pipe",
"createindustry:copper_encased_brass_pipe",

View File

@@ -1,36 +1,64 @@
{
"values": [
"createindustry:steel_block",
"createindustry:cast_iron_block",
"createindustry:aluminum_block",
"createindustry:plastic_block",
"createindustry:lead_block",
"createindustry:nickel_block",
"createindustry:lithium_block",
"createindustry:coal_coke_block",
"createindustry:heavy_casing_door",
"createindustry:steel_door",
"createindustry:steel_gearbox",
"createindustry:napalm_bomb",
"createindustry:steel_frame",
"createindustry:fossilstone",
"createindustry:oil_deposit",
"createindustry:steel_casing",
"createindustry:heavy_machinery_casing",
"createindustry:steel_truss",
"createindustry:aluminum_truss",
"createindustry:caution_block",
"createindustry:red_caution_block",
"createindustry:asphalt",
"createindustry:electric_casing",
"createindustry:lead_ore",
"createindustry:deepslate_lead_ore",
"createindustry:nickel_ore",
"createindustry:deepslate_nickel_ore",
"createindustry:lithium_ore",
"createindustry:deepslate_lithium_ore",
"createindustry:sulfur",
"createindustry:lignite",
"createindustry:steel_scaffolding",
"createindustry:aluminum_scaffolding",
"createindustry:steel_bars",
"createindustry:aluminum_bars",
"createindustry:steel_ladder",
"createindustry:aluminum_ladder",
"createindustry:steel_flywheel",
"createindustry:aluminum_flywheel",
"createindustry:cast_iron_flywheel",
"createindustry:factory_floor_stairs",
"createindustry:factory_floor",
"createindustry:factory_floor_slab",
"createindustry:light_bulb",
"createindustry:rgb_light_bulb",
"createindustry:copycat_cable_block",
"createindustry:copycat_cable_base",
"createindustry:brass_cable_hub",
"createindustry:copper_cable_hub",
"createindustry:steel_cable_hub",
"createindustry:aluminum_cable_hub",
"createindustry:steel_casing_cable_hub",
"createindustry:heavy_cable_hub",
"createindustry:cable_tube",
"createindustry:neon_tube",
"createindustry:diagonal_cable_block",
"createindustry:firebox",
"createindustry:accumulator",
"createindustry:capacitor",
"createindustry:converter",
"createindustry:galvanic_cell",
"createindustry:polarizer",
"createindustry:voltmeter",
"createindustry:energy_meter",
"createindustry:resistor",
"createindustry:copper_coil",
"createindustry:electric_motor",
"createindustry:rotor",
"createindustry:stator",
"createindustry:generator",
"createindustry:cable_connector",
"createindustry:creative_generator",
"createindustry:voltage_cube",
"createindustry:exhaust",
"createindustry:flarestack",
"createindustry:surface_scanner",
"createindustry:steel_fluid_tank",
"createindustry:cast_iron_distillation_output",
"createindustry:cast_iron_distillation_controller",
"createindustry:steel_distillation_output",
"createindustry:steel_distillation_controller",
"createindustry:industrial_pipe",
@@ -51,13 +79,10 @@
"createindustry:casting_spout",
"createindustry:coke_oven",
"createindustry:air_intake",
"createindustry:steel_block",
"createindustry:cast_iron_block",
"createindustry:aluminum_block",
"createindustry:plastic_block",
"createindustry:coal_coke_block",
"createindustry:heavy_casing_door",
"createindustry:steel_door",
"createindustry:steel_cogwheel",
"createindustry:large_steel_cogwheel",
"createindustry:aluminum_cogwheel",
"createindustry:large_aluminum_cogwheel",
"createindustry:gasoline_engine",
"createindustry:gasoline_engine_back",
"createindustry:lpg_engine",
@@ -71,36 +96,48 @@
"createindustry:radial_engine_input",
"createindustry:radial_engine_input_ponder",
"createindustry:compact_engine",
"createindustry:steel_pipe",
"createindustry:copper_encased_steel_pipe",
"createindustry:glass_steel_pipe",
"createindustry:steel_mechanical_pump",
"createindustry:steel_smart_fluid_pipe",
"createindustry:steel_fluid_valve",
"createindustry:cast_iron_pipe",
"createindustry:copper_encased_cast_iron_pipe",
"createindustry:glass_cast_iron_pipe",
"createindustry:cast_iron_mechanical_pump",
"createindustry:cast_iron_smart_fluid_pipe",
"createindustry:cast_iron_fluid_valve",
"createindustry:brass_pipe",
"createindustry:copper_encased_brass_pipe",
"createindustry:glass_brass_pipe",
"createindustry:brass_mechanical_pump",
"createindustry:brass_smart_fluid_pipe",
"createindustry:brass_fluid_valve",
"createindustry:plastic_pipe",
"createindustry:copper_encased_plastic_pipe",
"createindustry:glass_plastic_pipe",
"createindustry:plastic_mechanical_pump",
"createindustry:plastic_smart_fluid_pipe",
"createindustry:plastic_fluid_valve",
"createindustry:aluminum_pipe",
"createindustry:copper_encased_aluminum_pipe",
"createindustry:glass_aluminum_pipe",
"createindustry:aluminum_mechanical_pump",
"createindustry:aluminum_smart_fluid_pipe",
"createindustry:aluminum_fluid_valve",
"createindustry:low_grade_fuel_engine",
"createindustry:steel_truss",
"createindustry:aluminum_truss",
"createindustry:cast_iron_truss",
"createindustry:lead_truss",
"createindustry:nickel_truss",
"createindustry:copper_truss",
"createindustry:zinc_truss",
"createindustry:brass_truss",
"createindustry:steel_frame",
"createindustry:lead_frame",
"createindustry:copper_frame",
"createindustry:zinc_frame",
"createindustry:brass_frame",
"createindustry:aluminum_frame",
"createindustry:cast_iron_frame",
"createindustry:nickel_frame",
"createindustry:hardened_planks_slab",
"createindustry:lead_glass",
"createindustry:asphalt",
"createindustry:steel_scaffolding",
"createindustry:aluminum_scaffolding",
"createindustry:steel_bars",
"createindustry:aluminum_bars",
"createindustry:cast_iron_bars",
"createindustry:lead_bars",
"createindustry:nickel_bars",
"createindustry:steel_ladder",
"createindustry:aluminum_ladder",
"createindustry:cast_iron_ladder",
"createindustry:lead_ladder",
"createindustry:nickel_ladder",
"createindustry:steel_flywheel",
"createindustry:aluminum_flywheel",
"createindustry:cast_iron_flywheel",
"createindustry:lead_flywheel",
"createindustry:nickel_flywheel",
"createindustry:factory_floor_stairs",
"createindustry:factory_floor",
"createindustry:factory_floor_slab",
"createindustry:cinder_block",
"createindustry:cinderflour_block",
"createindustry:black_concrete",
"createindustry:black_concrete_wall",
"createindustry:black_concrete_stairs",
@@ -168,11 +205,70 @@
"createindustry:concrete_wall",
"createindustry:concrete_stairs",
"createindustry:concrete",
"createindustry:white_caution_block",
"createindustry:blue_caution_block",
"createindustry:light_blue_caution_block",
"createindustry:red_caution_block",
"createindustry:green_caution_block",
"createindustry:lime_caution_block",
"createindustry:pink_caution_block",
"createindustry:magenta_caution_block",
"createindustry:yellow_caution_block",
"createindustry:gray_caution_block",
"createindustry:light_gray_caution_block",
"createindustry:brown_caution_block",
"createindustry:cyan_caution_block",
"createindustry:purple_caution_block",
"createindustry:orange_caution_block",
"createindustry:concrete_slab",
"createindustry:rebar_concrete_wall",
"createindustry:rebar_concrete_stairs",
"createindustry:rebar_concrete",
"createindustry:rebar_concrete_slab",
"createindustry:steel_encased_shaft",
"createindustry:heavy_casing_encased_shaft",
"createindustry:steel_encased_cogwheel",
"createindustry:heavy_casing_encased_cogwheel",
"createindustry:steel_encased_large_cogwheel",
"createindustry:heavy_casing_encased_large_cogwheel",
"createindustry:steel_encased_steel_cogwheel",
"createindustry:heavy_casing_encased_steel_cogwheel",
"createindustry:steel_encased_large_steel_cogwheel",
"createindustry:heavy_casing_encased_large_steel_cogwheel",
"createindustry:steel_encased_aluminum_cogwheel",
"createindustry:heavy_casing_encased_aluminum_cogwheel",
"createindustry:steel_encased_large_aluminum_cogwheel",
"createindustry:heavy_casing_encased_large_aluminum_cogwheel",
"createindustry:steel_pipe",
"createindustry:copper_encased_steel_pipe",
"createindustry:glass_steel_pipe",
"createindustry:steel_mechanical_pump",
"createindustry:steel_smart_fluid_pipe",
"createindustry:steel_fluid_valve",
"createindustry:cast_iron_pipe",
"createindustry:copper_encased_cast_iron_pipe",
"createindustry:glass_cast_iron_pipe",
"createindustry:cast_iron_mechanical_pump",
"createindustry:cast_iron_smart_fluid_pipe",
"createindustry:cast_iron_fluid_valve",
"createindustry:brass_pipe",
"createindustry:copper_encased_brass_pipe",
"createindustry:glass_brass_pipe",
"createindustry:brass_mechanical_pump",
"createindustry:brass_smart_fluid_pipe",
"createindustry:brass_fluid_valve",
"createindustry:plastic_pipe",
"createindustry:copper_encased_plastic_pipe",
"createindustry:glass_plastic_pipe",
"createindustry:plastic_mechanical_pump",
"createindustry:plastic_smart_fluid_pipe",
"createindustry:plastic_fluid_valve",
"createindustry:aluminum_pipe",
"createindustry:copper_encased_aluminum_pipe",
"createindustry:glass_aluminum_pipe",
"createindustry:aluminum_mechanical_pump",
"createindustry:aluminum_smart_fluid_pipe",
"createindustry:aluminum_fluid_valve",
"createindustry:bauxite",
"createindustry:cut_bauxite",
"createindustry:cut_bauxite_stairs",
@@ -191,6 +287,25 @@
"createindustry:small_bauxite_brick_slab",
"createindustry:small_bauxite_brick_wall",
"createindustry:layered_bauxite",
"createindustry:bauxite_pillar"
"createindustry:bauxite_pillar",
"createindustry:galena",
"createindustry:cut_galena",
"createindustry:cut_galena_stairs",
"createindustry:cut_galena_slab",
"createindustry:cut_galena_wall",
"createindustry:polished_cut_galena",
"createindustry:polished_cut_galena_stairs",
"createindustry:polished_cut_galena_slab",
"createindustry:polished_cut_galena_wall",
"createindustry:cut_galena_bricks",
"createindustry:cut_galena_brick_stairs",
"createindustry:cut_galena_brick_slab",
"createindustry:cut_galena_brick_wall",
"createindustry:small_galena_bricks",
"createindustry:small_galena_brick_stairs",
"createindustry:small_galena_brick_slab",
"createindustry:small_galena_brick_wall",
"createindustry:layered_galena",
"createindustry:galena_pillar"
]
}

View File

@@ -1,5 +1,6 @@
{
"values": [
"createindustry:bauxite"
"createindustry:bauxite",
"createindustry:galena"
]
}

View File

@@ -3,6 +3,9 @@
"createindustry:steel_block",
"createindustry:cast_iron_block",
"createindustry:aluminum_block",
"createindustry:lead_block",
"createindustry:nickel_block",
"createindustry:lithium_block",
"createindustry:diesel_engine_expansion"
]
}

View File

@@ -1,10 +1,17 @@
{
"values": [
"createindustry:plastic_block",
"createindustry:coal_coke_block",
"createindustry:lead_ore",
"createindustry:deepslate_lead_ore",
"createindustry:nickel_ore",
"createindustry:deepslate_nickel_ore",
"createindustry:lithium_ore",
"createindustry:deepslate_lithium_ore",
"createindustry:hardened_planks_slab",
"createindustry:factory_floor_stairs",
"createindustry:factory_floor",
"createindustry:factory_floor_slab",
"createindustry:plastic_block",
"createindustry:coal_coke_block",
"createindustry:black_concrete",
"createindustry:black_concrete_wall",
"createindustry:black_concrete_stairs",
@@ -72,6 +79,21 @@
"createindustry:concrete_wall",
"createindustry:concrete_stairs",
"createindustry:concrete",
"createindustry:white_caution_block",
"createindustry:blue_caution_block",
"createindustry:light_blue_caution_block",
"createindustry:red_caution_block",
"createindustry:green_caution_block",
"createindustry:lime_caution_block",
"createindustry:pink_caution_block",
"createindustry:magenta_caution_block",
"createindustry:yellow_caution_block",
"createindustry:gray_caution_block",
"createindustry:light_gray_caution_block",
"createindustry:brown_caution_block",
"createindustry:cyan_caution_block",
"createindustry:purple_caution_block",
"createindustry:orange_caution_block",
"createindustry:concrete_slab",
"createindustry:rebar_concrete_slab"
]

View File

@@ -3,6 +3,10 @@
"createindustry:cut_bauxite_slab",
"createindustry:polished_cut_bauxite_slab",
"createindustry:cut_bauxite_brick_slab",
"createindustry:small_bauxite_brick_slab"
"createindustry:small_bauxite_brick_slab",
"createindustry:cut_galena_slab",
"createindustry:polished_cut_galena_slab",
"createindustry:cut_galena_brick_slab",
"createindustry:small_galena_brick_slab"
]
}

View File

@@ -22,6 +22,10 @@
"createindustry:cut_bauxite_stairs",
"createindustry:polished_cut_bauxite_stairs",
"createindustry:cut_bauxite_brick_stairs",
"createindustry:small_bauxite_brick_stairs"
"createindustry:small_bauxite_brick_stairs",
"createindustry:cut_galena_stairs",
"createindustry:polished_cut_galena_stairs",
"createindustry:cut_galena_brick_stairs",
"createindustry:small_galena_brick_stairs"
]
}

View File

@@ -1,7 +1,7 @@
{
"values": [
"createindustry:factory_floor_slab",
"createindustry:fireproof_brick_reinforcement",
"createindustry:factory_floor_slab",
"createindustry:black_concrete_wall",
"createindustry:black_concrete_slab",
"createindustry:white_concrete_wall",
@@ -41,6 +41,10 @@
"createindustry:cut_bauxite_wall",
"createindustry:polished_cut_bauxite_wall",
"createindustry:cut_bauxite_brick_wall",
"createindustry:small_bauxite_brick_wall"
"createindustry:small_bauxite_brick_wall",
"createindustry:cut_galena_wall",
"createindustry:polished_cut_galena_wall",
"createindustry:cut_galena_brick_wall",
"createindustry:small_galena_brick_wall"
]
}

View File

@@ -3,6 +3,10 @@
"createindustry:cut_bauxite_slab",
"createindustry:polished_cut_bauxite_slab",
"createindustry:cut_bauxite_brick_slab",
"createindustry:small_bauxite_brick_slab"
"createindustry:small_bauxite_brick_slab",
"createindustry:cut_galena_slab",
"createindustry:polished_cut_galena_slab",
"createindustry:cut_galena_brick_slab",
"createindustry:small_galena_brick_slab"
]
}

View File

@@ -3,6 +3,10 @@
"createindustry:cut_bauxite_stairs",
"createindustry:polished_cut_bauxite_stairs",
"createindustry:cut_bauxite_brick_stairs",
"createindustry:small_bauxite_brick_stairs"
"createindustry:small_bauxite_brick_stairs",
"createindustry:cut_galena_stairs",
"createindustry:polished_cut_galena_stairs",
"createindustry:cut_galena_brick_stairs",
"createindustry:small_galena_brick_stairs"
]
}

View File

@@ -3,6 +3,10 @@
"createindustry:cut_bauxite_wall",
"createindustry:polished_cut_bauxite_wall",
"createindustry:cut_bauxite_brick_wall",
"createindustry:small_bauxite_brick_wall"
"createindustry:small_bauxite_brick_wall",
"createindustry:cut_galena_wall",
"createindustry:polished_cut_galena_wall",
"createindustry:cut_galena_brick_wall",
"createindustry:small_galena_brick_wall"
]
}

View File

@@ -1,15 +1,22 @@
package com.drmangotea.createindustry;
import com.drmangotea.createindustry.base.TFMGContraptions;
import com.drmangotea.createindustry.registry.TFMGContraptions;
import com.drmangotea.createindustry.base.TFMGLangPartials;
import com.drmangotea.createindustry.config.TFMGConfigs;
import com.drmangotea.createindustry.items.gadgets.explosives.thermite_grenades.fire.TFMGColoredFires;
import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.TFMGColoredFires;
import com.drmangotea.createindustry.registry.*;
import com.drmangotea.createindustry.worldgen.TFMGConfiguredFeatures;
import com.drmangotea.createindustry.worldgen.TFMGFeatures;
import com.drmangotea.createindustry.worldgen.TFMGOreConfigEntries;
import com.mojang.logging.LogUtils;
import com.simibubi.create.AllParticleTypes;
import com.simibubi.create.content.processing.burner.BlazeBurnerBlock;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.LangMerger;
import com.simibubi.create.foundation.item.ItemDescription;
import com.simibubi.create.foundation.item.KineticStats;
import com.simibubi.create.foundation.item.TooltipHelper;
import com.simibubi.create.foundation.item.TooltipModifier;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.core.Holder;
@@ -31,6 +38,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.slf4j.Logger;
import static com.simibubi.create.content.fluids.tank.BoilerHeaters.registerHeater;
@Mod(CreateTFMG.MOD_ID)
public class CreateTFMG
@@ -41,8 +50,18 @@ public class CreateTFMG
public static final CreateRegistrate REGISTRATE = CreateRegistrate.create(MOD_ID);
public static final Logger LOGGER = LogUtils.getLogger();
static {
REGISTRATE.setTooltipModifierFactory(item -> {
return new ItemDescription.Modifier(item, TooltipHelper.Palette.STANDARD_CREATE)
.andThen(TooltipModifier.mapNull(KineticStats.create(item)));
});
}
public CreateTFMG()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
REGISTRATE.registerEventListeners(FMLJavaModLoadingContext.get().getModEventBus());
@@ -56,9 +75,16 @@ public class CreateTFMG
TFMGEntityTypes.register();
TFMGCreativeModeTabs.init();
TFMGFluids.register();
TFMGTags.init();
TFMGPaletteBlocks.register();
TFMGSoundEvents.prepare();
TFMGContraptions.prepare();
TFMGOreConfigEntries.init();
TFMGParticleTypes.register(modEventBus);
TFMGMobEffects.register(modEventBus);
TFMGPotions.register(modEventBus);
TFMGPackets.registerPackets();
TFMGColoredFires.register(modEventBus);
TFMGFeatures.register(modEventBus);
@@ -67,6 +93,7 @@ public class CreateTFMG
TFMGConfigs.register(ModLoadingContext.get());
//
modEventBus.addListener(CreateTFMG::init);
MinecraftForge.EVENT_BUS.register(this);
modEventBus.addListener(EventPriority.LOWEST, CreateTFMG::gatherData);
modEventBus.addListener(TFMGSoundEvents::register);
@@ -74,6 +101,28 @@ public class CreateTFMG
modEventBus.addListener(this::clientSetup);
}
public static void init(final FMLCommonSetupEvent event) {
TFMGFluids.registerFluidInteractions();
event.enqueueWork(() -> {
registerHeater(TFMGBlocks.FIREBOX.get(), (level, pos, state) -> {
BlazeBurnerBlock.HeatLevel value = state.getValue(BlazeBurnerBlock.HEAT_LEVEL);
if (value == BlazeBurnerBlock.HeatLevel.NONE) {
return -1;
}
if (value == BlazeBurnerBlock.HeatLevel.SEETHING) {
return 3;
}
if (value.isAtLeast(BlazeBurnerBlock.HeatLevel.FADING)) {
return 2;
}
return -1;
});
});
}
@SuppressWarnings("removal")
public static void gatherData(GatherDataEvent event) {
DataGenerator gen = event.getGenerator();
@@ -87,7 +136,7 @@ public class CreateTFMG
private void commonSetup(final FMLCommonSetupEvent event) {
event.enqueueWork(() -> {
final Holder<PlacedFeature> initializeOil = TFMGConfiguredFeatures.OIL_PLACED;
final Holder<PlacedFeature> initializeSimulatedOil = TFMGConfiguredFeatures.SIMULATED_OIL_PLACED;
final Holder<PlacedFeature> initializeSimulatedOil = TFMGConfiguredFeatures.OIL_DEPOSIT_PLACED;
});
}

View File

@@ -1,9 +1,14 @@
package com.drmangotea.createindustry;
import com.drmangotea.createindustry.items.gadgets.quad_potato_cannon.QuadPotatoCannonRenderHandler;
import com.drmangotea.createindustry.items.weapons.advanced_potato_cannon.AdvancedPotatoCannonRenderHandler;
import com.drmangotea.createindustry.items.weapons.flamethrover.FlamethrowerRenderHandler;
import com.drmangotea.createindustry.items.weapons.quad_potato_cannon.QuadPotatoCannonRenderHandler;
import com.drmangotea.createindustry.ponder.TFMGPonderIndex;
import com.drmangotea.createindustry.registry.TFMGPartialModels;
import com.drmangotea.createindustry.registry.TFMGParticleTypes;
import com.simibubi.create.AllParticleTypes;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -11,10 +16,23 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
public class CreateTFMGClient {
public static final QuadPotatoCannonRenderHandler QUAD_POTATO_CANNON_RENDER_HANDLER = new QuadPotatoCannonRenderHandler();
public static final AdvancedPotatoCannonRenderHandler ADVANCED_POTATO_CANNON_RENDER_HANDLER = new AdvancedPotatoCannonRenderHandler();
public static final FlamethrowerRenderHandler FLAMETHROWER_RENDER_HANDLER = new FlamethrowerRenderHandler();
public CreateTFMGClient() {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
TFMGPartialModels.init();
modEventBus.addListener(TFMGParticleTypes::registerFactories);
modEventBus.register(this);
ADVANCED_POTATO_CANNON_RENDER_HANDLER.registerListeners(forgeEventBus);
QUAD_POTATO_CANNON_RENDER_HANDLER.registerListeners(forgeEventBus);
FLAMETHROWER_RENDER_HANDLER.registerListeners(forgeEventBus);
}

View File

@@ -4,6 +4,8 @@ import com.drmangotea.createindustry.CreateTFMG;
import com.drmangotea.createindustry.blocks.decoration.doors.TFMGSlidingDoorBlock;
import com.drmangotea.createindustry.blocks.encased.TFMGEncasedCogwheelBlock;
import com.drmangotea.createindustry.blocks.encased.TFMGEncasedShaftBlock;
import com.drmangotea.createindustry.blocks.electricity.cable_blocks.copycat_cable_block.CopycatCableBlock;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllTags;
import com.simibubi.create.content.contraptions.behaviour.DoorMovingInteraction;
@@ -13,22 +15,19 @@ import com.simibubi.create.content.kinetics.BlockStressDefaults;
import com.simibubi.create.content.kinetics.base.RotatedPillarKineticBlock;
import com.simibubi.create.content.kinetics.simpleRelays.encased.EncasedCogCTBehaviour;
import com.simibubi.create.foundation.block.connected.CTSpriteShiftEntry;
import com.simibubi.create.foundation.data.AssetLookup;
import com.simibubi.create.foundation.data.CreateRegistrate;
import com.simibubi.create.foundation.data.ModelGen;
import com.simibubi.create.foundation.data.SharedProperties;
import com.simibubi.create.foundation.data.*;
import com.tterrag.registrate.builders.BlockBuilder;
import com.tterrag.registrate.util.nullness.NonNullUnaryOperator;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.core.Direction;
import net.minecraft.data.loot.BlockLoot;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.ItemTags;
import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraftforge.client.model.generators.ModelFile;
import java.util.function.Supplier;
@@ -38,7 +37,7 @@ import static com.simibubi.create.AllMovementBehaviours.movementBehaviour;
import static com.simibubi.create.foundation.data.BlockStateGen.axisBlock;
import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly;
@SuppressWarnings("removal")
public class TFMGBuilderTransformers {
public static <B extends TFMGSlidingDoorBlock, P> NonNullUnaryOperator<BlockBuilder<B, P>> slidingDoor(String type) {
@@ -77,7 +76,7 @@ public class TFMGBuilderTransformers {
public static <B extends TFMGEncasedShaftBlock, P> NonNullUnaryOperator<BlockBuilder<B, P>> encasedShaft(String casing,
Supplier<CTSpriteShiftEntry> casingShift) {
return builder -> encasedBase(builder, () -> AllBlocks.SHAFT.get())
return builder -> encasedBase(builder, () -> TFMGBlocks.NEON_TUBE.get())
.onRegister(CreateRegistrate.connectedTextures(() -> new EncasedCTBehaviour(casingShift.get())))
.onRegister(CreateRegistrate.casingConnectivity((block, cc) -> cc.make(block, casingShift.get(),
(s, f) -> f.getAxis() != s.getValue(TFMGEncasedShaftBlock.AXIS))))
@@ -144,4 +143,19 @@ public class TFMGBuilderTransformers {
}
public static <B extends CopycatCableBlock, P> NonNullUnaryOperator<BlockBuilder<B, P>> copycatCable() {
return b -> b.initialProperties(SharedProperties::softMetal)
.blockstate((c, p) -> p.simpleBlock(c.get(), p.models()
.getExistingFile(p.mcLoc("air"))))
.initialProperties(SharedProperties::softMetal)
.properties(p -> p.noOcclusion()
.color(MaterialColor.NONE))
.addLayer(() -> RenderType::solid)
.addLayer(() -> RenderType::cutout)
.addLayer(() -> RenderType::cutoutMipped)
// .addLayer(() -> RenderType::translucent)
.color(() -> CopycatCableBlock::wrappedColor)
.transform(TagGen.axeOrPickaxe());
}
}

View File

@@ -13,6 +13,8 @@ import com.simibubi.create.foundation.utility.Lang;
public enum TFMGLangPartials implements LangPartial {
INTERFACE("UI & Messages"),
TOOLTIPS("Tooltips"),
PONDERS("Ponders");
;

View File

@@ -10,18 +10,36 @@ public class TFMGSpriteShifts {
public static final CTSpriteShiftEntry
CAST_IRON_BLOCK = omni("cast_iron_block"),
LEAD_BLOCK = omni("lead_block"),
STEEL_BLOCK = omni("steel_block");
public static final CTSpriteShiftEntry
LEAD_GLASS = omni("lead_glass"),
STEEL_CASING = omni("steel_casing");
public static final CTSpriteShiftEntry STEEL_SCAFFOLD = horizontal("scaffold/steel_scaffold"),
public static final CTSpriteShiftEntry
STEEL_SCAFFOLD = horizontal("scaffold/steel_scaffold"),
ALUMINUM_SCAFFOLD = horizontal("scaffold/aluminum_scaffold");
public static final CTSpriteShiftEntry
ALUMINUM_SCAFFOLD_TOP = omni("aluminum_casing");
public static final CTSpriteShiftEntry
HEAVY_MACHINERY_CASING = omni("heavy_machinery_casing");
STEEL_SCAFFOLD_INSIDE = horizontal("scaffold/steel_scaffold_inside"),
ALUMINUM_SCAFFOLD_INSIDE = horizontal("scaffold/aluminum_scaffold_inside"),
CAST_IRON_SCAFFOLD_INSIDE = horizontal("scaffold/cast_iron_scaffold_inside"),
LEAD_SCAFFOLD_INSIDE = horizontal("scaffold/lead_scaffold_inside"),
NICKEL_SCAFFOLD_INSIDE = horizontal("scaffold/nickel_scaffold_inside")
;
public static final CTSpriteShiftEntry
HEAVY_MACHINERY_CASING = omni("heavy_machinery_casing"),
ELECTRIC_CASING = omni("electric_casing");
public static final CTSpriteShiftEntry
STEEL_FLUID_TANK = getCT(AllCTTypes.RECTANGLE, "steel_fluid_tank"),
@@ -31,8 +49,7 @@ public class TFMGSpriteShifts {
public static final CTSpriteShiftEntry
STEEL_SHEETMETAL = getCT(AllCTTypes.RECTANGLE, "steel_sheetmetal");
public static final CTSpriteShiftEntry STEEL_SCAFFOLD_INSIDE = horizontal("scaffold/steel_scaffold_inside"),
ALUMINUM_SCAFFOLD_INSIDE = horizontal("scaffold/aluminum_scaffold_inside");
public static final CTSpriteShiftEntry
@@ -41,6 +58,10 @@ public class TFMGSpriteShifts {
COKE_OVEN_BACK = getCT(AllCTTypes.RECTANGLE, "coke_oven/side"),
COKE_OVEN_SIDE = getCT(AllCTTypes.RECTANGLE, "coke_oven/side");
public static final CTSpriteShiftEntry
CAPACITOR = getCT(AllCTTypes.RECTANGLE, "capacitor_side"),
ACCUMULATOR = getCT(AllCTTypes.RECTANGLE, "accumulator_side");
public static final CTSpriteShiftEntry
STEEL_ENCASED_COGWHEEL_SIDE = vertical("steel_encased_cogwheel_side"),

View File

@@ -1,7 +1,7 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.drmangotea.createindustry.items.gadgets.explosives.thermite_grenades.fire.BlueFireBlock;
import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.BlueFireBlock;
import com.drmangotea.createindustry.registry.TFMGEntityTypes;
import com.drmangotea.createindustry.registry.TFMGItems;
import com.simibubi.create.content.trains.CubeParticleData;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.drmangotea.createindustry.CreateTFMG;
import com.mojang.blaze3d.vertex.PoseStack;

View File

@@ -1,7 +1,7 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.drmangotea.createindustry.items.gadgets.explosives.thermite_grenades.fire.GreenFireBlock;
import com.drmangotea.createindustry.items.weapons.explosives.thermite_grenades.fire.GreenFireBlock;
import com.drmangotea.createindustry.registry.TFMGEntityTypes;
import com.drmangotea.createindustry.registry.TFMGItems;
import com.simibubi.create.content.trains.CubeParticleData;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.drmangotea.createindustry.CreateTFMG;
import com.mojang.blaze3d.vertex.PoseStack;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.drmangotea.createindustry.registry.TFMGEntityTypes;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.base.spark;
package com.drmangotea.createindustry.base.util.spark;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.blocks.decoration.flywheels;
package com.drmangotea.createindustry.blocks.decoration.kinetics.flywheels;
import com.drmangotea.createindustry.registry.TFMGBlockEntities;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.blocks.decoration.flywheels;
package com.drmangotea.createindustry.blocks.decoration.kinetics.flywheels;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.blocks.decoration.flywheels;
package com.drmangotea.createindustry.blocks.decoration.kinetics.flywheels;
import com.jozufozu.flywheel.api.MaterialManager;
import com.jozufozu.flywheel.api.instance.DynamicInstance;

View File

@@ -1,4 +1,4 @@
package com.drmangotea.createindustry.blocks.decoration.flywheels;
package com.drmangotea.createindustry.blocks.decoration.kinetics.flywheels;
import com.jozufozu.flywheel.backend.Backend;
import com.mojang.blaze3d.vertex.PoseStack;

View File

@@ -7,19 +7,11 @@ import com.simibubi.create.foundation.block.IBE;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
public class FluidDepositBlock extends Block implements IBE<FluidDepositBlockEntity> {
public class FluidDepositBlock extends Block {
public FluidDepositBlock(Properties p_49795_) {
super(p_49795_);
}
@Override
public Class<FluidDepositBlockEntity> getBlockEntityClass() {
return FluidDepositBlockEntity.class;
}
@Override
public BlockEntityType<? extends FluidDepositBlockEntity> getBlockEntityType() {
return TFMGBlockEntities.OIL_DEPOSIT.get();
}
}

View File

@@ -1,53 +0,0 @@
package com.drmangotea.createindustry.blocks.deposits;
import com.drmangotea.createindustry.CreateTFMG;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
import java.util.List;
public class FluidDepositBlockEntity extends SmartBlockEntity {
public final int baseFluidAmount= Create.RANDOM.nextInt(3000000);
public final int fluidAmountToBuckets =baseFluidAmount/1000;
public int fluidAmount= fluidAmountToBuckets;
public FluidDepositBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
}
@Override
public void write(CompoundTag compound, boolean clientPacket) {
compound.putInt("FluidAmount", baseFluidAmount);
super.write(compound, clientPacket);
}
@Override
protected void read(CompoundTag compound, boolean clientPacket) {
super.read(compound, clientPacket);
fluidAmount = compound.getInt("FluidAmount");
}
public Fluid getDepositFluid(){
return TFMGFluids.CRUDE_OIL.getSource();
}
}

View File

@@ -1,7 +1,7 @@
package com.drmangotea.createindustry.blocks.deposits.surface_scanner;
import com.drmangotea.createindustry.blocks.deposits.FluidDepositBlockEntity;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.simibubi.create.Create;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
@@ -23,7 +23,7 @@ import net.minecraft.world.level.block.state.BlockState;
import java.util.List;
public class SurfaceScannerBlockEntity extends KineticBlockEntity implements IHaveGoggleInformation, IWrenchable {
public FluidDepositBlockEntity deposit;
public BlockPos deposit;
public BlockPos checkedPosition;
public boolean foundDeposit=false;
public BlockPos depositPos;
@@ -98,11 +98,11 @@ public class SurfaceScannerBlockEntity extends KineticBlockEntity implements IHa
float xDistance;
zDistance = deposit.getBlockPos().getZ()-getBlockPos().getZ();
zDistance = deposit.getZ()-getBlockPos().getZ();
xDistance = deposit.getBlockPos().getX()-getBlockPos().getX();
xDistance = deposit.getX()-getBlockPos().getX();
@@ -120,7 +120,7 @@ public class SurfaceScannerBlockEntity extends KineticBlockEntity implements IHa
angle = (float) Math.toDegrees(Math.atan(xDistance/zDistance));
if(this.getBlockPos().getZ()<deposit.getBlockPos().getZ())
if(this.getBlockPos().getZ()<deposit.getZ())
{
angle +=180;
}
@@ -142,15 +142,15 @@ public class SurfaceScannerBlockEntity extends KineticBlockEntity implements IHa
int random2 = Create.RANDOM.nextInt(2);
for(int x = 0; x<2;x++)
checkedPosition = new BlockPos(this.getBlockPos().getX() + random, -63-random2, this.getBlockPos().getZ() + random1);
BlockEntity checkedTileEntity = level.getBlockEntity(checkedPosition);
if (checkedTileEntity instanceof FluidDepositBlockEntity) {
deposit = (FluidDepositBlockEntity) checkedTileEntity;
BlockState checkedState = level.getBlockState(checkedPosition);
if (checkedState.is(TFMGBlocks.OIL_DEPOSIT.get())) {
deposit = checkedPosition;
if(level.getBlockState(checkedPosition.above()) != Blocks.BEDROCK.defaultBlockState()&&
level.getBlockState(checkedPosition.above(2)) != Blocks.BEDROCK.defaultBlockState()
&& level.getBlockState(checkedPosition.above(3)) != Blocks.BEDROCK.defaultBlockState()
&& level.getBlockState(checkedPosition.above(4)) != Blocks.BEDROCK.defaultBlockState())
foundDeposit = true;
depositPos = deposit.getBlockPos();
depositPos = deposit;
}
}

View File

@@ -1,6 +1,7 @@
package com.drmangotea.createindustry.blocks.encased;
import com.drmangotea.createindustry.registry.TFMGBlockEntities;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.simibubi.create.AllBlockEntityTypes;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.content.contraptions.ITransformableBlock;
@@ -17,6 +18,9 @@ import com.simibubi.create.content.schematics.requirement.ItemRequirement;
import com.simibubi.create.foundation.block.IBE;
import com.simibubi.create.foundation.utility.Iterate;
import com.simibubi.create.foundation.utility.VoxelShaper;
import com.tterrag.registrate.util.entry.BlockEntityEntry;
import com.tterrag.registrate.util.entry.BlockEntry;
import com.tterrag.registrate.util.entry.ItemEntry;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.NonNullList;
@@ -52,8 +56,39 @@ public class TFMGEncasedCogwheelBlock extends RotatedPillarKineticBlock
protected final boolean isLarge;
private final Supplier<Block> casing;
public TFMGEncasedCogwheelBlock(Properties properties, boolean large, Supplier<Block> casing) {
private final BlockEntry<?> blockSmall;
private final BlockEntry<?> blockLarge;
private final BlockEntityEntry<SimpleKineticBlockEntity> beSmall;
private final BlockEntityEntry<SimpleKineticBlockEntity> beLarge;
public static TFMGEncasedCogwheelBlock regular(Properties properties, boolean large, Supplier<Block> casing){
return new TFMGEncasedCogwheelBlock(properties,large,casing, AllBlocks.COGWHEEL,AllBlocks.LARGE_COGWHEEL,TFMGBlockEntities.TFMG_ENCASED_COGWHEEL,TFMGBlockEntities.TFMG_ENCASED_LARGE_COGWHEEL);
}
public static TFMGEncasedCogwheelBlock steel(Properties properties, boolean large, Supplier<Block> casing){
return new TFMGEncasedCogwheelBlock(properties,large,casing, TFMGBlocks.STEEL_COGWHEEL,TFMGBlocks.LARGE_STEEL_COGWHEEL,TFMGBlockEntities.ENCASED_STEEL_COGWHEEL,TFMGBlockEntities.ENCASED_LARGE_STEEL_COGWHEEL);
}
public static TFMGEncasedCogwheelBlock aluminum(Properties properties, boolean large, Supplier<Block> casing){
return new TFMGEncasedCogwheelBlock(properties,large,casing, TFMGBlocks.ALUMINUM_COGWHEEL,TFMGBlocks.LARGE_ALUMINUM_COGWHEEL,TFMGBlockEntities.ENCASED_ALUMINUM_COGWHEEL,TFMGBlockEntities.ENCASED_LARGE_ALUMINUM_COGWHEEL);
}
public TFMGEncasedCogwheelBlock(Properties properties, boolean large, Supplier<Block> casing, BlockEntry<?> blockSmall, BlockEntry<?> blockLarge,BlockEntityEntry<SimpleKineticBlockEntity> beSmall,BlockEntityEntry<SimpleKineticBlockEntity> beLarge) {
super(properties);
this.beSmall = beSmall;
this.beLarge = beLarge;
this.blockSmall = blockSmall;
this.blockLarge = blockLarge;
isLarge = large;
this.casing = casing;
registerDefaultState(defaultBlockState().setValue(TOP_SHAFT, false)
@@ -73,7 +108,7 @@ public class TFMGEncasedCogwheelBlock extends RotatedPillarKineticBlock
if (target instanceof BlockHitResult)
return ((BlockHitResult) target).getDirection()
.getAxis() != getRotationAxis(state)
? isLarge ? AllBlocks.LARGE_COGWHEEL.asStack() : AllBlocks.COGWHEEL.asStack()
? isLarge ? blockLarge.asStack() : blockSmall.asStack()
: getCasing().asItem().getDefaultInstance();
return super.getCloneItemStack(state, target, world, pos, player);
}
@@ -131,7 +166,7 @@ public class TFMGEncasedCogwheelBlock extends RotatedPillarKineticBlock
context.getLevel()
.levelEvent(2001, context.getClickedPos(), Block.getId(state));
KineticBlockEntity.switchToBlockState(context.getLevel(), context.getClickedPos(),
(isLarge ? AllBlocks.LARGE_COGWHEEL : AllBlocks.COGWHEEL).getDefaultState()
(isLarge ? blockLarge : blockSmall).getDefaultState()
.setValue(AXIS, state.getValue(AXIS)));
return InteractionResult.SUCCESS;
}
@@ -252,7 +287,7 @@ public class TFMGEncasedCogwheelBlock extends RotatedPillarKineticBlock
@Override
public ItemRequirement getRequiredItems(BlockState state, BlockEntity be) {
return ItemRequirement
.of(isLarge ? AllBlocks.LARGE_COGWHEEL.getDefaultState() : AllBlocks.COGWHEEL.getDefaultState(), be);
.of(isLarge ? blockLarge.getDefaultState() : blockSmall.getDefaultState(), be);
}
@Override
@@ -262,7 +297,7 @@ public class TFMGEncasedCogwheelBlock extends RotatedPillarKineticBlock
@Override
public BlockEntityType<? extends SimpleKineticBlockEntity> getBlockEntityType() {
return isLarge ? TFMGBlockEntities.TFMG_ENCASED_LARGE_COGWHEEL.get() : TFMGBlockEntities.TFMG_ENCASED_COGWHEEL.get();
return isLarge ? beLarge.get() : beSmall.get();
}
@Override

View File

@@ -3,6 +3,7 @@ package com.drmangotea.createindustry.blocks.engines.compact;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGSoundEvents;
import com.drmangotea.createindustry.registry.TFMGTags;
import com.simibubi.create.Create;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
@@ -17,6 +18,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.tags.TagKey;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
@@ -29,10 +31,10 @@ import net.minecraft.world.level.material.Fluid;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.templates.FluidTank;
@@ -72,8 +74,8 @@ public class CompactEngineBlockEntity extends GeneratingKineticBlockEntity imple
public float powerModifier=1;
public float efficiencyModifier = 1.4f;
//
int signal;
boolean signalChanged;
int signal;
boolean signalChanged;
//
// protected ScrollValueBehaviour generatedSpeed;
@@ -123,6 +125,10 @@ boolean signalChanged;
fuelConsumption = (int)((speed/(efficiency/10)/13)+1);
if(fuelConsumption<1)
fuelConsumption=0;
if(this.isOverStressed())
fuelConsumption = 0;
if(!tankInventory.isEmpty()) {
if(consumptionTimer>=45) {
@@ -223,7 +229,7 @@ boolean signalChanged;
////////////////////////////////////////
LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
LazyOptional<IFluidHandler> handler = this.getCapability(ForgeCapabilities.FLUID_HANDLER);
Optional<IFluidHandler> resolve = handler.resolve();
if (!resolve.isPresent())
return false;
@@ -372,7 +378,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
soundTimer++;
// if(!isExhaustTankFull()) {
if (soundTimer >= ((16-signal)/0.8)+1) {
if (soundTimer >= (((16-signal)/0.8)+1)/2) {
if(signal!=0&&
tankInventory.getFluidAmount()!=0 &&
!overStressed
@@ -448,7 +454,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
soundTimer=0;
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.6f, 1f, false);
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.04f, 1f, false);
}
@@ -483,7 +489,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
return new SmartFluidTank(1000, this::onFluidStackChanged){
@Override
public boolean isFluidValid(FluidStack stack) {
return stack.getFluid().isSame(validFuel());
return stack.getFluid().is(validFuel());
}
};
}
@@ -516,7 +522,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
@Override
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
if (cap == ForgeCapabilities.FLUID_HANDLER)
return fluidCapability.cast();
return super.getCapability(cap, side);
}
@@ -533,8 +539,8 @@ public void write(CompoundTag compound, boolean clientPacket) {
return tankInventory;
}
public Fluid validFuel(){
return TFMGFluids.GASOLINE.get();
public TagKey<Fluid> validFuel(){
return TFMGTags.TFMGFluidTags.GASOLINE.tag;
};
}

View File

@@ -5,6 +5,7 @@ import com.drmangotea.createindustry.blocks.engines.diesel.engine_expansion.Dies
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGSoundEvents;
import com.drmangotea.createindustry.registry.TFMGTags;
import com.simibubi.create.content.contraptions.bearing.WindmillBearingBlockEntity;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.kinetics.base.GeneratingKineticBlockEntity;
@@ -20,6 +21,7 @@ import com.simibubi.create.foundation.blockEntity.behaviour.scrollValue.ScrollOp
import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
import com.simibubi.create.foundation.fluid.SmartFluidTank;
import com.simibubi.create.foundation.utility.*;
import mekanism.common.recipe.lookup.cache.type.FluidInputCache;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -27,6 +29,7 @@ import net.minecraft.core.Direction.Axis;
import net.minecraft.core.Direction.AxisDirection;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
@@ -36,9 +39,9 @@ import net.minecraft.world.phys.AABB;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.templates.FluidTank;
import net.minecraftforge.fml.DistExecutor;
@@ -86,7 +89,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
fuelTank = createInventory(TFMGFluids.DIESEL.getSource(),false);
fuelTank = createInventory(TFMGTags.TFMGFluidTags.DIESEL.tag, false);
@@ -130,10 +133,6 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
if(getBlockState().getValue(FACE)==AttachFace.WALL)
expansionPos = this.getBlockPos().relative(getBlockState().getValue(FACING).getOpposite());
if(getBlockState().getValue(FACE)==AttachFace.CEILING)
@@ -498,7 +497,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
@SuppressWarnings("removal")
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, Direction side) {
if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
if (cap == ForgeCapabilities.FLUID_HANDLER)
return fluidCapability.cast();
return super.getCapability(cap, side);
}
@@ -536,7 +535,7 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
//--Fluid Info--//
LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
LazyOptional<IFluidHandler> handler = this.getCapability(ForgeCapabilities.FLUID_HANDLER);
Optional<IFluidHandler> resolve = handler.resolve();
if (!resolve.isPresent())
return false;
@@ -606,6 +605,33 @@ public class DieselEngineBlockEntity extends SmartBlockEntity implements IHaveGo
@Override
public FluidStack drain(FluidStack resource, FluidAction action) {
if (!extractionAllowed)
return FluidStack.EMPTY;
return super.drain(resource, action);
}
@Override
public FluidStack drain(int maxDrain, FluidAction action) {
if (!extractionAllowed)
return FluidStack.EMPTY;
return super.drain(maxDrain, action);
}
};
}
protected SmartFluidTank createInventory(TagKey<Fluid> validFluid, boolean extractionAllowed) {
return new SmartFluidTank(1000, this::onFluidStackChanged) {
@Override
public boolean isFluidValid(FluidStack stack) {
return stack.getFluid().is(validFluid);
}
@Override
public FluidStack drain(FluidStack resource, FluidAction action) {
if (!extractionAllowed)

View File

@@ -28,11 +28,11 @@ public class DieselEngineInstance extends BlockEntityInstance<DieselEngineBlockE
piston = materialManager.defaultSolid()
.material(Materials.TRANSFORMED)
.getModel(AllPartialModels.ENGINE_PISTON, blockState)
.getModel(TFMGPartialModels.DIESEL_ENGINE_PISTON, blockState)
.createInstance();
linkage = materialManager.defaultSolid()
.material(Materials.TRANSFORMED)
.getModel(AllPartialModels.ENGINE_LINKAGE, blockState)
.getModel(TFMGPartialModels.DIESEL_ENGINE_LINKAGE, blockState)
.createInstance();
connector = materialManager.defaultSolid()
.material(Materials.TRANSFORMED)

View File

@@ -1,6 +1,7 @@
package com.drmangotea.createindustry.blocks.engines.diesel;
import com.drmangotea.createindustry.registry.TFMGPartialModels;
import com.jozufozu.flywheel.backend.Backend;
import com.jozufozu.flywheel.core.PartialModel;
import com.mojang.blaze3d.vertex.PoseStack;
@@ -52,13 +53,13 @@ public class DieselEngineRenderer extends SafeBlockEntityRenderer<DieselEngineBl
transformed(AllPartialModels.ENGINE_PISTON, blockState, facing, roll90)
transformed(TFMGPartialModels.DIESEL_ENGINE_PISTON, blockState, facing, roll90)
.translate(0, piston, 0)
.light(light)
.renderInto(ms, vb);
transformed(AllPartialModels.ENGINE_LINKAGE, blockState, facing, roll90)
transformed(TFMGPartialModels.DIESEL_ENGINE_LINKAGE, blockState, facing, roll90)
.centre()
.translate(0, 1, 0)
.unCentre()

View File

@@ -7,6 +7,7 @@ import com.drmangotea.createindustry.blocks.engines.radial.input.RadialEngineInp
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGSoundEvents;
import com.drmangotea.createindustry.registry.TFMGTags;
import com.simibubi.create.Create;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
@@ -22,6 +23,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.tags.TagKey;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.block.Blocks;
@@ -35,7 +37,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.templates.FluidTank;
@@ -490,7 +491,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
soundTimer++;
// if(!isExhaustTankFull()) {
if (soundTimer >= ((16-signal)/0.8)+1) {
if (soundTimer >= (((16-signal)/0.8)+1)/8) {
if(signal!=0&&
tankInventory.getFluidAmount()!=0 &&
!overStressed
@@ -584,7 +585,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
return new SmartFluidTank(1000, this::onFluidStackChanged){
@Override
public boolean isFluidValid(FluidStack stack) {
return stack.getFluid().isSame(validFuel());
return stack.getFluid().is(validFuel());
}
};
}
@@ -633,8 +634,8 @@ public void write(CompoundTag compound, boolean clientPacket) {
return tankInventory;
}
public Fluid validFuel(){
return TFMGFluids.GASOLINE.get();
public TagKey<Fluid> validFuel(){
return TFMGTags.TFMGFluidTags.GASOLINE.tag;
};
}

View File

@@ -16,7 +16,7 @@ public class RadialEngineRenderer extends KineticBlockEntityRenderer<RadialEngin
@Override
protected SuperByteBuffer getRotatedModel(RadialEngineBlockEntity be, BlockState state) {
return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, state);
return CachedBufferer.partialFacing(AllPartialModels.COGWHEEL_SHAFT, state);
}
}

View File

@@ -2,7 +2,9 @@ package com.drmangotea.createindustry.blocks.engines.radial.large;
import com.drmangotea.createindustry.blocks.engines.radial.RadialEngineBlockEntity;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGTags;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
@@ -41,8 +43,7 @@ public class LargeRadialEngineBlockEntity extends RadialEngineBlockEntity {
}
@Override
public Fluid validFuel(){
return TFMGFluids.KEROSENE.get();
public TagKey<Fluid> validFuel(){
return TFMGTags.TFMGFluidTags.KEROSENE.tag;
};
}

View File

@@ -5,6 +5,7 @@ import com.drmangotea.createindustry.blocks.engines.small.turbine.TurbineEngineT
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGSoundEvents;
import com.drmangotea.createindustry.registry.TFMGTags;
import com.simibubi.create.Create;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
@@ -20,6 +21,7 @@ import net.minecraft.core.Direction;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.network.chat.Component;
import net.minecraft.tags.TagKey;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.block.DirectionalBlock;
@@ -29,10 +31,10 @@ import net.minecraft.world.level.material.Fluid;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidTank;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fluids.capability.templates.FluidTank;
@@ -44,7 +46,7 @@ import java.util.Optional;
import static com.simibubi.create.content.kinetics.base.DirectionalKineticBlock.FACING;
@SuppressWarnings("removal")
public abstract class AbstractEngineTileEntity extends GeneratingKineticBlockEntity implements IHaveGoggleInformation, IWrenchable {
public abstract class AbstractEngineBlockEntity extends GeneratingKineticBlockEntity implements IHaveGoggleInformation, IWrenchable {
protected LazyOptional<IFluidHandler> fluidCapability;
protected FluidTank tankInventory;
@@ -88,7 +90,7 @@ boolean signalChanged;
// protected ScrollValueBehaviour generatedSpeed;
public AbstractEngineTileEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
public AbstractEngineBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
tankInventory = createInventory();
@@ -285,7 +287,7 @@ boolean signalChanged;
////////////////////////////////////////
LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
LazyOptional<IFluidHandler> handler = this.getCapability(ForgeCapabilities.FLUID_HANDLER);
Optional<IFluidHandler> resolve = handler.resolve();
if (!resolve.isPresent())
return false;
@@ -443,7 +445,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
soundTimer++;
// if(!isExhaustTankFull()) {
if (soundTimer >= ((16-signal)/0.8)+1) {
if (soundTimer >= (((16-signal)/0.8)+1)/2) {
if(signal!=0&&
hasBackPart()&&
tankInventory.getFluidAmount()!=0 &&
@@ -542,11 +544,11 @@ public void write(CompoundTag compound, boolean clientPacket) {
private void makeSound(){
soundTimer=0;
if(this instanceof TurbineEngineTileEntity){
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.2f, 1.5f, false);
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.06f, 1.5f, false);
}
else
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.3f, 1f, false);
TFMGSoundEvents.ENGINE.playAt(level, worldPosition, 0.1f, 1f, false);
}
@@ -567,7 +569,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
return new SmartFluidTank(1000, this::onFluidStackChanged){
@Override
public boolean isFluidValid(FluidStack stack) {
return stack.getFluid().isSame(validFuel());
return stack.getFluid().is(validFuel());
}
};
}
@@ -614,7 +616,7 @@ public void write(CompoundTag compound, boolean clientPacket) {
@Override
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
if (cap == ForgeCapabilities.FLUID_HANDLER)
return fluidCapability.cast();
return super.getCapability(cap, side);
}
@@ -631,8 +633,8 @@ public void write(CompoundTag compound, boolean clientPacket) {
return tankInventory;
}
public Fluid validFuel(){
return TFMGFluids.GASOLINE.get();
public TagKey<Fluid> validFuel(){
return TFMGTags.TFMGFluidTags.GASOLINE.tag;
};
}

View File

@@ -7,14 +7,14 @@ import com.simibubi.create.foundation.render.SuperByteBuffer;
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
import net.minecraft.world.level.block.state.BlockState;
public class UniversalEngineRenderer extends KineticBlockEntityRenderer<AbstractEngineTileEntity> {
public class UniversalEngineRenderer extends KineticBlockEntityRenderer<AbstractEngineBlockEntity> {
public UniversalEngineRenderer(BlockEntityRendererProvider.Context context) {
super(context);
}
@Override
protected SuperByteBuffer getRotatedModel(AbstractEngineTileEntity be, BlockState state) {
protected SuperByteBuffer getRotatedModel(AbstractEngineBlockEntity be, BlockState state) {
return CachedBufferer.partialFacing(AllPartialModels.SHAFT_HALF, state);
}

View File

@@ -1,14 +1,15 @@
package com.drmangotea.createindustry.blocks.engines.small.gasoline;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineTileEntity;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineBlockEntity;
import com.drmangotea.createindustry.registry.TFMGFluids;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
public class GasolineEngineTileEntity extends AbstractEngineTileEntity {
public class GasolineEngineTileEntity extends AbstractEngineBlockEntity {
public GasolineEngineTileEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
@@ -16,8 +17,4 @@ public class GasolineEngineTileEntity extends AbstractEngineTileEntity {
}
@Override
public Fluid validFuel() {
return TFMGFluids.GASOLINE.getSource();
}
}

View File

@@ -1,17 +1,19 @@
package com.drmangotea.createindustry.blocks.engines.small.lpg;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineTileEntity;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineBlockEntity;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGTags;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.DirectionalBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
public class LPGEngineTileEntity extends AbstractEngineTileEntity {
public class LPGEngineTileEntity extends AbstractEngineBlockEntity {
public LPGEngineTileEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
@@ -48,7 +50,7 @@ public class LPGEngineTileEntity extends AbstractEngineTileEntity {
return true;
}
@Override
public Fluid validFuel() {
return TFMGFluids.LPG.getSource();
public TagKey<Fluid> validFuel() {
return TFMGTags.TFMGFluidTags.LPG.tag;
}
}

View File

@@ -1,17 +1,19 @@
package com.drmangotea.createindustry.blocks.engines.small.turbine;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineTileEntity;
import com.drmangotea.createindustry.blocks.engines.small.AbstractEngineBlockEntity;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGTags;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.DirectionalBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluid;
public class TurbineEngineTileEntity extends AbstractEngineTileEntity {
public class TurbineEngineTileEntity extends AbstractEngineBlockEntity {
public TurbineEngineTileEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
@@ -49,7 +51,7 @@ public class TurbineEngineTileEntity extends AbstractEngineTileEntity {
return true;
}
@Override
public Fluid validFuel() {
return TFMGFluids.KEROSENE.getSource();
public TagKey<Fluid> validFuel() {
return TFMGTags.TFMGFluidTags.KEROSENE.tag;
}
}

View File

@@ -1,91 +0,0 @@
package com.drmangotea.createindustry.blocks.fluids;
import net.minecraft.core.BlockPos;
import net.minecraft.util.RandomSource;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.FluidState;
import net.minecraftforge.fluids.ForgeFlowingFluid;
/**
* makes fluid burn when close to fire,
* not working for now
*/
public class BurnableFluid extends ForgeFlowingFluid {
protected BurnableFluid(Properties properties) {
super(properties);
}
@Override
public boolean isSource(FluidState p_76140_) {
return true;
}
@Override
public int getAmount(FluidState p_164509_) {
return 8;
}
@Override
public void randomTick(Level level, BlockPos pos, FluidState p_230574_, RandomSource randomSource) {
//level.setBlock(pos,Blocks.FIRE.defaultBlockState(),3);
// if (!level.isClientSide) {
// Direction checkedDirection=Direction.NORTH;
// for(int i = 0; i < 4; i++) {
// checkedDirection=checkedDirection.getClockWise();
// BlockPos checkedPos = pos.relative(checkedDirection);
// if(level.getBlockEntity(checkedPos).getBlockState().is(Blocks.FIRE)) {
// level.explode(null, pos.getX(), pos.getY(), pos.getZ(), 2.0F, Explosion.BlockInteraction.NONE);
// level.setBlock(pos,Blocks.FIRE.defaultBlockState(),3);
// }
// }
// }
}
protected boolean isRandomlyTicking() {
return true;
}
//
public static class Flowing extends BurnableFluid {
public Flowing(Properties properties) {
super(properties);
}
protected void createFluidStateDefinition(StateDefinition.Builder<Fluid, FluidState> p_76260_) {
super.createFluidStateDefinition(p_76260_);
p_76260_.add(LEVEL);
}
public int getAmount(FluidState p_76264_) {
return p_76264_.getValue(LEVEL);
}
public boolean isSource(FluidState p_76262_) {
return false;
}
}
public static class Source extends BurnableFluid {
public Source(Properties properties) {
super(properties);
}
public int getAmount(FluidState p_76269_) {
return 8;
}
public boolean isSource(FluidState p_76267_) {
return true;
}
}
}

View File

@@ -133,6 +133,7 @@ public class ExhaustBlockEntity extends SmartBlockEntity implements IHaveGoggleI
};
}
protected void onFluidStackChanged(FluidStack newFluidStack) {
sendData();
}

View File

@@ -2,6 +2,7 @@ package com.drmangotea.createindustry.blocks.machines.flarestack;
import com.drmangotea.createindustry.registry.TFMGFluids;
import com.drmangotea.createindustry.registry.TFMGTags;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.blockEntity.SmartBlockEntity;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
@@ -127,19 +128,7 @@ public class FlarestackBlockEntity extends SmartBlockEntity implements IHaveGogg
return new SmartFluidTank(1000, this::onFluidStackChanged) {
@Override
public boolean isFluidValid(FluidStack stack) {
return
stack.getFluid().isSame(TFMGFluids.BUTANE.getSource())||
stack.getFluid().isSame(TFMGFluids.PROPANE.getSource())||
stack.getFluid().isSame(TFMGFluids.LPG.getSource())||
stack.getFluid().isSame(TFMGFluids.KEROSENE.getSource())||
stack.getFluid().isSame(TFMGFluids.NAPHTHA.getSource())||
stack.getFluid().isSame(TFMGFluids.ETHYLENE.getSource())||
stack.getFluid().isSame(TFMGFluids.PROPYLENE.getSource())||
stack.getFluid().isSame(TFMGFluids.DIESEL.getSource())||
stack.getFluid().isSame(TFMGFluids.LUBRICATION_OIL.getSource())||
stack.getFluid().isSame(TFMGFluids.HEAVY_OIL.getSource())||
stack.getFluid().isSame(TFMGFluids.CREOSOTE.getSource())||
stack.getFluid().isSame(TFMGFluids.GASOLINE.getSource());
return stack.getFluid().is(TFMGTags.TFMGFluidTags.FLAMMABLE.tag);
}
};
}

View File

@@ -2,7 +2,9 @@ package com.drmangotea.createindustry.blocks.machines.metal_processing.blast_fur
import com.drmangotea.createindustry.registry.TFMGBlockEntities;
import com.simibubi.create.foundation.block.IBE;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.HorizontalDirectionalBlock;
import net.minecraft.world.level.block.entity.BlockEntityType;
@@ -20,7 +22,9 @@ public class BlastFurnaceOutputBlock extends HorizontalDirectionalBlock implemen
public Class<BlastFurnaceOutputBlockEntity> getBlockEntityClass() {
return BlastFurnaceOutputBlockEntity.class;
}
public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
IBE.onRemove(state, worldIn, pos, newState);
}
@Override
public BlockEntityType<? extends BlastFurnaceOutputBlockEntity> getBlockEntityType() {
return TFMGBlockEntities.BLAST_FURNACE_OUTPUT.get();

View File

@@ -9,6 +9,7 @@ import com.drmangotea.createindustry.registry.TFMGRecipeTypes;
import com.simibubi.create.Create;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.foundation.item.SmartInventory;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.LangBuilder;
@@ -25,11 +26,10 @@ import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.AABB;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ForgeCapabilities;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandlerModifiable;
import net.minecraftforge.items.wrapper.CombinedInvWrapper;
import net.minecraftforge.items.wrapper.RecipeWrapper;
@@ -94,6 +94,14 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
tank1.getPrimaryHandler().setCapacity(8000);
tank2.getPrimaryHandler().setCapacity(8000);
}
@Override
public void destroy() {
super.destroy();
ItemHelper.dropContents(level, worldPosition, inputInventory);
ItemHelper.dropContents(level, worldPosition, fuelInventory);
}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
super.addBehaviours(behaviours);
@@ -105,16 +113,10 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
manageMoltenMetal();
if(type== BlastFurnaceType.SMALL) {
blastFurnaceLevel = ((float) validHeight / 2) - 1;
blastFurnaceLevel = (float) Math.min(blastFurnaceLevel,2.5);
}
if(type== BlastFurnaceType.BIG_LEFT||type== BlastFurnaceType.BIG_RIGHT){
blastFurnaceLevel = validHeight;
blastFurnaceLevel = Math.min(blastFurnaceLevel,15);
}
if(speedModifier!=0) {
@@ -213,14 +215,9 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
public void manageMoltenMetal(){
BlockPos posToSpawn;
BlockPos posToSpawn1;
BlockPos posToSpawn2;
BlockPos posToSpawn3;
BlockPos posToSpawn4;
BlockPos posToSpawn5;
if (timer>0&&type == BlastFurnaceType.SMALL) {
if (timer>0) {
posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above();
@@ -236,78 +233,8 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
}
}
//////
if (timer>0&&type == BlastFurnaceType.BIG_LEFT) {
posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above();
posToSpawn1 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above();
posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getCounterClockWise());
posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getCounterClockWise());
if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) {
level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(), 3);
}else {
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40;
}
}
////////
if (timer>0&&type == BlastFurnaceType.BIG_RIGHT) {
posToSpawn = this.getBlockPos().relative(outputFacing.getOpposite()).above();
posToSpawn1 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above();
posToSpawn2 = this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getClockWise());
posToSpawn3 = this.getBlockPos().relative(outputFacing.getOpposite(),2).above().relative(outputFacing.getClockWise());
if(!level.getBlockState(posToSpawn).is(TFMGBlocks.MOLTEN_METAL.get())) {
level.setBlock(posToSpawn, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn1, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn2, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn3, TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn1.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn2.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
level.setBlock(posToSpawn3.above(), TFMGBlocks.MOLTEN_METAL.getDefaultState(),3);
}else {
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn1.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn2.above())).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3)).discardTimer = 40;
((MoltenMetalBlockEntity) level.getBlockEntity(posToSpawn3.above())).discardTimer = 40;
}
}
}
@Override
protected AABB createRenderBoundingBox() {
@@ -353,16 +280,23 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
} else {
int freeSpace = inputInventory.getStackInSlot(0).getMaxStackSize()-inputInventory.getStackInSlot(0).getCount();
if(itemStack.getCount()==1) {
ItemStack stack2 = itemStack;
stack2.setCount(2);
itemEntity.setItem(stack2);
}
int freeSpace2 = inputInventory.getStackInSlot(0).getMaxStackSize()-inputInventory.getStackInSlot(0).getCount();
int count = itemStack.getCount();
if(!inputInventory.isEmpty())
if(!inputInventory.getItem(0).is(itemStack.getItem()))
continue;
if(count>freeSpace){
itemStack.setCount(itemStack.getCount()-freeSpace);
inputInventory.setItem(0 ,new ItemStack (itemStack.getItem(),inputInventory.getStackInSlot(0).getCount()+freeSpace));
if(count>freeSpace2){
itemStack.setCount(itemStack.getCount()-freeSpace2);
inputInventory.setItem(0 ,new ItemStack (itemStack.getItem(),inputInventory.getStackInSlot(0).getCount()+freeSpace2));
}else {
inputInventory.setItem(0 ,new ItemStack (itemStack.getItem(),inputInventory.getStackInSlot(0).getCount()+itemStack.getCount()));
itemEntity.discard();
@@ -403,21 +337,12 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
.forGoggles(tooltip, 1);
Lang.translate("goggles.blast_furnace.size_stats")
.style(ChatFormatting.DARK_GRAY)
.forGoggles(tooltip, 1);
Lang.translate("goggles.blast_furnace.height", validHeight)
.style(ChatFormatting.GOLD)
.forGoggles(tooltip, 1);
if(type == BlastFurnaceType.SMALL) {
Lang.translate("goggles.blast_furnace.diameter.one")
.style(ChatFormatting.GOLD)
.forGoggles(tooltip, 1);
} else
Lang.translate("goggles.blast_furnace.diameter.two")
.style(ChatFormatting.GOLD)
.forGoggles(tooltip, 1);
Lang.translate("goggles.misc.storage_info")
@@ -438,57 +363,8 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
//--Fluid Info--//
LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
Optional<IFluidHandler> resolve = handler.resolve();
if (!resolve.isPresent())
return false;
IFluidHandler tank = resolve.get();
if (tank.getTanks() == 0)
return false;
LangBuilder mb = Lang.translate("generic.unit.millibuckets");
boolean isEmpty = true;
for (int i = 0; i < tank.getTanks(); i++) {
FluidStack fluidStack = tank.getFluidInTank(i);
if (fluidStack.isEmpty())
continue;
Lang.fluidName(fluidStack)
.style(ChatFormatting.GRAY)
.forGoggles(tooltip, 1);
Lang.builder()
.add(Lang.number(fluidStack.getAmount())
.add(mb)
.style(ChatFormatting.DARK_GREEN))
.text(ChatFormatting.GRAY, " / ")
.add(Lang.number(tank.getTankCapacity(i))
.add(mb)
.style(ChatFormatting.DARK_GRAY))
.forGoggles(tooltip, 1);
isEmpty = false;
}
if (tank.getTanks() > 1) {
if (isEmpty)
tooltip.remove(tooltip.size() - 1);
return true;
}
if (!isEmpty)
return true;
Lang.translate("gui.goggles.fluid_container.capacity")
.add(Lang.number(tank.getTankCapacity(0))
.add(mb)
.style(ChatFormatting.DARK_GREEN))
.style(ChatFormatting.DARK_GRAY)
.forGoggles(tooltip, 1);
containedFluidTooltip(tooltip, isPlayerSneaking,
getCapability(ForgeCapabilities.FLUID_HANDLER));
return true;
@@ -518,11 +394,11 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
}
@Nonnull
@Override
@SuppressWarnings("'net.minecraftforge.items.CapabilityItemHandler' is deprecated and marked for removal ")
public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, Direction side) {
if (cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
if (cap == ForgeCapabilities.ITEM_HANDLER)
return itemCapability.cast();
if (cap == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
if (cap == ForgeCapabilities.FLUID_HANDLER)
return fluidCapability.cast();
return super.getCapability(cap, side);
}
@@ -543,17 +419,10 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
if(canBeSmall())
type = BlastFurnaceType.SMALL;
if(canBeBigLeft())
type = BlastFurnaceType.BIG_LEFT;
if(canBeBigRight())
type = BlastFurnaceType.BIG_RIGHT;
if(
!canBeBigLeft()&&
!canBeBigRight()&&
!canBeSmall()
)type = BlastFurnaceType.INVALID;
if(!canBeSmall())
type = BlastFurnaceType.INVALID;
@@ -666,200 +535,15 @@ public class BlastFurnaceOutputBlockEntity extends TFMGMachineBlockEntity implem
return true;
}
public boolean canBeBigRight(){
mainFloor = this.getBlockPos().relative(outputFacing.getOpposite());
BlockPos checkedPos = this.getBlockPos().relative(outputFacing.getCounterClockWise());
for(int i = 0; i<4; i++){
for(int y = 0; y<4; y++){
if(
!(i ==0 && y ==0)&&
!(i ==3 && y ==3)&&
!(i ==0 && y ==3)&&
!(i ==3 && y ==0)
) {
if( i ==1 && y ==0){
if(isAboveValid(checkedPos)) {
checkedPos = checkedPos.relative(outputFacing.getOpposite());
continue;
} else return false;
}
if(!isValidBlock(checkedPos)) {
return false;
}
if(i==0&&y==1){
if(!isAboveValid(checkedPos,true)) {
return false;
}
}
if(
i ==0 || i ==3 ||
y == 0 || y == 3
){
if(!isAboveValid(checkedPos)) {
return false;
}
}
else
if(!isAboveClear(checkedPos)) {
return false;
}
} else{
//reinforcements
if(i ==0 && y ==0)
isReinforcement(checkedPos,true);
isReinforcement(checkedPos);
}
checkedPos = checkedPos.relative(outputFacing.getOpposite());
}
checkedPos= checkedPos.relative(outputFacing,4);
checkedPos= checkedPos.relative(outputFacing.getClockWise());
}
// level.setBlock(checkedPos.above(5), Blocks.DIAMOND_BLOCK.defaultBlockState(), 3);
return true;
}
public boolean canBeBigLeft(){
mainFloor = this.getBlockPos().relative(outputFacing.getOpposite());
BlockPos checkedPos = this.getBlockPos().relative(outputFacing.getClockWise());
for(int i = 0; i<4; i++){
for(int y = 0; y<4; y++){
if(
!(i ==0 && y ==0)&&
!(i ==3 && y ==3)&&
!(i ==0 && y ==3)&&
!(i ==3 && y ==0)
) {
if( i ==1 && y ==0){
if(isAboveValid(checkedPos)) {
checkedPos = checkedPos.relative(outputFacing.getOpposite());
continue;
} else return false;
}
if(!isValidBlock(checkedPos)) {
return false;
}
if(i==0&&y==1){
if(!isAboveValid(checkedPos,true)) {
return false;
}
}
if(
i ==0 || i ==3 ||
y == 0 || y == 3
){
if(!isAboveValid(checkedPos)) {
return false;
}
}
else
if(!isAboveClear(checkedPos)) {
return false;
}
}else{
//reinforcements
if(i ==0 && y ==0)
isReinforcement(checkedPos,true);
isReinforcement(checkedPos);
}
checkedPos = checkedPos.relative(outputFacing.getOpposite());
}
checkedPos= checkedPos.relative(outputFacing,4);
checkedPos= checkedPos.relative(outputFacing.getCounterClockWise());
}
// level.setBlock(checkedPos.above(5), Blocks.EMERALD_BLOCK.defaultBlockState(), 3);
return true;
}
public List<ItemEntity> getItemsToPick(BlastFurnaceType type) {
AABB searchArea=null;
AABB searchArea1=null;
AABB searchArea2=null;
AABB searchArea3=null;
if(type == BlastFurnaceType.SMALL)
searchArea = new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above());
if(type == BlastFurnaceType.BIG_RIGHT) {
searchArea = new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above());
searchArea1 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite(), 2).above());
searchArea2 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite(), 2).above().relative(outputFacing.getClockWise()));
searchArea3 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getClockWise()));
}
if(type == BlastFurnaceType.BIG_LEFT) {
searchArea = new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above());
searchArea1 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite(), 2).above());
searchArea2 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite(), 2).above().relative(outputFacing.getCounterClockWise()));
searchArea3 = new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above().relative(outputFacing.getCounterClockWise()));
}
if(searchArea1!=null){
List<ItemEntity> itemList= new ArrayList<>();
itemList.addAll(level.getEntitiesOfClass(ItemEntity.class, searchArea));
itemList.addAll(level.getEntitiesOfClass(ItemEntity.class, searchArea1));
itemList.addAll(level.getEntitiesOfClass(ItemEntity.class, searchArea2));
itemList.addAll(level.getEntitiesOfClass(ItemEntity.class, searchArea3));
return itemList;
}
return level.getEntitiesOfClass(ItemEntity.class, searchArea);
return level.getEntitiesOfClass(ItemEntity.class, new AABB(this.getBlockPos().relative(outputFacing.getOpposite()).above()));
}
public enum BlastFurnaceType{
SMALL,
BIG_LEFT,
BIG_RIGHT,
INVALID
}
}

View File

@@ -85,30 +85,8 @@ public class BlastFurnaceRenderer extends SafeBlockEntityRenderer<BlastFurnaceOu
.light(light)
.renderInto(ms, vb);
}
int y = -1;
if (be.type == BlastFurnaceOutputBlockEntity.BlastFurnaceType.BIG_RIGHT||be.type == BlastFurnaceOutputBlockEntity.BlastFurnaceType.BIG_LEFT) {
if(be.type == BlastFurnaceOutputBlockEntity.BlastFurnaceType.BIG_LEFT)
y = -2;
for(int i = 0; i < 2;i++) {
for(int x = 0; x < 2;x++) {
CachedBufferer.partial(TFMGPartialModels.COAL_COKE_DUST_LAYER, blockState)
.rotateY(angle)
.centre()
.translateX(x+y)
.translateZ(i)
.translateY(height)
.light(light)
.renderInto(ms, vb);
}
}
}
}

View File

@@ -43,27 +43,20 @@ public class MoltenMetalBlock extends Block implements IBE<MoltenMetalBlockEntit
super(p_49795_);
}
public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) {
entity.setSecondsOnFire(10);
if(!(entity instanceof LivingEntity)){
// if(entity instanceof ItemEntity)
// if(!entity.fireImmune()){
// entity.discard();
// if(level.isClientSide)
// level.playSound(null, pos, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, .2f,
// 1f + Create.RANDOM.nextFloat());
// }
return;
}
if(entity instanceof LivingEntity){
entity.makeStuckInBlock(state, new Vec3((double)0.9F, 1.5D, (double)0.9F));
int random = Create.RANDOM.nextInt(24);
int random = Create.RANDOM.nextInt(24);
if(random==7)
entity.hurt(DamageSource.IN_FIRE,4);
entity.setSecondsOnFire(10);
}
if(random==7)
entity.hurt(DamageSource.IN_FIRE,4);
}

View File

@@ -37,6 +37,9 @@ public class CastingBasinBlock extends Block implements IBE<CastingBasinBlockEnt
public VoxelShape getShape(BlockState pState, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return AllShapes.BASIN_BLOCK_SHAPE;
} @Override
public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
IBE.onRemove(state, worldIn, pos, newState);
}
@Override
public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand interactionHand, BlockHitResult blockHitResult) {

View File

@@ -6,6 +6,7 @@ import com.drmangotea.createindustry.recipes.casting.CastingRecipe;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.foundation.item.SmartInventory;
import com.simibubi.create.foundation.recipe.RecipeFinder;
import com.simibubi.create.foundation.utility.Lang;
@@ -126,6 +127,12 @@ public class CastingBasinBlockEntity extends TFMGMachineBlockEntity implements I
}
@Override
public void destroy() {
super.destroy();
ItemHelper.dropContents(level, worldPosition, moldInventory);
ItemHelper.dropContents(level, worldPosition, outputInventory);
}
public void setMold(){
if(moldInventory.isEmpty())

View File

@@ -27,6 +27,10 @@ public class CokeOvenBlock extends HorizontalDirectionalBlock implements IBE<Cok
}
@Override
public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving) {
IBE.onRemove(state, worldIn, pos, newState);
}
@Override
public InteractionResult onWrenched(BlockState state, UseOnContext context) {
Level level = context.getLevel();

View File

@@ -9,6 +9,7 @@ import com.drmangotea.createindustry.registry.TFMGRecipeTypes;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.fluid.CombinedTankWrapper;
import com.simibubi.create.foundation.item.ItemHelper;
import com.simibubi.create.foundation.item.SmartInventory;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.animation.LerpedFloat;
@@ -162,6 +163,14 @@ public class CokeOvenBlockEntity extends TFMGMachineBlockEntity implements IWren
}
@Override
public void destroy() {
super.destroy();
ItemHelper.dropContents(level, worldPosition, inputInventory);
}
public void setBlockState(){
if(controller == this){

View File

@@ -1,95 +0,0 @@
package com.drmangotea.createindustry.blocks.machines.oil_processing.distillation;
import com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillery.DistilleryControllerBlockEntity;
import com.drmangotea.createindustry.recipes.distillation.AbstractDistillationRecipe;
import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
import com.simibubi.create.foundation.advancement.CreateAdvancement;
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
import com.simibubi.create.foundation.blockEntity.behaviour.simple.DeferralBehaviour;
import com.simibubi.create.foundation.recipe.RecipeFinder;
import net.minecraft.core.BlockPos;
import net.minecraft.world.Container;
import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
public abstract class FluidProcessingBlockEntity extends KineticBlockEntity {
public DeferralBehaviour basinChecker;
public boolean basinRemoved;
protected AbstractDistillationRecipe recipe;
public FluidProcessingBlockEntity(BlockEntityType<?> typeIn, BlockPos pos, BlockState state) {
super(typeIn, pos, state);
}
@Override
public void addBehaviours(List<BlockEntityBehaviour> behaviours) {
super.addBehaviours(behaviours);
basinChecker = new DeferralBehaviour(this, this::updateController);
behaviours.add(basinChecker);
}
@Override
public void tick() {
if (basinRemoved) {
basinRemoved = false;
onControllerRemoved();
sendData();
return;
}
super.tick();
}
protected boolean updateController() {
return false;
}
protected abstract boolean isRunning();
public void startProcessing() {}
public boolean continueWithPreviousRecipe() {
return true;
}
protected <C extends Container> boolean matchItemlessRecipe(Recipe<C> recipe) {
if (recipe == null)
return false;
Optional<DistilleryControllerBlockEntity> controller = getController();
if (!controller.isPresent())
return false;
return AbstractDistillationRecipe.match(controller.get(), recipe);
}
protected abstract void onControllerRemoved();
public Optional<DistilleryControllerBlockEntity> getController() {
if (level == null)
return Optional.empty();
BlockEntity basinTE = level.getBlockEntity(worldPosition.below(1));
if (!(basinTE instanceof DistilleryControllerBlockEntity))
return Optional.empty();
return Optional.of((DistilleryControllerBlockEntity) basinTE);
}
protected Optional<CreateAdvancement> getProcessedRecipeTrigger() {
return Optional.empty();
}
protected abstract <C extends Container> boolean matchStaticFilters(Recipe<C> recipe);
protected abstract Object getRecipeCacheKey();
}

View File

@@ -1,83 +0,0 @@
package com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillation_tower;
import com.drmangotea.createindustry.blocks.tanks.SteelTankBlock;
import com.drmangotea.createindustry.registry.TFMGBlockEntities;
import com.simibubi.create.content.equipment.wrench.IWrenchable;
import com.simibubi.create.foundation.block.IBE;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.pathfinder.PathComputationType;
import net.minecraft.core.Direction;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.FaceAttachedHorizontalDirectionalBlock;
import net.minecraft.world.level.block.state.StateDefinition;
public class DistillationControllerBlock extends FaceAttachedHorizontalDirectionalBlock
implements IWrenchable, IBE<DistillationControllerBlockEntity> {
public DistillationControllerBlock(Properties properties) {
super(properties);
}
@Override
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> pBuilder) {
super.createBlockStateDefinition(pBuilder.add(FACE, FACING));
}
@Override
public boolean canSurvive(BlockState pState, LevelReader pLevel, BlockPos pPos) {
return canAttach(pLevel, pPos, getConnectedDirection(pState).getOpposite());
}
public static boolean canAttach(LevelReader pReader, BlockPos pPos, Direction pDirection) {
return true;
}
@Override
public void onPlace(BlockState pState, Level pLevel, BlockPos pPos, BlockState pOldState, boolean pIsMoving) {
SteelTankBlock.updateTowerState(pState, pLevel, pPos.relative(getFacing(pState).getOpposite()));
}
@Override
public void onRemove(BlockState state, Level world, BlockPos pos, BlockState newState, boolean pIsMoving) {
if (state.hasBlockEntity() && (!state.is(newState.getBlock()) || !newState.hasBlockEntity()))
world.removeBlockEntity(pos);
SteelTankBlock.updateTowerState(state, world, pos.relative(getFacing(state).getOpposite()));
}
@Override
public boolean isPathfindable(BlockState state, BlockGetter reader, BlockPos pos, PathComputationType type) {
return false;
}
public static Direction getFacing(BlockState sideState) {
return getConnectedDirection(sideState);
}
@Override
public Class<DistillationControllerBlockEntity> getBlockEntityClass() {
return DistillationControllerBlockEntity.class;
}
@Override
public BlockEntityType<? extends DistillationControllerBlockEntity> getBlockEntityType() {
return TFMGBlockEntities.STEEL_DISTILLATION_CONTROLLER.get();
}
}

View File

@@ -1,229 +0,0 @@
package com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillation_tower;
import com.drmangotea.createindustry.blocks.machines.oil_processing.distillation.distillery.DistilleryControllerBlockEntity;
import com.drmangotea.createindustry.blocks.tanks.SteelTankBlockEntity;
import com.drmangotea.createindustry.registry.TFMGBlocks;
import com.simibubi.create.content.equipment.goggles.IHaveGoggleInformation;
import com.simibubi.create.foundation.utility.Lang;
import com.simibubi.create.foundation.utility.LangBuilder;
import net.minecraft.ChatFormatting;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
import net.minecraftforge.fluids.capability.IFluidHandler;
import javax.annotation.Nullable;
import java.lang.ref.WeakReference;
import java.util.List;
import java.util.Optional;
public class DistillationControllerBlockEntity extends DistilleryControllerBlockEntity implements IHaveGoggleInformation {
public WeakReference<SteelTankBlockEntity> source;
public int towerLevel =0;
public boolean hasTank = false;
public boolean isTallEnough = true;
public boolean hasMainOutput = false;
public DistillationOutputBlockEntity mainOutput;
public DistillationControllerBlockEntity(BlockEntityType<?> type, BlockPos pos, BlockState state) {
super(type, pos, state);
}
@Override
public void tick() {
source = new WeakReference<>(null);
super.tick();
BlockEntity entityAbove = level.getBlockEntity(getBlockPos().above());
if(entityAbove instanceof DistillationOutputBlockEntity){
mainOutput = (DistillationOutputBlockEntity) entityAbove;
hasMainOutput = true;
}else {
hasMainOutput = false;
}
@Nullable
SteelTankBlockEntity tank = getTank();
if(tank==null){
hasTank=false;
towerLevel = 0;
return;
}
hasTank = true;
towerLevel = tank.tower.towerLevel;
}
@Override
public boolean addToGoggleTooltip(List<Component> tooltip, boolean isPlayerSneaking) {
LangBuilder mb = Lang.translate("generic.unit.millibuckets");
Lang.translate("goggles.distillation_tower.status")
.style(ChatFormatting.GRAY)
.space()
.forGoggles(tooltip, 1);
if(!hasTank) {
Lang.translate("goggles.distillation_tower.tank_not_found")
.style(ChatFormatting.DARK_RED)
.forGoggles(tooltip);
return true;
}else {
if(towerLevel<4) {
Lang.translate("goggles.distillation_tower.level", this.towerLevel)
.style(ChatFormatting.DARK_RED)
.forGoggles(tooltip, 1);
return true;
}
if(!hasMainOutput) {
Lang.translate("goggles.distillation_tower.no_outputs")
.style(ChatFormatting.DARK_RED)
.forGoggles(tooltip, 1);
return true;
}
// if(getTank().getHeight()<((DistillationOutputBlockEntity)level.getBlockEntity(getBlockPos().above())).foundOutputs*2) {
// Lang.translate("goggles.distillation_tower.not_tall_enough")
// .style(ChatFormatting.DARK_RED)
// .forGoggles(tooltip, 1);
// return true;
// }
Lang.translate("goggles.distillation_tower.level", this.towerLevel)
.style(ChatFormatting.GREEN)
.forGoggles(tooltip, 1);
Lang.translate("goggles.distillation_tower.found_outputs", this.getOutputCount())
.style(ChatFormatting.GREEN)
.space()
.forGoggles(tooltip, 1);
}
///////////////////////////////////////////
LazyOptional<IFluidHandler> handler = this.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY);
Optional<IFluidHandler> resolve = handler.resolve();
if (!resolve.isPresent())
return false;
IFluidHandler tank = resolve.get();
if (tank.getTanks() == 0)
return false;
Lang.translate("goggles.fluid_in_tank")
.style(ChatFormatting.GRAY)
.forGoggles(tooltip);
boolean isEmpty = true;
for (int i = 0; i < tank.getTanks(); i++) {
FluidStack fluidStack = tank.getFluidInTank(i);
if (fluidStack.isEmpty())
continue;
Lang.fluidName(fluidStack)
.style(ChatFormatting.GRAY)
.forGoggles(tooltip, 1);
Lang.builder()
.add(Lang.number(fluidStack.getAmount())
.add(mb)
.style(ChatFormatting.GOLD))
.text(ChatFormatting.GRAY, " / ")
.add(Lang.number(tank.getTankCapacity(i))
.add(mb)
.style(ChatFormatting.DARK_GRAY))
.forGoggles(tooltip, 1);
isEmpty = false;
}
if (tank.getTanks() > 1) {
if (isEmpty)
tooltip.remove(tooltip.size() - 1);
return true;
}
if (!isEmpty)
return true;
Lang.translate("gui.goggles.fluid_container.capacity")
.add(Lang.number(tank.getTankCapacity(0))
.add(mb)
.style(ChatFormatting.GOLD))
.style(ChatFormatting.DARK_GRAY)
.forGoggles(tooltip, 1);
return true;
}
public int getOutputCount(){
BlockPos checkedPos = this.getBlockPos().above(3);
int outputCount = 1;
for(int i = 0; i <5;i++){
if(
level.getBlockState(checkedPos).is(TFMGBlocks.STEEL_DISTILLATION_OUTPUT.get())&&
level.getBlockState(checkedPos.below()).is(TFMGBlocks.INDUSTRIAL_PIPE.get())
){
outputCount++;
checkedPos = checkedPos.above(2);
continue;
}
return outputCount;
}
return outputCount;
}
public SteelTankBlockEntity getTank() {
SteelTankBlockEntity tank = source.get();
if (tank == null || tank.isRemoved()) {
if (tank != null)
source = new WeakReference<>(null);
Direction facing = DistillationControllerBlock.getFacing(getBlockState());
BlockEntity be = level.getBlockEntity(worldPosition.relative(facing.getOpposite()));
if (be instanceof SteelTankBlockEntity tankTe)
source = new WeakReference<>(tank = tankTe);
}
if (tank == null)
return null;
return (SteelTankBlockEntity) tank.getControllerBE();
}
}

Some files were not shown because too many files have changed in this diff Show More