Skip to content

Commit

Permalink
feat: wip moon boss
Browse files Browse the repository at this point in the history
  • Loading branch information
AlphaMode committed May 24, 2024
1 parent 3480f7a commit 1ecbd8a
Show file tree
Hide file tree
Showing 60 changed files with 3,411 additions and 22 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "galacticraft:block/moon_dungeon_brick"
}
}
}
3 changes: 3 additions & 0 deletions src/main/generated/assets/galacticraft/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"block.galacticraft.basic_solar_panel.description": "Basic Solar Panels collect energy from the sun, and store it for further use. Collects most energy at mid-day (non-adjustable).",
"block.galacticraft.black_candle_moon_cheese_block": "Block of Cheese with Black Candle",
"block.galacticraft.blue_candle_moon_cheese_block": "Block of Cheese with Blue Candle",
"block.galacticraft.boss_spawner": "Boss Spawner",
"block.galacticraft.bronze_decoration": "Bronze Decoration",
"block.galacticraft.bronze_decoration_slab": "Bronze Decoration Slab",
"block.galacticraft.bronze_decoration_stairs": "Bronze Decoration Stairs",
Expand Down Expand Up @@ -174,6 +175,7 @@
"block.galacticraft.moon_copper_ore": "Moon Copper Ore",
"block.galacticraft.moon_dirt": "Moon Dirt",
"block.galacticraft.moon_dirt_path": "Moon Dirt Path",
"block.galacticraft.moon_dungeon_brick": "Moon Dungeon Brick",
"block.galacticraft.moon_rock": "Moon Rock",
"block.galacticraft.moon_rock_slab": "Moon Rock Slab",
"block.galacticraft.moon_rock_stairs": "Moon Rock Stairs",
Expand Down Expand Up @@ -295,6 +297,7 @@
"entity.galacticraft.evolved_evoker": "Evolved Evoker",
"entity.galacticraft.evolved_pillager": "Evolved Pillager",
"entity.galacticraft.evolved_skeleton": "Evolved Skeleton",
"entity.galacticraft.evolved_skeleton_boss": "Evolved Skeleton Boss",
"entity.galacticraft.evolved_spider": "Evolved Spider",
"entity.galacticraft.evolved_vindicator": "Evolved Vindicator",
"entity.galacticraft.evolved_zombie": "Evolved Zombie",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "galacticraft:block/moon_dungeon_brick"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "galacticraft:block/moon_dungeon_brick"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "galacticraft:moon_dungeon_brick"
}
],
"rolls": 1.0
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"type": "minecraft:entity",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"name": "minecraft:arrow"
}
],
"rolls": 1.0
}
],
"random_sequence": "galacticraft:entities/evolved_skeleton_boss"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#galacticraft:moon"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "galacticraft:moon_dungeon",
"config": {
"biomes": "#galacticraft:has_structure/moon_boss",
"spawn_overrides": {},
"step": "surface_structures"
},
"dungeon_configuration": {
"bossRoom": "galacticraft:moondungeonbossroom",
"brickBlock": {
"Name": "galacticraft:moon_dungeon_brick"
},
"hallwayHeight": 5,
"hallwayLengthMax": 16,
"hallwayLengthMin": 8,
"roomHeight": 6,
"treasureRoom": "galacticraft:moondungeontreasureroom",
"yPosition": 25
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"placement": {
"type": "minecraft:random_spread",
"salt": 52532672,
"separation": 8,
"spacing": 32
},
"structures": [
{
"structure": "galacticraft:moon_boss",
"weight": 1
}
]
}
27 changes: 27 additions & 0 deletions src/main/java/dev/galacticraft/api/entity/IgnoreShift.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
/*
* Copyright (c) 2019-2024 Team Galacticraft
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/

package dev.galacticraft.api.entity;

public interface IgnoreShift {
boolean shouldIgnoreShiftExit();
}
3 changes: 3 additions & 0 deletions src/main/java/dev/galacticraft/mod/Constant.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ interface Block {
// Natural
String MOON_TURF = "moon_turf";
String MOON_SURFACE_ROCK = "moon_surface_rock";
String MOON_DUNGEON_BRICK = "moon_dungeon_brick";
String MOON_ROCK = "moon_rock";
String MOON_ROCK_SLAB = "moon_rock_slab";
String MOON_ROCK_STAIRS = "moon_rock_stairs";
Expand Down Expand Up @@ -185,6 +186,7 @@ interface Block {
String TREASURE_CHEST_TIER_2 = "treasure_chest_tier_2";
String TREASURE_CHEST_TIER_3 = "treasure_chest_tier_3";
String CRASHED_PROBE_BLOCK = "crashed_probe";
String BOSS_SPAWNER = "boss_spawner";

// Moon Cheese
String MOON_CHEESE_WHEEL = "moon_cheese_block";
Expand Down Expand Up @@ -563,6 +565,7 @@ interface EntityTexture {
String COMET_CUBE = "textures/entity/comet_cube.png";
String GAZER = "textures/entity/gazer.png";
String LANDER = "textures/entity/lander.png";
String SKELETON_BOSS = "textures/entity/skeletonboss.png";
}

interface TextureCoordinate {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/dev/galacticraft/mod/GalacticraftClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public void onInitializeClient() {
EntityRendererRegistry.register(GCEntityTypes.LANDER, LanderEntityRenderer::new);
EntityRendererRegistry.register(GCEntityTypes.PARACHEST, ParachestRenderer::new);
EntityRendererRegistry.register(GCEntityTypes.THROWABLE_METEOR_CHUNK, ThrownItemRenderer::new);
EntityRendererRegistry.register(GCEntityTypes.SKELETON_BOSS, EvolvedSkeletonBossRenderer::new);

GCBlockEntityRenderer.register();
GCClientPacketReceiver.register();
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/dev/galacticraft/mod/api/config/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ public interface Config {

long playerOxygenConsuptionRate();

double bossHealthMultiplier();

void load();

void save();
Expand Down
Loading

0 comments on commit 1ecbd8a

Please sign in to comment.