time dilation and contraction effects, various fixes
This commit is contained in:
1 parent
68eba61022
commit
89d41dd7e1
192 files changed
+2866
-1885
No files matched your search
+644
-85
File diff suppressed because it is too large.
Load diff
+228
-34
@@ -1,5 +1,6 @@
|
||||
package com.craisinlord.antarchy.content;
|
||||
|
||||
import com.craisinlord.antarchy.compat.item.AntarchyItemComponent;
|
||||
import com.craisinlord.antarchy.content.entity.BedBugEntity;
|
||||
import com.craisinlord.antarchy.content.entity.BomberEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ButterflyEntity;
|
||||
@@ -17,6 +18,7 @@ import com.craisinlord.antarchy.content.entity.WaspEntity;
|
||||
import com.craisinlord.antarchy.content.entity.brutalfly.BrutalflyEntity;
|
||||
import com.craisinlord.antarchy.content.entity.brutalfly.BrutalflyOrbEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.HushweedBlockEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.VortexLensBlockEntity;
|
||||
import com.craisinlord.antarchy.content.entity.flying_squirrel.FlyingSquirrelEntity;
|
||||
import com.craisinlord.antarchy.content.entity.MissileSquidEntity;
|
||||
import com.craisinlord.antarchy.content.entity.OctopusBombEntity;
|
||||
@@ -27,9 +29,15 @@ import com.craisinlord.antarchy.content.entity.MolewormEntity;
|
||||
import com.craisinlord.antarchy.content.entity.MantisEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ReverieEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ScorpionEntity;
|
||||
import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity;
|
||||
import com.craisinlord.antarchy.content.entity.lucid.LucidEntity;
|
||||
import com.craisinlord.antarchy.content.entity.vortex.VortexChargeProjectileEntity;
|
||||
import com.craisinlord.antarchy.content.entity.vortex.VortexEntity;
|
||||
import com.craisinlord.antarchy.content.entity.vortex.WindVortexEntity;
|
||||
import com.craisinlord.antarchy.content.time.TimeDilationFieldEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmareBiteEntity;
|
||||
import com.craisinlord.antarchy.content.entity.nightmare.NightmarePortalEntity;
|
||||
import com.craisinlord.antarchy.content.entity.portal.DimensionalTearEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.AntNestBlockEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.DreamCampfireBlockEntity;
|
||||
import com.craisinlord.antarchy.content.block.entity.SeashellBlockEntity;
|
||||
@@ -37,6 +45,7 @@ import com.craisinlord.antarchy.content.block.entity.WaspNestBlockEntity;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.particles.SimpleParticleType;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.effect.MobEffect;
|
||||
import net.minecraft.world.entity.ai.attributes.Attribute;
|
||||
import net.minecraft.world.entity.EntityType;
|
||||
@@ -69,12 +78,35 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<OctopusBombEntity>> OCTOPUS_BOMB = (Supplier<EntityType<OctopusBombEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<NightmareEntity>> NIGHTMARE = (Supplier<EntityType<NightmareEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<NightmarePortalEntity>> NIGHTMARE_PORTAL = (Supplier<EntityType<NightmarePortalEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<DimensionalTearEntity>> DIMENSIONAL_TEAR = (Supplier<EntityType<DimensionalTearEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> DIMENSIONAL_TEAR_MARKER = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.DimensionalTearMarkerBlockEntity>> DIMENSIONAL_TEAR_MARKER_BLOCK_ENTITY =
|
||||
(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.DimensionalTearMarkerBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<NightmareBiteEntity>> NIGHTMARE_BITE = (Supplier<EntityType<NightmareBiteEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<LucidEntity>> LUCID = (Supplier<EntityType<LucidEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<VortexEntity>> VORTEX = (Supplier<EntityType<VortexEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<WindVortexEntity>> WIND_VORTEX = (Supplier<EntityType<WindVortexEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<VortexChargeProjectileEntity>> VORTEX_CHARGE_PROJECTILE = (Supplier<EntityType<VortexChargeProjectileEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<TimeDilationFieldEntity>> TIME_DILATION_FIELD = (Supplier<EntityType<TimeDilationFieldEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBlackHoleEntity>> ROYAL_BLACK_HOLE = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBlackHoleEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> VORTEX_LENS = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<VortexLensBlockEntity>> VORTEX_LENS_BLOCK_ENTITY = (Supplier<BlockEntityType<VortexLensBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<MolewormEntity>> MOLEWORM = (Supplier<EntityType<MolewormEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<MantisEntity>> MANTIS = (Supplier<EntityType<MantisEntity>>) UNBOUND;
|
||||
@@ -109,6 +141,8 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<LurkingTerrorEntity>> LURKING_TERROR = (Supplier<EntityType<LurkingTerrorEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.ManticoreEntity>> MANTICORE = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.ManticoreEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<StinkBugEntity>> STINK_BUG = (Supplier<EntityType<StinkBugEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.RollyPollyEntity>> ROLLY_POLLY = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.RollyPollyEntity>>) UNBOUND;
|
||||
@@ -119,14 +153,32 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<HerculesBeetleEntity>> HERCULES_BEETLE = (Supplier<EntityType<HerculesBeetleEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrinceEntity>> PRINCE = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrinceEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrincessEntity>> PRINCESS = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrincessEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity>> ROYAL_BOLT = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalElementalProjectileEntity>> ROYAL_ELEMENTAL_PROJECTILE = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalElementalProjectileEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalIceSpikeEntity>> ROYAL_ICE_SPIKE = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalIceSpikeEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.KingEntity>> KING = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.KingEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.QueenEntity>> QUEEN = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.QueenEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> PRINCE_EGG = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> PRINCESS_EGG = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity>> ROYAL_EGG_BLOCK_ENTITY = (Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity>> OURANWOOD_DEER = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.glimmer.GlimmerEntity>> GLIMMER = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.glimmer.GlimmerEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Item> SPIRIT_APPLE = (Supplier<Item>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MobEffect> GLIMMERING_EFFECT = (Supplier<MobEffect>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<EntityType<com.craisinlord.antarchy.content.entity.ElkaEntity>> ELKA = (Supplier<EntityType<com.craisinlord.antarchy.content.entity.ElkaEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Item> PEACH = (Supplier<Item>) UNBOUND;
|
||||
@@ -150,14 +202,17 @@ public final class AntarchyObjects {
|
||||
public static Supplier<Item> COOKED_CORNDOG = (Supplier<Item>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Item> GLIMMER_BOTTLE = (Supplier<Item>) UNBOUND;
|
||||
public static final com.craisinlord.antarchy.content.component.AntarchyItemComponent<com.craisinlord.antarchy.content.entity.glimmer.GlimmerVariant> GLIMMER_VARIANT_COMPONENT =
|
||||
com.craisinlord.antarchy.content.component.AntarchyItemComponent.of(
|
||||
"antarchy_glimmer_variant",
|
||||
variant -> net.minecraft.nbt.StringTag.valueOf(variant.name()),
|
||||
tag -> com.craisinlord.antarchy.content.entity.glimmer.GlimmerVariant.byName(tag.getAsString()));
|
||||
@SuppressWarnings("unchecked")
|
||||
public static AntarchyItemComponent<com.craisinlord.antarchy.content.entity.glimmer.GlimmerVariant> GLIMMER_VARIANT_COMPONENT =
|
||||
AntarchyItemComponent.string("antarchy_glimmer_variant", value -> {
|
||||
try { return com.craisinlord.antarchy.content.entity.glimmer.GlimmerVariant.valueOf(value); }
|
||||
catch (IllegalArgumentException ignored) { return null; }
|
||||
}, value -> value.name());
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MenuType<com.craisinlord.antarchy.content.menu.DorrieInventoryMenu>> DORRIE_INVENTORY_MENU = (Supplier<MenuType<com.craisinlord.antarchy.content.menu.DorrieInventoryMenu>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>> ROYAL_JUDGMENT_MENU = (Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<net.minecraft.world.item.Item> CHEEP_ITEM = (Supplier<net.minecraft.world.item.Item>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> DUPLICATOR_LOG = (Supplier<Block>) UNBOUND;
|
||||
@@ -254,8 +309,6 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MobEffect> DREAD = (Supplier<MobEffect>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Holder<Attribute>> SCALE = (Supplier<Holder<Attribute>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Holder<Attribute>> DOUBLE_DAMAGE_CHANCE = (Supplier<Holder<Attribute>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Holder<Attribute>> BLOODGLASS_MAX_HEARTS = (Supplier<Holder<Attribute>>) UNBOUND;
|
||||
@@ -268,6 +321,9 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MobEffect> STINKY_EFFECT = (Supplier<MobEffect>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MobEffect> GLIMMERING_EFFECT = (Supplier<MobEffect>) UNBOUND;
|
||||
public static Supplier<MobEffect> DILATED_EFFECT = (Supplier<MobEffect>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Fluid> LUMEN = (Supplier<Fluid>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Fluid> FLOWING_LUMEN = (Supplier<Fluid>) UNBOUND;
|
||||
@@ -278,6 +334,8 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> LUMEN_FROGLIGHT = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> GLIMMERING_REED = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> OURANWOOD_ACORN_BLOCK = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> MOSSY_OURANWOOD_LOG = (Supplier<Block>) UNBOUND;
|
||||
@@ -320,9 +378,6 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> LUCID_ANCHOR = (Supplier<Block>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>> LUCID_ANCHOR_BLOCK_ENTITY =
|
||||
(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<AntNestBlockEntity>> ANT_NEST_BLOCK_ENTITY = (Supplier<BlockEntityType<AntNestBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<DreamCampfireBlockEntity>> DREAM_CAMPFIRE_BLOCK_ENTITY = (Supplier<BlockEntityType<DreamCampfireBlockEntity>>) UNBOUND;
|
||||
@@ -336,6 +391,9 @@ public final class AntarchyObjects {
|
||||
public static Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.CritterCageBlockEntity>> CRITTER_CAGE_BLOCK_ENTITY =
|
||||
(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.CritterCageBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>> LUCID_ANCHOR_BLOCK_ENTITY =
|
||||
(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<SimpleParticleType> STINKY_GAS = (Supplier<SimpleParticleType>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<SimpleParticleType> NIGHTMARE_FIRE_FLAME = (Supplier<SimpleParticleType>) UNBOUND;
|
||||
@@ -349,24 +407,32 @@ public final class AntarchyObjects {
|
||||
public static Supplier<SimpleParticleType> LUCID_BOLT_IMPACT_SMALL = (Supplier<SimpleParticleType>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<SimpleParticleType> LUCID_BOLT_IMPACT_LARGE = (Supplier<SimpleParticleType>) UNBOUND;
|
||||
public static final com.craisinlord.antarchy.content.component.AntarchyItemComponent<net.minecraft.util.Unit> AMERICAN_COMPONENT =
|
||||
com.craisinlord.antarchy.content.component.AntarchyItemComponent.ofMarker("antarchy_american");
|
||||
@SuppressWarnings("unchecked")
|
||||
public static AntarchyItemComponent<net.minecraft.util.Unit> AMERICAN_COMPONENT = AntarchyItemComponent.marker("antarchy_american");
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.CritterCageProjectileEntity>> CRITTER_CAGE_PROJECTILE =
|
||||
(Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.CritterCageProjectileEntity>>) UNBOUND;
|
||||
public static final com.craisinlord.antarchy.content.component.AntarchyItemComponent<net.minecraft.resources.ResourceLocation> CRITTER_CAGE_ENTITY_TYPE_COMPONENT =
|
||||
com.craisinlord.antarchy.content.component.AntarchyItemComponent.of(
|
||||
"antarchy_critter_cage_entity_type",
|
||||
rl -> net.minecraft.nbt.StringTag.valueOf(rl.toString()),
|
||||
tag -> new net.minecraft.resources.ResourceLocation(tag.getAsString()));
|
||||
public static final com.craisinlord.antarchy.content.component.AntarchyItemComponent<Integer> CRITTER_CAGE_PRIMARY_COLOR_COMPONENT =
|
||||
com.craisinlord.antarchy.content.component.AntarchyItemComponent.ofInt("antarchy_critter_cage_primary_color");
|
||||
public static final com.craisinlord.antarchy.content.component.AntarchyItemComponent<Integer> CRITTER_CAGE_SECONDARY_COLOR_COMPONENT =
|
||||
com.craisinlord.antarchy.content.component.AntarchyItemComponent.ofInt("antarchy_critter_cage_secondary_color");
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.WormHookProjectileEntity>> WORM_HOOK_PROJECTILE =
|
||||
(Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.WormHookProjectileEntity>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Item> WORM_HOOK = (Supplier<Item>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static AntarchyItemComponent<net.minecraft.resources.ResourceLocation> CRITTER_CAGE_ENTITY_TYPE_COMPONENT =
|
||||
AntarchyItemComponent.string("antarchy_cage_entity_type", ResourceLocation::new, ResourceLocation::toString);
|
||||
@SuppressWarnings("unchecked")
|
||||
public static AntarchyItemComponent<Integer> CRITTER_CAGE_PRIMARY_COLOR_COMPONENT = AntarchyItemComponent.integer("antarchy_cage_primary_color");
|
||||
@SuppressWarnings("unchecked")
|
||||
public static AntarchyItemComponent<Integer> CRITTER_CAGE_SECONDARY_COLOR_COMPONENT = AntarchyItemComponent.integer("antarchy_cage_secondary_color");
|
||||
|
||||
private AntarchyObjects() {
|
||||
}
|
||||
|
||||
/** Compatibility entry point for loader registries that bind the expanded 1.21 object set. */
|
||||
public static void bind(Supplier<?>... ignored) {
|
||||
// Loader-specific registrations populate the fields through the explicit setters below.
|
||||
}
|
||||
|
||||
public static void bind(
|
||||
Supplier<EntityType<EasterBunnyEntity>> easterBunny,
|
||||
Supplier<EntityType<FlyingSquirrelEntity>> flyingSquirrel,
|
||||
@@ -465,7 +531,6 @@ public final class AntarchyObjects {
|
||||
Supplier<SimpleParticleType> stinkyGas,
|
||||
Supplier<SimpleParticleType> stinkyFly,
|
||||
Supplier<SimpleParticleType> peachLeaves,
|
||||
Supplier<Holder<Attribute>> scale,
|
||||
Supplier<Holder<Attribute>> doubleDamageChance,
|
||||
Supplier<Holder<Attribute>> bloodglassMaxHearts,
|
||||
Supplier<MobEffect> bloodglassWard
|
||||
@@ -567,7 +632,6 @@ public final class AntarchyObjects {
|
||||
STINKY_GAS = stinkyGas;
|
||||
STINKY_FLY = stinkyFly;
|
||||
PEACH_LEAVES_PARTICLE = peachLeaves;
|
||||
SCALE = scale;
|
||||
DOUBLE_DAMAGE_CHANCE = doubleDamageChance;
|
||||
BLOODGLASS_MAX_HEARTS = bloodglassMaxHearts;
|
||||
BLOODGLASS_WARD = bloodglassWard;
|
||||
@@ -593,10 +657,56 @@ public final class AntarchyObjects {
|
||||
DIMENSIONAL_TEAR = supplier;
|
||||
}
|
||||
|
||||
public static void setDimensionalTearMarker(Supplier<Block> supplier) {
|
||||
DIMENSIONAL_TEAR_MARKER = supplier;
|
||||
}
|
||||
|
||||
public static void setDimensionalTearMarkerBlockEntity(
|
||||
Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.DimensionalTearMarkerBlockEntity>> supplier
|
||||
) {
|
||||
DIMENSIONAL_TEAR_MARKER_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setNightmare(Supplier<EntityType<NightmareEntity>> supplier) {
|
||||
NIGHTMARE = supplier;
|
||||
}
|
||||
|
||||
public static void setNightmareBite(Supplier<EntityType<NightmareBiteEntity>> supplier) {
|
||||
NIGHTMARE_BITE = supplier;
|
||||
}
|
||||
|
||||
public static void setLucid(Supplier<EntityType<LucidEntity>> supplier) {
|
||||
LUCID = supplier;
|
||||
}
|
||||
|
||||
public static void setVortex(Supplier<EntityType<VortexEntity>> supplier) {
|
||||
VORTEX = supplier;
|
||||
}
|
||||
|
||||
public static void setWindVortex(Supplier<EntityType<WindVortexEntity>> supplier) {
|
||||
WIND_VORTEX = supplier;
|
||||
}
|
||||
|
||||
public static void setVortexChargeProjectile(Supplier<EntityType<VortexChargeProjectileEntity>> supplier) {
|
||||
VORTEX_CHARGE_PROJECTILE = supplier;
|
||||
}
|
||||
|
||||
public static void setTimeDilationField(Supplier<EntityType<TimeDilationFieldEntity>> supplier) {
|
||||
TIME_DILATION_FIELD = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalBlackHole(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBlackHoleEntity>> supplier) {
|
||||
ROYAL_BLACK_HOLE = supplier;
|
||||
}
|
||||
|
||||
public static void setVortexLens(Supplier<Block> supplier) {
|
||||
VORTEX_LENS = supplier;
|
||||
}
|
||||
|
||||
public static void setVortexLensBlockEntity(Supplier<BlockEntityType<VortexLensBlockEntity>> supplier) {
|
||||
VORTEX_LENS_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setLotus(Supplier<Block> supplier) {
|
||||
LOTUS = supplier;
|
||||
}
|
||||
@@ -617,18 +727,62 @@ public final class AntarchyObjects {
|
||||
HERCULES_BEETLE = supplier;
|
||||
}
|
||||
|
||||
public static void setPrince(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrinceEntity>> supplier) {
|
||||
PRINCE = supplier;
|
||||
}
|
||||
|
||||
public static void setPrincess(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.PrincessEntity>> supplier) {
|
||||
PRINCESS = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalBolt(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalBoltEntity>> supplier) {
|
||||
ROYAL_BOLT = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalElementalProjectile(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalElementalProjectileEntity>> supplier) {
|
||||
ROYAL_ELEMENTAL_PROJECTILE = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalIceSpike(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.RoyalIceSpikeEntity>> supplier) {
|
||||
ROYAL_ICE_SPIKE = supplier;
|
||||
}
|
||||
|
||||
public static void setKing(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.KingEntity>> supplier) {
|
||||
KING = supplier;
|
||||
}
|
||||
|
||||
public static void setManticore(Supplier<EntityType<com.craisinlord.antarchy.content.entity.ManticoreEntity>> supplier) {
|
||||
MANTICORE = supplier;
|
||||
}
|
||||
|
||||
public static void setQueen(Supplier<EntityType<com.craisinlord.antarchy.content.entity.royal.QueenEntity>> supplier) {
|
||||
QUEEN = supplier;
|
||||
}
|
||||
|
||||
public static void setPrinceEgg(Supplier<Block> supplier) {
|
||||
PRINCE_EGG = supplier;
|
||||
}
|
||||
|
||||
public static void setPrincessEgg(Supplier<Block> supplier) {
|
||||
PRINCESS_EGG = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalEggBlockEntity(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.RoyalEggBlockEntity>> supplier) {
|
||||
ROYAL_EGG_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setOuranwoodDeer(Supplier<EntityType<com.craisinlord.antarchy.content.entity.OuranwoodDeerEntity>> supplier) {
|
||||
OURANWOOD_DEER = supplier;
|
||||
}
|
||||
|
||||
public static void setGlimmer(Supplier<EntityType<com.craisinlord.antarchy.content.entity.glimmer.GlimmerEntity>> supplier) {
|
||||
GLIMMER = supplier;
|
||||
}
|
||||
|
||||
public static void setRollyPolly(Supplier<EntityType<com.craisinlord.antarchy.content.entity.RollyPollyEntity>> supplier) {
|
||||
ROLLY_POLLY = supplier;
|
||||
}
|
||||
|
||||
public static void setGlimmer(Supplier<EntityType<com.craisinlord.antarchy.content.entity.glimmer.GlimmerEntity>> supplier) {
|
||||
GLIMMER = supplier;
|
||||
}
|
||||
|
||||
public static void setLumen(Supplier<Fluid> supplier) {
|
||||
LUMEN = supplier;
|
||||
}
|
||||
@@ -649,6 +803,10 @@ public final class AntarchyObjects {
|
||||
LUMEN_FROGLIGHT = supplier;
|
||||
}
|
||||
|
||||
public static void setGlimmeringReed(Supplier<Block> supplier) {
|
||||
GLIMMERING_REED = supplier;
|
||||
}
|
||||
|
||||
public static void setSpiritApple(Supplier<Item> supplier) {
|
||||
SPIRIT_APPLE = supplier;
|
||||
}
|
||||
@@ -657,6 +815,10 @@ public final class AntarchyObjects {
|
||||
GLIMMERING_EFFECT = supplier;
|
||||
}
|
||||
|
||||
public static void setDilatedEffect(Supplier<MobEffect> supplier) {
|
||||
DILATED_EFFECT = supplier;
|
||||
}
|
||||
|
||||
public static void setElka(Supplier<EntityType<com.craisinlord.antarchy.content.entity.ElkaEntity>> supplier) {
|
||||
ELKA = supplier;
|
||||
}
|
||||
@@ -685,10 +847,6 @@ public final class AntarchyObjects {
|
||||
LUCID_ANCHOR = supplier;
|
||||
}
|
||||
|
||||
public static void setLucidAnchorBlockEntity(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>> supplier) {
|
||||
LUCID_ANCHOR_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setStarCoralBlock(Supplier<Block> supplier) {
|
||||
STAR_CORAL_BLOCK = supplier;
|
||||
}
|
||||
@@ -741,18 +899,54 @@ public final class AntarchyObjects {
|
||||
PEACH_LEAVES_PARTICLE = supplier;
|
||||
}
|
||||
|
||||
public static void setGlimmerVariantComponent(Supplier<AntarchyItemComponent<com.craisinlord.antarchy.content.entity.glimmer.GlimmerVariant>> supplier) {
|
||||
GLIMMER_VARIANT_COMPONENT = supplier.get();
|
||||
}
|
||||
|
||||
public static void setDorrieInventoryMenu(Supplier<MenuType<com.craisinlord.antarchy.content.menu.DorrieInventoryMenu>> supplier) {
|
||||
DORRIE_INVENTORY_MENU = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalJudgmentMenu(Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>> supplier) {
|
||||
ROYAL_JUDGMENT_MENU = supplier;
|
||||
}
|
||||
|
||||
public static void setAmericanComponent(Supplier<AntarchyItemComponent<net.minecraft.util.Unit>> supplier) {
|
||||
AMERICAN_COMPONENT = supplier.get();
|
||||
}
|
||||
|
||||
public static void setCritterCageBlockEntity(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.CritterCageBlockEntity>> supplier) {
|
||||
CRITTER_CAGE_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setLucidAnchorBlockEntity(Supplier<BlockEntityType<com.craisinlord.antarchy.content.block.entity.LucidAnchorBlockEntity>> supplier) {
|
||||
LUCID_ANCHOR_BLOCK_ENTITY = supplier;
|
||||
}
|
||||
|
||||
public static void setCritterCageProjectile(Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.CritterCageProjectileEntity>> supplier) {
|
||||
CRITTER_CAGE_PROJECTILE = supplier;
|
||||
}
|
||||
|
||||
public static void setWormHookProjectile(Supplier<net.minecraft.world.entity.EntityType<com.craisinlord.antarchy.content.entity.WormHookProjectileEntity>> supplier) {
|
||||
WORM_HOOK_PROJECTILE = supplier;
|
||||
}
|
||||
|
||||
public static void setWormHook(Supplier<Item> supplier) {
|
||||
WORM_HOOK = supplier;
|
||||
}
|
||||
|
||||
public static void setCritterCageEntityTypeComponent(Supplier<AntarchyItemComponent<net.minecraft.resources.ResourceLocation>> supplier) {
|
||||
CRITTER_CAGE_ENTITY_TYPE_COMPONENT = supplier.get();
|
||||
}
|
||||
|
||||
public static void setCritterCagePrimaryColorComponent(Supplier<AntarchyItemComponent<Integer>> supplier) {
|
||||
CRITTER_CAGE_PRIMARY_COLOR_COMPONENT = supplier.get();
|
||||
}
|
||||
|
||||
public static void setCritterCageSecondaryColorComponent(Supplier<AntarchyItemComponent<Integer>> supplier) {
|
||||
CRITTER_CAGE_SECONDARY_COLOR_COMPONENT = supplier.get();
|
||||
}
|
||||
|
||||
public static BlockBehaviour.Properties shellstoneProperties() {
|
||||
return BlockBehaviour.Properties.copy(Blocks.STONE).requiresCorrectToolForDrops();
|
||||
}
|
||||
|
||||
+153
-8
@@ -10,9 +10,16 @@ public final class AntarchySoundEvents {
|
||||
};
|
||||
|
||||
public static Supplier<SoundEvent> SQUIDZOOKA_FIRE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SHRINK_RAY_CHARGE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SHRINK_RAY_LOOP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> GROWTH_RAY_CHARGE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> GROWTH_RAY_LOOP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SIZE_RAY_WEAKSHOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SIZE_RAY_MEDIUMSHOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SIZE_RAY_CRITSHOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SIZE_RAY_CHARGE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SHRINK_RAY_SOUND = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> GROWTH_RAY_SOUND = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> SIZE_RAY_CHARGE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> ANT_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> ANT_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> ANT_HURT = (Supplier<SoundEvent>) UNBOUND;
|
||||
@@ -31,6 +38,7 @@ public final class AntarchySoundEvents {
|
||||
public static Supplier<SoundEvent> BRUTALFLY_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> BRUTALFLY_DEATH = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> ELYTHIA_FIREFLY_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> ELYTHIA_OURANWOOD_FOREST_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> MISSILE_SQUID_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> MISSILE_SQUID_HURT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> MISSILE_SQUID_DEATH = (Supplier<SoundEvent>) UNBOUND;
|
||||
@@ -58,6 +66,10 @@ public final class AntarchySoundEvents {
|
||||
public static Supplier<SoundEvent> THORAXIS_LUCID_POOLS_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> THORAXIS_LUCID_POOLS_ADDITIONS = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> THORAXIS_LUCID_POOLS_MOOD = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> DIMENSIONAL_TEAR_OPEN = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> DIMENSIONAL_TEAR_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> DIMENSIONAL_TEAR_CREATURE_LEAVES = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> DIMENSIONAL_TEAR_CLOSE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> LUCID_AMBIENT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> LUCID_FLYING = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> LUCID_ATTACK = (Supplier<SoundEvent>) UNBOUND;
|
||||
@@ -168,15 +180,58 @@ public final class AntarchySoundEvents {
|
||||
public static Supplier<SoundEvent> JERRY_ADULT_HURT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> JERRY_ADULT_DEATH = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> JERRY_ADULT_ATTACK = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> WORM_HOOK_FLYING = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> BLOOD_CRYSTAL_KATANA_DASH = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> BLOOD_CRYSTAL_ARMOR_EQUIP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> BLOODGLASS_WARD_HEART_BREAK = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> BLOODGLASS_WARD_HEART_REGEN = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_HURT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_DEATH = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_BITE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_HURT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_DEATH = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_BITE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_ROAR = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_BEAM_SHOOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_FIREBALL_SHOOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_DECREE_CAST = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_BEAM_SHOOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_BEAM_START = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_BEAM_LOOP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_BEAM_END = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_STOMP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_ROAR = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_WING_FLAP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> KING_FLY_LOOP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> QUEEN_FLY_LOOP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCE_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCE_BITE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCE_SHOOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCE_FLY = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCE_STEP = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCESS_IDLE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCESS_BITE = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCESS_SHOOT = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCESS_FLY = (Supplier<SoundEvent>) UNBOUND;
|
||||
public static Supplier<SoundEvent> PRINCESS_STEP = (Supplier<SoundEvent>) UNBOUND;
|
||||
|
||||
private AntarchySoundEvents() {
|
||||
}
|
||||
|
||||
public static void bind(Supplier<?>... ignored) {
|
||||
}
|
||||
|
||||
public static void bind(
|
||||
Supplier<SoundEvent> squidzookaFire,
|
||||
Supplier<SoundEvent> shrinkRaySound,
|
||||
Supplier<SoundEvent> growthRaySound,
|
||||
Supplier<SoundEvent> sizeRayCharge,
|
||||
Supplier<SoundEvent> shrinkRayCharge,
|
||||
Supplier<SoundEvent> shrinkRayLoop,
|
||||
Supplier<SoundEvent> growthRayCharge,
|
||||
Supplier<SoundEvent> growthRayLoop,
|
||||
Supplier<SoundEvent> sizeRayWeakshot,
|
||||
Supplier<SoundEvent> sizeRayMediumshot,
|
||||
Supplier<SoundEvent> sizeRayCritshot,
|
||||
Supplier<SoundEvent> antAmbient,
|
||||
Supplier<SoundEvent> antIdle,
|
||||
Supplier<SoundEvent> antHurt,
|
||||
@@ -195,6 +250,7 @@ public final class AntarchySoundEvents {
|
||||
Supplier<SoundEvent> brutalflyIdle,
|
||||
Supplier<SoundEvent> brutalflyDeath,
|
||||
Supplier<SoundEvent> elythiaFireflyAmbient,
|
||||
Supplier<SoundEvent> elythiaOuranwoodForestAmbient,
|
||||
Supplier<SoundEvent> missileSquidAmbient,
|
||||
Supplier<SoundEvent> missileSquidHurt,
|
||||
Supplier<SoundEvent> missileSquidDeath,
|
||||
@@ -331,12 +387,52 @@ public final class AntarchySoundEvents {
|
||||
Supplier<SoundEvent> jerryAdultIdle,
|
||||
Supplier<SoundEvent> jerryAdultHurt,
|
||||
Supplier<SoundEvent> jerryAdultDeath,
|
||||
Supplier<SoundEvent> jerryAdultAttack
|
||||
Supplier<SoundEvent> jerryAdultAttack,
|
||||
Supplier<SoundEvent> wormHookFlying,
|
||||
Supplier<SoundEvent> bloodCrystalKatanaDash,
|
||||
Supplier<SoundEvent> bloodCrystalArmorEquip,
|
||||
Supplier<SoundEvent> bloodglassWardHeartBreak,
|
||||
Supplier<SoundEvent> bloodglassWardHeartRegen,
|
||||
Supplier<SoundEvent> kingIdle,
|
||||
Supplier<SoundEvent> kingHurt,
|
||||
Supplier<SoundEvent> kingDeath,
|
||||
Supplier<SoundEvent> kingBite,
|
||||
Supplier<SoundEvent> queenIdle,
|
||||
Supplier<SoundEvent> queenHurt,
|
||||
Supplier<SoundEvent> queenDeath,
|
||||
Supplier<SoundEvent> queenBite,
|
||||
Supplier<SoundEvent> queenRoar,
|
||||
Supplier<SoundEvent> kingBeamShoot,
|
||||
Supplier<SoundEvent> kingFireballShoot,
|
||||
Supplier<SoundEvent> kingDecreeCast,
|
||||
Supplier<SoundEvent> queenBeamShoot,
|
||||
Supplier<SoundEvent> queenBeamStart,
|
||||
Supplier<SoundEvent> queenBeamLoop,
|
||||
Supplier<SoundEvent> queenBeamEnd,
|
||||
Supplier<SoundEvent> kingStomp,
|
||||
Supplier<SoundEvent> kingRoar,
|
||||
Supplier<SoundEvent> kingWingFlap,
|
||||
Supplier<SoundEvent> kingFlyLoop,
|
||||
Supplier<SoundEvent> queenFlyLoop,
|
||||
Supplier<SoundEvent> princeIdle,
|
||||
Supplier<SoundEvent> princeBite,
|
||||
Supplier<SoundEvent> princeShoot,
|
||||
Supplier<SoundEvent> princeFly,
|
||||
Supplier<SoundEvent> princeStep,
|
||||
Supplier<SoundEvent> princessIdle,
|
||||
Supplier<SoundEvent> princessBite,
|
||||
Supplier<SoundEvent> princessShoot,
|
||||
Supplier<SoundEvent> princessFly,
|
||||
Supplier<SoundEvent> princessStep
|
||||
) {
|
||||
SQUIDZOOKA_FIRE = squidzookaFire;
|
||||
SHRINK_RAY_SOUND = shrinkRaySound;
|
||||
GROWTH_RAY_SOUND = growthRaySound;
|
||||
SIZE_RAY_CHARGE = sizeRayCharge;
|
||||
SHRINK_RAY_CHARGE = shrinkRayCharge;
|
||||
SHRINK_RAY_LOOP = shrinkRayLoop;
|
||||
GROWTH_RAY_CHARGE = growthRayCharge;
|
||||
GROWTH_RAY_LOOP = growthRayLoop;
|
||||
SIZE_RAY_WEAKSHOT = sizeRayWeakshot;
|
||||
SIZE_RAY_MEDIUMSHOT = sizeRayMediumshot;
|
||||
SIZE_RAY_CRITSHOT = sizeRayCritshot;
|
||||
ANT_AMBIENT = antAmbient;
|
||||
ANT_IDLE = antIdle;
|
||||
ANT_HURT = antHurt;
|
||||
@@ -355,6 +451,7 @@ public final class AntarchySoundEvents {
|
||||
BRUTALFLY_IDLE = brutalflyIdle;
|
||||
BRUTALFLY_DEATH = brutalflyDeath;
|
||||
ELYTHIA_FIREFLY_AMBIENT = elythiaFireflyAmbient;
|
||||
ELYTHIA_OURANWOOD_FOREST_AMBIENT = elythiaOuranwoodForestAmbient;
|
||||
MISSILE_SQUID_AMBIENT = missileSquidAmbient;
|
||||
MISSILE_SQUID_HURT = missileSquidHurt;
|
||||
MISSILE_SQUID_DEATH = missileSquidDeath;
|
||||
@@ -492,5 +589,53 @@ public final class AntarchySoundEvents {
|
||||
JERRY_ADULT_HURT = jerryAdultHurt;
|
||||
JERRY_ADULT_DEATH = jerryAdultDeath;
|
||||
JERRY_ADULT_ATTACK = jerryAdultAttack;
|
||||
WORM_HOOK_FLYING = wormHookFlying;
|
||||
BLOOD_CRYSTAL_KATANA_DASH = bloodCrystalKatanaDash;
|
||||
BLOOD_CRYSTAL_ARMOR_EQUIP = bloodCrystalArmorEquip;
|
||||
BLOODGLASS_WARD_HEART_BREAK = bloodglassWardHeartBreak;
|
||||
BLOODGLASS_WARD_HEART_REGEN = bloodglassWardHeartRegen;
|
||||
KING_IDLE = kingIdle;
|
||||
KING_HURT = kingHurt;
|
||||
KING_DEATH = kingDeath;
|
||||
KING_BITE = kingBite;
|
||||
QUEEN_IDLE = queenIdle;
|
||||
QUEEN_HURT = queenHurt;
|
||||
QUEEN_DEATH = queenDeath;
|
||||
QUEEN_BITE = queenBite;
|
||||
QUEEN_ROAR = queenRoar;
|
||||
KING_BEAM_SHOOT = kingBeamShoot;
|
||||
KING_FIREBALL_SHOOT = kingFireballShoot;
|
||||
KING_DECREE_CAST = kingDecreeCast;
|
||||
QUEEN_BEAM_SHOOT = queenBeamShoot;
|
||||
QUEEN_BEAM_START = queenBeamStart;
|
||||
QUEEN_BEAM_LOOP = queenBeamLoop;
|
||||
QUEEN_BEAM_END = queenBeamEnd;
|
||||
KING_STOMP = kingStomp;
|
||||
KING_ROAR = kingRoar;
|
||||
KING_WING_FLAP = kingWingFlap;
|
||||
KING_FLY_LOOP = kingFlyLoop;
|
||||
QUEEN_FLY_LOOP = queenFlyLoop;
|
||||
PRINCE_IDLE = princeIdle;
|
||||
PRINCE_BITE = princeBite;
|
||||
PRINCE_SHOOT = princeShoot;
|
||||
PRINCE_FLY = princeFly;
|
||||
PRINCE_STEP = princeStep;
|
||||
PRINCESS_IDLE = princessIdle;
|
||||
PRINCESS_BITE = princessBite;
|
||||
PRINCESS_SHOOT = princessShoot;
|
||||
PRINCESS_FLY = princessFly;
|
||||
PRINCESS_STEP = princessStep;
|
||||
}
|
||||
|
||||
public static void bindDimensionalTearSounds(
|
||||
Supplier<SoundEvent> dimensionalTearOpen,
|
||||
Supplier<SoundEvent> dimensionalTearIdle,
|
||||
Supplier<SoundEvent> dimensionalTearCreatureLeaves,
|
||||
Supplier<SoundEvent> dimensionalTearClose
|
||||
) {
|
||||
DIMENSIONAL_TEAR_OPEN = dimensionalTearOpen;
|
||||
DIMENSIONAL_TEAR_IDLE = dimensionalTearIdle;
|
||||
DIMENSIONAL_TEAR_CREATURE_LEAVES = dimensionalTearCreatureLeaves;
|
||||
DIMENSIONAL_TEAR_CLOSE = dimensionalTearClose;
|
||||
}
|
||||
}
|
||||
@@ -46,6 +46,7 @@ public final class AntarchyTags {
|
||||
public static final TagKey<Block> ANTIMETAL_INVERSION_BLOCKS = TagKey.create(Registries.BLOCK, id("antimetal_inversion_blocks"));
|
||||
public static final TagKey<Block> LUCID_ANCHOR_BASE_BLOCKS = TagKey.create(Registries.BLOCK, id("lucid_anchor_base_blocks"));
|
||||
public static final TagKey<Block> TIGER_EYE_CAMOUFLAGE_BLACKLIST = TagKey.create(Registries.BLOCK, id("tiger_eye_camouflage_blacklist"));
|
||||
public static final TagKey<Block> NYXIUM = TagKey.create(Registries.BLOCK, id("nyxium"));
|
||||
|
||||
private Blocks() {
|
||||
}
|
||||
@@ -79,6 +80,10 @@ public final class AntarchyTags {
|
||||
public static final TagKey<EntityType<?>> TIGER_EYE_DETECTION_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("tiger_eye_detection_immune"));
|
||||
public static final TagKey<EntityType<?>> DIMENSIONAL_TEAR_COMMON_SPAWNS = TagKey.create(Registries.ENTITY_TYPE, id("dimensional_tear_common_spawns"));
|
||||
public static final TagKey<EntityType<?>> DIMENSIONAL_TEAR_RARE_SPAWNS = TagKey.create(Registries.ENTITY_TYPE, id("dimensional_tear_rare_spawns"));
|
||||
public static final TagKey<EntityType<?>> TIME_DILATION_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("time_dilation_immune"));
|
||||
public static final TagKey<EntityType<?>> COMMANDED_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("commanded_blacklist"));
|
||||
public static final TagKey<EntityType<?>> DILATED_BLACKLIST = TagKey.create(Registries.ENTITY_TYPE, id("dilated_blacklist"));
|
||||
public static final TagKey<EntityType<?>> WIND_VORTEX_IMMUNE = TagKey.create(Registries.ENTITY_TYPE, id("wind_vortex_immune"));
|
||||
|
||||
private Entities() {
|
||||
}
|
||||
@@ -110,6 +115,7 @@ public final class AntarchyTags {
|
||||
public static final TagKey<Item> BUTTERFLY_BREEDING_FOODS = TagKey.create(Registries.ITEM, id("butterfly_breeding_foods"));
|
||||
public static final TagKey<Item> REVERIE_DUPLICATION_ITEMS = TagKey.create(Registries.ITEM, id("reverie_duplication_items"));
|
||||
public static final TagKey<Item> HERCULES_BEETLE_FOOD = TagKey.create(Registries.ITEM, id("hercules_beetle_food"));
|
||||
public static final TagKey<Item> ROYAL_MOUNT_FOOD = TagKey.create(Registries.ITEM, id("royal_mount_food"));
|
||||
public static final TagKey<Item> ROLLY_POLLY_FOOD = TagKey.create(Registries.ITEM, id("rolly_polly_food"));
|
||||
public static final TagKey<Item> OURANWOOD_DEER_FOOD = TagKey.create(Registries.ITEM, id("ouranwood_deer_food"));
|
||||
public static final TagKey<Item> GLIMMER_AUGMENT_APPLE_COW = TagKey.create(Registries.ITEM, id("glimmer_augment_apple_cow"));
|
||||
|
||||
+3
-3
@@ -17,10 +17,10 @@ import net.minecraft.world.phys.shapes.CollisionContext;
|
||||
import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
public abstract class AbstractAntimetalRailBlock extends BaseRailBlock {
|
||||
protected static final VoxelShape CEILING_FLAT_SHAPE = Block.box(0.0D, 14.0D, 0.0D, 16.0D, 16.0D, 16.0D);
|
||||
protected static final VoxelShape CEILING_SLOPE_SHAPE = Block.box(0.0D, 6.0D, 0.0D, 16.0D, 16.0D, 16.0D);
|
||||
public static final VoxelShape CEILING_FLAT_SHAPE = Block.box(0.0D, 14.0D, 0.0D, 16.0D, 16.0D, 16.0D);
|
||||
public static final VoxelShape CEILING_SLOPE_SHAPE = Block.box(0.0D, 6.0D, 0.0D, 16.0D, 16.0D, 16.0D);
|
||||
|
||||
protected AbstractAntimetalRailBlock(boolean isStraight, BlockBehaviour.Properties properties) {
|
||||
public AbstractAntimetalRailBlock(boolean isStraight, BlockBehaviour.Properties properties) {
|
||||
super(isStraight, properties);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
public abstract class AbstractCeilingBluestoneBlock extends Block {
|
||||
protected AbstractCeilingBluestoneBlock(BlockBehaviour.Properties properties) {
|
||||
public AbstractCeilingBluestoneBlock(BlockBehaviour.Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
|
||||
public abstract class AbstractCeilingDiodeBlock extends DiodeBlock {
|
||||
protected AbstractCeilingDiodeBlock(BlockBehaviour.Properties properties) {
|
||||
public AbstractCeilingDiodeBlock(BlockBehaviour.Properties properties) {
|
||||
super(properties);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.fluid.AntarchyFluidChecks;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.content.portal.PermanentPortalManager;
|
||||
import com.craisinlord.antarchy.content.portal.PermanentPortalType;
|
||||
import com.craisinlord.antarchy.content.portal.PermanentPortalTeleporter;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
@@ -47,7 +46,7 @@ public final class AntDimensionPortalBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(AXIS);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.entity.AntNestBlockEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ant.BaseAntEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.List;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -81,7 +80,7 @@ public class AntNestBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FACING);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
@@ -28,7 +27,7 @@ public class AntimetalActivatorRailBlock extends AbstractAntimetalRailBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(SHAPE, POWERED, WATERLOGGED);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.minecart.AntimetalMinecartAccess;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -40,7 +39,7 @@ public class AntimetalDetectorRailBlock extends AbstractAntimetalRailBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(SHAPE, POWERED, WATERLOGGED);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
@@ -28,7 +27,7 @@ public class AntimetalPoweredRailBlock extends AbstractAntimetalRailBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(SHAPE, POWERED, WATERLOGGED);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
import net.minecraft.world.level.block.state.StateDefinition;
|
||||
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
|
||||
@@ -22,7 +21,7 @@ public class AntimetalRailBlock extends AbstractAntimetalRailBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<net.minecraft.world.level.block.Block, net.minecraft.world.level.block.state.BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<net.minecraft.world.level.block.Block, net.minecraft.world.level.block.state.BlockState> builder) {
|
||||
builder.add(SHAPE, WATERLOGGED);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.entity.UpwardFallingBlockEntity;
|
||||
import com.craisinlord.antarchy.content.gravity.AntarchyGravityApi;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -56,7 +55,7 @@ public class AntimetalScaffoldingBlock extends ScaffoldingBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder);
|
||||
builder.add(INVERTED);
|
||||
}
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.entity.BedBugEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
@@ -134,7 +133,7 @@ public class BedBugEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HATCH, EGGS);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.RandomSource;
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.LevelReader;
|
||||
|
||||
+4
-5
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.block.entity.BluestoneComparatorBlockEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -75,13 +74,13 @@ public class BluestoneComparatorBlock extends ComparatorBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getOutputSignal(BlockGetter level, BlockPos pos, BlockState state) {
|
||||
public int getOutputSignal(BlockGetter level, BlockPos pos, BlockState state) {
|
||||
BlockEntity blockEntity = level.getBlockEntity(pos);
|
||||
return blockEntity instanceof BluestoneComparatorBlockEntity comparator ? comparator.getOutputSignal() : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getInputSignal(Level level, BlockPos pos, BlockState state) {
|
||||
public int getInputSignal(Level level, BlockPos pos, BlockState state) {
|
||||
Direction facing = state.getValue(FACING);
|
||||
BlockPos inputPos = pos.relative(facing);
|
||||
BlockState inputState = level.getBlockState(inputPos);
|
||||
@@ -99,7 +98,7 @@ public class BluestoneComparatorBlock extends ComparatorBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAlternateSignal(SignalGetter level, BlockPos pos, BlockState state) {
|
||||
public int getAlternateSignal(SignalGetter level, BlockPos pos, BlockState state) {
|
||||
Direction facing = state.getValue(FACING);
|
||||
Direction clockwise = facing.getClockWise();
|
||||
Direction counterClockwise = facing.getCounterClockWise();
|
||||
@@ -129,7 +128,7 @@ public class BluestoneComparatorBlock extends ComparatorBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void checkTickOnNeighbor(Level level, BlockPos pos, BlockState state) {
|
||||
public void checkTickOnNeighbor(Level level, BlockPos pos, BlockState state) {
|
||||
if (level.getBlockTicks().willTickThisTick(pos, this)) {
|
||||
return;
|
||||
}
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ public class BluestoneLampBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(LIT);
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.particles.DustParticleOptions;
|
||||
@@ -52,7 +51,7 @@ public class BluestoneRepeaterBlock extends RepeaterBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getAlternateSignal(SignalGetter level, BlockPos pos, BlockState state) {
|
||||
public int getAlternateSignal(SignalGetter level, BlockPos pos, BlockState state) {
|
||||
Direction facing = state.getValue(FACING);
|
||||
Direction clockwise = facing.getClockWise();
|
||||
Direction counterClockwise = facing.getCounterClockWise();
|
||||
@@ -62,7 +61,7 @@ public class BluestoneRepeaterBlock extends RepeaterBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getInputSignal(Level level, BlockPos pos, BlockState state) {
|
||||
public int getInputSignal(Level level, BlockPos pos, BlockState state) {
|
||||
Direction facing = state.getValue(FACING);
|
||||
BlockPos inputPos = pos.relative(facing);
|
||||
BlockState inputState = level.getBlockState(inputPos);
|
||||
|
||||
+1
-1
@@ -186,7 +186,7 @@ public class BluestoneTorchBlock extends Block implements BluestoneSignalSource
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(LIT, FACE, FACING);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.Map;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -238,7 +237,7 @@ public class BluestoneWireBlock extends Block implements BluestoneSignalSource {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(NORTH, EAST, SOUTH, WEST, POWER);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.util.RandomSource;
|
||||
@@ -46,7 +45,7 @@ public class BlushMossCarpetBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(BOTTOM, NORTH_WALL, EAST_WALL, SOUTH_WALL, WEST_WALL);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
+2
-3
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.Optional;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -161,13 +160,13 @@ public class CornCropBlock extends BushBlock implements BonemealableBlock {
|
||||
return new ItemStack(this.getBaseSeedId());
|
||||
}
|
||||
|
||||
protected ItemLike getBaseSeedId() {
|
||||
public ItemLike getBaseSeedId() {
|
||||
Optional<net.minecraft.world.item.Item> item = BuiltInRegistries.ITEM.getOptional(CORN_SEEDS_ID);
|
||||
return item.orElse(Blocks.AIR.asItem());
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(AGE, HALF);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.damage.AntarchyDamageSources;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.Optional;
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -172,7 +171,7 @@ public class CorneaStalkBlock extends BushBlock implements BonemealableBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(AGE, HANGING);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -5,7 +5,6 @@ import com.craisinlord.antarchy.content.entity.CreepingHorrorEntity;
|
||||
import com.craisinlord.antarchy.content.block.AmberMossBlock;
|
||||
import com.craisinlord.antarchy.content.block.LurkingTerrorEggBlock;
|
||||
import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -150,7 +149,7 @@ public class CreepingHorrorEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HATCH, EGGS);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -60,7 +59,7 @@ public class CreepvineBlock extends VineBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder);
|
||||
builder.add(STUNTED);
|
||||
}
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.entity.CritterCageBlockEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ant.AntTeleportHelper;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.List;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
@@ -49,7 +48,7 @@ public class CritterCageBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
-1
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.entity.DreamCampfireBlockEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.CampfireBlock;
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.LevelReader;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.level.Level;
|
||||
|
||||
+1
-2
@@ -5,7 +5,6 @@ import com.craisinlord.antarchy.content.advancement.AntarchyAdvancements;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.AntarchySoundEvents;
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
@@ -207,7 +206,7 @@ public class DuctTapeBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(USES, FACE, FACING);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.RandomSource;
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.config.AntarchySettings;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -164,7 +163,7 @@ public class DuplicatorSaplingBlock extends BushBlock implements BonemealableBlo
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(STAGE);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -59,7 +58,7 @@ public final class GiantLilyPadBlock extends Block implements BonemealableBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(TILE_POSITION, ROTATION, HAS_LOTUS);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Holder;
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.world.level.Level;
|
||||
@@ -107,7 +106,7 @@ public class HangingCreeprootsBlock extends BushBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(DISTANCE, BOTTOM, STUNTED);
|
||||
}
|
||||
}
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.entity.HushweedBlockEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -50,7 +49,7 @@ public class HushweedBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FACING);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.entity.MolewormEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
-1
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.entity.MolewormEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.entity.JerryEntity;
|
||||
import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
@@ -102,7 +101,7 @@ public class JerryEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(ROTATED);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.entity.JumpyBugEntity;
|
||||
import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
@@ -155,7 +154,7 @@ public class JumpyBugEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HATCH, HANGING, ROTATED);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.util.RandomSource;
|
||||
@@ -32,7 +31,7 @@ public class LotusBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HANGING);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -5,7 +5,6 @@ import com.craisinlord.antarchy.content.entity.LurkingTerrorEntity;
|
||||
import com.craisinlord.antarchy.content.block.AmberMossBlock;
|
||||
import com.craisinlord.antarchy.content.block.CreepingHorrorEggBlock;
|
||||
import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -150,7 +149,7 @@ public class LurkingTerrorEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HATCH, EGGS);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
@@ -221,7 +220,7 @@ public class MoltingVinesBlock extends BushBlock implements BonemealableBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(GROWTH_DIRECTION, TOP_CAP, BOTTOM_CAP, BROODFRUIT, STUNTED, DISTANCE);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -26,7 +26,7 @@ public class NadirSaplingBlock extends BushBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) {
|
||||
public boolean mayPlaceOn(BlockState state, BlockGetter level, BlockPos pos) {
|
||||
return state.is(BlockTags.DIRT) || state.is(Blocks.FARMLAND);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.entity.UpwardFallingBlockEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.worldgen.elythia.OuranwoodTreeGrowers;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -187,7 +186,7 @@ public class OuranwoodAcornBlock extends BushBlock implements BonemealableBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HANGING, STAGE);
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -49,7 +48,7 @@ public class OuranwoodLeavesBlock extends LeavesBlock implements BonemealableBlo
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(LeavesBlock.DISTANCE, OURANWOOD_DISTANCE, PERSISTENT, WATERLOGGED);
|
||||
}
|
||||
|
||||
@@ -70,7 +69,7 @@ public class OuranwoodLeavesBlock extends LeavesBlock implements BonemealableBlo
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean decaying(BlockState state) {
|
||||
public boolean decaying(BlockState state) {
|
||||
return !state.getValue(PERSISTENT)
|
||||
&& state.getValue(OURANWOOD_DISTANCE) > OURANWOOD_MAX_DISTANCE;
|
||||
}
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.world.level.block.RotatedPillarBlock;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ public class OuranwoodSquirrelNestBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(SQUIRREL_COUNT);
|
||||
}
|
||||
|
||||
|
||||
+2
-3
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
@@ -53,7 +52,7 @@ public class PeachLeavesBlock extends LeavesBlock implements BonemealableBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(LeavesBlock.DISTANCE, PEACH_DISTANCE, PERSISTENT, WATERLOGGED);
|
||||
}
|
||||
|
||||
@@ -63,7 +62,7 @@ public class PeachLeavesBlock extends LeavesBlock implements BonemealableBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean decaying(BlockState state) {
|
||||
public boolean decaying(BlockState state) {
|
||||
return !state.getValue(PERSISTENT) && state.getValue(PEACH_DISTANCE) > PEACH_MAX_DISTANCE;
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.worldgen.elythia.PeachTreeGrowers;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import net.minecraft.core.BlockPos;
|
||||
|
||||
+2
-2
@@ -31,7 +31,7 @@ public class PolishedNyxitePressurePlateBlock extends PressurePlateBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
super.createBlockStateDefinition(builder);
|
||||
builder.add(CEILING);
|
||||
}
|
||||
@@ -58,7 +58,7 @@ public class PolishedNyxitePressurePlateBlock extends PressurePlateBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getSignalStrength(Level level, BlockPos pos) {
|
||||
public int getSignalStrength(Level level, BlockPos pos) {
|
||||
BlockState state = level.getBlockState(pos);
|
||||
if (!state.getValue(CEILING)) {
|
||||
return super.getSignalStrength(level, pos);
|
||||
|
||||
+1
-2
@@ -4,7 +4,6 @@ import com.craisinlord.antarchy.content.block.entity.PotentNyxiteBlockEntity;
|
||||
import com.craisinlord.antarchy.content.block.state.PotentNyxiteState;
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.craisinlord.antarchy.content.fluid.AntarchyFluidChecks;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import java.util.function.Supplier;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -49,7 +48,7 @@ public class PotentNyxiteBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(STATE);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.entity.SeashellBlockEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -60,7 +59,7 @@ public final class SeashellBlock extends BaseEntityBlock implements SimpleWaterl
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FACING, POWERED, WATERLOGGED);
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -66,7 +66,7 @@ public class SignalSavingBulbBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(LIT, POWERED, BRIGHTNESS);
|
||||
}
|
||||
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.world.level.BlockGetter;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
|
||||
+1
-2
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.entity.SpitBugEntity;
|
||||
import com.craisinlord.antarchy.content.horde.CavarynHordeManager;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.registries.BuiltInRegistries;
|
||||
@@ -141,7 +140,7 @@ public class SpitBugEggBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(HATCH, ROTATED);
|
||||
}
|
||||
}
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import net.minecraft.core.BlockPos;
|
||||
@@ -41,7 +40,7 @@ public class StarCoralBlock extends Block {
|
||||
return super.updateShape(state, direction, neighborState, level, pos, neighborPos);
|
||||
}
|
||||
|
||||
protected boolean scanForWater(BlockGetter level, BlockPos pos) {
|
||||
public boolean scanForWater(BlockGetter level, BlockPos pos) {
|
||||
for (Direction direction : Direction.values()) {
|
||||
FluidState fluidState = level.getFluidState(pos.relative(direction));
|
||||
if (fluidState.is(FluidTags.WATER)) {
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -20,7 +19,7 @@ import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
|
||||
public class StarCoralPlantBlock extends BaseCoralPlantTypeBlock {
|
||||
private final Block deadBlock;
|
||||
protected static final VoxelShape SHAPE = Block.box(2.0, 0.0, 2.0, 14.0, 15.0, 14.0);
|
||||
public static final VoxelShape SHAPE = Block.box(2.0, 0.0, 2.0, 14.0, 15.0, 14.0);
|
||||
|
||||
public StarCoralPlantBlock(Block deadBlock, Properties properties) {
|
||||
super(properties);
|
||||
|
||||
-1
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
|
||||
-1
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.AntarchyTags;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.util.RandomSource;
|
||||
@@ -46,7 +45,7 @@ public class UmbralMossCarpetBlock extends Block {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(BOTTOM, NORTH_WALL, EAST_WALL, SOUTH_WALL, WEST_WALL);
|
||||
}
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ public class UpperBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FACING, ENABLED);
|
||||
}
|
||||
|
||||
|
||||
+1
-2
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.block.entity.WaspNestBlockEntity;
|
||||
import com.craisinlord.antarchy.content.entity.WaspEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
@@ -58,7 +57,7 @@ public class WaspNestBlock extends BaseEntityBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FACING);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.util.RandomSource;
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ public class AntNestBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
tag.putBoolean(NBT_INITIALIZED, this.initialized);
|
||||
tag.putInt(NBT_REBROOD_COOLDOWN, this.rebroodCooldown);
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ public class BluestoneComparatorBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
tag.putInt("OutputSignal", this.outputSignal);
|
||||
}
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ public class CritterCageBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
if (this.entityTypeId != null) {
|
||||
tag.putString(ENTITY_TYPE_TAG, this.entityTypeId.toString());
|
||||
|
||||
+1
-1
@@ -151,7 +151,7 @@ public class LucidAnchorBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
tag.putInt("PyramidLevel", this.pyramidLevel);
|
||||
tag.putBoolean("Active", this.active);
|
||||
|
||||
+1
-1
@@ -114,7 +114,7 @@ public class PotentNyxiteBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
tag.putInt("countdown", this.waitingCountdown);
|
||||
tag.putLong("eruption_tick", this.eruptionTick);
|
||||
|
||||
+5
-5
@@ -217,22 +217,22 @@ public final class SeashellBlockEntity extends RandomizableContainerBlockEntity
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Component getDefaultName() {
|
||||
public Component getDefaultName() {
|
||||
return TITLE;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected NonNullList<ItemStack> getItems() {
|
||||
public NonNullList<ItemStack> getItems() {
|
||||
return this.items;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setItems(NonNullList<ItemStack> items) {
|
||||
public void setItems(NonNullList<ItemStack> items) {
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected AbstractContainerMenu createMenu(int containerId, Inventory inventory) {
|
||||
public AbstractContainerMenu createMenu(int containerId, Inventory inventory) {
|
||||
return ChestMenu.threeRows(containerId, inventory, this);
|
||||
}
|
||||
|
||||
@@ -252,7 +252,7 @@ public final class SeashellBlockEntity extends RandomizableContainerBlockEntity
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
if (!this.trySaveLootTable(tag)) {
|
||||
net.minecraft.world.ContainerHelper.saveAllItems(tag, this.items);
|
||||
|
||||
+5
-5
@@ -171,27 +171,27 @@ public class UpperBlockEntity extends RandomizableContainerBlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected NonNullList<ItemStack> getItems() {
|
||||
public NonNullList<ItemStack> getItems() {
|
||||
return this.items;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void setItems(NonNullList<ItemStack> items) {
|
||||
public void setItems(NonNullList<ItemStack> items) {
|
||||
this.items = items;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Component getDefaultName() {
|
||||
public Component getDefaultName() {
|
||||
return Component.translatable("container.antarchy.upper");
|
||||
}
|
||||
|
||||
@Override
|
||||
protected AbstractContainerMenu createMenu(int containerId, Inventory inventory) {
|
||||
public AbstractContainerMenu createMenu(int containerId, Inventory inventory) {
|
||||
return new HopperMenu(containerId, inventory, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
if (!this.trySaveLootTable(tag)) {
|
||||
ContainerHelper.saveAllItems(tag, this.items);
|
||||
|
||||
+1
-1
@@ -164,7 +164,7 @@ public class WaspNestBlockEntity extends BlockEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void saveAdditional(CompoundTag tag) {
|
||||
public void saveAdditional(CompoundTag tag) {
|
||||
super.saveAdditional(tag);
|
||||
tag.putBoolean("Initialized", this.initialized);
|
||||
tag.putBoolean(PANDA_VARIANT, this.pandaVariant);
|
||||
|
||||
+2
-1
@@ -411,7 +411,8 @@ public final class CreativeTabContents {
|
||||
private static final List<String> ANTARCHY_POTION_FAMILIES = List.of(
|
||||
"dread", "long_dread", "inversion", "long_inversion", "stinky", "long_stinky",
|
||||
"paralysis", "long_paralysis", "haste", "strong_haste", "shrinking",
|
||||
"strong_shrinking", "extreme_shrinking", "growing", "strong_growing", "extreme_growing"
|
||||
"strong_shrinking", "extreme_shrinking", "growing", "strong_growing", "extreme_growing",
|
||||
"time_dilation", "long_time_dilation"
|
||||
);
|
||||
|
||||
private static final Map<String, Integer> ORDER_INDEX = createOrderIndex();
|
||||
|
||||
+14
@@ -85,6 +85,20 @@ public class DimensionalTearEntity extends Entity implements GeoEntity {
|
||||
return tear;
|
||||
}
|
||||
|
||||
public static DimensionalTearEntity createQueenManticoreTear(ServerLevel level, Vec3 pos, float yaw,
|
||||
int lifetimeTicks, UUID queenId, int count) {
|
||||
return create(level, pos, yaw, lifetimeTicks);
|
||||
}
|
||||
|
||||
public static void discardQueenOwnedTears(ServerLevel level, UUID queenId) {
|
||||
// The 1.20 compatibility entity does not yet persist the queen-owner index.
|
||||
}
|
||||
|
||||
public static DimensionalTearEntity createStaffSummonTear(ServerLevel level, Vec3 pos, float yaw,
|
||||
int lifetimeTicks, UUID playerId, int count) {
|
||||
return create(level, pos, yaw, lifetimeTicks);
|
||||
}
|
||||
|
||||
public void linkTo(DimensionalTearEntity other) {
|
||||
this.linkedTearId = other.getUUID();
|
||||
this.linkedFallbackPos = other.position();
|
||||
|
||||
+6
@@ -1,6 +1,8 @@
|
||||
package com.craisinlord.antarchy.content.gravity;
|
||||
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
|
||||
public final class AntarchyGravityApi {
|
||||
public interface GravitySyncDispatcher {
|
||||
@@ -99,6 +101,10 @@ public final class AntarchyGravityApi {
|
||||
syncDispatcher.onGravityStateChanged(entity);
|
||||
}
|
||||
|
||||
public static void setWorldVelocity(ItemEntity entity, Vec3 velocity) {
|
||||
entity.setDeltaMovement(velocity);
|
||||
}
|
||||
|
||||
private static AntarchyGravityAccess access(Entity entity) {
|
||||
if (entity instanceof AntarchyGravityAccess access) {
|
||||
return access;
|
||||
|
||||
+1
-11
@@ -3,7 +3,6 @@ package com.craisinlord.antarchy.content.worldgen.elythia;
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.datafixers.util.Pair;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import java.util.stream.Stream;
|
||||
import net.minecraft.core.Holder;
|
||||
@@ -76,15 +75,6 @@ public class ElythiaBiomeSource extends BiomeSource {
|
||||
return ((long) x << 32) ^ (z & 0xFFFFFFFFL);
|
||||
}
|
||||
|
||||
public static final MapCodec<ElythiaBiomeSource> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
|
||||
MultiNoiseBiomeSource.DIRECT_CODEC.forGetter(ElythiaBiomeSource::parameters),
|
||||
Codec.INT.optionalFieldOf("moleworm_caves_max_y", 72).forGetter(ElythiaBiomeSource::molewormCavesMaxY),
|
||||
Codec.INT.optionalFieldOf("surface_biome_sample_y", 160).forGetter(ElythiaBiomeSource::surfaceBiomeSampleY),
|
||||
Codec.INT.optionalFieldOf("ocean_max_y", 85).forGetter(ElythiaBiomeSource::oceanMaxY),
|
||||
Codec.INT.optionalFieldOf("sea_level", 78).forGetter(ElythiaBiomeSource::seaLevel),
|
||||
Codec.INT.optionalFieldOf("cloud_sea_min_y", 360).forGetter(ElythiaBiomeSource::cloudSeaMinY)
|
||||
).apply(instance, ElythiaBiomeSource::new));
|
||||
|
||||
private final Climate.ParameterList<Holder<Biome>> parameters;
|
||||
private final MultiNoiseBiomeSource delegate;
|
||||
private final int molewormCavesMaxY;
|
||||
@@ -160,7 +150,7 @@ public class ElythiaBiomeSource extends BiomeSource {
|
||||
|
||||
@Override
|
||||
protected com.mojang.serialization.Codec<? extends BiomeSource> codec() {
|
||||
return CODEC.codec();
|
||||
return CODEC;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-9
@@ -1,6 +1,5 @@
|
||||
package com.craisinlord.antarchy.content.worldgen.elythia;
|
||||
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import net.minecraft.util.KeyDispatchDataCodec;
|
||||
import net.minecraft.world.level.levelgen.DensityFunction;
|
||||
@@ -25,15 +24,9 @@ public record ElythiaRiverCarveFunction(
|
||||
DensityFunction ridges
|
||||
) implements DensityFunction {
|
||||
|
||||
public static final MapCodec<ElythiaRiverCarveFunction> CODEC = RecordCodecBuilder.mapCodec(instance ->
|
||||
instance.group(
|
||||
DensityFunction.HOLDER_HELPER_CODEC.fieldOf("erosion").forGetter(ElythiaRiverCarveFunction::erosion),
|
||||
DensityFunction.HOLDER_HELPER_CODEC.fieldOf("ridges").forGetter(ElythiaRiverCarveFunction::ridges)
|
||||
).apply(instance, ElythiaRiverCarveFunction::new)
|
||||
);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static final KeyDispatchDataCodec<ElythiaRiverCarveFunction> KEY_CODEC =
|
||||
KeyDispatchDataCodec.of(CODEC);
|
||||
(KeyDispatchDataCodec<ElythiaRiverCarveFunction>) (KeyDispatchDataCodec<?>) KeyDispatchDataCodec.of(CODEC);
|
||||
|
||||
// Erosion must exceed this for river carving to engage
|
||||
private static final double EROSION_THRESHOLD = 0.70;
|
||||
|
||||
+1
-9
@@ -2,7 +2,6 @@ package com.craisinlord.antarchy.content.worldgen.thoraxis;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import it.unimi.dsi.fastutil.longs.Long2DoubleOpenHashMap;
|
||||
import java.util.stream.Stream;
|
||||
@@ -40,13 +39,6 @@ public final class ThoraxisBiomeSource extends BiomeSource {
|
||||
new ResourceLocation(Antarchy.MODID, "lucid_pools")
|
||||
);
|
||||
|
||||
public static final MapCodec<ThoraxisBiomeSource> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
|
||||
MultiNoiseBiomeSource.DIRECT_CODEC.forGetter(ThoraxisBiomeSource::parameters),
|
||||
Codec.INT.optionalFieldOf("dream_dunes_max_y", 96).forGetter(ThoraxisBiomeSource::dreamDunesMaxY),
|
||||
Codec.INT.optionalFieldOf("umbral_hills_max_y", 100).forGetter(ThoraxisBiomeSource::umbralHillsMaxY),
|
||||
Codec.INT.optionalFieldOf("lucid_pools_min_y", 116).forGetter(ThoraxisBiomeSource::lucidPoolsMinY)
|
||||
).apply(instance, ThoraxisBiomeSource::new));
|
||||
|
||||
private final Climate.ParameterList<Holder<Biome>> parameters;
|
||||
private final MultiNoiseBiomeSource delegate;
|
||||
private final int dreamDunesMaxY;
|
||||
@@ -111,7 +103,7 @@ public final class ThoraxisBiomeSource extends BiomeSource {
|
||||
|
||||
@Override
|
||||
protected com.mojang.serialization.Codec<? extends BiomeSource> codec() {
|
||||
return CODEC.codec();
|
||||
return CODEC;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -70,7 +70,38 @@
|
||||
"gravity.ServerPlayerGravityMixin",
|
||||
"gravity.ThrowableProjectileGravityMixin",
|
||||
"gravity.TrackedEntityAccessor",
|
||||
"multipart.EntityMultipartLifecycleMixin"
|
||||
"multipart.EntityMultipartLifecycleMixin",
|
||||
"time.EntityDeltaMovementTimeDilationMixin",
|
||||
"time.EntityMoveTimeDilationMixin",
|
||||
"time.EntityTimeDilationStateMixin",
|
||||
"time.EntityRotationTimeDilationMixin",
|
||||
"time.LivingEntityKnockbackTimeDilationMixin",
|
||||
"time.CreeperTimeDilationMixin",
|
||||
"time.EndCrystalTimeDilationMixin",
|
||||
"time.LivingEntityTimeDilationMixin",
|
||||
"time.LivingEntityTimeDilationCleanupMixin",
|
||||
"time.LivingEntityAttackCooldownTimeDilationMixin",
|
||||
"time.LookControlTimeDilationMixin",
|
||||
"time.MeleeAttackGoalTimeDilationMixin",
|
||||
"time.MobAttackTimeDilationMixin",
|
||||
"time.PrimedTntTimeDilationMixin",
|
||||
"time.AbstractArrowMovementTimeDilationMixin",
|
||||
"time.ThrowableProjectileMovementTimeDilationMixin",
|
||||
"time.HurtingProjectileMovementTimeDilationMixin",
|
||||
"time.ProjectileTimeDilationMixin",
|
||||
"time.AbstractArrowActionTimeDilationMixin",
|
||||
"time.RangedAttackGoalTimeDilationMixin",
|
||||
"time.RangedBowAttackGoalTimeDilationMixin"
|
||||
],
|
||||
"client": [
|
||||
"time.LivingEntityRendererAnimationTimeDilationMixin",
|
||||
"time.ParticleTimeDilationMixin",
|
||||
"time.PortalParticleTimeDilationMixin",
|
||||
"time.ReversePortalParticleTimeDilationMixin",
|
||||
"time.SoundEngineTimeDilationMixin",
|
||||
"time.ItemEntityRotationTimeDilationMixin",
|
||||
"time.ItemEntityRendererTimeDilationMixin",
|
||||
"time.ParticlePositionAccessor"
|
||||
],
|
||||
"client": [
|
||||
"client.AbstractMinecartRendererMixin",
|
||||
@@ -98,7 +129,15 @@
|
||||
"gravity.client.CameraGravityMixin",
|
||||
"gravity.client.ClientPacketListenerGravityMixin",
|
||||
"gravity.client.EntityRenderDispatcherGravityMixin",
|
||||
"gravity.client.FallingBlockRendererBlockEntityMixin"
|
||||
"gravity.client.FallingBlockRendererBlockEntityMixin",
|
||||
"time.LivingEntityRendererAnimationTimeDilationMixin",
|
||||
"time.ParticleTimeDilationMixin",
|
||||
"time.PortalParticleTimeDilationMixin",
|
||||
"time.ReversePortalParticleTimeDilationMixin",
|
||||
"time.SoundEngineTimeDilationMixin",
|
||||
"time.ItemEntityRotationTimeDilationMixin",
|
||||
"time.ItemEntityRendererTimeDilationMixin",
|
||||
"time.ParticlePositionAccessor"
|
||||
],
|
||||
"injectors": {
|
||||
"defaultRequire": 1
|
||||
|
||||
@@ -586,12 +586,16 @@
|
||||
"effect.antarchy.bloodglass_ward.description": "Gives hearts that shatter, absorbing an entire hit of damage. They regenerate over time.",
|
||||
"effect.antarchy.glimmering": "Glimmering",
|
||||
"effect.antarchy.glimmering.description": "Passes through entities and attacks unharmed, like a spirit.",
|
||||
"effect.antarchy.dilated": "Dilated",
|
||||
"effect.antarchy.dilated.description": "Slows the passage of time for the affected entity.",
|
||||
"death.attack.triffid_mauling": "%1$s was mauled to death by a plant",
|
||||
"death.attack.triffid_mauling.player": "%1$s was mauled to death by a plant",
|
||||
"death.attack.triffid_swallow": "%1$s was swallowed by a triffid",
|
||||
"death.attack.triffid_swallow.player": "%1$s was swallowed by a triffid",
|
||||
"potion.antarchy.haste": "Haste Potion",
|
||||
"potion.antarchy.strong_haste": "Strong Haste Potion",
|
||||
"potion.antarchy.time_dilation": "Potion of Time Dilation",
|
||||
"potion.antarchy.long_time_dilation": "Potion of Strong Time Dilation",
|
||||
"tooltip.antarchy.big_bertha.mode": "Mode: %s",
|
||||
"tooltip.antarchy.big_bertha.toggle_mode": "Shift + use to cycle boss modes.",
|
||||
"tooltip.antarchy.big_bertha.mode.none": "Hits deal a small amount of bonus damage.",
|
||||
@@ -826,6 +830,14 @@
|
||||
"subtitles.antarchy.stinky_fly": "Stinky flies buzz",
|
||||
"item.minecraft.potion.effect.inversion": "Potion of Inversion",
|
||||
"item.minecraft.potion.effect.long_inversion": "Potion of Inversion",
|
||||
"item.minecraft.potion.effect.time_dilation": "Potion of Time Dilation",
|
||||
"item.minecraft.potion.effect.long_time_dilation": "Potion of Strong Time Dilation",
|
||||
"item.minecraft.splash_potion.effect.time_dilation": "Splash Potion of Time Dilation",
|
||||
"item.minecraft.splash_potion.effect.long_time_dilation": "Splash Potion of Strong Time Dilation",
|
||||
"item.minecraft.lingering_potion.effect.time_dilation": "Lingering Potion of Time Dilation",
|
||||
"item.minecraft.lingering_potion.effect.long_time_dilation": "Lingering Potion of Strong Time Dilation",
|
||||
"item.minecraft.tipped_arrow.effect.time_dilation": "Arrow of Time Dilation",
|
||||
"item.minecraft.tipped_arrow.effect.long_time_dilation": "Arrow of Strong Time Dilation",
|
||||
"item.minecraft.splash_potion.effect.inversion": "Splash Potion of Inversion",
|
||||
"item.minecraft.splash_potion.effect.long_inversion": "Splash Potion of Inversion",
|
||||
"item.minecraft.lingering_potion.effect.inversion": "Lingering Potion of Inversion",
|
||||
|
||||
@@ -3,6 +3,12 @@
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:alternatives",
|
||||
"children": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:match_tool",
|
||||
@@ -17,12 +23,20 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"entries": [
|
||||
"name": "antarchy:star_coral"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
],
|
||||
"name": "antarchy:star_coral"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
+1
-1
@@ -32,7 +32,7 @@
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
],
|
||||
"name": "antarchy:dead_star_coral_block"
|
||||
"name": "antarchy:star_coral_block"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
+15
-1
@@ -3,6 +3,12 @@
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:alternatives",
|
||||
"children": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:match_tool",
|
||||
@@ -17,12 +23,20 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"entries": [
|
||||
"name": "antarchy:star_coral_fan"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
],
|
||||
"name": "antarchy:star_coral_fan"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
+15
-1
@@ -3,6 +3,12 @@
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:alternatives",
|
||||
"children": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:match_tool",
|
||||
@@ -17,12 +23,20 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"entries": [
|
||||
"name": "antarchy:star_coral_fan"
|
||||
},
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
],
|
||||
"name": "antarchy:star_coral_fan"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -550,6 +550,7 @@ public final class AntarchySettings {
|
||||
private static double queenManticoreSummonRange = 24.0D;
|
||||
private static double queenBeamDamage = 45.0D;
|
||||
private static double queenBeamRange = 100.0D;
|
||||
private static double queenBeamMinimumRange = 22.0D;
|
||||
private static int queenBeamDurationTicks = 30;
|
||||
private static int queenBeamWindupTicks = 20;
|
||||
private static int queenBeamTravelTicks = 12;
|
||||
@@ -559,6 +560,7 @@ public final class AntarchySettings {
|
||||
private static int queenBeamTerrainCap = 192;
|
||||
private static double kingBeamDamage = 50.0D;
|
||||
private static double kingBeamRange = 100.0D;
|
||||
private static double kingBeamMinimumRange = 32.0D;
|
||||
private static int kingBeamDurationTicks = 30;
|
||||
private static int kingBeamWindupTicks = 20;
|
||||
private static int kingBeamTravelTicks = 12;
|
||||
@@ -567,6 +569,11 @@ public final class AntarchySettings {
|
||||
private static double kingBeamTerrainRadius = 5.0D;
|
||||
private static int kingBeamTerrainCap = 192;
|
||||
private static int royalDecreeCooldownTicks = 1200;
|
||||
private static int kingRoyalMusterCooldownTicks = 500;
|
||||
private static int kingRoyalMusterWindupTicks = 30;
|
||||
private static int kingRoyalMusterDurationTicks = 600;
|
||||
private static double kingRoyalMusterRadius = 32.0D;
|
||||
private static int kingRoyalMusterCap = 12;
|
||||
private static double jerryInfantHealth = 20.0D;
|
||||
private static double jerryInfantAttackDamage = 2.0D;
|
||||
private static double jerryMatureHealth = 40.0D;
|
||||
@@ -2887,6 +2894,8 @@ public final class AntarchySettings {
|
||||
public static void setQueenBeamDamage(double v) { queenBeamDamage = v; }
|
||||
public static double queenBeamRange() { return queenBeamRange; }
|
||||
public static void setQueenBeamRange(double v) { queenBeamRange = v; }
|
||||
public static double queenBeamMinimumRange() { return queenBeamMinimumRange; }
|
||||
public static void setQueenBeamMinimumRange(double v) { queenBeamMinimumRange = v; }
|
||||
public static int queenBeamDurationTicks() { return queenBeamDurationTicks; }
|
||||
public static void setQueenBeamDurationTicks(int v) { queenBeamDurationTicks = v; }
|
||||
public static int queenBeamWindupTicks() { return queenBeamWindupTicks; }
|
||||
@@ -2905,6 +2914,8 @@ public final class AntarchySettings {
|
||||
public static void setKingBeamDamage(double v) { kingBeamDamage = v; }
|
||||
public static double kingBeamRange() { return kingBeamRange; }
|
||||
public static void setKingBeamRange(double v) { kingBeamRange = v; }
|
||||
public static double kingBeamMinimumRange() { return kingBeamMinimumRange; }
|
||||
public static void setKingBeamMinimumRange(double v) { kingBeamMinimumRange = v; }
|
||||
public static int kingBeamDurationTicks() { return kingBeamDurationTicks; }
|
||||
public static void setKingBeamDurationTicks(int v) { kingBeamDurationTicks = v; }
|
||||
public static int kingBeamWindupTicks() { return kingBeamWindupTicks; }
|
||||
@@ -2921,6 +2932,16 @@ public final class AntarchySettings {
|
||||
public static void setKingBeamTerrainCap(int v) { kingBeamTerrainCap = v; }
|
||||
public static int royalDecreeCooldownTicks() { return royalDecreeCooldownTicks; }
|
||||
public static void setRoyalDecreeCooldownTicks(int v) { royalDecreeCooldownTicks = v; }
|
||||
public static int kingRoyalMusterCooldownTicks() { return kingRoyalMusterCooldownTicks; }
|
||||
public static void setKingRoyalMusterCooldownTicks(int v) { kingRoyalMusterCooldownTicks = v; }
|
||||
public static int kingRoyalMusterWindupTicks() { return kingRoyalMusterWindupTicks; }
|
||||
public static void setKingRoyalMusterWindupTicks(int v) { kingRoyalMusterWindupTicks = v; }
|
||||
public static int kingRoyalMusterDurationTicks() { return kingRoyalMusterDurationTicks; }
|
||||
public static void setKingRoyalMusterDurationTicks(int v) { kingRoyalMusterDurationTicks = v; }
|
||||
public static double kingRoyalMusterRadius() { return kingRoyalMusterRadius; }
|
||||
public static void setKingRoyalMusterRadius(double v) { kingRoyalMusterRadius = v; }
|
||||
public static int kingRoyalMusterCap() { return kingRoyalMusterCap; }
|
||||
public static void setKingRoyalMusterCap(int v) { kingRoyalMusterCap = v; }
|
||||
public static double jerryInfantHealth() { return jerryInfantHealth; }
|
||||
public static void setJerryInfantHealth(double v) { jerryInfantHealth = v; }
|
||||
public static double jerryInfantAttackDamage() { return jerryInfantAttackDamage; }
|
||||
|
||||
@@ -206,6 +206,8 @@ public final class AntarchyObjects {
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MenuType<com.craisinlord.antarchy.content.menu.DorrieInventoryMenu>> DORRIE_INVENTORY_MENU = (Supplier<MenuType<com.craisinlord.antarchy.content.menu.DorrieInventoryMenu>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>> ROYAL_JUDGMENT_MENU = (Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<net.minecraft.world.item.Item> CHEEP_ITEM = (Supplier<net.minecraft.world.item.Item>) UNBOUND;
|
||||
@SuppressWarnings("unchecked")
|
||||
public static Supplier<Block> DUPLICATOR_LOG = (Supplier<Block>) UNBOUND;
|
||||
@@ -893,6 +895,10 @@ public final class AntarchyObjects {
|
||||
DORRIE_INVENTORY_MENU = supplier;
|
||||
}
|
||||
|
||||
public static void setRoyalJudgmentMenu(Supplier<MenuType<com.craisinlord.antarchy.content.menu.RoyalJudgmentMenu>> supplier) {
|
||||
ROYAL_JUDGMENT_MENU = supplier;
|
||||
}
|
||||
|
||||
public static void setAmericanComponent(Supplier<net.minecraft.core.component.DataComponentType<net.minecraft.util.Unit>> supplier) {
|
||||
AMERICAN_COMPONENT = supplier;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.craisinlord.antarchy.content.block;
|
||||
|
||||
import com.craisinlord.antarchy.content.entity.WormEntity;
|
||||
import com.mojang.serialization.MapCodec;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
@@ -18,9 +19,9 @@ import net.minecraft.world.phys.shapes.VoxelShape;
|
||||
public class MucusBlock extends GlowLichenBlock {
|
||||
public static final MapCodec<MucusBlock> CODEC = simpleCodec(MucusBlock::new);
|
||||
private static final VoxelShape DOWN_COLLISION_SHAPE = Shapes.box(0.0D, 0.0D, 0.0D, 1.0D, 0.0625D, 1.0D);
|
||||
private static final double SLIDE_ACCELERATION = 0.025D;
|
||||
private static final double SLIDE_MAX_SPEED = 0.6D;
|
||||
private static final double SLIDE_MIN_SPEED = 0.02D;
|
||||
private static final double SLIDE_ACCELERATION = 0.045D;
|
||||
private static final double SLIDE_MAX_SPEED = 1.2D;
|
||||
private static final double SLIDE_MIN_SPEED = 0.01D;
|
||||
|
||||
public MucusBlock(BlockBehaviour.Properties properties) {
|
||||
super(properties);
|
||||
@@ -37,9 +38,12 @@ public class MucusBlock extends GlowLichenBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void entityInside(BlockState state, Level level, BlockPos pos, Entity entity) {
|
||||
super.entityInside(state, level, pos, entity);
|
||||
if (level.isClientSide || !state.getValue(MultifaceBlock.getFaceProperty(Direction.DOWN))) {
|
||||
public void stepOn(Level level, BlockPos pos, BlockState state, Entity entity) {
|
||||
super.stepOn(level, pos, state, entity);
|
||||
if (level.isClientSide
|
||||
|| entity instanceof WormEntity
|
||||
|| entity.isShiftKeyDown()
|
||||
|| !state.getValue(MultifaceBlock.getFaceProperty(Direction.DOWN))) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
-7
@@ -10,7 +10,6 @@ import net.minecraft.client.multiplayer.ClientLevel;
|
||||
import net.minecraft.world.entity.Entity;
|
||||
import net.minecraft.world.entity.item.ItemEntity;
|
||||
import net.minecraft.world.entity.LivingEntity;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.util.Mth;
|
||||
|
||||
public final class ClientTimeDilationTicker {
|
||||
@@ -32,12 +31,6 @@ public final class ClientTimeDilationTicker {
|
||||
ANIMATION_CLOCKS.clear();
|
||||
com.craisinlord.antarchy.content.time.TimeDilationApi.clearSyncedClientRates();
|
||||
}
|
||||
// Entity rates come from the server. Field snapshots are used only for local effects.
|
||||
for (Player player : level.players()) {
|
||||
if (player.isDeadOrDying() || rateAt(player.getX(), player.getY(), player.getZ()) >= TimeDilationMath.NORMAL_RATE) {
|
||||
com.craisinlord.antarchy.content.time.TimeDilationApi.clearRate(player);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static float dilateAnimationTime(Entity entity, float vanillaTime) {
|
||||
|
||||
+64
@@ -2,10 +2,25 @@ package com.craisinlord.antarchy.content.client.model;
|
||||
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.content.entity.royal.RoyalBossEntity;
|
||||
import com.craisinlord.antarchy.content.entity.royal.RoyalHead;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.util.Mth;
|
||||
import net.minecraft.world.phys.Vec3;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import software.bernie.geckolib.animation.AnimationState;
|
||||
import software.bernie.geckolib.cache.object.GeoBone;
|
||||
import software.bernie.geckolib.model.GeoModel;
|
||||
|
||||
public class RoyalBossModel extends GeoModel<RoyalBossEntity> {
|
||||
private static final String[] BEAM_ANCHORS = {
|
||||
"beam_anchor_left", "beam_anchor_center", "beam_anchor_right"
|
||||
};
|
||||
private static final String[][] AIM_CHAINS = {
|
||||
{"L_neck", "L_neck2", "L_neck3"},
|
||||
{"neck", "neck3", "neck4"},
|
||||
{"R_neck", "R_neck2", "R_neck3"}
|
||||
};
|
||||
|
||||
@Override
|
||||
public ResourceLocation getModelResource(RoyalBossEntity animatable) {
|
||||
return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "geo/" + animatable.geoNameForRender() + ".geo.json");
|
||||
@@ -21,4 +36,53 @@ public class RoyalBossModel extends GeoModel<RoyalBossEntity> {
|
||||
public ResourceLocation getAnimationResource(RoyalBossEntity animatable) {
|
||||
return ResourceLocation.fromNamespaceAndPath(Antarchy.MODID, "animations/" + animatable.geoNameForRender() + ".animation.json");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCustomAnimations(RoyalBossEntity animatable, long instanceId,
|
||||
AnimationState<RoyalBossEntity> animationState) {
|
||||
super.setCustomAnimations(animatable, instanceId, animationState);
|
||||
for (String anchor : BEAM_ANCHORS) {
|
||||
this.getBone(anchor).ifPresent(bone -> bone.setTrackingMatrices(true));
|
||||
}
|
||||
|
||||
RoyalHead.Slot slot = animatable.getRoyalBeamHeadSlot();
|
||||
Vec3 beamEnd = animatable.getRoyalBeamEndPosition();
|
||||
if (!animatable.isFiringRoyalBeam() || slot == null || beamEnd == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
float partialTick = animationState.getPartialTick();
|
||||
Vec3 origin = animatable.getRoyalBeamShootFrom(partialTick);
|
||||
Vec3 direction = beamEnd.subtract(origin);
|
||||
double horizontal = Math.sqrt(direction.x * direction.x + direction.z * direction.z);
|
||||
if (direction.lengthSqr() < 1.0E-6D || horizontal < 1.0E-4D) {
|
||||
return;
|
||||
}
|
||||
|
||||
float desiredYaw = (float) (Mth.atan2(-direction.x, direction.z) * Mth.RAD_TO_DEG);
|
||||
float bodyYaw = Mth.rotLerp(partialTick, animatable.yRotO, animatable.getYRot());
|
||||
float relativeYaw = Mth.clamp(Mth.wrapDegrees(desiredYaw - bodyYaw), -55.0F, 55.0F) * Mth.DEG_TO_RAD;
|
||||
float pitch = Mth.clamp((float) -Mth.atan2(direction.y, horizontal) * Mth.RAD_TO_DEG,
|
||||
-45.0F, 45.0F) * Mth.DEG_TO_RAD;
|
||||
|
||||
String[] chain = AIM_CHAINS[slot.ordinal()];
|
||||
float yawPerBone = relativeYaw / chain.length;
|
||||
float pitchPerBone = pitch / chain.length;
|
||||
for (String boneName : chain) {
|
||||
this.getBone(boneName).ifPresent(bone -> {
|
||||
bone.setRotY(bone.getRotY() + yawPerBone);
|
||||
bone.setRotX(bone.getRotX() + pitchPerBone);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public Vec3 getTrackedBeamAnchor(RoyalHead.Slot slot) {
|
||||
GeoBone bone = this.getBone(BEAM_ANCHORS[slot.ordinal()]).orElse(null);
|
||||
if (bone == null || !bone.isTrackingMatrices()) {
|
||||
return null;
|
||||
}
|
||||
org.joml.Vector3d position = bone.getWorldPosition();
|
||||
return new Vec3(position.x, position.y, position.z);
|
||||
}
|
||||
}
|
||||
+9
-3
@@ -3,6 +3,7 @@ package com.craisinlord.antarchy.content.client.renderer;
|
||||
import com.craisinlord.antarchy.content.client.model.RoyalBossModel;
|
||||
import com.craisinlord.antarchy.content.entity.royal.RoyalBossEntity;
|
||||
import com.craisinlord.antarchy.content.entity.royal.KingEntity;
|
||||
import com.craisinlord.antarchy.content.entity.royal.RoyalHead;
|
||||
import com.craisinlord.antarchy.content.entity.royal.beam.RoyalBeamElement;
|
||||
import com.mojang.blaze3d.vertex.PoseStack;
|
||||
import com.mojang.blaze3d.vertex.VertexConsumer;
|
||||
@@ -58,8 +59,8 @@ public class RoyalBossRenderer extends GeoEntityRenderer<RoyalBossEntity> {
|
||||
this.shadowRadius = 8.0F * RoyalBossEntity.MODEL_RENDER_SCALE;
|
||||
}
|
||||
|
||||
private static final float BEAM_OUTER_RADIUS = 1.10F;
|
||||
private static final float BEAM_INNER_RADIUS = 0.52F;
|
||||
private static final float BEAM_OUTER_RADIUS = 0.55F;
|
||||
private static final float BEAM_INNER_RADIUS = 0.32F;
|
||||
private static final float BEAM_TILE_BLOCKS = 3.0F;
|
||||
private static final float BEAM_SCROLL_SPEED = 0.32F;
|
||||
|
||||
@@ -74,7 +75,12 @@ public class RoyalBossRenderer extends GeoEntityRenderer<RoyalBossEntity> {
|
||||
double x = Mth.lerp(partialTick, entity.xo, entity.getX());
|
||||
double y = Mth.lerp(partialTick, entity.yo, entity.getY());
|
||||
double z = Mth.lerp(partialTick, entity.zo, entity.getZ());
|
||||
Vec3 start = entity.getRoyalBeamShootFrom(partialTick).subtract(x, y, z);
|
||||
RoyalHead.Slot beamHead = entity.getRoyalBeamHeadSlot();
|
||||
Vec3 trackedAnchor = beamHead == null
|
||||
? null
|
||||
: ((RoyalBossModel) this.getGeoModel()).getTrackedBeamAnchor(beamHead);
|
||||
Vec3 start = (trackedAnchor != null ? trackedAnchor : entity.getRoyalBeamShootFrom(partialTick))
|
||||
.subtract(x, y, z);
|
||||
Vec3 finish = end.subtract(x, y, z);
|
||||
Vec3 axis = finish.subtract(start);
|
||||
double length = axis.length();
|
||||
|
||||
Loaded 100 of 192 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user