From e06ca510810a1c58a92cb97a085b259d808ecb31 Mon Sep 17 00:00:00 2001 From: GameStar <56610486+BlueBoat29@users.noreply.github.com> Date: Sun, 14 Dec 2025 16:03:41 -0600 Subject: [PATCH] New Active Transformer (#2424) * textures and stuff * recipes * looks a little better * got texture thing to be * probably good enough * cooling tower touchup --- .../block/machine/active_transformer.json | 82 +++++++++++++++++ .../blockstates/active_power_transformer.json | 19 ++++ .../machine_casing_power_casing.json | 7 ++ .../casings/machine_casing_power_casing.json | 1 + .../machines/active_power_transformer.json | 86 ++++++++++++++++++ .../models/item/active_power_transformer.json | 3 + .../item/machine_casing_power_casing.json | 3 + .../casings/machine_casing_power_casing.png | Bin 0 -> 526 bytes .../machine_casing_power_casing.png.mcmeta | 5 + .../machine_casing_power_casing_ctm.png | Bin 0 -> 1200 bytes .../machine_casing_power_casing_ctm_n.png | Bin 0 -> 347 bytes .../machine_casing_power_casing_ctm_s.png | Bin 0 -> 217 bytes .../casings/machine_casing_power_casing_n.png | Bin 0 -> 235 bytes .../casings/machine_casing_power_casing_s.png | Bin 0 -> 144 bytes .../tfg/machines/recipes.casings.js | 9 +- .../tfg/machines/recipes.multiblocks.js | 11 +++ kubejs/server_scripts/tfg/tags.js | 1 + .../tfg/mars/materials.mars.js | 1 + kubejs/startup_scripts/tfg/materials.js | 4 +- .../tfg/nuclear/blocks.nuclear.js | 4 +- 20 files changed, 232 insertions(+), 4 deletions(-) create mode 100644 kubejs/assets/gtceu/models/block/machine/active_transformer.json create mode 100644 kubejs/assets/tfg/blockstates/active_power_transformer.json create mode 100644 kubejs/assets/tfg/blockstates/machine_casing_power_casing.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json create mode 100644 kubejs/assets/tfg/models/block/machines/active_power_transformer.json create mode 100644 kubejs/assets/tfg/models/item/active_power_transformer.json create mode 100644 kubejs/assets/tfg/models/item/machine_casing_power_casing.json create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png diff --git a/kubejs/assets/gtceu/models/block/machine/active_transformer.json b/kubejs/assets/gtceu/models/block/machine/active_transformer.json new file mode 100644 index 000000000..852f3edb9 --- /dev/null +++ b/kubejs/assets/gtceu/models/block/machine/active_transformer.json @@ -0,0 +1,82 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtceu:active_transformer", + "texture_overrides": { + "all": "tfg:item/deprecated" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:item/deprecated", + "overlay_front": "tfg:item/deprecated_active" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/active_power_transformer.json b/kubejs/assets/tfg/blockstates/active_power_transformer.json new file mode 100644 index 000000000..9a0e2d7bb --- /dev/null +++ b/kubejs/assets/tfg/blockstates/active_power_transformer.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "tfg:block/machines/active_power_transformer", + "y": 90 + }, + "facing=north": { + "model": "tfg:block/machines/active_power_transformer" + }, + "facing=south": { + "model": "tfg:block/machines/active_power_transformer", + "y": 180 + }, + "facing=west": { + "model": "tfg:block/machines/active_power_transformer", + "y": 270 + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json new file mode 100644 index 000000000..4d1dfb56f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/machine_casing_power_casing.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/casings/machine_casing_power_casing" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json new file mode 100644 index 000000000..18d68ef40 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_power_casing.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_power_casing"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/machines/active_power_transformer.json b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json new file mode 100644 index 000000000..c2960ee1c --- /dev/null +++ b/kubejs/assets/tfg/models/block/machines/active_power_transformer.json @@ -0,0 +1,86 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "tfg:active_power_transformer", + "texture_overrides": { + "all": "tfg:block/casings/machine_casing_power_casing" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "tfg:block/casings/machine_casing_power_casing", + "overlay_front": "gtceu:block/multiblock/power_substation/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/power_substation/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/active_power_transformer.json b/kubejs/assets/tfg/models/item/active_power_transformer.json new file mode 100644 index 000000000..b3073fdff --- /dev/null +++ b/kubejs/assets/tfg/models/item/active_power_transformer.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/machines/active_power_transformer" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/machine_casing_power_casing.json b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json new file mode 100644 index 000000000..a77205b25 --- /dev/null +++ b/kubejs/assets/tfg/models/item/machine_casing_power_casing.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/casings/machine_casing_power_casing" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing.png new file mode 100644 index 0000000000000000000000000000000000000000..651e8d468f8c7febc01070b1fc21587d556692c7 GIT binary patch literal 526 zcmV+p0`dKcP)kDx{ReajbdO`@YEF%a4IvxAy0HCTW z9LLe819+aNMXIMb3RV6HIru~^V*wQw9q^KDfCTKw+g4R`A`hy9-0 z@ipStPX@iWOo8Qc`HXLy_7v{cYh71z$F?l_{Ov2&lgNa%TCJKmj`4jT&+~}mn0=?M z2_FVSzKb8!b5pCDy%cs>pTq}yA z#%%b$PjmT-m#$0x_{i08#Qj6gwk)ykA4t_`+gsQx~^%vF59x?{%KMs zUq7N6i`pa%L&m+n7K|=m1II|4d?_VXuh(n3-7atn$zU)*2*G4B0noOUSmh`ha6iL@=ZByp7-@V5jzuj%2=i%<$@BY5;obPx3O&NUrD4WeX>~^6` zJdsdUbt{u;^mu-*uhT2m?N)0dm4b5B*EKyo?Q}Z3ySpbRC*Oy@R@c@tKJxv0Oa1YV zj*gX;mF4B-o}L~PosP{o3s2}+A!G6@bl4C%aX1{LRN8DZ9rR{KbTWgd!G=L- z-JZKHTuP=lisIP=6Kx|i|2dk)2=hQ`*`PPtAL z9ubenNoj8I8a~PQ({4aVla0>yc1u|~2NrVfY^%JP)@dh6`JqEH{?tjg!2=V!4}Opa zpXR?Y8jE<1EdL-~W`-p=_eI9z)qpW0!|<~fi?NSe+uKmGTiHw|gReXKEA-!q#Npia znGJPSr4tBmxSwXAF&7Y7fUdCF6h(2?)!`MqB~z)o+9Nh8QxVBfD1_}5m3GEgT5Tek zmN90~BJ>pA^UG?5FF+GHv_eE9$J|}DLdwEWIP7vAXMB7;)^xO zlFd?%uZ&ksDtkbRS>DOV8PZV}Lmi+ORS99h=hXrIa0`MHFp1PgMq*KBzm&*$QCJ7) z??MWTESEZcMg3Y`T?IwR6DZv5(wkaajmKhGOsCT@0|o2K@bEAp?4@au{i1EbU=Yvw z`T6U2Zkfu;Q0=I=a5RcU|MKnwA=}#8v>RYH@hP0V20_HwJe2YA@uj7u&CSiry*Cg8 zS4|Cf8i=d)boAqA*aoJ*zu#P6zgu`kSt{g*oWSWqA7^l1hE>(n{7EKvNlT|)E|(bt zmfoS1Vo8o0C|X!pxODRxosRiI&4#6;^&FDb-PZbg>}4PjPo#NV4c^DmV8-q^jMGtHXz3h-7QGix!6F`jDf|CdA#y$OK==dCgTK0s z{o|F>r;OTU61ic> zO@ak&0MiCnY3cGI*{k$cLGu73mQ12g2)(cDwTeA+AwT$Qj_1I@05+o&{1V%Sd4ML`*Vh+~Mi&`a#c literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_n.png new file mode 100644 index 0000000000000000000000000000000000000000..f618836e2bc8bed89a2c1f292cd90b443e60cfce GIT binary patch literal 347 zcmV-h0i^zkP){PE(LtIPErtmxm4XQ{fDAwYq-IPP>lna8 z?F`^H6MO}>fGuDP*aEhIEno|X;5mW<)DQh9z6``qoeiSTJ3pI|D^B9ZlmW>=JQ*fH zsgj8*BHs?FCVBv@HsLytNb>?h2L8K|(ymJjj=)Hb_ucLdLI6qa2Spu%Z%Rd88%hHy z$zRsSID%6EyRNuLbIm01RJns@PgBVx8-_CDK4l5NHSjUh(pNDL>3%@-3!ucDEji<-*IWy t5Y>!KAAzO+Ae^6-tE385A!ZL5_yv%9UqH$Yj4J>D002ovPDHLkV1nCYi17db literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_ctm_s.png new file mode 100644 index 0000000000000000000000000000000000000000..caa8b7323301bcc22215b40d6dda9932b6515070 GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ1)eUBArY-_r*GtIP~dTie%$nb z4fDUvJr){H0#lasTHNt53IWG1$^Bh=qv~d( zO2)$*-zopr09HL#@Bjb+ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_n.png new file mode 100644 index 0000000000000000000000000000000000000000..17163a5b1a19d29c918948961743c063a2c84158 GIT binary patch literal 235 zcmV3`IXm0XASQNoU*HN@}qI4|{du0d@=!U>yG`!2fT;k`4PqRnSWSP|7uNUVEMx zl5^5%=DDonbGZN!R6VNzhRCPV? l;8(@+FTb3#8_H14JRg?>J<;6muTcO1002ovPDHLkV1lA7UeEvl literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_power_casing_s.png new file mode 100644 index 0000000000000000000000000000000000000000..a9472dbe1351bc2e3d8fb6461b6c02d9dfab7d61 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`;hrvzAr`%NCvW6B;K1QLf9dJJ zCG7P!u~sqs%&hIrY(|n!JrWHDC(?^rgAY7(zrW$Wf`*mH<*wIG#=#zo(_XD*y%P7Z rq);}j)|&Cny9Kq!E+v@$`l){>>4jsgfAIz_pcM?Bu6{1-oD!M { event.add('forge:mineable/wrench', 'tfg:electromagnetic_accelerator') event.add('forge:mineable/wrench', 'tfg:reflector') event.add('forge:mineable/wrench', 'tfg:machine_casing_aluminium_plated_steel') + event.add('forge:mineable/wrench', 'tfg:machine_casing_power_casing') event.add('minecraft:mineable/pickaxe', 'tfg:mars_ice') event.add('minecraft:mineable/pickaxe', 'tfg:dry_ice') diff --git a/kubejs/startup_scripts/tfg/mars/materials.mars.js b/kubejs/startup_scripts/tfg/mars/materials.mars.js index e03e5dc76..58eeab18a 100644 --- a/kubejs/startup_scripts/tfg/mars/materials.mars.js +++ b/kubejs/startup_scripts/tfg/mars/materials.mars.js @@ -96,6 +96,7 @@ function registerTFGMarsMaterials(event) { event.create("ostrum_iodide") .ingot() + .liquid() .components('2x ostrum', 'iodine') .blastTemp(3700, 'mid', GTValues.VA[GTValues.IV], (20*120)) .iconSet(GTMaterialIconSet.BRIGHT) diff --git a/kubejs/startup_scripts/tfg/materials.js b/kubejs/startup_scripts/tfg/materials.js index 107407e83..47c0f10df 100644 --- a/kubejs/startup_scripts/tfg/materials.js +++ b/kubejs/startup_scripts/tfg/materials.js @@ -113,7 +113,9 @@ const registerTFGMaterials = (event) => { GTMaterialFlags.GENERATE_ROD, GTMaterialFlags.GENERATE_BOLT_SCREW, GTMaterialFlags.EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, - GTMaterialFlags.GENERATE_GEAR + GTMaterialFlags.GENERATE_GEAR, + GTMaterialFlags.GENERATE_FOIL, + GTMaterialFlags.GENERATE_FINE_WIRE ) .fluidPipeProperties(4250, 1700, true, false, false, false) diff --git a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js index fdb862127..ca75d5ef3 100644 --- a/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js +++ b/kubejs/startup_scripts/tfg/nuclear/blocks.nuclear.js @@ -51,10 +51,10 @@ function registerTFGNuclearBlocks(event) { .tagBlock('gtceu:mineable/pickaxe_or_wrench') .mapColor('color_black') .speedFactor(1.1) - .activeOffset(3.5, 2, 3.5) + .activeOffset(2, 2, 2) .activeVelocity(0.0, 0.0, 0.0) .activeParticle('tfg:cooling_steam') - .activeBase(0.0, 12.5, 0.0) + .activeBase(0.0, 13.5, 0.0) .activeCount(2) .activeForced(false) .hasTicker(true)