Fixed DreamCampfireBlock not working with silk touch.
Added first draft of shellstone, water cannon, Toreterror, primordial armor
This commit is contained in:
1 parent
670c8949b6
commit
4fd9789e5c
41 files changed
+586
-16
No files matched your search
+12
@@ -143,6 +143,18 @@ public final class AntarchyConfigModuleNeoforge {
|
||||
AntarchySettings.setDreadHallucinationMobsEnabled(AntarchyMobsConfig.dreadHallucinationMobsEnabled());
|
||||
AntarchySettings.setDreadHallucinationMobMinInterval(AntarchyMobsConfig.dreadHallucinationMobMinInterval());
|
||||
AntarchySettings.setDreadHallucinationMobMaxInterval(AntarchyMobsConfig.dreadHallucinationMobMaxInterval());
|
||||
|
||||
AntarchySettings.setToreterrorHealth(AntarchyMobsConfig.toreterrorHealth());
|
||||
AntarchySettings.setToreterrorJumpAttackDamage(AntarchyMobsConfig.toreterrorJumpAttackDamage());
|
||||
AntarchySettings.setToreterrorJumpAttackKnockback(AntarchyMobsConfig.toreterrorJumpAttackKnockback());
|
||||
AntarchySettings.setToreterrorSpinDamage(AntarchyMobsConfig.toreterrorSpinDamage());
|
||||
AntarchySettings.setToreterrorSpinKnockback(AntarchyMobsConfig.toreterrorSpinKnockback());
|
||||
AntarchySettings.setToreterrorRangedWaterBombChance(AntarchyMobsConfig.toreterrorRangedWaterBombChance());
|
||||
AntarchySettings.setWaterBombDamage(AntarchyMobsConfig.waterBombDamage());
|
||||
AntarchySettings.setWaterBombLifetimeTicks(AntarchyMobsConfig.waterBombLifetimeTicks());
|
||||
AntarchySettings.setWaterBombGravity(AntarchyMobsConfig.waterBombGravity());
|
||||
AntarchySettings.setWaterBombKnockback(AntarchyMobsConfig.waterBombKnockback());
|
||||
AntarchySettings.setWaterCannonCooldownSeconds(AntarchyMobsConfig.waterCannonCooldownSeconds());
|
||||
}
|
||||
|
||||
private static void bakeToolsConfig() {
|
||||
|
||||
@@ -146,6 +146,21 @@ public final class AntarchyMobsConfig {
|
||||
private static final ModConfigSpec.IntValue BASILISK_PREY_PETRIFY_TICKS;
|
||||
|
||||
|
||||
// Toreterror
|
||||
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_HEALTH;
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_JUMP_ATTACK_DAMAGE;
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_JUMP_ATTACK_KNOCKBACK;
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_SPIN_DAMAGE;
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_SPIN_KNOCKBACK;
|
||||
private static final ModConfigSpec.DoubleValue TORETERROR_RANGED_WATER_BOMB_CHANCE;
|
||||
private static final ModConfigSpec.DoubleValue WATER_BOMB_DAMAGE;
|
||||
private static final ModConfigSpec.IntValue WATER_BOMB_LIFETIME_TICKS;
|
||||
private static final ModConfigSpec.DoubleValue WATER_BOMB_GRAVITY;
|
||||
private static final ModConfigSpec.DoubleValue WATER_BOMB_KNOCKBACK;
|
||||
private static final ModConfigSpec.DoubleValue WATER_CANNON_COOLDOWN_SECONDS;
|
||||
|
||||
|
||||
// Lucid
|
||||
|
||||
private static final ModConfigSpec.DoubleValue LUCID_ATTACK_RANGE;
|
||||
@@ -417,6 +432,20 @@ public final class AntarchyMobsConfig {
|
||||
|
||||
b.pop(); // dread
|
||||
|
||||
b.push("toreterror");
|
||||
TORETERROR_HEALTH = b.comment("Base max health.").defineInRange("health", 300.0D, 1.0D, 32768.0D);
|
||||
TORETERROR_JUMP_ATTACK_DAMAGE = b.comment("Damage dealt by the jump shockwave.").defineInRange("jumpAttackDamage", 14.0D, 0.0D, 1024.0D);
|
||||
TORETERROR_JUMP_ATTACK_KNOCKBACK = b.comment("Knockback strength of the jump shockwave.").defineInRange("jumpAttackKnockback", 2.5D, 0.0D, 10.0D);
|
||||
TORETERROR_SPIN_DAMAGE = b.comment("Damage per spin-attack tick.").defineInRange("spinDamage", 8.0D, 0.0D, 1024.0D);
|
||||
TORETERROR_SPIN_KNOCKBACK = b.comment("Knockback strength of the spin attack.").defineInRange("spinKnockback", 1.5D, 0.0D, 10.0D);
|
||||
TORETERROR_RANGED_WATER_BOMB_CHANCE = b.comment("Chance (0.0-1.0) the ranged attack fires a Water Bomb instead of Bombers.").defineInRange("rangedWaterBombChance", 0.5D, 0.0D, 1.0D);
|
||||
WATER_BOMB_DAMAGE = b.comment("Damage dealt by a Water Bomb hit.").defineInRange("waterBombDamage", 6.0D, 0.0D, 1024.0D);
|
||||
WATER_BOMB_LIFETIME_TICKS = b.comment("Ticks before a Water Bomb despawns.").defineInRange("waterBombLifetimeTicks", 120, 1, 6000);
|
||||
WATER_BOMB_GRAVITY = b.comment("Gravity applied to Water Bombs (higher = steeper arc).").defineInRange("waterBombGravity", 0.12D, 0.0D, 2.0D);
|
||||
WATER_BOMB_KNOCKBACK = b.comment("Knockback strength when a Water Bomb hits an entity.").defineInRange("waterBombKnockback", 1.2D, 0.0D, 10.0D);
|
||||
WATER_CANNON_COOLDOWN_SECONDS = b.comment("Cooldown in seconds between Water Cannon shots.").defineInRange("waterCannonCooldownSeconds", 1.5D, 0.0D, 300.0D);
|
||||
b.pop();
|
||||
|
||||
SPEC = b.build();
|
||||
}
|
||||
|
||||
@@ -529,6 +558,18 @@ public final class AntarchyMobsConfig {
|
||||
static double lucidAttackRange() { return LUCID_ATTACK_RANGE.get(); }
|
||||
static double lucidPearlInvertedDurationSeconds() { return LUCID_PEARL_INVERTED_DURATION_SECONDS.get(); }
|
||||
|
||||
static double toreterrorHealth() { return TORETERROR_HEALTH.get(); }
|
||||
static double toreterrorJumpAttackDamage() { return TORETERROR_JUMP_ATTACK_DAMAGE.get(); }
|
||||
static double toreterrorJumpAttackKnockback() { return TORETERROR_JUMP_ATTACK_KNOCKBACK.get(); }
|
||||
static double toreterrorSpinDamage() { return TORETERROR_SPIN_DAMAGE.get(); }
|
||||
static double toreterrorSpinKnockback() { return TORETERROR_SPIN_KNOCKBACK.get(); }
|
||||
static double toreterrorRangedWaterBombChance() { return TORETERROR_RANGED_WATER_BOMB_CHANCE.get(); }
|
||||
static double waterBombDamage() { return WATER_BOMB_DAMAGE.get(); }
|
||||
static int waterBombLifetimeTicks() { return WATER_BOMB_LIFETIME_TICKS.get(); }
|
||||
static double waterBombGravity() { return WATER_BOMB_GRAVITY.get(); }
|
||||
static double waterBombKnockback() { return WATER_BOMB_KNOCKBACK.get(); }
|
||||
static double waterCannonCooldownSeconds() { return WATER_CANNON_COOLDOWN_SECONDS.get(); }
|
||||
|
||||
static boolean dreadHallucinationSoundsEnabled() { return DREAD_HALLUCINATION_SOUNDS_ENABLED.get(); }
|
||||
static double dreadHallucinationSoundMinInterval() { return DREAD_HALLUCINATION_SOUND_MIN_INTERVAL.get(); }
|
||||
static double dreadHallucinationSoundMaxInterval() { return DREAD_HALLUCINATION_SOUND_MAX_INTERVAL.get(); }
|
||||
|
||||
@@ -181,12 +181,29 @@ public class AntarchyNeoforge {
|
||||
AntarchyNeoforgeEntites.BRUTALFLY,
|
||||
AntarchyNeoforgeEntites.BRUTALFLY_ORB,
|
||||
AntarchyNeoforgeEntites.HUSH_PROJECTILE,
|
||||
AntarchyNeoforgeEntites.TORETERROR,
|
||||
AntarchyNeoforgeEntites.WATER_BOMB,
|
||||
() -> AntarchyNeoforgeBlocks.DUPLICATOR_LOG.get(),
|
||||
() -> AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(),
|
||||
() -> AntarchyNeoforgeBlocks.DUCT_TAPE.get(),
|
||||
() -> AntarchyNeoforgeBlocks.INFESTED_ROOTED_DIRT.get(),
|
||||
() -> AntarchyNeoforgeBlocks.INFESTED_COARSE_DIRT.get(),
|
||||
() -> AntarchyNeoforgeBlocks.NYXITE.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE.get(),
|
||||
() -> AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICKS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.CHISELED_SHELLSTONE.get(),
|
||||
() -> AntarchyNeoforgeBlocks.MOSSY_SHELLSTONE_BRICKS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.CRACKED_SHELLSTONE_BRICKS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_STAIRS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_SLAB.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_WALL.get(),
|
||||
() -> AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_STAIRS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_SLAB.get(),
|
||||
() -> AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_WALL.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_STAIRS.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_SLAB.get(),
|
||||
() -> AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_WALL.get(),
|
||||
() -> AntarchyNeoforgeBlocks.CLOUD_BLOCK.get(),
|
||||
() -> AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(),
|
||||
() -> AntarchyNeoforgeBlocks.PALE_NYXITE.get(),
|
||||
|
||||
+3
@@ -114,6 +114,8 @@ public final class AntarchyNeoForgeClient {
|
||||
event.registerEntityRenderer(AntarchyNeoforgeEntites.UPWARD_FALLING_BLOCK.get(), com.craisinlord.antarchy.content.client.renderer.UpwardFallingBlockRenderer::new);
|
||||
event.registerEntityRenderer(AntarchyNeoforgeEntites.SCORPION.get(), context -> withParalyzedGeoLayer(new ScorpionRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), context -> withParalyzedGeoLayer(new EmperorScorpionRenderer(context)));
|
||||
event.registerEntityRenderer(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorRenderer::new);
|
||||
event.registerEntityRenderer(AntarchyNeoforgeEntites.WATER_BOMB.get(), WaterBombRenderer::new);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -325,6 +327,7 @@ public final class AntarchyNeoForgeClient {
|
||||
registerGeoItemExtensionSizeRay(event, AntarchyNeoforgeItems.GROWTH_RAY.get());
|
||||
registerGeoItemExtension(event, AntarchyNeoforgeItems.GRAVITY_GUN.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD);
|
||||
registerGeoItemExtension(event, AntarchyNeoforgeItems.SQUIDZOOKA.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD);
|
||||
registerGeoItemExtension(event, AntarchyNeoforgeItems.WATER_CANNON.get(), HumanoidModel.ArmPose.CROSSBOW_HOLD);
|
||||
registerGeoItemExtension(event, AntarchyNeoforgeItems.BATTLE_AXE.get());
|
||||
registerGeoItemExtension(event, AntarchyNeoforgeItems.BIG_BERTHA.get());
|
||||
}
|
||||
|
||||
+31
@@ -2,6 +2,7 @@ package com.craisinlord.antarchy.neoforge.registry;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.config.AntarchySettings;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.*;
|
||||
import com.craisinlord.antarchy.content.block.entity.AntNestBlockEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.DreamCampfireBlockEntity;
|
||||
@@ -123,6 +124,36 @@ public final class AntarchyNeoforgeBlocks {
|
||||
() -> new SlabBlock(nyxiteProperties()));
|
||||
public static final DeferredBlock<WallBlock> NYXITE_BRICK_WALL = BLOCKS.register("nyxite_brick_wall",
|
||||
() -> new WallBlock(nyxiteProperties()));
|
||||
public static final DeferredBlock<Block> SHELLSTONE = BLOCKS.register("shellstone",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<Block> POLISHED_SHELLSTONE = BLOCKS.register("polished_shellstone",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<Block> SHELLSTONE_BRICKS = BLOCKS.register("shellstone_bricks",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<Block> CHISELED_SHELLSTONE = BLOCKS.register("chiseled_shellstone",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<Block> MOSSY_SHELLSTONE_BRICKS = BLOCKS.register("mossy_shellstone_bricks",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<Block> CRACKED_SHELLSTONE_BRICKS = BLOCKS.register("cracked_shellstone_bricks",
|
||||
() -> new Block(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<StairBlock> SHELLSTONE_STAIRS = BLOCKS.register("shellstone_stairs",
|
||||
() -> new StairBlock(SHELLSTONE.get().defaultBlockState(), AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<SlabBlock> SHELLSTONE_SLAB = BLOCKS.register("shellstone_slab",
|
||||
() -> new SlabBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<WallBlock> SHELLSTONE_WALL = BLOCKS.register("shellstone_wall",
|
||||
() -> new WallBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<StairBlock> POLISHED_SHELLSTONE_STAIRS = BLOCKS.register("polished_shellstone_stairs",
|
||||
() -> new StairBlock(POLISHED_SHELLSTONE.get().defaultBlockState(), AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<SlabBlock> POLISHED_SHELLSTONE_SLAB = BLOCKS.register("polished_shellstone_slab",
|
||||
() -> new SlabBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<WallBlock> POLISHED_SHELLSTONE_WALL = BLOCKS.register("polished_shellstone_wall",
|
||||
() -> new WallBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<StairBlock> SHELLSTONE_BRICK_STAIRS = BLOCKS.register("shellstone_brick_stairs",
|
||||
() -> new StairBlock(SHELLSTONE_BRICKS.get().defaultBlockState(), AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<SlabBlock> SHELLSTONE_BRICK_SLAB = BLOCKS.register("shellstone_brick_slab",
|
||||
() -> new SlabBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<WallBlock> SHELLSTONE_BRICK_WALL = BLOCKS.register("shellstone_brick_wall",
|
||||
() -> new WallBlock(AntarchyObjects.shellstoneProperties()));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.TriffidGooBlock> TRIFFID_GOO_BLOCK = BLOCKS.register("triffid_goo_block",
|
||||
() -> new com.craisinlord.antarchy.content.block.TriffidGooBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SLIME_BLOCK).noOcclusion().isViewBlocking((s, l, p) -> false).isSuffocating((s, l, p) -> false)));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.CloudBlock> CLOUD_BLOCK = BLOCKS.register("cloud_block",
|
||||
|
||||
+25
-2
@@ -76,6 +76,7 @@ public class AntarchyNeoforgeCreativeModeTabs {
|
||||
event.accept(AntarchyNeoforgeItems.SCORPION_SPAWN_EGG.get());
|
||||
event.accept(AntarchyNeoforgeItems.BASILISK_SPAWN_EGG.get());
|
||||
event.accept(AntarchyNeoforgeItems.EMPEROR_SCORPION_SPAWN_EGG.get());
|
||||
event.accept(AntarchyNeoforgeItems.TORETERROR_SPAWN_EGG.get());
|
||||
}
|
||||
|
||||
if (event.getTabKey() == CreativeModeTabs.NATURAL_BLOCKS) {
|
||||
@@ -168,6 +169,21 @@ public class AntarchyNeoforgeCreativeModeTabs {
|
||||
event.accept(AntarchyNeoforgeItems.OURANWOOD_BUTTON_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.OURANWOOD_SIGN_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.OURANWOOD_HANGING_SIGN_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_STAIRS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_SLAB_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_WALL_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.POLISHED_SHELLSTONE_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.POLISHED_SHELLSTONE_STAIRS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.POLISHED_SHELLSTONE_SLAB_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.POLISHED_SHELLSTONE_WALL_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_BRICKS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_BRICK_STAIRS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_BRICK_SLAB_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.SHELLSTONE_BRICK_WALL_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.CHISELED_SHELLSTONE_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.MOSSY_SHELLSTONE_BRICKS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.CRACKED_SHELLSTONE_BRICKS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.NYXITE_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.NYXITE_STAIRS_ITEM.get());
|
||||
event.accept(AntarchyNeoforgeItems.NYXITE_SLAB_ITEM.get());
|
||||
@@ -246,7 +262,12 @@ public class AntarchyNeoforgeCreativeModeTabs {
|
||||
event.accept(AntarchyNeoforgeItems.SHRINK_RAY.get());
|
||||
event.accept(AntarchyNeoforgeItems.GROWTH_RAY.get());
|
||||
event.accept(AntarchyNeoforgeItems.GRAVITY_GUN.get());
|
||||
event.accept(AntarchyNeoforgeItems.WATER_CANNON.get());
|
||||
event.accept(AntarchyNeoforgeItems.LUCID_PEARL.get());
|
||||
event.accept(AntarchyNeoforgeItems.PRIMORDIAL_HELMET.get());
|
||||
event.accept(AntarchyNeoforgeItems.PRIMORDIAL_CHESTPLATE.get());
|
||||
event.accept(AntarchyNeoforgeItems.PRIMORDIAL_LEGGINGS.get());
|
||||
event.accept(AntarchyNeoforgeItems.PRIMORDIAL_BOOTS.get());
|
||||
event.accept(AntarchyNeoforgeItems.NIGHTMARE_HELMET.get());
|
||||
event.accept(AntarchyNeoforgeItems.NIGHTMARE_CHESTPLATE.get());
|
||||
event.accept(AntarchyNeoforgeItems.NIGHTMARE_LEGGINGS.get());
|
||||
@@ -356,12 +377,14 @@ public class AntarchyNeoforgeCreativeModeTabs {
|
||||
|
||||
// 17 - Weapons
|
||||
case "battle_axe", "basilisk_dagger", "squidzooka", "shrink_ray", "growth_ray",
|
||||
"gravity_gun", "nightmare_sword", "lucid_pearl", "scorpion_whip", "blood_crystal_katana",
|
||||
"gravity_gun", "water_cannon", "nightmare_sword", "lucid_pearl", "scorpion_whip", "blood_crystal_katana",
|
||||
"big_bertha", "big_bertha_blade", "big_bertha_handle", "big_bertha_hilt",
|
||||
"ultimate_sword", "ultimate_mace" -> 17;
|
||||
|
||||
// 18 - Armor sets
|
||||
case "blood_crystal_helmet", "blood_crystal_chestplate",
|
||||
case "primordial_helmet", "primordial_chestplate",
|
||||
"primordial_leggings", "primordial_boots",
|
||||
"blood_crystal_helmet", "blood_crystal_chestplate",
|
||||
"blood_crystal_leggings", "blood_crystal_boots",
|
||||
"nightmare_helmet", "nightmare_chestplate",
|
||||
"nightmare_leggings", "nightmare_boots",
|
||||
|
||||
+13
@@ -40,6 +40,8 @@ import com.craisinlord.antarchy.content.entity.lucid.LucidBoltEntity;
|
||||
import com.craisinlord.antarchy.content.entity.lucid.LucidEntity;
|
||||
import com.craisinlord.antarchy.content.entity.lucid.LucidEyeProjectileEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ToreterrorEntity;
|
||||
import com.craisinlord.antarchy.content.entity.WaterBombEntity;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
import net.minecraft.world.entity.MobCategory;
|
||||
@@ -240,6 +242,17 @@ public final class AntarchyNeoforgeEntites {
|
||||
.clientTrackingRange(10)
|
||||
.updateInterval(1)
|
||||
.build("brutalfly_orb"));
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<ToreterrorEntity>> TORETERROR = ENTITY_TYPES.register("toreterror",
|
||||
() -> EntityType.Builder.of(ToreterrorEntity::new, MobCategory.MONSTER)
|
||||
.sized(2.5F, 3.0F)
|
||||
.clientTrackingRange(14)
|
||||
.build("toreterror"));
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<WaterBombEntity>> WATER_BOMB = ENTITY_TYPES.register("water_bomb",
|
||||
() -> EntityType.Builder.<WaterBombEntity>of(WaterBombEntity::new, MobCategory.MISC)
|
||||
.sized(0.4F, 0.4F)
|
||||
.clientTrackingRange(8)
|
||||
.updateInterval(1)
|
||||
.build("water_bomb"));
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<UpwardFallingBlockEntity>> UPWARD_FALLING_BLOCK = ENTITY_TYPES.register("upward_falling_block",
|
||||
() -> EntityType.Builder.<UpwardFallingBlockEntity>of(
|
||||
UpwardFallingBlockEntity::new, MobCategory.MISC)
|
||||
|
||||
+2
@@ -9,6 +9,7 @@ import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEnt
|
||||
import com.craisinlord.antarchy.content.entity.kraken.KrakenEntity;
|
||||
import com.craisinlord.antarchy.content.entity.lucid.LucidEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ToreterrorEntity;
|
||||
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
|
||||
import net.minecraft.world.entity.ai.attributes.Attributes;
|
||||
import net.minecraft.world.entity.animal.Cow;
|
||||
@@ -51,6 +52,7 @@ public class AntarchyNeoforgeEntityAttributes {
|
||||
event.put(AntarchyNeoforgeEntites.SCORPION.get(), ScorpionEntity.createAttributes().build());
|
||||
event.put(AntarchyNeoforgeEntites.BASILISK.get(), BasiliskEntity.createAttributes().build());
|
||||
event.put(AntarchyNeoforgeEntites.EMPEROR_SCORPION.get(), EmperorScorpionEntity.createAttributes().build());
|
||||
event.put(AntarchyNeoforgeEntites.TORETERROR.get(), ToreterrorEntity.createAttributes().build());
|
||||
|
||||
AttributeSupplier redAntAttributes = buildAntAttributes(AntarchySettings.redAntHealth(), AntarchySettings.redAntMovementSpeed(), AntarchySettings.redAntAttackDamage()).build();
|
||||
AttributeSupplier brownAntAttributes = buildAntAttributes(AntarchySettings.brownAntHealth(), AntarchySettings.brownAntMovementSpeed(), AntarchySettings.brownAntAttackDamage()).build();
|
||||
|
||||
+51
-2
@@ -13,6 +13,8 @@ import com.craisinlord.antarchy.content.item.BloodCrystalKatanaItem;
|
||||
import com.craisinlord.antarchy.content.item.BloodCrystalShardItem;
|
||||
import com.craisinlord.antarchy.content.item.ultimate.*;
|
||||
import com.craisinlord.antarchy.content.item.NightmareArmorItem;
|
||||
import com.craisinlord.antarchy.content.item.PrimordialArmorItem;
|
||||
import com.craisinlord.antarchy.content.item.WaterCannonItem;
|
||||
import com.craisinlord.antarchy.content.item.NightmareSwordItem;
|
||||
import com.craisinlord.antarchy.content.item.LucidEyeItem;
|
||||
import com.craisinlord.antarchy.content.item.LucidPearlItem;
|
||||
@@ -103,6 +105,18 @@ public final class AntarchyNeoforgeItems {
|
||||
0.0F,
|
||||
0.0F
|
||||
));
|
||||
public static final DeferredItem<Item> PRIMORDIAL_SCUTE = ITEMS.registerSimpleItem("primordial_scute",
|
||||
new Item.Properties().rarity(Rarity.UNCOMMON));
|
||||
private static final DeferredHolder<ArmorMaterial, ArmorMaterial> PRIMORDIAL_ARMOR_MATERIAL = ARMOR_MATERIALS.register("primordial",
|
||||
() -> new ArmorMaterial(
|
||||
createPrimordialArmorDefense(),
|
||||
15,
|
||||
SoundEvents.ARMOR_EQUIP_NETHERITE,
|
||||
() -> Ingredient.of(PRIMORDIAL_SCUTE.get()),
|
||||
List.of(new ArmorMaterial.Layer(ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "primordial"))),
|
||||
3.0F,
|
||||
0.1F
|
||||
));
|
||||
private static final DeferredHolder<ArmorMaterial, ArmorMaterial> FALLEN_KING_CROWN_ARMOR_MATERIAL = ARMOR_MATERIALS.register("fallen_king_crown",
|
||||
() -> new ArmorMaterial(
|
||||
createFallenKingCrownDefense(),
|
||||
@@ -215,6 +229,21 @@ public final class AntarchyNeoforgeItems {
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> NYXITE_BRICK_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_BRICK_STAIRS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> NYXITE_BRICK_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_BRICK_SLAB);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> NYXITE_BRICK_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.NYXITE_BRICK_WALL);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> POLISHED_SHELLSTONE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICKS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> CHISELED_SHELLSTONE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CHISELED_SHELLSTONE);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> MOSSY_SHELLSTONE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.MOSSY_SHELLSTONE_BRICKS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> CRACKED_SHELLSTONE_BRICKS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.CRACKED_SHELLSTONE_BRICKS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_STAIRS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_SLAB);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_WALL);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> POLISHED_SHELLSTONE_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_STAIRS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> POLISHED_SHELLSTONE_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_SLAB);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> POLISHED_SHELLSTONE_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.POLISHED_SHELLSTONE_WALL);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_BRICK_STAIRS_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_STAIRS);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_BRICK_SLAB_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_SLAB);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> SHELLSTONE_BRICK_WALL_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.SHELLSTONE_BRICK_WALL);
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> TRIFFID_GOO_BLOCK_ITEM = ITEMS.register("triffid_goo_block",
|
||||
() -> new com.craisinlord.antarchy.content.item.TriffidGooBlockItem(AntarchyNeoforgeBlocks.TRIFFID_GOO_BLOCK.get(), new Item.Properties()));
|
||||
public static final DeferredItem<net.minecraft.world.item.BlockItem> PALE_NYXITE_ITEM = ITEMS.registerSimpleBlockItem(AntarchyNeoforgeBlocks.PALE_NYXITE);
|
||||
@@ -274,8 +303,6 @@ public final class AntarchyNeoforgeItems {
|
||||
.nutrition(2)
|
||||
.saturationModifier(0.4F)
|
||||
.build())));
|
||||
public static final DeferredItem<Item> PRIMORDIAL_SCUTE = ITEMS.register("primordial_scute",
|
||||
() -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.UNCOMMON)));
|
||||
public static final DeferredItem<Item> TRIFFID_GOO = ITEMS.registerSimpleItem("triffid_goo",
|
||||
new Item.Properties().rarity(Rarity.UNCOMMON));
|
||||
public static final DeferredItem<Item> VORTEX_EYE = ITEMS.register("vortex_eye",
|
||||
@@ -490,6 +517,18 @@ public final class AntarchyNeoforgeItems {
|
||||
new Item.Properties().stacksTo(16).rarity(Rarity.UNCOMMON),
|
||||
AntarchyNeoforgeEntites.LUCID_PEARL_PROJECTILE
|
||||
));
|
||||
public static final DeferredItem<WaterCannonItem> WATER_CANNON = ITEMS.register("water_cannon",
|
||||
() -> new WaterCannonItem(new Item.Properties().stacksTo(1).durability(192).rarity(Rarity.RARE)));
|
||||
public static final DeferredItem<PrimordialArmorItem> PRIMORDIAL_HELMET = ITEMS.register("primordial_helmet",
|
||||
() -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.HELMET, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
|
||||
public static final DeferredItem<PrimordialArmorItem> PRIMORDIAL_CHESTPLATE = ITEMS.register("primordial_chestplate",
|
||||
() -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.CHESTPLATE, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
|
||||
public static final DeferredItem<PrimordialArmorItem> PRIMORDIAL_LEGGINGS = ITEMS.register("primordial_leggings",
|
||||
() -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.LEGGINGS, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
|
||||
public static final DeferredItem<PrimordialArmorItem> PRIMORDIAL_BOOTS = ITEMS.register("primordial_boots",
|
||||
() -> new PrimordialArmorItem(PRIMORDIAL_ARMOR_MATERIAL, ArmorItem.Type.BOOTS, new Item.Properties().rarity(Rarity.RARE).fireResistant()));
|
||||
public static final DeferredItem<DeferredSpawnEggItem> TORETERROR_SPAWN_EGG = ITEMS.register("toreterror_spawn_egg",
|
||||
() -> new DeferredSpawnEggItem(AntarchyNeoforgeEntites.TORETERROR, 0x90EE90, 0x5C4033, new Item.Properties().rarity(Rarity.EPIC)));
|
||||
|
||||
private AntarchyNeoforgeItems() {}
|
||||
|
||||
@@ -571,6 +610,16 @@ public final class AntarchyNeoforgeItems {
|
||||
return defense;
|
||||
}
|
||||
|
||||
private static EnumMap<ArmorItem.Type, Integer> createPrimordialArmorDefense() {
|
||||
EnumMap<ArmorItem.Type, Integer> defense = new EnumMap<>(ArmorItem.Type.class);
|
||||
defense.put(ArmorItem.Type.BOOTS, 3);
|
||||
defense.put(ArmorItem.Type.LEGGINGS, 6);
|
||||
defense.put(ArmorItem.Type.CHESTPLATE, 8);
|
||||
defense.put(ArmorItem.Type.HELMET, 3);
|
||||
defense.put(ArmorItem.Type.BODY, 8);
|
||||
return defense;
|
||||
}
|
||||
|
||||
private static EnumMap<ArmorItem.Type, Integer> createFallenKingCrownDefense() {
|
||||
EnumMap<ArmorItem.Type, Integer> defense = new EnumMap<>(ArmorItem.Type.class);
|
||||
defense.put(ArmorItem.Type.BOOTS, 0);
|
||||
|
||||
Reference in new issue
Block a user