-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Warden and Hoglin Posses (#1037)
* New Possession 2 * Possessed Warden * Possessed Hoglin * Some smithing templetes from possessed mobs * Big Nerf wither skull drop * Mushrooms are cows * Very small fix * Semi-revert the nerf
- Loading branch information
1 parent
df8e941
commit 23fce09
Showing
35 changed files
with
695 additions
and
27 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
src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_hoglin.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_warden.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" | ||
} |
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
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
53 changes: 53 additions & 0 deletions
53
...sm/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_hoglin.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,53 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": { | ||
"item": "minecraft:netherite_upgrade_smithing_template" | ||
}, | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_hoglin.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_hoglin", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 0.7, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_hoglin.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_hoglin", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_hoglin.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 4, | ||
"y": 1 | ||
} |
53 changes: 53 additions & 0 deletions
53
...sm/modonomicon/books/dictionary_of_spirits/entries/possession_rituals/possess_warden.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,53 @@ | ||
{ | ||
"background_u_index": 0, | ||
"background_v_index": 0, | ||
"category": "occultism:possession_rituals", | ||
"condition": { | ||
"type": "modonomicon:true" | ||
}, | ||
"description": "", | ||
"hide_while_locked": false, | ||
"icon": { | ||
"item": "minecraft:echo_shard" | ||
}, | ||
"name": "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.name", | ||
"pages": [ | ||
{ | ||
"type": "modonomicon:entity", | ||
"anchor": "", | ||
"default_rotation": -45.0, | ||
"entity_id": "occultism:possessed_warden", | ||
"name": "", | ||
"offset": 0.0, | ||
"rotate": true, | ||
"scale": 1.0, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.entity.text" | ||
}, | ||
{ | ||
"type": "occultism:ritual_recipe", | ||
"anchor": "", | ||
"recipe_id_1": "occultism:ritual/possess_warden", | ||
"text": "", | ||
"title1": "", | ||
"title2": "" | ||
}, | ||
{ | ||
"type": "modonomicon:text", | ||
"anchor": "", | ||
"show_title_separator": true, | ||
"text": "book.occultism.dictionary_of_spirits.possession_rituals.possess_warden.description.text", | ||
"title": "", | ||
"use_markdown_in_title": false | ||
} | ||
], | ||
"parents": [ | ||
{ | ||
"draw_arrow": true, | ||
"entry": "occultism:possession_rituals/overview", | ||
"line_enabled": true, | ||
"line_reversed": false | ||
} | ||
], | ||
"x": 4, | ||
"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
45 changes: 45 additions & 0 deletions
45
src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedHoglinEntity.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,45 @@ | ||
/* | ||
* 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.hoglin.Hoglin; | ||
import net.minecraft.world.level.Level; | ||
|
||
public class PossessedHoglinEntity extends Hoglin { | ||
|
||
public PossessedHoglinEntity(EntityType<? extends Hoglin> type, | ||
Level worldIn) { | ||
super(type, worldIn); | ||
} | ||
|
||
//region Static Methods | ||
public static AttributeSupplier.Builder createAttributes() { | ||
return Hoglin.createAttributes() | ||
.add(Attributes.ATTACK_DAMAGE, 12.0) | ||
.add(Attributes.MAX_HEALTH, 66.0); | ||
} | ||
|
||
} |
51 changes: 51 additions & 0 deletions
51
src/main/java/com/klikli_dev/occultism/common/entity/possessed/PossessedWardenEntity.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,51 @@ | ||
/* | ||
* 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.warden.Warden; | ||
import net.minecraft.world.level.Level; | ||
|
||
public class PossessedWardenEntity extends Warden { | ||
|
||
public PossessedWardenEntity(EntityType<? extends Warden> type, | ||
Level worldIn) { | ||
super(type, worldIn); | ||
} | ||
|
||
//region Static Methods | ||
public static AttributeSupplier.Builder createAttributes() { | ||
return Warden.createAttributes() | ||
.add(Attributes.ATTACK_DAMAGE, 15.0) | ||
.add(Attributes.MAX_HEALTH, 250.0) | ||
.add(Attributes.MOVEMENT_SPEED, 0.6F) | ||
.add(Attributes.ATTACK_KNOCKBACK, 0.5); | ||
} | ||
|
||
@Override | ||
protected boolean shouldDespawnInPeaceful() { | ||
return false; | ||
} | ||
} |
Oops, something went wrong.