SwitchyJuice/Modpack-1.12.2
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

merge into: SwitchyJuice:main
Branches Tags
SwitchyJuice:main
SwitchyJuice:feature/better-ore-veins-indicators
...
pull from: SwitchyJuice:feature/better-ore-veins-indicators
Branches Tags
SwitchyJuice:main
SwitchyJuice:feature/better-ore-veins-indicators

6 commits
main ... feature/be

Author SHA1 Message Date
Wroclaw
3f08eebabe oreveins indicators: use api to replace block instead of chat command. 2022-11-19 21:55:52 +01:00
Wroclaw
08e56ccc40 fix typos 2022-11-16 15:27:03 +01:00
Wroclaw
f983810620 Add Chat Tweaks and hide "Block placed" messages 2022-11-13 18:41:15 +01:00
Wroclaw
f1ac960376 Use indicators from contenttweaker script in ore veins 2022-11-13 18:04:42 +01:00
Wroclaw
dfc65320a5 Merge branch 'main' 2022-11-13 17:34:50 +01:00
Wroclaw
2d1a2f14e5 Add ore indicators as items placed on the ground 
Item placing on the ground is added by Draconic Evolution,
I used a janky way to setblock generated indicator to that tile.
That tile needs nbt so I had to set a block using execute as setblock command,
which is bad, because it spams logs and operators chat
 2022-11-13 07:54:48 +01:00
7 changed files with 260 additions and 118 deletions
Show stats Expand all files Collapse all files

51
config/ChatTweaks/views.json Normal file
View file

@ -0,0 +1,51 @@
{
"views": [
{
"name": "*",
"filterPattern": "",
"outputFormat": "$0",
"style": "Chat",
"isExclusive": false,
"isMuted": false,
"channels": [
"main",
"interaction",
"system",
"death"
]
},
{
"name": "ore veins indicators setblock spam",
"filterPattern": "^\\[[a-zA-Z0-9_]{2,16}: Block placed\\]$",
"outputFormat": "",
"style": "Hidden",
"isExclusive": true,
"isMuted": false,
"channels": [
"system"
]
},
{
"name": "system",
"filterPattern": "",
"outputFormat": "$0",
"style": "Side",
"isExclusive": true,
"isMuted": false,
"channels": [
"system"
]
},
{
"name": "interaction",
"filterPattern": "",
"outputFormat": "$0",
"style": "Bottom",
"isExclusive": true,
"isMuted": false,
"channels": [
"interaction"
]
}
]
}

183
config/oreveins/ore_veins.json
View file

@ -5,6 +5,12 @@
"block": "ic2:resource",
"meta": 1
},
"indicator": {
"blocks": "contenttweaker:juice/internal/indicator/copper",
"ignore_vegatation": false,
"ignore_liquids": false,
"rarity": 24
},
"stone": "minecraft:stone",
"rarity": 160,
"min_y": -30,
@ -21,6 +27,12 @@
"block": "forestry:resources",
"meta": 0
},
"indicator": {
"blocks": "contenttweaker:juice/internal/indicator/apatite",
"ignore_vegatation": false,
"ignore_liquids": false,
"rarity": 24
},
"stone": "minecraft:stone",
"rarity": "100",
"min_y": -10,
@ -36,9 +48,9 @@
"ore": "minecraft:gold_ore",
"stone": "minecraft:stone",
"indicator": {
"blocks": "minecraft:gold_ore",
"blocks": "contenttweaker:juice/internal/indicator/gold",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 200,
@ -57,12 +69,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 2
},
"blocks": "contenttweaker:juice/internal/indicator/silver",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 240,
@ -81,12 +90,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 6
},
"blocks": "contenttweaker:juice/internal/indicator/platinium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 300,
@ -105,12 +111,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "mekanism:oreblock",
"meta": 2
},
"blocks": "contenttweaker:juice/internal/indicator/tin",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 180,
@ -130,12 +133,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 4
},
"blocks": "contenttweaker:juice/internal/indicator/aluminium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 190,
@ -154,12 +154,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 5
},
"blocks": "contenttweaker:juice/internal/indicator/nickel",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 210,
@ -178,12 +175,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "minecraft:redstone_ore",
"meta": 0
},
"blocks": "contenttweaker:juice/internal/indicator/redstone",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 170,
@ -201,9 +195,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "mekanism:oreblock",
"blocks": "contenttweaker:juice/internal/indicator/osmium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 190,
@ -222,12 +216,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "nuclearcraft:ore",
"meta": 7
},
"blocks": "contenttweaker:juice/internal/indicator/magnesium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 255,
@ -246,12 +237,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "nuclearcraft:ore",
"meta": 5
},
"blocks": "contenttweaker:juice/internal/indicator/boron",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 280,
@ -270,10 +258,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "nuclearcraft:ore",
"meta": 6,
"blocks": "contenttweaker:juice/internal/indicator/lithium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 255,
@ -292,12 +279,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "nuclearcraft:ore",
"meta": 4
},
"blocks": "contenttweaker:juice/internal/indicator/uranium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 260,
@ -315,9 +299,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "minecraft:coal_ore",
"blocks": "contenttweaker:juice/internal/indicator/coal",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 90,
@ -336,9 +320,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "minecraft:iron_ore",
"blocks": "contenttweaker:juice/internal/indicator/iron",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 160,
@ -356,9 +340,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "minecraft:diamond_ore",
"blocks": "contenttweaker:juice/internal/indicator/diamond",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 300,
@ -376,9 +360,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": "minecraft:lapis_ore",
"blocks": "contenttweaker:juice/internal/indicator/lapis",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 150,
@ -397,12 +381,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "galacticraftcore:basic_block_core",
"meta": 8
},
"blocks": "contenttweaker:juice/internal/indicator/silicon",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 210,
@ -420,12 +401,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 3
},
"blocks": "contenttweaker:juice/internal/indicator/lead",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 185,
@ -443,12 +421,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "thermalfoundation:ore",
"meta": 7
},
"blocks": "contenttweaker:juice/internal/indicator/iridium",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 360,
@ -459,7 +434,7 @@
"horizontal_size": 4
},
"blackquartz_ore": {
"black_quartz_ore": {
"type": "cluster",
"ore": {
"block": "actuallyadditions:block_misc",
@ -467,12 +442,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "actuallyadditions:block_misc",
"meta": 3
},
"blocks": "contenttweaker:juice/internal/indicator/black_quartz",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 265,
@ -491,12 +463,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 1
},
"blocks": "contenttweaker:juice/internal/indicator/ruby",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 310,
@ -514,12 +483,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 7
},
"blocks": "contenttweaker:juice/internal/indicator/amber",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 275,
@ -537,12 +503,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 6
},
"blocks": "contenttweaker:juice/internal/indicator/sapphire",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 310,
@ -560,12 +523,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 2
},
"blocks": "contenttweaker:juice/internal/indicator/peridot",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 300,
@ -583,12 +543,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 5
},
"blocks": "contenttweaker:juice/internal/indicator/malachite",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 270,
@ -606,12 +563,9 @@
},
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 3
},
"blocks": "contenttweaker:juice/internal/indicator/tanzite",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 295,
@ -635,12 +589,9 @@
],
"stone": "minecraft:stone",
"indicator": {
"blocks": {
"block": "biomesoplenty:gem_ore",
"meta": 3
},
"blocks": "contenttweaker:juice/internal/indicator/certus_quartz",
"ignore_vegatation": false,
"ignore_liquids": true,
"ignore_liquids": false,
"rarity": 24
},
"rarity": 330,

19
index.toml generated
View file

@ -8,6 +8,10 @@ hash = "cd20deace73b9632c228f75f3740fb7fcd03acabc44e91b25c56e98de19f23de"
file = "config/AsmodeusCore/core.conf"
hash = "c01c2587ea013f8aac6d534041d631d99ad7d05ae1583fbd139be4ff57bfea56"
[[files]]
file = "config/ChatTweaks/views.json"
hash = "e732ee836fca9e69a06c1793860d06f2ddff619d01c4972bc3409e3388f7c7da"
[[files]]
file = "config/ExtraPlanets.cfg"
hash = "3ab88bac6026c888eed64172d6d964dd6adff421fab8e55b40b2e75aefc39bcf"
@ -1146,7 +1150,7 @@ hash = "5046cde3673ccd62ba2209aaab9a917b3e1b0da7f521477e89f68bdba1648187"
[[files]]
file = "config/oreveins/ore_veins.json"
hash = "a8c9789bff4ded56851059a429814250a48b7636e74fe740365e61f57a710590"
hash = "1863ec33cc86c4c6d8adde5500a5fc6c959948177d9b85c9153c95821f75b4e6"
[[files]]
file = "config/sereneseasons/biome_info.json"
@ -1353,6 +1357,11 @@ file = "mods/chameleon.pw.toml"
hash = "305815006195c0647af38ea5d8c03cd6c652c77bf975e3e967b754bc3b9ac569"
metafile = true
[[files]]
file = "mods/chat-tweaks.pw.toml"
hash = "36b4d3a36e0556b9c5b9fd329c9d5737af36e41dbc22f4adfa1fbd475017107e"
metafile = true
[[files]]
file = "mods/chicken-chunks-1-8.pw.toml"
hash = "8c1cd98cbd76ccba330c24575c02edd0ede38a08330a843f9874efee8a1738dd"
@ -2393,3 +2402,11 @@ hash = "b4aea7892748ecfa5cf775fb0a18f0909795c0b025666ecaea88bb3a923b4194"
[[files]]
file = "scripts/nc_script_addons/MoarRealisticRadiation/rad_qmd.zs"
hash = "a07879875ad20ae8e285c3cb39beeee648bd080ec12985b76583ad707a3de3ee"
[[files]]
file = "scripts/ore_veins/indicators.1.zs"
hash = "36e4b9ee448ad7503f5df16b788e95a0f69bb24a55041c33a87b45c347e57d7f"
[[files]]
file = "scripts/ore_veins/indicators.2.zs"
hash = "08d456f730c1a797aab31811ba5a24e319ce35d000c4af80348a964a6c471898"

13
mods/chat-tweaks.pw.toml Normal file
View file

@ -0,0 +1,13 @@
name = "Chat Tweaks"
filename = "ChatTweaks_1.12.2-5.1.25.jar"
side = "both"
[download]
hash-format = "sha1"
hash = "79f0d53ac10f149e48e45fae09de3798fe9c8478"
mode = "metadata:curseforge"
[update]
[update.curseforge]
file-id = 2990969
project-id = 243506

2
pack.toml
View file

@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "b5060bd22fa052dba2eb881c4b2208fe5b2e671841901887f489a672a69ad743"
hash = "42ca8e723c1e0761d17e371bcd988f0fe299aa09f3c914f0c1183e7c85099d96"
[versions]
forge = "14.23.5.2860"

105
scripts/ore_veins/indicators.1.zs Normal file
View file

@ -0,0 +1,105 @@
#loader contenttweaker
import crafttweaker.block.IBlock;
import crafttweaker.block.IBlockState;
import crafttweaker.data.IData;
import crafttweaker.world.IBlockPos;
import crafttweaker.world.IWorld;
import mods.contenttweaker.Block;
import mods.contenttweaker.BlockPos;
import mods.contenttweaker.DropHandler;
import mods.contenttweaker.ResourceLocation;
import mods.contenttweaker.VanillaFactory;
import mods.contenttweaker.World;
var nugget_table as string[][] = [
# [name, id, meta]
["copper", "ic2:resource", "1"],
["apatite", "forestry:resources", "0"],
["gold", "minecraft:gold_ore", "0"],
["silver", "thermalfoundation:ore", "2"],
["platinium", "thermalfoundation:ore", "6"],
["tin", "mekanism:oreblock", "2"],
["aluminium", "thermalfoundation:ore", "4"],
["nickel", "thermalfoundation:ore", "5"],
["redstone", "minecraft:redstone_ore", "0"],
["osmium", "mekanism:oreblock", "0"],
["magnesium", "nuclearcraft:ore", "7"],
["boron", "nuclearcraft:ore", "5"],
["lithium", "nuclearcraft:ore", "6"],
["uranium", "nuclearcraft:ore", "4"],
["coal", "minecraft:coal_ore", "0"],
["iron", "minecraft:iron_ore", "0"],
["diamond", "minecraft:diamond_ore", "0"],
["lapis", "minecraft:lapis_ore", "0"],
["silicon", "galacticraftcore:basic_block_core", "8"],
["lead", "thermalfoundation:ore", "3"],
["iridium", "thermalfoundation:ore", "7"],
["black_quartz", "actuallyadditions:block_misc", "3"],
["ruby", "biomesoplenty:gem_ore", "1"],
["amber", "biomesoplenty:gem_ore", "7"],
["sapphire", "biomesoplenty:gem_ore", "6"],
["peridot", "biomesoplenty:gem_ore", "2"],
["malachite", "biomesoplenty:gem_ore", "5"],
["tanzite", "biomesoplenty:gem_ore", "4"],
["certus_quartz", "appliedenergistics2:material", "0"]
];
function replace(
item as string,
meta as string,
blockPos as mods.contenttweaker.BlockPos,
world as World
)
{
if (world.isRemote()) { return null; }
# janky hack, mate
var trueWorld as IWorld = IWorld.getFromID(world.getDimension());
var nbt as IData = {
Facing: 0 as byte,
InventoryStacks: [{
id: item as string,
Count: 1 as byte,
Damage: meta as short
}]
};
var position as IBlockPos = crafttweaker.util.Position3f.create(blockPos.getX(), blockPos.getY(), blockPos.getZ()).asBlockPos();
trueWorld.setBlockState(<blockstate:draconicevolution:placed_item:facing=down>, nbt, position);
}
for i in nugget_table {
var blockName as string = "juice/internal/indicator/" + i[0];
var item as string = i[1];
var meta as string = i[2];
print("Adding internal ore indicator block: " + i[0]);
var block = VanillaFactory.createBlock(blockName, <blockmaterial:air>);
block.setTextureLocation(ResourceLocation.create("contenttweaker:blocks/ore_nugget"));
block.setToolLevel(0);
# block.setAxisAlignedBB(mods.contenttweaker.AxisAlignedBB.create(0.375f, 0.0f, 0.375f, 0.625f, 0.125f, 0.625f));
block.setEnumBlockRenderType("MODEL");
block.setBlockHardness(0.1);
block.setBlockLayer("CUTOUT");
block.setBlockResistance(0);
block.setDropHandler(function(drops, world, position, state, fortune) { drops.clear(); });
block.setFullBlock(false);
block.setLightOpacity(0);
block.setPassable(true);
block.setReplaceable(true);
block.setOnBlockPlace(function(world, blockPos, blockState) {
replace(item, meta, blockPos, world);
});
block.setOnRandomTick(function(world, blockPos, blockState) {
replace(item, meta, blockPos, world);
});
block.setOnUpdateTick(function(world, blockPos, blockState) {
replace(item, meta, blockPos, world);
});
block.register();
}

5
scripts/ore_veins/indicators.2.zs Normal file
View file

@ -0,0 +1,5 @@
for i in loadedMods["contenttweaker"].items {
if (i.definition.name.contains("internal")) {
mods.jei.JEI.hide(i);
}
}