some work
This commit is contained in:
Dmitry
parent
79e2b7947e
commit
48acbe2f52
13 changed files with 86 additions and 44 deletions
19
CHANGELOG.md
19
CHANGELOG.md
|
|
@ -7,11 +7,24 @@
|
|||
- EMI has been restored to replace REI, with bindings configured to be similar to REI. Unnecessary categories have been removed, and a new item hiding system has been added. This fixes a crash issue on servers.
|
||||
- Now, when items are disabled, their BlockTags are also removed.
|
||||
- A special Tag has been added to disabled items and liquids, which has facilitated development.
|
||||
- Greg's method has been used to disable headgear made from materials that should not exist (again, as Greg fixed this).
|
||||
- Greg's method has been used to disable tool heads made from materials that should not exist (again, as Greg fixed this).
|
||||
- Fixed bow assmebler recipe (now using all string instead of hardcoded vanilla strings).
|
||||
- Removed assembler lead recipem but added strings + wrought iron ring recipe for lead in workbench.
|
||||
- Fixed wool assembler recipe (Now consuming any strings).
|
||||
- Removed outdated concrete colorizing recipes because gtceu adds own.
|
||||
- Fixed carpet colorizing recipes.
|
||||
- Removed dye + bed = dye bed recipes, because u should use chemical bath or barrel for that.
|
||||
- Disabled coordinates displaying in xaeros map. Of course, I understand that everyone can turn this back on, but the modpack involves navigating the terrain using firmaciv devices, so this solution is temporary.
|
||||
- Disabled entity displaying in xaeros map.
|
||||
- Players are now displayed on the map as dots.
|
||||
- Fixed oil output from tfc dirt -> biomass recipe (what??)
|
||||
- GTCEu bolts now can be used in FirmaCiv boats (Fix for new FirmaCiv ver).
|
||||
# Wip for now (required for update)
|
||||
- Added assembler recipes for a lot of TFC recipes.
|
||||
- Added assembler recipes for a lot of FirmaCiv items.
|
||||
- Vanilla glass bottles has been replaced with TFC bottles.
|
||||
- Recipes for plates, sticks, and others through Create mechanisms have been redistributed once again (an attempt to fix a crash).
|
||||
- The primitive pump from GTCEu has been removed, so at the beginning of the game, you will have to pump water using a pump from Create.
|
||||
- Vanilla strings have been removed from the recipes; we have enough strings, with 150 thousand variations already.
|
||||
- Bolts from FirmaCiv have been reintroduced into the game, with their recipe and name changed to large bolts, and they now also have a recipe in Greg's mod.
|
||||
|
||||
## [0.6.8] - 24.01.2024
|
||||
### Changes
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ displayCurrentClaim:true
|
|||
claimsFillOpacity:46
|
||||
claimsBorderOpacity:80
|
||||
infoDisplayOrder:coords:overworld_coords:chunk_coords:angles:dimension:biome:weather:light_level:time:real_time:highlights:light_overlay_indicator:manual_cave_mode_indicator:custom_sub_world
|
||||
infoDisplay:coords:true:15:-1
|
||||
infoDisplay:coords:false:15:-1
|
||||
infoDisplay:overworld_coords:false:15:-1
|
||||
infoDisplay:chunk_coords:false:15:-1
|
||||
infoDisplay:angles:false:15:-1
|
||||
|
|
@ -129,5 +129,5 @@ interface:dummy:0:36:true:false:false:false
|
|||
interface:dummy:0:10000:true:false:false:false
|
||||
interface:dummy:0:0:false:false:true:false
|
||||
interface:dummy:0:36:true:false:false:false
|
||||
interface:gui.xaero_minimap:84:-12:false:false:true:false
|
||||
interface:gui.xaero_minimap:-32:-57:false:false:false:false
|
||||
#WAYPOINTS HAVE BEEN MOVED TO /XaeroWaypoints
|
||||
|
|
|
|||
|
|
@ -3,6 +3,9 @@
|
|||
{
|
||||
"category": "minecraft:campfire_cooking"
|
||||
},
|
||||
{
|
||||
"category": "minecraft:brewing"
|
||||
},
|
||||
{
|
||||
"category": "emi:anvil_repairing"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
const registerComputerCraftData = (event) => {
|
||||
const TURTLE_TOOL_TYPES = [ GTToolType.SWORD, GTToolType.PICKAXE, GTToolType.AXE, GTToolType.SHOVEL, GTToolType.HOE ]
|
||||
|
||||
GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => {
|
||||
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
|
||||
TURTLE_TOOL_TYPES.forEach(type => {
|
||||
let toolStack = $ToolHelper.get(type, material)
|
||||
|
||||
|
|
|
|||
|
|
@ -907,7 +907,6 @@ const registerCreateRecipes = (event) => {
|
|||
E: 'minecraft:obsidian'
|
||||
}).id('tfg:create/mechanical_crafting/wand_of_symmetry')
|
||||
|
||||
|
||||
// Фильтр список
|
||||
event.shaped('create:filter', [
|
||||
'ABA'
|
||||
|
|
|
|||
|
|
@ -2,19 +2,39 @@
|
|||
|
||||
const registerFirmaCivRecipes = (event) => {
|
||||
|
||||
/*
|
||||
|
||||
event.remove({ id: '/firmaciv:quern/' })
|
||||
event.remove({ id: 'firmaciv:anvil/copper_bolt' })
|
||||
|
||||
|
||||
//#region Heating
|
||||
|
||||
// Oarlock
|
||||
event.recipes.tfc.heating('firmaciv:oarlock', 1535)
|
||||
.resultFluid(Fluid.of('gtceu:iron', 288))
|
||||
.id(`firmaciv:heating/oarlock`)
|
||||
|
||||
// Anchor
|
||||
// Cannon Barrel
|
||||
// Cannonball
|
||||
// Cleat
|
||||
|
||||
//#endregion
|
||||
|
||||
// Sextant
|
||||
// Navigator Timepiece
|
||||
// Barometer
|
||||
// Compass
|
||||
// Acnhor
|
||||
// Cannon Barrel
|
||||
// Cannonball
|
||||
// Oarlock
|
||||
// Cleat
|
||||
|
||||
// Compass
|
||||
event.recipes.gtceu.canner('tfg:firmaciv/compass')
|
||||
.itemInputs('minecraft:redstone', '#forge:plates/wrought_iron')
|
||||
.circuit(1)
|
||||
.itemOutputs('firmaciv:firmaciv_compass')
|
||||
.duration(100)
|
||||
.EUt(4)*/
|
||||
.EUt(4)
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
const registerGTCEULoots = (event) => {
|
||||
|
||||
global.TFC_STONE_TYPES.forEach(stoneType => {
|
||||
GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => {
|
||||
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
|
||||
if (material.hasProperty(PropertyKey.ORE)) {
|
||||
|
||||
let stoneTypeMaterial = GTMaterials.get(stoneType)
|
||||
|
|
|
|||
|
|
@ -1277,7 +1277,7 @@ const registerGTCEURecipes = (event) => {
|
|||
|
||||
//#region Рецепты, которые итерируются по всем материалам
|
||||
|
||||
GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => {
|
||||
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
|
||||
|
||||
//#region Рецепты инструментов
|
||||
|
||||
|
|
|
|||
|
|
@ -2108,23 +2108,6 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Нитки
|
||||
|
||||
event.recipes.tfc.barrel_sealed(6000)
|
||||
.inputs('tfc:wool_yarn', Fluid.of('tfc:tannin', 250))
|
||||
.outputItem('minecraft:string')
|
||||
.id('tfg:barrel/sealed/string')
|
||||
|
||||
|
||||
event.recipes.gtceu.mixer('vanilla_string_from_wool_yarn')
|
||||
.inputFluids(Fluid.of('tfc:tannin', 200))
|
||||
.itemInputs('tfc:wool_yarn')
|
||||
.itemOutputs('minecraft:string')
|
||||
.duration(800)
|
||||
.EUt(2)
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Факел
|
||||
|
||||
//#region В Верстаке
|
||||
|
|
@ -2433,6 +2416,7 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#region Выход: Бетон
|
||||
|
||||
/*
|
||||
global.MINECRAFT_DYE_NAMES.forEach(dye => {
|
||||
|
||||
event.recipes.gtceu.chemical_bath(`${dye}_powder_to_${dye}_concrete`)
|
||||
|
|
@ -2449,12 +2433,20 @@ const registerMinecraftRecipes = (event) => {
|
|||
.itemOutputs(`minecraft:${dye}_concrete`)
|
||||
.duration(300)
|
||||
.EUt(4)
|
||||
})
|
||||
})*/
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Шерсть
|
||||
|
||||
event.recipes.gtceu.assembler('wool_from_string')
|
||||
.itemInputs('4x #forge:string')
|
||||
.circuit(4)
|
||||
.itemOutputs('minecraft:white_wool')
|
||||
.duration(100)
|
||||
.EUt(4)
|
||||
|
||||
/*
|
||||
global.MINECRAFT_DYE_NAMES.forEach(dye => {
|
||||
|
||||
event.remove({ id: `minecraft:dye_${dye}_wool` })
|
||||
|
|
@ -2474,12 +2466,13 @@ const registerMinecraftRecipes = (event) => {
|
|||
.EUt(4)
|
||||
}
|
||||
|
||||
})
|
||||
})*/
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Ковры
|
||||
|
||||
/*
|
||||
global.MINECRAFT_DYE_NAMES.forEach(dye => {
|
||||
|
||||
event.remove({ id: `minecraft:dye_${dye}_carpet` })
|
||||
|
|
@ -2498,7 +2491,7 @@ const registerMinecraftRecipes = (event) => {
|
|||
.duration(300)
|
||||
.EUt(4)
|
||||
}
|
||||
})
|
||||
})*/
|
||||
|
||||
//#endregion
|
||||
|
||||
|
|
@ -2512,7 +2505,7 @@ const registerMinecraftRecipes = (event) => {
|
|||
.EUt(4)
|
||||
|
||||
global.MINECRAFT_DYE_NAMES.forEach(dye => {
|
||||
event.remove({ id: `minecraft:${dye}_bed` })
|
||||
event.remove({ id: `minecraft:dye_${dye}_bed` })
|
||||
|
||||
if (dye != "white")
|
||||
event.recipes.gtceu.chemical_bath(`${dye}_bed`)
|
||||
|
|
@ -2531,6 +2524,16 @@ const registerMinecraftRecipes = (event) => {
|
|||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Лук
|
||||
|
||||
event.recipes.gtceu.assembler('bow')
|
||||
.itemInputs('3x #forge:string', '3x #forge:rods/wooden')
|
||||
.itemOutputs('minecraft:bow')
|
||||
.duration(100)
|
||||
.EUt(4)
|
||||
|
||||
//#endregion
|
||||
|
||||
//#region Выход: Наблюдатель
|
||||
|
||||
event.remove({ id: 'minecraft:observer' })
|
||||
|
|
@ -2594,6 +2597,16 @@ const registerMinecraftRecipes = (event) => {
|
|||
//#region Выход: Веревка
|
||||
|
||||
event.remove({ id: 'minecraft:lead' })
|
||||
event.remove({ id: 'gtceu:assembler/lead' })
|
||||
|
||||
event.shaped('minecraft:lead', [
|
||||
' AA',
|
||||
' BA',
|
||||
'A '
|
||||
], {
|
||||
A: '#forge:string',
|
||||
B: '#forge:rings/wrought_iron'
|
||||
})
|
||||
|
||||
//#endregion
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ const registerTFCHeats = (event) => {
|
|||
if (!tool.isEmpty()) event.itemHeat(tool, heatCapacity, tfcProperty.getForgingTemp(), tfcProperty.getWeldingTemp())
|
||||
}
|
||||
|
||||
GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => {
|
||||
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
|
||||
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
|
||||
|
||||
if (tfcProperty != null) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ const registerTFCRecipes = (event) => {
|
|||
event.remove({ id: /tfc:crafting\/metal\/block\/*_slab/ })
|
||||
event.remove({ id: /tfc:heating\/metal\/*_block_slab/ })
|
||||
|
||||
GTCEuAPI.materialManager.getRegisteredMaterials().forEach(material => {
|
||||
GTMaterialRegistry.getRegisteredMaterials().forEach(material => {
|
||||
|
||||
let tfcProperty = material.getProperty(TFGPropertyKey.TFC_PROPERTY)
|
||||
|
||||
|
|
@ -2109,7 +2109,6 @@ const registerTFCRecipes = (event) => {
|
|||
.chancedOutput('gtceu:plant_ball', 1250, 700)
|
||||
.chancedOutput('tfc:sand/yellow', 5000, 1200)
|
||||
.chancedOutput('gtceu:tiny_clay_dust', 4000, 900)
|
||||
.outputFluids(Fluid.of('gtceu:oil', 2000))
|
||||
.duration(250)
|
||||
.EUt(30)
|
||||
|
||||
|
|
@ -2839,7 +2838,7 @@ const registerTFCRecipes = (event) => {
|
|||
event.smelting('tfc:ceramic/fire_brick', 'gtceu:compressed_fireclay')
|
||||
.id('tfg:smelting/fireclay_brick')
|
||||
|
||||
// Wool yarn
|
||||
// Wool Yarn
|
||||
event.recipes.gtceu.macerator('macerate_wool')
|
||||
.itemInputs('#minecraft:wool')
|
||||
.itemOutputs('tfc:wool_yarn')
|
||||
|
|
|
|||
|
|
@ -5,10 +5,5 @@
|
|||
* у которых должны быть удалены тэги и они должны быть скрыты в REI.
|
||||
*/
|
||||
global.FIRMACIV_DISABLED_ITEMS = [
|
||||
//'firmaciv:copper_bolt',
|
||||
//'firmaciv:kayak_with_paddle_icon_only',
|
||||
//'firmaciv:canoe_icon_only',
|
||||
//'firmaciv:canoe_with_paddle_icon_only',
|
||||
//'firmaciv:rowboat_icon_only',
|
||||
//'firmaciv:wood/canoe_component_block/mangrove'
|
||||
'firmaciv:copper_bolt'
|
||||
];
|
||||
2
mods
2
mods
|
|
@ -1 +1 @@
|
|||
Subproject commit ea34805d32fb717a47af9da4ad452e44135c40ff
|
||||
Subproject commit 114ac764ef6e1d5472d9bb6c40fa4bab6451a6c7
|
||||
Loading…
Add table
Add a link
Reference in a new issue