Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified config/voidislandcontrolstructures/basement.nbt
Binary file not shown.
Binary file modified pillar/structures/basement.nbt
Binary file not shown.
6 changes: 6 additions & 0 deletions resources/contenttweaker/blockstates/ir_black_pavement.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "botania:pavement/black_pavement" },
"inventory": { "model": "botania:pavement/black_pavement" }
}
}
6 changes: 6 additions & 0 deletions resources/contenttweaker/blockstates/ir_managlass.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "botania:mana_glass" },
"inventory": { "model": "botania:mana_glass" }
}
}
6 changes: 6 additions & 0 deletions resources/contenttweaker/blockstates/ir_patterned_metal.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "factorytech:metal_diamond" },
"inventory": { "model": "factorytech:metal_diamond" }
}
}
6 changes: 6 additions & 0 deletions resources/contenttweaker/blockstates/ir_smooth_metal.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "factorytech:metal_smooth" },
"inventory": { "model": "factorytech:metal_smooth" }
}
}
6 changes: 6 additions & 0 deletions resources/contenttweaker/blockstates/ir_white_pavement.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"variants": {
"normal": { "model": "botania:pavement/white_pavement" },
"inventory": { "model": "botania:pavement/white_pavement" }
}
}
14 changes: 10 additions & 4 deletions resources/contenttweaker/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ tile.contenttweaker.elemental_stone.name=Elemental Stone
tile.contenttweaker.untamed_plant_matter.name=Untamed Plant Matter
tile.contenttweaker.blue_matter.name=Blue Matter Block
tile.contenttweaker.infected_andesite.name=Infected Andesite
tile.contenttweaker.otherworldy_stone.name=Otherworldy Stone
tile.contenttweaker.otherworldy_stone.name=Otherworldly Stone

tile.contenttweaker.shining_mess.name=Lumium Alloy Gravel

Expand Down Expand Up @@ -154,7 +154,7 @@ fluid.heavywater=Heavy Water
fluid.blood=Sacrificing Blood
fluid.lust=Unlimited Fervor
fluid.greed=Virid Avarity
fluid.pride=Aggorant Hubris
fluid.pride=Arrogant Hubris
fluid.hot_water=Heated Water
fluid.blue_matter_f=Blue Matter
fluid.material_dust=Infused Elemental Concentrate
Expand All @@ -174,7 +174,7 @@ fluid.molten_cobalt=Molten Cobalt
fluid.molten_beryllium=Molten Beryllium
fluid.molten_chrome=Molten Chrome
fluid.molten_iridium=Molten Iridium
fluid.molten_alluminum=Molten Alluminum
fluid.molten_alluminum=Molten Aluminum

fluid.reactor_fuel_1=Elemental Plasma
fluid.reactor_fuel_2=Boiling Plasma
Expand All @@ -186,4 +186,10 @@ item.thermalexpansion.frame.frameCell.name=Terra Machine Frame

requious.jei.recipe.shovel=Crushing With Shovel
requious.jei.recipe.loonium=Loonium Flower Probabilities
requious.jei.recipe.factoryparts=FactoryTech Part Requirements
requious.jei.recipe.factoryparts=FactoryTech Part Requirements

tile.contenttweaker.ir_managlass.name=Otherworldly Glass
tile.contenttweaker.ir_white_pavement.name=Otherworldly White Pavement
tile.contenttweaker.ir_black_pavement.name=Otherworldly Black Pavement
tile.contenttweaker.ir_patterned_metal.name=Otherworldly Patterned Metal
tile.contenttweaker.ir_smooth_metal.name=Otherworldly Smooth Metal
54 changes: 54 additions & 0 deletions scripts/blocks_and_items.zs
Original file line number Diff line number Diff line change
Expand Up @@ -508,3 +508,57 @@ var block100 = VanillaFactory.createBlock("computer_ore", <blockmaterial:rock>);
return;
};
block100.register();

// These custom blocks are used for the basement structure
var blockPavement = VanillaFactory.createBlock("ir_white_pavement", <blockmaterial:rock>);
blockPavement.setBlockHardness(105000);
blockPavement.setBlockResistance(35000000);
blockPavement.setToolClass("pickaxe");
blockPavement.setToolLevel(34);
blockPavement.mobilityFlag = mods.contenttweaker.PushReaction.block();
blockPavement.setWitherProof(true);
blockPavement.register();

var blockBPavement = VanillaFactory.createBlock("ir_black_pavement", <blockmaterial:rock>);
blockBPavement.setBlockHardness(105000);
blockBPavement.setBlockResistance(35000000);
blockBPavement.setToolClass("pickaxe");
blockBPavement.mobilityFlag = mods.contenttweaker.PushReaction.block();
blockBPavement.setToolLevel(34);
blockBPavement.setWitherProof(true);
blockBPavement.register();

var blockPattern = VanillaFactory.createBlock("ir_patterned_metal", <blockmaterial:rock>);
blockPattern.setBlockHardness(105000);
blockPattern.setBlockResistance(35000000);
blockPattern.setToolClass("pickaxe");
blockPattern.mobilityFlag = mods.contenttweaker.PushReaction.block();
blockPattern.setToolLevel(34);
blockPattern.setWitherProof(true);
blockPattern.register();

var blockSmooth = VanillaFactory.createBlock("ir_smooth_metal", <blockmaterial:rock>);
blockSmooth.setBlockHardness(105000);
blockSmooth.setBlockResistance(35000000);
blockSmooth.setToolClass("pickaxe");
blockPattern.mobilityFlag = mods.contenttweaker.PushReaction.block();
blockSmooth.setToolLevel(34);
blockSmooth.setWitherProof(true);
blockSmooth.register();

// ContentTweaker on 1.12 does not support proper side culling behavior for glass
// We can't quite recreate managlass, but by setting this to a full block we can produce a spooky x-ray effect
var blockManaGlass = VanillaFactory.createBlock("ir_managlass", <blockmaterial:glass>);
blockManaGlass.setFullBlock(true);
blockManaGlass.setBlockLayer("TRANSLUCENT");
blockManaGlass.setLightOpacity(0);
blockManaGlass.setLightValue(15);
blockManaGlass.setTranslucent(true);
blockManaGlass.setBlockHardness(105000);
blockManaGlass.setBlockResistance(35000000);
blockManaGlass.setToolClass("pickaxe");
blockManaGlass.setToolLevel(34);
blockManaGlass.mobilityFlag = mods.contenttweaker.PushReaction.block();
blockManaGlass.setWitherProof(true);
blockManaGlass.setBlockSoundType(<soundtype:glass>);
blockManaGlass.register();
7 changes: 3 additions & 4 deletions scripts/general_tweaks.zs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ function setUnbreakable(block as IItemStack){
blockDef.setUnbreakable();
}

setUnbreakable(<botania:pavement>);
setUnbreakable(<factorytech:metal:0>);
setUnbreakable(<factorytech:metal:2>);
setUnbreakable(<botania:managlass>);
//setUnbreakable(<botania:pavement>);
//setUnbreakable(<factorytech:metal>);
//setUnbreakable(<botania:managlass>);

//makes gunpowder slighty less grindy
recipes.removeByRecipeName("thermalfoundation:gunpowder");
Expand Down