-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Possessed Ghast Spawn Egg * Possessed Phantom * Possessed Phantom * Weak Possessed Shulker * Wild Parrot Really Foliot * Possessed Elder Guardian Possessed Shulker Weak Possessed Shulker -> Possessed Weak Shulker * Rituals for new possessed mobs * (and the respective generated files) Closes #104
- Loading branch information
1 parent
7da15d4
commit 76d49f4
Showing
37 changed files
with
1,299 additions
and
20 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
3 changes: 3 additions & 0 deletions
3
...generated/resources/assets/occultism/models/item/ritual_dummy/possess_elder_guardian.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_phantom.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_shulker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_weak_shulker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"parent": "occultism:item/ritual_dummy" | ||
} |
35 changes: 35 additions & 0 deletions
35
src/generated/resources/data/occultism/loot_tables/entities/possessed_phantom.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"type": "minecraft:entity", | ||
"pools": [ | ||
{ | ||
"bonus_rolls": 0.0, | ||
"entries": [ | ||
{ | ||
"type": "minecraft:item", | ||
"functions": [ | ||
{ | ||
"add": false, | ||
"count": { | ||
"type": "minecraft:uniform", | ||
"max": 4.0, | ||
"min": 1.0 | ||
}, | ||
"function": "minecraft:set_count" | ||
}, | ||
{ | ||
"count": { | ||
"type": "minecraft:uniform", | ||
"max": 1.0, | ||
"min": 0.0 | ||
}, | ||
"function": "minecraft:looting_enchant" | ||
} | ||
], | ||
"name": "minecraft:phantom_membrane" | ||
} | ||
], | ||
"rolls": 1.0 | ||
} | ||
], | ||
"random_sequence": "occultism:entities/possessed_phantom" | ||
} |
51 changes: 51 additions & 0 deletions
51
...omicon/books/dictionary_of_spirits/entries/possession_rituals/possess_elder_guardian.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": "minecraft:heart_of_the_sea", | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_elder_guardian.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_elder_guardian", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 0.5, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_elder_guardian.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_elder_guardian", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_elder_guardian.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 2, | ||
"y": -1 | ||
} |
51 changes: 51 additions & 0 deletions
51
...m/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_phantom.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": "minecraft:phantom_membrane", | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_phantom.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_phantom", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 0.5, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_phantom.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_phantom", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_phantom.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 0, | ||
"y": -1 | ||
} |
51 changes: 51 additions & 0 deletions
51
...m/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_shulker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": "minecraft:shulker_shell", | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_shulker.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_shulker", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 0.5, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_shulker.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_shulker", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_shulker.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 2, | ||
"y": 1 | ||
} |
51 changes: 51 additions & 0 deletions
51
...onomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_weak_shulker.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": "minecraft:chorus_fruit", | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_shulker.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_weak_shulker", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 0.5, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_shulker.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_weak_shulker", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_weak_shulker.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 0, | ||
"y": 1 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
...n/java/com/klikli_dev/occultism/common/entity/possessed/PossessedElderGuardianEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* MIT License | ||
* | ||
* Copyright 2020 klikli-dev | ||
* | ||
* 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 com.klikli_dev.occultism.common.entity.possessed; | ||
|
||
import net.minecraft.world.entity.EntityType; | ||
import net.minecraft.world.entity.ai.attributes.AttributeSupplier; | ||
import net.minecraft.world.entity.ai.attributes.Attributes; | ||
import net.minecraft.world.entity.monster.ElderGuardian; | ||
import net.minecraft.world.level.Level; | ||
|
||
public class PossessedElderGuardianEntity extends ElderGuardian { | ||
|
||
public PossessedElderGuardianEntity(EntityType<? extends ElderGuardian> type, | ||
Level worldIn) { | ||
super(type, worldIn); | ||
} | ||
|
||
//region Static Methods | ||
public static AttributeSupplier.Builder createAttributes() { | ||
return ElderGuardian.createAttributes() | ||
.add(Attributes.MAX_HEALTH, 160.0); | ||
} | ||
|
||
@Override | ||
protected boolean shouldDespawnInPeaceful() { | ||
return false; | ||
} | ||
//endregion Static Methods | ||
} |
53 changes: 53 additions & 0 deletions
53
src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedPhantomEntity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* MIT License | ||
* | ||
* Copyright 2020 klikli-dev | ||
* | ||
* 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 com.klikli_dev.occultism.common.entity.possessed; | ||
|
||
import net.minecraft.world.entity.EntityType; | ||
import net.minecraft.world.entity.ai.attributes.AttributeSupplier; | ||
import net.minecraft.world.entity.monster.Phantom; | ||
import net.minecraft.world.entity.monster.Zombie; | ||
import net.minecraft.world.level.Level; | ||
|
||
public class PossessedPhantomEntity extends Phantom { | ||
|
||
public PossessedPhantomEntity(EntityType<? extends Phantom> type, | ||
Level worldIn) { | ||
super(type, worldIn); | ||
} | ||
|
||
//region Static Methods | ||
public static AttributeSupplier.Builder createAttributes() { | ||
return Zombie.createAttributes(); | ||
} | ||
|
||
@Override | ||
protected boolean shouldDespawnInPeaceful() { | ||
return false; | ||
} | ||
|
||
@Override | ||
protected boolean isSunBurnTick() { | ||
return false; | ||
} | ||
//endregion Static Methods | ||
} |
Oops, something went wrong.