diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index 4da05e0c1..bbd0bdae2 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -623,6 +623,11 @@ "block.tfg.large_nest_box_warped": "Large Warped Nest", "block.tfg.titanium_concrete": "Titanium-Rebar Concrete", "block.tfg.polished_titanium_concrete": "Polished Titanium-Rebar Concrete", + "block.tfg.titanium_concrete_tile": "Titanium-Rebar Concrete Tile", + "block.tfg.titanium_concrete_tile_small": "Small Titanium-Rebar Concrete Tile", + "block.tfg.titanium_concrete_bricks": "Titanium-Rebar Concrete Bricks", + "block.tfg.titanium_concrete_bricks_small": "Small Titanium-Rebar Concrete Bricks", + "block.tfg.titanium_concrete_bricks_square": "Square Titanium-Rebar Concrete Bricks", "block.tfg.nuclear_turbine": "Nuclear Steam Turbine", "block.tfg.evaporation_tower": "Evaporation Tower", "fluid.tfg.nether_slurry": "Nether Slurry", diff --git a/kubejs/assets/tfg/models/block/casings/heat_pipe_casing.json b/kubejs/assets/tfg/models/block/casings/heat_pipe_casing.json new file mode 100644 index 000000000..1861c13e9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/heat_pipe_casing.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/heat_pipe_casing"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json index 1aa5fc507..8720f2cc3 100644 --- a/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json +++ b/kubejs/assets/tfg/models/block/concrete/polished_titanium_concrete.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "tfg:block/polished_titanium_concrete" + "all": "tfg:block/concrete/polished_titanium_concrete" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json index 8328c13fa..fc3617b55 100644 --- a/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "tfg:block/titanium_concrete" + "all": "tfg:block/concrete/titanium_concrete" } } \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks.json new file mode 100644 index 000000000..50ec657af --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/concrete/titanium_concrete_bricks" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_small.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_small.json new file mode 100644 index 000000000..140a29227 --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/concrete/titanium_concrete_bricks_small" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_square.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_square.json new file mode 100644 index 000000000..ca6c49bce --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_bricks_square.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/concrete/titanium_concrete_bricks_square" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile.json new file mode 100644 index 000000000..1a4a68fde --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/concrete/titanium_concrete_tile" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile_small.json b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile_small.json new file mode 100644 index 000000000..41f55b235 --- /dev/null +++ b/kubejs/assets/tfg/models/block/concrete/titanium_concrete_tile_small.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/concrete/titanium_concrete_tile_small" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png new file mode 100644 index 000000000..1538c493e Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png differ diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png.mcmeta new file mode 100644 index 000000000..5283ef7e8 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/heat_pipe_casing_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png new file mode 100644 index 000000000..57b10e1ba Binary files /dev/null and b/kubejs/assets/tfg/textures/block/casings/heat_pipe_casing_ctm.png differ diff --git a/kubejs/assets/tfg/textures/block/polished_titanium_concrete.png b/kubejs/assets/tfg/textures/block/concrete/polished_titanium_concrete.png similarity index 100% rename from kubejs/assets/tfg/textures/block/polished_titanium_concrete.png rename to kubejs/assets/tfg/textures/block/concrete/polished_titanium_concrete.png diff --git a/kubejs/assets/tfg/textures/block/titanium_concrete.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete.png similarity index 100% rename from kubejs/assets/tfg/textures/block/titanium_concrete.png rename to kubejs/assets/tfg/textures/block/concrete/titanium_concrete.png diff --git a/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks.png new file mode 100644 index 000000000..7949f5cc4 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks.png differ diff --git a/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_small.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_small.png new file mode 100644 index 000000000..314cbe072 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_small.png differ diff --git a/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_square.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_square.png new file mode 100644 index 000000000..f2f4429ca Binary files /dev/null and b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_bricks_square.png differ diff --git a/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile.png new file mode 100644 index 000000000..a9b51911e Binary files /dev/null and b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile.png differ diff --git a/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile_small.png b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile_small.png new file mode 100644 index 000000000..3b8081727 Binary files /dev/null and b/kubejs/assets/tfg/textures/block/concrete/titanium_concrete_tile_small.png differ diff --git a/kubejs/server_scripts/tfg/recipes.miscellaneous.js b/kubejs/server_scripts/tfg/recipes.miscellaneous.js index 54ec33441..5743ba462 100644 --- a/kubejs/server_scripts/tfg/recipes.miscellaneous.js +++ b/kubejs/server_scripts/tfg/recipes.miscellaneous.js @@ -1366,11 +1366,42 @@ function registerTFGMiscellaneousRecipes(event) { .EUt(GTValues.VH[GTValues.LV]) event.recipes.gtceu.assembler('tfg:titanium_concrete') - .itemInputs('2x #forge:rods/titanium') + .itemInputs('2x #forge:rods/titanium', '4x #forge:dusts/kaolinite') .inputFluids(Fluid.of('gtceu:concrete', 144*1.5)) .itemOutputs('tfg:titanium_concrete') .circuit(2) .duration(20) .EUt(GTValues.VH[GTValues.EV]) + + event.recipes.gtceu.laser_engraver('tfg:titanium_concrete_bricks') + .itemInputs('tfg:polished_titanium_concrete') + .notConsumable('#forge:lenses/light_blue') + .itemOutputs('tfg:titanium_concrete_bricks') + .duration(20 * (2.5)) + .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.laser_engraver('tfg:titanium_concrete_bricks_small') + .itemInputs('tfg:polished_titanium_concrete') + .notConsumable('#forge:lenses/pink') + .itemOutputs('tfg:titanium_concrete_bricks_small') + .duration(20 * (2.5)) + .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.laser_engraver('tfg:titanium_concrete_bricks_square') + .itemInputs('tfg:polished_titanium_concrete') + .notConsumable('#forge:lenses/green') + .itemOutputs('tfg:titanium_concrete_bricks_square') + .duration(20 * (2.5)) + .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.laser_engraver('tfg:titanium_concrete_tile') + .itemInputs('tfg:polished_titanium_concrete') + .notConsumable('#forge:lenses/red') + .itemOutputs('tfg:titanium_concrete_tile') + .duration(20 * (2.5)) + .EUt(GTValues.VA[GTValues.LV]) + event.recipes.gtceu.laser_engraver('tfg:titanium_concrete_tile_small') + .itemInputs('tfg:polished_titanium_concrete') + .notConsumable('#forge:lenses/black') + .itemOutputs('tfg:titanium_concrete_tile_small') + .duration(20 * (2.5)) + .EUt(GTValues.VA[GTValues.LV]) } diff --git a/kubejs/server_scripts/tfg/tags.facades.js b/kubejs/server_scripts/tfg/tags.facades.js index 8851fbf77..13c5b8ea6 100644 --- a/kubejs/server_scripts/tfg/tags.facades.js +++ b/kubejs/server_scripts/tfg/tags.facades.js @@ -37,6 +37,7 @@ function registerFacadeWhitelistTags(event) { '#tfg:ad_astra_ostrum_blocks', '#tfg:ad_astra_calorite_blocks', '#tfg:ad_astra_etrium_blocks', + '#tfg:titanium_concrete', //rnr shingles 'rnr:ceramic_roof', diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 89527f2b4..ad5d1eb8d 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -123,6 +123,16 @@ const registerTFGBlocks = (event) => { .tagBlock('minecraft:mineable/pickaxe') .tagBlock('minecraft:mineable/wrench') .mapColor('color_light_gray') + + event.create('tfg:casings/heat_pipe_casing') + .translationKey('block.tfg.casings.heat_pipe_casing') + .model('tfg:block/casings/heat_pipe_casing') + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .tagBlock('minecraft:mineable/wrench') + .mapColor('color_black') //#endregion @@ -132,14 +142,56 @@ const registerTFGBlocks = (event) => { .soundType('stone') .mapColor('stone') .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') event.create('tfg:polished_titanium_concrete') - .translationKey('block.tfg.polidhed_titanium_concrete') + .translationKey('block.tfg.polished_titanium_concrete') .model('tfg:block/concrete/polished_titanium_concrete') .soundType('stone') .mapColor('stone') .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') + + event.create('tfg:titanium_concrete_tile') + .translationKey('block.tfg.titanium_concrete_tile') + .model('tfg:block/concrete/titanium_concrete_tile') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') + + event.create('tfg:titanium_concrete_tile_small') + .translationKey('block.tfg.titanium_concrete_tile_small') + .model('tfg:block/concrete/titanium_concrete_tile_small') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') + + event.create('tfg:titanium_concrete_bricks') + .translationKey('block.tfg.titanium_concrete_bricks') + .model('tfg:block/concrete/titanium_concrete_bricks') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') + + event.create('tfg:titanium_concrete_bricks_small') + .translationKey('block.tfg.titanium_concrete_bricks_small') + .model('tfg:block/concrete/titanium_concrete_bricks_small') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') + + event.create('tfg:titanium_concrete_bricks_square') + .translationKey('block.tfg.titanium_concrete_bricks_square') + .model('tfg:block/concrete/titanium_concrete_bricks_square') + .soundType('stone') + .mapColor('stone') + .tagBlock('minecraft:mineable/pickaxe') + .tagBoth('tfg:titanium_concrete') // #region Decorative vases