Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Mechalopa committed Sep 9, 2023
1 parent 2e3f8ac commit c4e1366
Show file tree
Hide file tree
Showing 9 changed files with 148 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class ModBlocks
public static final RegistryObject<Block> ANCIENT_STONE_BLOCK = REGISTRY.register("ancient_stone_block", () -> new ModBlock(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_BROWN).requiresCorrectToolForDrops().strength(1.25F, 4.2F).lightLevel((state) -> 5).sound(SoundType.STONE), new ModBlock.Properties().enchantPowerBonus(1.0F)));
public static final RegistryObject<Block> BURNING_CORE_BLOCK = REGISTRY.register("burning_core_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.NETHER).strength(1.0F, 5.0F).lightLevel((state) -> 10).sound(SoundType.STONE)));
public static final RegistryObject<Block> ENDER_EYE_BLOCK = REGISTRY.register("ender_eye_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_CYAN).strength(1.0F, 5.0F).sound(SoundType.STONE)));
public static final RegistryObject<Block> PRISMARINE_CRYSTAL_BLOCK = REGISTRY.register("prismarine_crystal_block", () -> new Block(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.QUARTZ).strength(0.5F).lightLevel((state) -> 15).sound(SoundType.GLASS)));
public static final RegistryObject<Block> PRISMARINE_CRYSTAL_BLOCK = REGISTRY.register("prismarine_crystal_block", () -> new ModBlock(BlockBehaviour.Properties.of(Material.GLASS, MaterialColor.QUARTZ).strength(0.5F).lightLevel((state) -> 15).sound(SoundType.GLASS), new ModBlock.Properties().setConduitFrame()));
public static final RegistryObject<Block> SCUTE_BLOCK = REGISTRY.register("scute_block", () -> new Block(BlockBehaviour.Properties.of(Material.STONE, MaterialColor.COLOR_GREEN).strength(1.5F, 6.0F).sound(SoundType.STONE)));
public static final RegistryObject<Block> NETHERITE_SCRAP_BLOCK = REGISTRY.register("netherite_scrap_block", () -> new Block(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.COLOR_BLACK).requiresCorrectToolForDrops().strength(30.0F, 1200.0F).sound(SoundType.ANCIENT_DEBRIS)));
public static final RegistryObject<Block> NETHER_STAR_BLOCK = REGISTRY.register("nether_star_block", () -> new ModBlock(BlockBehaviour.Properties.of(Material.METAL, MaterialColor.QUARTZ).requiresCorrectToolForDrops().strength(2.0F, 2000.0F).lightLevel((state) -> 10).sound(SoundType.STONE), new ModBlock.Properties().enchantPowerBonus(5.0F)));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ else if (ModConfigs.cachedServer.JACK_FROST_FREEZES_WATER && ForgeEventFactory.g

if (this.level.isEmptyBlock(blockpos$mutable))
{
BlockState blockstate1 = level.getBlockState(blockpos1);
BlockState blockstate1 = this.level.getBlockState(blockpos1);
boolean isFull = blockstate1.getBlock() == Blocks.WATER && blockstate1.getValue(LiquidBlock.LEVEL) == 0;

if (blockstate1.getMaterial() == Material.WATER && isFull && blockstate.canSurvive(level, blockpos1) && level.isUnobstructed(blockstate, blockpos1, CollisionContext.empty()) && !ForgeEventFactory.onBlockPlace(this, BlockSnapshot.create(level.dimension(), level, blockpos1), Direction.UP))
if (blockstate1.getMaterial() == Material.WATER && isFull && blockstate.canSurvive(this.level, blockpos1) && this.level.isUnobstructed(blockstate, blockpos1, CollisionContext.empty()) && !ForgeEventFactory.onBlockPlace(this, BlockSnapshot.create(this.level.dimension(), this.level, blockpos1), Direction.UP))
{
this.level.setBlockAndUpdate(blockpos1, blockstate);
this.level.scheduleTick(blockpos1, Blocks.FROSTED_ICE, Mth.nextInt(this.getRandom(), 60, 120));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void performRangedAttack(LivingEntity target, float distance)
{
ServerLevel serverlevel = (ServerLevel)this.level;

for(int i = 0; i < 3; ++i)
for (int i = 0; i < 3; ++i)
{
BlockPos blockpos = this.blockPosition().offset(-2 + this.getRandom().nextInt(5), 1, -2 + this.getRandom().nextInt(5));
Vex vex = EntityType.VEX.create(this.level);
Expand Down
5 changes: 3 additions & 2 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ displayURL="https://www.curseforge.com/minecraft/mc-mods/hostile-mobs-and-girls"
credits="Mechalopa"
authors="Mechalopa"
description='''More Hostile Mobs and Girls!!!'''
itemIcon="hmag:evil_crystal"
[[dependencies.hmag]]
modId="forge"
mandatory=true
Expand All @@ -24,4 +23,6 @@ itemIcon="hmag:evil_crystal"
mandatory=true
versionRange="[1.19.2]"
ordering="NONE"
side="BOTH"
side="BOTH"
[modproperties.hmag]
catalogueItemIcon="hmag:evil_crystal"
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"hmag:drowned_girl",
"hmag:savagefang"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"hmag:ender_executor"
]
}
120 changes: 120 additions & 0 deletions src/main/resources/data/hmag/tags/blocks/giant_mummy_destroyables.json
Original file line number Diff line number Diff line change
Expand Up @@ -1607,6 +1607,126 @@
{
"id": "terrestria:tall_cattail",
"required": false
},
{
"id": "eidolon:avennian_sprig",
"required": false
},
{
"id": "eidolon:merammer_root",
"required": false
},
{
"id": "eidolon:oanna_bloom",
"required": false
},
{
"id": "eidolon:sildrian_seed",
"required": false
},
{
"id": "malum:soulwood_growth",
"required": false
},
{
"id": "aether_redux:aevelium_sprouts",
"required": false
},
{
"id": "aether_redux:aevelium_growth",
"required": false
},
{
"id": "aether_redux:cloudcap_mushling",
"required": false
},
{
"id": "aether_redux:highfields_flower_patch",
"required": false
},
{
"id": "aether_redux:sprouting_lightroots",
"required": false
},
{
"id": "good_nights_sleep:dream_grass",
"required": false
},
{
"id": "good_nights_sleep:lollipop_bush",
"required": false
},
{
"id": "good_nights_sleep:nightmare_grass",
"required": false
},
{
"id": "good_nights_sleep:prickly_nightmare_grass",
"required": false
},
{
"id": "good_nights_sleep:rainbow_berries",
"required": false
},
{
"id": "#good_nights_sleep:mushrooms",
"required": false
},
{
"id": "blue_skies:turquoise_grass",
"required": false
},
{
"id": "blue_skies:tall_turquoise_grass",
"required": false
},
{
"id": "blue_skies:brittlebush",
"required": false
},
{
"id": "blue_skies:brewberry_bush",
"required": false
},
{
"id": "blue_skies:lunar_grass",
"required": false
},
{
"id": "blue_skies:tall_lunar_grass",
"required": false
},
{
"id": "blue_skies:muckweed",
"required": false
},
{
"id": "blue_skies:crystallized_grass",
"required": false
},
{
"id": "blue_skies:baneful_mushroom",
"required": false
},
{
"id": "blue_skies:glimmer_reed",
"required": false
},
{
"id": "blue_skies:cherry_grass",
"required": false
},
{
"id": "blue_skies:snowcap_pinhead",
"required": false
},
{
"id": "blue_skies:snowcap_mushroom",
"required": false
},
{
"id": "#blue_skies:vines",
"required": false
}
]
}
4 changes: 4 additions & 0 deletions src/main/resources/data/hmag/tags/entity_types/creepers.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
{
"id": "enderzoology:concussion_creeper",
"required": false
},
{
"id": "good_nights_sleep:baby_creeper",
"required": false
}
]
}
4 changes: 4 additions & 0 deletions src/main/resources/data/hmag/tags/entity_types/sheep.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@
{
"id": "aether:sheepuff",
"required": false
},
{
"id": "blue_skies:stardust_ram",
"required": false
}
]
}

0 comments on commit c4e1366

Please sign in to comment.