illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More things (#1468)

Browse source 
* - Yeast recipe conflict fix

* - Fixed seed oil voiding in barrels. And item weight inconsistency.

* - Reduced loading screen logo size by 4MB

* - Update Changelog

* - Compressed loading screen images to maybe help with ram

* - Added default gui scale to make the main menu look better on first launch

* - Update Changelog

* - Added utility script for adding circuits to existing recipes

* fixed changelog conflict

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>

* - Added harvest baskets

* - Fixed baked potato recipe mixing from oven

* - Allowed elytras to be repaired regardless of damage

* - Fixed sea water barrel recipe

* - Gave plants tags to bushes so they can have other uses

* - Pushed stubborn models

* - updated Changelog

* - Changelog typo

* - Integrated Ad Astra wood

* - Updated changelog

* - Treated chipboard composite barrel lang

* - Some Tacz fixes

* - Jar dupe fix

* - tacz data

* - updated changelog

* - we hate git

* - Loading screen and main menu optimizations

* - image push

* - I think I got the title screen looking good on all resolutions

* - Updated Changelog

* - Added scale fix to loading screen too

* - Fix pixel alignment

* - Recipes, tags, assets+ for railgun

* - Brick interaction events and new function for interacting with blocks

* - Added parameter boolean to decide if blockstate should be copied

* - Change for block interaction event constant that may fix linux crash

* - Moved global array to the events file and some linter fixes.

* - Updated Changelog

* - Some more model fixes and remove gtceu metal armor

* - always a stubborn file

* - Large Solar Panel Change

---------

Signed-off-by: Redeix <59435925+Redeix@users.noreply.github.com>
Signed-off-by: Pyritie <pyritie@gmail.com>
Co-authored-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Redeix 2025-07-28 00:03:48 -05:00 • committed by GitHub
parent f3dfa471ec
commit f61a6615dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 184 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
kubejs/assets/gtceu/blockstates/bismuth_bronze_crate.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "gtceu:block/machine/bismuth_bronze_crate"
}
}
}

7
kubejs/assets/gtceu/blockstates/bismuth_bronze_drum.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "gtceu:block/machine/bismuth_bronze_drum"
}
}
}

7
kubejs/assets/gtceu/blockstates/black_bronze_crate.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "gtceu:block/machine/black_bronze_crate"
}
}
}

7
kubejs/assets/gtceu/blockstates/black_bronze_drum.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "gtceu:block/machine/black_bronze_drum"
}
}
}

13
kubejs/assets/gtceu/models/block/machine/bismuth_bronze_crate.json Normal file
View file

@ -0,0 +1,13 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:bismuth_bronze_crate",
"variants": {
"taped=false": {
"model": "gtceu:block/machine/template/crate/metal_crate"
},
"taped=true": {
"model": "gtceu:block/machine/template/crate/metal_crate_taped"
}
}
}

10
kubejs/assets/gtceu/models/block/machine/bismuth_bronze_drum.json Normal file
View file

@ -0,0 +1,10 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:bismuth_bronze_drum",
"variants": {
"": {
"model": "gtceu:block/machine/template/drum/metal_drum"
}
}
}

13
kubejs/assets/gtceu/models/block/machine/black_bronze_crate.json Normal file
View file

@ -0,0 +1,13 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:black_bronze_crate",
"variants": {
"taped=false": {
"model": "gtceu:block/machine/template/crate/metal_crate"
},
"taped=true": {
"model": "gtceu:block/machine/template/crate/metal_crate_taped"
}
}
}

10
kubejs/assets/gtceu/models/block/machine/black_bronze_drum.json Normal file
View file

@ -0,0 +1,10 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtceu:black_bronze_drum",
"variants": {
"": {
"model": "gtceu:block/machine/template/drum/metal_drum"
}
}
}

3
kubejs/assets/gtceu/models/item/bismuth_bronze_crate.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/bismuth_bronze_crate"
}

3
kubejs/assets/gtceu/models/item/bismuth_bronze_drum.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/bismuth_bronze_drum"
}

3
kubejs/assets/gtceu/models/item/black_bronze_crate.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/black_bronze_crate"
}

3
kubejs/assets/gtceu/models/item/black_bronze_drum.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "gtceu:block/machine/black_bronze_drum"
}

BIN
kubejs/assets/tfg/textures/block/machines/food_oven/overlay_side_active_emissive.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 149 B

19
kubejs/server_scripts/gregtech/recipes.removes.js
View file

@ -723,6 +723,25 @@ function removeGTCEURecipes(event) {
})
event.remove({ output: 'gtceu:damascus_steel_crowbar'})
//removes metal armor
const armor = [
'gtceu:bronze_helmet',
'gtceu:bronze_chestplate',
'gtceu:bronze_leggings',
'gtceu:bronze_boots',
'gtceu:steel_helmet',
'gtceu:steel_chestplate',
'gtceu:steel_leggings',
'gtceu:steel_boots',
'gtceu:titanium_helmet',
'gtceu:titanium_chestplate',
'gtceu:titanium_leggings',
'gtceu:titanium_boots'
];
armor.forEach(armor => {
event.remove({ output: armor})
});
}
function removeMaceratorRecipe(event, id) {

14
kubejs/startup_scripts/gtceu/constants.js
View file

@ -143,6 +143,20 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:lv_damascus_steel_screwdriver',
'gtceu:damascus_steel_bucket',
//armor
'gtceu:bronze_helmet',
'gtceu:bronze_chestplate',
'gtceu:bronze_leggings',
'gtceu:bronze_boots',
'gtceu:steel_helmet',
'gtceu:steel_chestplate',
'gtceu:steel_leggings',
'gtceu:steel_boots',
'gtceu:titanium_helmet',
'gtceu:titanium_chestplate',
'gtceu:titanium_leggings',
'gtceu:titanium_boots',
// Huh
'gtceu:wax_dust',
'gtceu:small_wax_dust',

85
kubejs/startup_scripts/gtceu/machines.js
View file

@ -217,28 +217,71 @@ const registerGTCEuMachines = (event) => {
.noRecipeModifier()
.appearanceBlock(() => Block.getBlock('tfg:casings/machine_casing_iron_desh'))
.pattern(definition => FactoryBlockPattern.start()
.aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP')
.aisle(' ', ' ', ' ', 'P P', 'KIIIIIK')
.aisle(' PLP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK')
.aisle(' LPL ', ' L#L ', ' RGR ', 'P RGR P', 'KIIGIIK')
.aisle(' PXP ', ' PLP ', ' RRR ', 'P RRR P', 'KIIIIIK')
.aisle(' ', ' ', ' ', 'P P', 'KIIIIIK')
.aisle('P P', 'P P', 'P P', 'PPPPPPP', 'PKKKKKP')
.where('X', Predicates.controller(Predicates.blocks(definition.get())))
.where('R', Predicates.blocks('gtceu:cleanroom_glass'))
.where('I', Predicates.blocks('tfg:casings/machine_casing_red_solar_panel'))
.where('G', Predicates.blocks('ad_astra:glowing_iron_pillar'))
.where('P', Predicates.blocks('tfg:casings/machine_casing_iron_desh'))
.where('K', Predicates.blocks('ad_astra:iron_plateblock'))
.where('L', Predicates.blocks('tfg:casings/machine_casing_iron_desh')
.or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setMaxGlobalLimited(2).setPreviewCount(1))
.aisle(" B B ", " B B ", " CCCCC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CCCCC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CC CC ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" CCC ", " CC CC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B CC CC B B ", " B C C B ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle("B B B", "B C C B", "C C", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C FFF C B ", " C B B C ", "C B B C", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " EEE ", " GGG ", " GGG ", " GGG ")
.aisle(" C FIF C ", " C I C ", "C I C", " I ", " I ", " I ", " I ", " I ", " I ", " I ", " EIE ", " GIG ", " GKG ", " GGG ")
.aisle(" C FHF C ", " C B B C ", "C B B C", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " EEE ", " GGG ", " GGG ", " GGG ")
.aisle("B B B B", "B C C B", "C C", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B CC CC B B ", " B C C B ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" CCC ", " CC CC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CC CC ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CCCCC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CCCCC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.where("H", Predicates.controller(Predicates.blocks(definition.get())))
.where("B", Predicates.blocks(ChemicalHelper.getBlock(TagPrefix.frameGt, GTMaterials.StainlessSteel)))
.where("C", Predicates.blocks("tfg:casings/machine_casing_red_solar_panel"))
.where("E", Predicates.blocks("ad_astra:iron_plateblock"))
.where("F", Predicates.blocks("tfg:casings/machine_casing_iron_desh")
.or(Predicates.autoAbilities(definition.getRecipeTypes()))
.or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))
.or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1))
.or(Predicates.abilities(PartAbility.EXPORT_FLUIDS).setMaxGlobalLimited(2).setPreviewCount(1))
.or(Predicates.abilities(PartAbility.PARALLEL_HATCH).setMaxGlobalLimited(1))
.or(Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)))
.where('#', Predicates.air())
.where(' ', Predicates.any())
)
.where("G", Predicates.blocks(GTBlocks.CASING_TEMPERED_GLASS.get()))
.where("I", Predicates.blocks("tfg:casings/machine_casing_iron_desh"))
.where("K", Predicates.blocks(ChemicalHelper.getBlock(TagPrefix.block, GTMaterials.Silver)))
.where(" ", Predicates.any())
.build()
)
.shapeInfo(controller => MultiblockShapeInfo.builder()
.aisle(" B B ", " B B ", " CCCCC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CCCCC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CC CC ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" CCC ", " CC CC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B CC CC B B ", " B C C B ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle("B B B", "B C C B", "C C", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C INI C B ", " C B B C ", "C B B C", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " EEE ", " GGG ", " GGG ", " GGG ")
.aisle(" C AIJ C ", " C I C ", "C I C", " I ", " I ", " I ", " I ", " I ", " I ", " I ", " EIE ", " GIG ", " GKG ", " GGG ")
.aisle(" C DHL C ", " C B B C ", "C B B C", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " B B ", " EEE ", " GGG ", " GGG ", " GGG ")
.aisle("B B B B", "B C C B", "C C", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B CC CC B B ", " B C C B ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" CCC ", " CC CC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CC CC ", " C C ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " CCCCC ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CC CC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.aisle(" B B ", " B B ", " CCCCC ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ")
.where("H", controller, Direction.SOUTH)
.where("B", Block.getBlock("gtceu:stainless_steel_frame"))
.where("C", Block.getBlock("tfg:casings/machine_casing_red_solar_panel"))
.where("E", Block.getBlock("ad_astra:iron_plateblock"))
.where("A", GTMachines.ITEM_IMPORT_BUS[GTValues.ULV], Direction.WEST)
.where("D", GTMachines.MAINTENANCE_HATCH, Direction.SOUTH)
.where("J", GTMachines.FLUID_IMPORT_HATCH[GTValues.MV], Direction.EAST)
.where("L", GTMachines.FLUID_EXPORT_HATCH[GTValues.MV], Direction.EAST)
.where("N", GTMachines.ENERGY_OUTPUT_HATCH[GTValues.HV], Direction.NORTH)
.where("G", Block.getBlock("gtceu:tempered_glass"))
.where("I", Block.getBlock("tfg:casings/machine_casing_iron_desh"))
.where("K", Block.getBlock("gtceu:silver_block"))
.build()
)
.workableCasingModel('tfg:block/casings/machine_casing_iron_desh', 'gtceu:block/multiblock/hpca')

1
kubejs/startup_scripts/gtceu/materials.js
View file

@ -211,6 +211,7 @@ const registerGTCEuMaterialModification = (event) => {
GTMaterials.Copper.addFlags(GENERATE_FRAME);
GTMaterials.BlackBronze.addFlags(GENERATE_FRAME);
GTMaterials.BismuthBronze.addFlags(GENERATE_FRAME);
GTMaterials.RhodiumPlatedPalladium.addFlags(GENERATE_FRAME);
GTMaterials.Wood.addFlags(GENERATE_SMALL_GEAR);
GTMaterials.Brass.addFlags(GENERATE_SMALL_GEAR, GENERATE_RING);