Skip to content
Merged
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
14 changes: 8 additions & 6 deletions kubejs/assets/createastral/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"tooltip.createastral.orcane.2": "A major change you *might* want to be aware of. The Nether does not exist. Do not even try to make the portal as it will not function. All Nether related items are distributed throughout the pack (mostly planets)",
"tooltip.createastral.bronze_block": "Texture courtesy of Create: Alloyed.",
"tooltip.createastral.seitan": "MEAT - Multipurpose, Ethical And True",
"tooltip.createastral.cogwheel_skull": "Timestop I",

"tooltip.astraladditions.fragile_item": "Breaks when held in player inventories, it must be moved with logistical methods!",

Expand Down Expand Up @@ -356,8 +357,8 @@

"block.kubejs.fragile_sheet_block": "Fragile Sheet Block",
"block.kubejs.broken_fragile_sheet_block": "Broken Fragile Sheet Block",
"block.kubejs.fire_resistant_fragile_sheet_block": "Fire Resistant Fragile Sheet Block",
"block.kubejs.broken_fire_resistant_fragile_sheet_block": "Broken Fire Resistant Fragile Sheet Block",
"block.kubejs.fire_resistant_fragile_sheet_block": "Fire-Resistant Fragile Sheet Block",
"block.kubejs.broken_fire_resistant_fragile_sheet_block": "Broken Fire-Resistant Fragile Sheet Block",

"block.astralsignals.signal_coordinator_dummy": "Signal Coordinator Dummy",
"block.astralsignals.radio_telescope_dummy": "Radio Telescope Dummy",
Expand All @@ -380,9 +381,9 @@
"block.createastral.bronze_block": "Bronze Block",
"block.createastral.copper_heating_coil": "Copper Coil Block",

"block.createastral.blast-resistant_concrete": "Blast Resistant Concrete",
"block.createastral.blast-resistant_concrete_slab": "Blast Resistant Concrete Slab",
"block.createastral.blast-resistant_concrete_stairs": "Blast Resistant Concrete Stairs",
"block.createastral.blast-resistant_concrete": "Blast-Resistant Concrete",
"block.createastral.blast-resistant_concrete_slab": "Blast-Resistant Concrete Slab",
"block.createastral.blast-resistant_concrete_stairs": "Blast-Resistant Concrete Stairs",

"block.createastral.distillery_dummy": "Distillery Dummy",
"block.createastral.electrolyser_dummy": "Electrolyzer Dummy",
Expand All @@ -401,6 +402,7 @@
"block.createastral.swift_andesite": "Swift Andesite",
"block.createastral.rocket_casing": "Rocket Casing",
"block.createastral.moonset_stone": "Moonset Stone",
"block.createastral.cogwheel_skull": "Cogwheel Skull",

"item.astralfoods.ambrosia": "Ambrosia",
"item.astralfoods.chocolate_ice_cream": "Chocolate Ice Cream",
Expand Down Expand Up @@ -2437,7 +2439,7 @@
"ftbquests.chapter.chapter_4.quests95.description3": "Steel will have a lot more relevance in Chapter 4. For now, it's vital for getting there in the first place.",
"ftbquests.chapter.chapter_4.quests96.title": "Blast-Resistant Cement",
"ftbquests.chapter.chapter_4.quests96.subtitle": "This doesn't make the bucket blast resistant, just the cement in it.",
"ftbquests.chapter.chapter_4.quests96.description0": "To make blast-resistant Cement, Steel and Lime Dust needs to be mixed together with Concrete Powder.",
"ftbquests.chapter.chapter_4.quests96.description0": "To make Blast-Resistant Cement, Steel and Lime Dust needs to be mixed together with Concrete Powder.",
"ftbquests.chapter.chapter_4.quests96.description3": "Clay Dust for the Concrete Powder can be obtained by crushing Limestone, or crushing Clay. The material is too soft for the Grinder to work.",
"ftbquests.chapter.chapter_4.quests97.subtitle": "More useful then you might realize!",
"ftbquests.chapter.chapter_4.quests97.description0": "Lastly, all you need to do is pour the Cement into a Casting Basin.",
Expand Down
175 changes: 175 additions & 0 deletions kubejs/assets/createastral/models/block/cogwheel_skull.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 32],
"textures": {
"0": "create:block/cogwheel_axis",
"1": "minecraft:entity/skeleton/skeleton",
"3": "create:block/axis_top",
"1_2": "create:block/cogwheel",
"particle": "createastral:block/bronze_block"
},
"elements": [
{
"name": "Axis",
"from": [6, 2, 6],
"to": [10, 10, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [6, 0, 10, 16], "texture": "#0"},
"east": {"uv": [6, 0, 10, 16], "texture": "#0"},
"south": {"uv": [6, 0, 10, 16], "texture": "#0"},
"west": {"uv": [6, 0, 10, 16], "texture": "#0"},
"up": {"uv": [6, 6, 10, 10], "texture": "#3"},
"down": {"uv": [6, 6, 10, 10], "texture": "#3"}
}
},
{
"name": "Gear",
"from": [-1, 0.5, 6.5],
"to": [17, 3.5, 9.5],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]},
"faces": {
"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
}
},
{
"name": "Gear2",
"from": [-1, 0.5, 6.5],
"to": [17, 3.5, 9.5],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 2, 8]},
"faces": {
"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
}
},
{
"name": "Gear3",
"from": [-1, 0.5, 6.5],
"to": [17, 3.5, 9.5],
"rotation": {"angle": -45, "axis": "y", "origin": [8, 2, 8]},
"faces": {
"north": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"east": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"south": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"west": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"up": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"},
"down": {"uv": [7, 6, 16, 7.5], "texture": "#1_2"}
}
},
{
"name": "Gear4",
"from": [6.5, 0.5, -1],
"to": [9.5, 3.5, 17],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]},
"faces": {
"north": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"east": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"south": {"uv": [5, 8, 6.5, 9.5], "texture": "#1_2"},
"west": {"uv": [7, 8, 16, 9.5], "texture": "#1_2"},
"up": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"},
"down": {"uv": [7, 6, 16, 7.5], "rotation": 90, "texture": "#1_2"}
}
},
{
"name": "GearCaseInner",
"from": [2, 0.55, 2],
"to": [14, 3.45, 14],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]},
"faces": {
"north": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
"east": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
"south": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
"west": {"uv": [0, 6, 6, 7.5], "texture": "#1_2"},
"up": {"uv": [4, 0, 10, 6], "texture": "#1_2"},
"down": {"uv": [4, 0, 10, 6], "texture": "#1_2"}
}
},
{
"name": "GearCaseOuter",
"from": [4, 0, 4],
"to": [12, 4, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [0, -6, 0]},
"faces": {
"north": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
"east": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
"south": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
"west": {"uv": [0, 4, 4, 6], "texture": "#1_2"},
"up": {"uv": [0, 0, 4, 4], "texture": "#1_2"},
"down": {"uv": [10, 0, 14, 4], "texture": "#1_2"}
}
},
{
"name": "Skull",
"from": [4, 6, 4],
"to": [12, 14, 12],
"faces": {
"north": {"uv": [2, 4, 4, 8], "texture": "#1"},
"east": {"uv": [0, 4, 2, 8], "texture": "#1"},
"south": {"uv": [6, 4, 8, 8], "texture": "#1"},
"west": {"uv": [4, 4, 6, 8], "texture": "#1"},
"up": {"uv": [4, 4, 2, 0], "texture": "#1"},
"down": {"uv": [6, 0, 4, 4], "texture": "#1"}
}
},
{
"name": "InsideSkull",
"from": [12, 14, 12],
"to": [4, 6, 4],
"faces": {
"north": {"uv": [6, 8, 8, 4], "texture": "#1"},
"east": {"uv": [4, 8, 6, 4], "texture": "#1"},
"south": {"uv": [2, 8, 4, 4], "texture": "#1"},
"west": {"uv": [0, 8, 2, 4], "texture": "#1"},
"up": {"uv": [6, 0, 4, 4], "rotation": 180, "texture": "#1"},
"down": {"uv": [4, 0, 2, 4], "rotation": 180, "texture": "#1"}
}
}
],
"display": {
"firstperson_righthand": {
"rotation": [0, 180, 0]
},
"thirdperson_righthand": {
"rotation": [45, 45, 0],
"translation": [0, 3, 0],
"scale": [0.5, 0.5, 0.5]
},
"ground": {
"translation": [0, 3, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, 2, 0],
"scale": [0.75, 0.75, 0.75]
},
"fixed": {
"rotation": [0, 0, 0],
"translation": [0, 2, 0],
"scale": [0.75, 0.75, 0.75]
}
},
"groups": [
{
"name": "cogwheel",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6]
},
{
"name": "skull",
"origin": [0, 0, 0],
"color": 0,
"children": [7, 8]
}
]
}
1 change: 1 addition & 0 deletions kubejs/data/create/tags/blocks/wrench_pickup.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"createbigcannons:nethersteel_screw_breech",
"createbigcannons:incomplete_steel_screw_breech",
"createbigcannons:incomplete_nethersteel_screw_breech",
"createastral:cogwheel_skull",
"createastral:rocket_casing",
"kubejs:fragile_sheet_block",
"kubejs:fire_resistant_fragile_sheet_block",
Expand Down
59 changes: 59 additions & 0 deletions kubejs/server_scripts/misc/interaction.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,65 @@
soundList: [],
},
},
{
projectile: { item: "createastral:cogwheel_skull" },
createAutoJson: {
fileName: "cogwheel_skull",
reloadTicks: 60,
damage: 5,
knockback: 0,
drag: 1,
velocityMultiplier: 0.5,
gravityMultiplier: 0.5,
sticky: false,
soundPitch: 0.5,
},
particles: {
enabled: true,
spread: 3,
size: 150,
speed: 1,
count: 50,
type: "ae2:matter_cannon_fx",
hasColor: false,
},
explosion: {
enabled: false,
},
AOE: {
enabled: true,
effectList: [
{
potionEffect: "minecraft:slowness",
potionTime: 5,
potionAmplifier: 100,
potionHideParticles: true,
range: "7",
},
{
potionEffect: "minecraft:mining_fatigue",
potionTime: 5,
potionAmplifier: 100,
potionHideParticles: true,
range: "7",
},
{
potionEffect: "minecraft:weakness",
potionTime: 5,
potionAmplifier: 100,
potionHideParticles: true,
range: "7",
},
{
potionEffect: "minecraft:jump_boost",
potionTime: 5,
potionAmplifier: 200,
potionHideParticles: true,
range: "7",
},
],
},
},
{
projectile: { item: "createbigcannons:autocannon_cartridge" },
particles: {
Expand Down
9 changes: 9 additions & 0 deletions kubejs/server_scripts/recipes/minecraft/shaped.js
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,15 @@
B: "createastral:bronze_sheet",
},
},
{
output: "createastral:cogwheel_skull",
pattern: ["A", "B", "C"],
key: {
A: "minecraft:skeleton_skull",
B: "minecraft:clock",
C: "create:cogwheel",
},
},
{
output: "yttr:wasteland_dirt",
pattern: ["ABA"],
Expand Down
33 changes: 30 additions & 3 deletions kubejs/startup_scripts/registry/createastral/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
.textureAll("createastral:block/blast_side")
.texture("up", "createastral:block/blast_top")
.texture("down", "createastral:block/blast_top")
.tagBlock("minecraft:mineable/pickaxe");
.tagBlock("minecraft:mineable/pickaxe")
.displayName("Blast-Resistant Concrete");
event
.create("createastral:blast-resistant_concrete_slab", "slab")
.material("stone")
Expand All @@ -100,7 +101,8 @@
.textureAll("createastral:block/blast_side")
.texture("up", "createastral:block/blast_top")
.texture("down", "createastral:block/blast_top")
.tagBlock("minecraft:mineable/pickaxe");
.tagBlock("minecraft:mineable/pickaxe")
.displayName("Blast-Resistant Concrete Slab");
event
.create("createastral:blast-resistant_concrete_stairs", "stairs")
.material("stone")
Expand All @@ -109,7 +111,8 @@
.textureAll("createastral:block/blast_side")
.texture("up", "createastral:block/blast_top")
.texture("down", "createastral:block/blast_top")
.tagBlock("minecraft:mineable/pickaxe");
.tagBlock("minecraft:mineable/pickaxe")
.displayName("Blast-Resistant Concrete Stairs");
event
.create("createastral:distillery_dummy", "basic")
.hardness(4)
Expand Down Expand Up @@ -208,5 +211,29 @@
.textureAll("createastral:block/gas_mixer")
.texture("down", "createastral:block/gas_mixer_shaft");
event.create("createastral:channeling_transformer_dummy").textureAll("createastral:block/channeling_transformer");
event
.create("createastral:cogwheel_skull")
.material("lantern")
.hardness(2)
.box(4, 0, 4, 12, 14, 12, true)
.box(2, 0, 2, 14, 3, 14, true)
.tagBlock("minecraft:mineable/pickaxe")
.tagBlock("minecraft:mineable/axe")
.requiresTool(true)
.property(BlockProperties.HORIZONTAL_FACING)
.placementState(event =>
event.set(
BlockProperties.HORIZONTAL_FACING,
`${event.getHorizontalDirection().getOpposite()}`
)
)
.blockstateJson = {
"variants": {
"facing=north": { "model": "createastral:block/cogwheel_skull" },
"facing=east" : { "model": "createastral:block/cogwheel_skull", "y": 90 },
"facing=south": { "model": "createastral:block/cogwheel_skull", "y": 180 },
"facing=west" : { "model": "createastral:block/cogwheel_skull", "y": 270 },
}
};
});
})();
4 changes: 2 additions & 2 deletions kubejs/startup_scripts/registry/kubejs/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
.material("stone")
.defaultTranslucent()
.hardness(1)
.displayName("Fire Resistant Fragile Sheet Block");
.displayName("Fire-Resistant Fragile Sheet Block");
event
.create("kubejs:broken_fire_resistant_fragile_sheet_block", "basic")
.material("stone")
.defaultTranslucent()
.hardness(1)
.box(0, 0, 0, 16, 8, 16, true)
.box(2, 8, 2, 14, 12, 14, true)
.displayName("Broken Fire Resistant Fragile Sheet Block");
.displayName("Broken Fire-Resistant Fragile Sheet Block");
});
})();
Loading
Loading