diff --git a/CHANGELOG.md b/CHANGELOG.md index e407199b0..891de9ad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,9 @@ - Air Distributors now consume as much gas as they should, instead of significantly more (#1760) @Bumperdo09 - Fixed not being able to put igneous intrusive stones into the ore sack (#1893) @Nashy1232 - Fixed food processor jam recipes not accepting honey (#1896) @Xaligal +- Fixed stainless steel needles being consumed (#1900) @Redeix +- Updated boiler minecart models and textures (#1900) @Redeix +- Fixed flux dupe using filled sea shells (#1903) @Redeix ### Translation updates - Chinese (simplified) @jmecn diff --git a/kubejs/assets/minecraft/models/block/furnace.json b/kubejs/assets/minecraft/models/block/furnace.json new file mode 100644 index 000000000..a9d1b3318 --- /dev/null +++ b/kubejs/assets/minecraft/models/block/furnace.json @@ -0,0 +1,52 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "particle": "gtceu:block/casings/steam/bricked_steel/side", + "side": "gtceu:block/casings/steam/bricked_steel/side", + "top": "gtceu:block/casings/steam/bricked_steel/top", + "bottom": "gtceu:block/casings/steam/bricked_steel/bottom", + "overlay": "gtceu:block/generators/boiler/coal/overlay_front", + "vent": "gtceu:block/overlay/machine/overlay_steam_vent" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + } + }, + { + "name": "overlay", + "from": [0, 0, -0.01], + "to": [16, 16, -0.01], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16.1]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} + } + }, + { + "from": [0, 16.01, 0], + "to": [16, 16.01, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#vent"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#vent"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/models/block/furnace_on.json b/kubejs/assets/minecraft/models/block/furnace_on.json new file mode 100644 index 000000000..ef9f5de0a --- /dev/null +++ b/kubejs/assets/minecraft/models/block/furnace_on.json @@ -0,0 +1,52 @@ +{ + "parent": "minecraft:block/orientable", + "textures": { + "particle": "gtceu:block/casings/steam/bricked_steel/side", + "side": "gtceu:block/casings/steam/bricked_steel/side", + "top": "gtceu:block/casings/steam/bricked_steel/top", + "bottom": "gtceu:block/casings/steam/bricked_steel/bottom", + "overlay": "gtceu:block/generators/boiler/coal/overlay_front_active", + "vent": "gtceu:block/overlay/machine/overlay_steam_vent" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "east": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "west": {"uv": [0, 0, 16, 16], "texture": "#side"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#top"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#bottom"} + } + }, + { + "name": "overlay", + "from": [0, 0, -0.01], + "to": [16, 16, -0.01], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 0, 16.1]}, + "faces": { + "north": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "east": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 16], "texture": "#overlay"}, + "west": {"uv": [0, 0, 0, 16], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} + } + }, + { + "from": [0, 16.01, 0], + "to": [16, 16.01, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 0]}, + "faces": { + "north": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "east": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "south": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "west": {"uv": [0, 0, 16, 0], "texture": "#missing"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#vent"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#vent"} + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/minecraft/textures/item/furnace_minecart.png b/kubejs/assets/minecraft/textures/item/furnace_minecart.png new file mode 100644 index 000000000..0aa3b7ac4 Binary files /dev/null and b/kubejs/assets/minecraft/textures/item/furnace_minecart.png differ diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 224793837..45821afd7 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1712,32 +1712,26 @@ const registerCreateRecipes = (event) => { }).id('tfg:create/shaped/cardboard_from_glue') event.recipes.gtceu.assembler('tfg:create/cardboard_from_glue') - .itemInputs('5x minecraft:paper') - .inputFluids(Fluid.of('gtceu:glue', 100)) + .itemInputs('4x minecraft:paper') + .inputFluids(Fluid.of('gtceu:glue', 50)) .circuit(5) .itemOutputs('2x create:cardboard') .duration(200) .EUt(7) - event.shaped('create:packager', [ + event.shaped('2x create:packager', [ 'AAA', 'BCD', 'EFE' ], { A: '#forge:rods/wrought_iron', B: '#forge:springs/wrought_iron', - C: 'gtceu:ulv_machine_hull', + C: 'gtceu:ulv_machine_casing', D: 'create:bound_cardboard_block', E: 'create:electron_tube', F: '#tfg:metal_bars' }).id('tfg:create/shaped/packager') - event.recipes.gtceu.assembler('tfg:create/packager') - .itemInputs('gtceu:ulv_machine_hull', '4x #forge:rods/wrought_iron', '#forge:springs/wrought_iron', '4x create:cardboard', '#forge:string', '#gtceu:circuits/ulv') - .itemOutputs('create:packager') - .duration(200) - .EUt(20) - event.shaped('create:item_hatch', [ 'A', 'B', diff --git a/kubejs/server_scripts/create_factory_logistics/recipes.js b/kubejs/server_scripts/create_factory_logistics/recipes.js index 073a15a97..029c91d54 100644 --- a/kubejs/server_scripts/create_factory_logistics/recipes.js +++ b/kubejs/server_scripts/create_factory_logistics/recipes.js @@ -21,25 +21,20 @@ function registerCreateFactoryLogisticsRecipes(event) { .EUt(20) - event.shaped('create_factory_logistics:jar_packager', [ + event.shaped('2x create_factory_logistics:jar_packager', [ 'AAA', 'BCD', 'EFE' ], { A: '#forge:rods/copper', B: '#forge:springs/copper', - C: 'gtceu:ulv_machine_hull', + C: 'gtceu:ulv_machine_casing', D: 'create:fluid_tank', E: 'create:electron_tube', F: '#tfg:metal_bars' }).id('create_factory_logistics:shaped/jar_packager') - event.recipes.gtceu.assembler('create_factory_logistics:jar_packager') - .itemInputs('gtceu:ulv_machine_hull', '4x #forge:rods/copper', '#forge:springs/copper', 'create:fluid_tank', '#gtceu:circuits/ulv') - .itemOutputs('create_factory_logistics:jar_packager') - .duration(200) - .EUt(20) - + event.shapeless('create_factory_logistics:factory_fluid_gauge', ['create_factory_logistics:factory_fluid_gauge']) .id('create_factory_logistics:shapeless/factory_fluid_gauge_clear') diff --git a/kubejs/server_scripts/firmalife/tags.js b/kubejs/server_scripts/firmalife/tags.js index 36da0e53d..b881ac228 100644 --- a/kubejs/server_scripts/firmalife/tags.js +++ b/kubejs/server_scripts/firmalife/tags.js @@ -18,8 +18,6 @@ const registerFirmaLifeItemTags = (event) => { event.add('tfc:foods/usable_in_salad', 'firmalife:food/pickled_egg') - event.add('tfc:fluxstone', 'firmalife:hollow_shell') - // Удаление тегов у руд event.removeAllTagsFrom("/tfc:ore/[^*]+/[^*]+/") } diff --git a/kubejs/server_scripts/tfg/recipes.bioreactor.js b/kubejs/server_scripts/tfg/recipes.bioreactor.js index e62367aa7..03aabcbea 100644 --- a/kubejs/server_scripts/tfg/recipes.bioreactor.js +++ b/kubejs/server_scripts/tfg/recipes.bioreactor.js @@ -194,7 +194,7 @@ function registerTFGBioreactorRecipes(event) { event.recipes.gtceu.wiremill('tfg:stainless_steel_needle') .itemInputs(ChemicalHelper.get(TagPrefix.pipeNormalFluid, GTMaterials.StainlessSteel, 1)) - .itemOutputs('tfg:stainless_steel_needle') + .itemOutputs(Item.of('tfg:stainless_steel_needle').withNBT({Unbreakable: 1})) .duration(2*60*20) .circuit(4) .EUt(GTValues.VA[GTValues.MV]) @@ -204,7 +204,7 @@ function registerTFGBioreactorRecipes(event) { ChemicalHelper.get(TagPrefix.ring, GTMaterials.StyreneButadieneRubber, 2), ChemicalHelper.get(TagPrefix.pipeNormalFluid, GTMaterials.Polytetrafluoroethylene, 1), ChemicalHelper.get(TagPrefix.rod, GTMaterials.Polytetrafluoroethylene, 1), - 'tfg:stainless_steel_needle' + Item.of('tfg:stainless_steel_needle').weakNBT() ) .inputFluids(Fluid.of('gtceu:polytetrafluoroethylene', 288)) .itemOutputs('tfg:empty_dna_syringe') diff --git a/kubejs/startup_scripts/tfg/items.js b/kubejs/startup_scripts/tfg/items.js index b46650010..cd63faab2 100644 --- a/kubejs/startup_scripts/tfg/items.js +++ b/kubejs/startup_scripts/tfg/items.js @@ -257,6 +257,7 @@ const registerTFGItems = (event) => { event.create('tfg:stainless_steel_needle') .translationKey('item.tfg.stainless_steel_needle') .unstackable() + .maxDamage(9999) //Fishing Nets event.create('tfg:fishing_net/wood')