Skip to content

Commit

Permalink
KubeJS Item Reordering, Texturing (#406)
Browse files Browse the repository at this point in the history 
* New textures just dropped

* Downscaled guardian scale

* Item reorder

- Now that looks clean

* HM item relocation

* Warden model consistency fix

- Just gives the right type of matter

* Removed Ender Dragon model and data

- That's it.

* Revert "Removed Ender Dragon model and data"

This reverts commit 1a344b3.

---------

Co-authored-by: Pansmith <70342772+ThePansmith@users.noreply.github.com>
  • Loading branch information
@WithersChat @ThePansmith
WithersChat and ThePansmith authored Jul 23, 2024
1 parent 14ac9ee commit c605189
Show file tree
Hide file tree
Showing 14 changed files with 394 additions and 249 deletions.
Binary file modified config/solarflux/textures/block/hadal_base.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/abyssal_energy_core.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions kubejs/assets/kubejs/textures/item/abyssal_energy_core.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time": 40},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1}
]
}
}
Binary file modified kubejs/assets/kubejs/textures/item/bathyal_energy_core.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 32 additions & 0 deletions kubejs/assets/kubejs/textures/item/bathyal_energy_core.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"animation": {
"frametime": 1,
"frames": [
{"index": 0, "time": 85},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1},
{"index": 1, "time": 1},
{"index": 2, "time": 1},
{"index": 3, "time": 1},
{"index": 4, "time": 1}
]
}
}
Binary file modified kubejs/assets/kubejs/textures/item/guardian_scale.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/hadal_core.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified kubejs/assets/kubejs/textures/item/reverberation_core.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions kubejs/assets/kubejs/textures/item/reverberation_core.png.mcmeta
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"animation": {
"interpolate": true,
"frametime": 30
}
}
2 changes: 1 addition & 1 deletion kubejs/data/hostilenetworks/data_models/warden.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"item": "hostilenetworks:prediction_matrix"
},
"base_drop": {
"item": "hostilenetworks:end_prediction"
"item": "hostilenetworks:overworld_prediction"
},
"trivia": "hostilenetworks.trivia.warden",
"fabricator_drops": [
Expand Down
138 changes: 111 additions & 27 deletions kubejs/startup_scripts/Block_Registry.js
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,74 @@
StartupEvents.registry("block", event => {
event.create('excitationcoil', 'cardinal').displayName("Excitation Coil").soundType('metal').renderType('cutout').box(3, 0, 3, 13, 1, 13).tag("mineable/pickaxe").box(4, 1, 4, 12, 9, 12);
event.create('dust', 'falling').soundType('sand').hardness(0.4).resistance(0.4).tag("mineable/shovel").displayName("Dust Block").property(BlockProperties.FALLING);
event.create('starry_diamond_block').displayName("Starry Diamond Block").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true).textureAll('kubejs:block/microverse/starry_diamond_block');
event.create('dark_steel_machine_hull').displayName("Dark Steel Machine Hull").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('infinity_dust_block', 'falling').displayName('Infinity Dust Block').soundType('sand').resistance(6).hardness(5).tagBlock("mineable/shovel").requiresTool(true);
event.create('compressed_infinity_dust_block', 'falling').displayName('Compressed Infinity Dust Block').soundType('sand').resistance(6).hardness(5).tagBlock("mineable/shovel").requiresTool(true);
event.create('double_compressed_infinity_dust_block', 'falling').displayName('Double Compressed Infinity Dust Block').soundType('sand').resistance(6).hardness(5).tagBlock("mineable/shovel").requiresTool(true);
event.create('dense_oilsands_ore').displayName('Dense Oilsands Ore').soundType('stone').resistance(6).hardness(5).tagBlock("mineable/shovel").requiresTool(true);
event.create('empowerer_casing').displayName("Empowerer Casing").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('compressed_sand').displayName("Compressed Sand").soundType('sand').resistance(1).hardness(1).tagBlock("mineable/shovel").requiresTool(true).property(BlockProperties.FALLING);
event.create('double_compressed_sand').displayName("Double Compressed Sand").soundType('sand').resistance(2).hardness(2).tagBlock("mineable/shovel").requiresTool(true).property(BlockProperties.FALLING);
event.create('compressed_red_sand').displayName("Compressed Red Sand").soundType('sand').resistance(1).hardness(1).tagBlock("mineable/shovel").requiresTool(true).property(BlockProperties.FALLING);
event.create('double_compressed_red_sand').displayName("Double Compressed Red Sand").soundType('sand').resistance(2).hardness(2).tagBlock("mineable/shovel").requiresTool(true).property(BlockProperties.FALLING);
event.create('warp_core').displayName("Warp Core").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('warp_controller').displayName("Warp Controller").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('universal_warp_core').displayName("Universal Warp Core").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('universal_warp_controller').displayName("Universal Warp Controller").soundType('metal').resistance(6).hardness(5).tagBlock("mineable/pickaxe").requiresTool(true);
event.create('starry_diamond_block')
.displayName("Starry Diamond Block")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true)
.textureAll('kubejs:block/microverse/starry_diamond_block');

event.create('dense_oilsands_ore')
.displayName('Dense Oilsands Ore')
.soundType('stone')
.resistance(6).hardness(5)
.tagBlock("mineable/shovel").requiresTool(true);

event.create('empowerer_casing')
.displayName("Empowerer Casing")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

event.create('dust', 'falling')
.soundType('sand')
.hardness(0.4).resistance(0.4)
.tag("mineable/shovel").displayName("Dust Block")
.property(BlockProperties.FALLING);

event.create('compressed_sand')
.displayName("Compressed Sand")
.soundType('sand')
.resistance(1).hardness(1)
.tagBlock("mineable/shovel").requiresTool(true)
.property(BlockProperties.FALLING);

event.create('double_compressed_sand')
.displayName("Double Compressed Sand")
.soundType('sand')
.resistance(2).hardness(2)
.tagBlock("mineable/shovel").requiresTool(true)
.property(BlockProperties.FALLING);

event.create('compressed_red_sand')
.displayName("Compressed Red Sand")
.soundType('sand')
.resistance(1).hardness(1)
.tagBlock("mineable/shovel").requiresTool(true)
.property(BlockProperties.FALLING);

event.create('double_compressed_red_sand')
.displayName("Double Compressed Red Sand")
.soundType('sand')
.resistance(2).hardness(2)
.tagBlock("mineable/shovel").requiresTool(true)
.property(BlockProperties.FALLING);

event.create('infinity_dust_block', 'falling')
.displayName('Infinity Dust Block')
.soundType('sand')
.resistance(6).hardness(5)
.tagBlock("mineable/shovel").requiresTool(true);

event.create('compressed_infinity_dust_block', 'falling')
.displayName('Compressed Infinity Dust Block')
.soundType('sand')
.resistance(6).hardness(5)
.tagBlock("mineable/shovel").requiresTool(true);

event.create('double_compressed_infinity_dust_block', 'falling')
.displayName('Double Compressed Infinity Dust Block')
.soundType('sand')
.resistance(6).hardness(5)
.tagBlock("mineable/shovel").requiresTool(true);

// Micro Miner Cores
event.create('electrum_micro_miner_core')
Expand Down Expand Up @@ -72,6 +125,30 @@ StartupEvents.registry("block", event => {
.requiresTool(true)
.defaultCutout();

event.create('warp_core')
.displayName("Warp Core")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

event.create('warp_controller')
.displayName("Warp Controller")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

event.create('universal_warp_core')
.displayName("Universal Warp Core")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

event.create('universal_warp_controller')
.displayName("Universal Warp Controller")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

//Dense Ores
const ores = [
'redstone_ore',
Expand All @@ -93,6 +170,7 @@ StartupEvents.registry("block", event => {
.resistance(6)
.hardness(5)
.tagBlock('mineable/pickaxe')
.tagBlock('forge:ores/dense')
.tagBlock('forge:ores/dense_' + ore)
.requiresTool(true);
}
Expand All @@ -103,20 +181,27 @@ StartupEvents.registry("block", event => {
.resistance(6)
.hardness(5)
.tagBlock('mineable/pickaxe')
.tagBlock('forge:ores/dense')
.tagBlock('forge:ores/dense_magma')
.requiresTool(true)
.lightLevel(1.0);

//EMERGENCY FIX
/*event.create('gtceu:dilithium_ore')
.soundType('stone')
.hardness(2)
.resistance(2)
.tagBlock("mineable/pickaxe")
.requiresTool();*/

//Casing stuff

event.create('excitationcoil', 'cardinal')
.displayName("Excitation Coil")
.soundType('metal')
.renderType('cutout')
.box(3, 0, 3, 13, 1, 13)
.box(4, 1, 4, 12, 9, 12)
.tag("mineable/pickaxe").requiresTool(true);

event.create('dark_steel_machine_hull')
.displayName("Dark Steel Machine Hull")
.soundType('metal')
.resistance(6).hardness(5)
.tagBlock("mineable/pickaxe").requiresTool(true);

event.create("microverse_casing", 'gtceu:renderer')
.displayName("Microverse Casing")
.soundType('metal')
Expand All @@ -125,7 +210,6 @@ StartupEvents.registry("block", event => {
.requiresTool(true)
.tagBlock("mineable/pickaxe")
.textureOverrideRenderer('minecraft:block/cube_all', {'all': new ResourceLocation('kubejs', 'block/microverse/casing')})


event.create('cryolobus_casing', 'gtceu:renderer')
.displayName("Cryolobus Casing")
Expand Down Expand Up @@ -163,7 +247,7 @@ StartupEvents.registry("block", event => {
.requiresTool(true)
.textureOverrideRenderer('minecraft:block/cube_all', {'all': new ResourceLocation('kubejs', 'block/cryolobus/cryococcus_fusion_coil')})

event.create("dark_soularium_casing", 'gtceu:renderer')
event.create("dark_soularium_casing", 'gtceu:renderer')
.displayName("Dark Soularium Casing")
.soundType('metal')
.hardness(2.5)
Expand Down
Loading

0 comments on commit c605189

Please sign in to comment.