diff --git a/config/voidislandcontrolstructures/basement.nbt b/config/voidislandcontrolstructures/basement.nbt index 3d60976..00c03c8 100644 Binary files a/config/voidislandcontrolstructures/basement.nbt and b/config/voidislandcontrolstructures/basement.nbt differ diff --git a/pillar/structures/basement.nbt b/pillar/structures/basement.nbt index 3d60976..00c03c8 100644 Binary files a/pillar/structures/basement.nbt and b/pillar/structures/basement.nbt differ diff --git a/resources/contenttweaker/blockstates/ir_black_pavement.json b/resources/contenttweaker/blockstates/ir_black_pavement.json new file mode 100644 index 0000000..4d5ac3d --- /dev/null +++ b/resources/contenttweaker/blockstates/ir_black_pavement.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "botania:pavement/black_pavement" }, + "inventory": { "model": "botania:pavement/black_pavement" } + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/ir_managlass.json b/resources/contenttweaker/blockstates/ir_managlass.json new file mode 100644 index 0000000..1402331 --- /dev/null +++ b/resources/contenttweaker/blockstates/ir_managlass.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "botania:mana_glass" }, + "inventory": { "model": "botania:mana_glass" } + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/ir_patterned_metal.json b/resources/contenttweaker/blockstates/ir_patterned_metal.json new file mode 100644 index 0000000..3538712 --- /dev/null +++ b/resources/contenttweaker/blockstates/ir_patterned_metal.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "factorytech:metal_diamond" }, + "inventory": { "model": "factorytech:metal_diamond" } + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/ir_smooth_metal.json b/resources/contenttweaker/blockstates/ir_smooth_metal.json new file mode 100644 index 0000000..4dc3579 --- /dev/null +++ b/resources/contenttweaker/blockstates/ir_smooth_metal.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "factorytech:metal_smooth" }, + "inventory": { "model": "factorytech:metal_smooth" } + } +} \ No newline at end of file diff --git a/resources/contenttweaker/blockstates/ir_white_pavement.json b/resources/contenttweaker/blockstates/ir_white_pavement.json new file mode 100644 index 0000000..7e5ea59 --- /dev/null +++ b/resources/contenttweaker/blockstates/ir_white_pavement.json @@ -0,0 +1,6 @@ +{ + "variants": { + "normal": { "model": "botania:pavement/white_pavement" }, + "inventory": { "model": "botania:pavement/white_pavement" } + } +} \ No newline at end of file diff --git a/resources/contenttweaker/lang/en_us.lang b/resources/contenttweaker/lang/en_us.lang index 43a11a0..a848f25 100644 --- a/resources/contenttweaker/lang/en_us.lang +++ b/resources/contenttweaker/lang/en_us.lang @@ -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 @@ -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 @@ -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 @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/scripts/blocks_and_items.zs b/scripts/blocks_and_items.zs index d0736f3..db89462 100644 --- a/scripts/blocks_and_items.zs +++ b/scripts/blocks_and_items.zs @@ -508,3 +508,57 @@ var block100 = VanillaFactory.createBlock("computer_ore", ); return; }; block100.register(); + +// These custom blocks are used for the basement structure +var blockPavement = VanillaFactory.createBlock("ir_white_pavement", ); + 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", ); + 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", ); + 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", ); + 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", ); + 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(); + blockManaGlass.register(); \ No newline at end of file diff --git a/scripts/general_tweaks.zs b/scripts/general_tweaks.zs index 543107e..e3d2033 100644 --- a/scripts/general_tweaks.zs +++ b/scripts/general_tweaks.zs @@ -11,10 +11,9 @@ function setUnbreakable(block as IItemStack){ blockDef.setUnbreakable(); } -setUnbreakable(); -setUnbreakable(); -setUnbreakable(); -setUnbreakable(); +//setUnbreakable(); +//setUnbreakable(); +//setUnbreakable(); //makes gunpowder slighty less grindy recipes.removeByRecipeName("thermalfoundation:gunpowder");