1.1.0 release
This commit is contained in:
1 parent
b81dcc3bef
commit
de529b54c2
149 files changed
+5623
-2919
No files matched your search
+6
-5
@@ -91,11 +91,10 @@ public final class AntarchyFabricContent {
|
||||
builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.CLOUD_SHARK_FIN.get()), net.minecraft.world.item.alchemy.Potions.SLOW_FALLING);
|
||||
builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.JUMPY_BUG_LEG.get()), Potions.LEAPING);
|
||||
builder.registerPotionRecipe(net.minecraft.world.item.alchemy.Potions.AWKWARD, Ingredient.of(AntarchyFabricItems.CORNEA_EAR.get()), net.minecraft.world.item.alchemy.Potions.NIGHT_VISION);
|
||||
// These two use registerItemRecipe (not registerPotionRecipe) purely to mark corn/syrup
|
||||
// as valid brewing-stand ingredients; the actual water-only output logic still comes
|
||||
// from PotionBrewingMixin -> CustomBrewingRecipes so it stays consistent with NeoForge.
|
||||
builder.registerItemRecipe(Items.POTION, Ingredient.of(AntarchyFabricItems.CORN.get()), AntarchyFabricItems.HIGH_FRUCTOSE_CORN_SYRUP.get());
|
||||
builder.registerItemRecipe(AntarchyFabricItems.HIGH_FRUCTOSE_CORN_SYRUP.get(), Ingredient.of(com.craisinlord.antarchy.content.recipe.CustomBrewingRecipes.rootsTag()), AntarchyFabricItems.ROOT_BEER.get());
|
||||
// Corn/syrup/root-beer are plain items, not Potion holders, so vanilla's Builder#expectPotion
|
||||
// rejects them via registerItemRecipe/registerPotionRecipe. The actual output logic comes from
|
||||
// PotionBrewingMixin -> CustomBrewingRecipes; brewing-stand slot validity for these custom items
|
||||
// is handled by BrewingStandCustomIngredientMixin (Fabric doesn't expose Builder#addContainer).
|
||||
});
|
||||
|
||||
AntarchyFabricSounds.SOUND_EVENTS.register();
|
||||
@@ -152,6 +151,7 @@ public final class AntarchyFabricContent {
|
||||
AntarchyFabricSounds.BRUTALFLY_IDLE,
|
||||
AntarchyFabricSounds.BRUTALFLY_DEATH,
|
||||
AntarchyFabricSounds.ELYTHIA_FIREFLY_AMBIENT,
|
||||
AntarchyFabricSounds.ELYTHIA_OURANWOOD_FOREST_AMBIENT,
|
||||
AntarchyFabricSounds.MISSILE_SQUID_AMBIENT,
|
||||
AntarchyFabricSounds.MISSILE_SQUID_HURT,
|
||||
AntarchyFabricSounds.MISSILE_SQUID_DEATH,
|
||||
@@ -300,6 +300,7 @@ public final class AntarchyFabricContent {
|
||||
AntarchyObjects.setKrakenTentacle(() -> AntarchyFabricItems.KRAKEN_TENTACLE.get());
|
||||
AntarchyObjects.setKrakensGrasp(() -> AntarchyFabricItems.KRAKENS_GRASP.get());
|
||||
AntarchyObjects.setOuranwoodDeer(AntarchyFabricEntities.OURANWOOD_DEER);
|
||||
AntarchyObjects.setRollyPolly(AntarchyFabricEntities.ROLLY_POLLY);
|
||||
AntarchyObjects.setGlimmer(AntarchyFabricEntities.GLIMMER);
|
||||
AntarchyObjects.setSpiritApple(() -> AntarchyFabricItems.SPIRIT_APPLE.get());
|
||||
AntarchyObjects.setGlimmeringEffect(() -> AntarchyFabricMisc.mobEffectHolder(AntarchyFabricMisc.GLIMMERING));
|
||||
|
||||
@@ -3,6 +3,7 @@ import com.craisinlord.antarchy.fabric.registry.AntarchyFabricBlocks;
|
||||
import com.craisinlord.antarchy.fabric.registry.AntarchyFabricItems;
|
||||
|
||||
import com.craisinlord.antarchy.content.entity.ReverieEntity;
|
||||
import com.craisinlord.antarchy.content.entity.ant.RainbowAntEntity;
|
||||
import com.craisinlord.antarchy.config.AntarchySettings;
|
||||
import com.craisinlord.antarchy.content.AntarchyObjects;
|
||||
import com.craisinlord.antarchy.content.block.DuctTapeBlock;
|
||||
@@ -91,6 +92,9 @@ public final class AntarchyFabricEvents {
|
||||
BloodglassManager.handleDeath(sp);
|
||||
}
|
||||
PermanentPortalManager.handleSacrifice(entity);
|
||||
if (entity instanceof RainbowAntEntity rainbowAnt) {
|
||||
rainbowAnt.tryIgniteInfinityPortalOnDeath();
|
||||
}
|
||||
if (entity.getKillCredit() instanceof ServerPlayer killer) {
|
||||
CavarynHordeManager.recordMobKill(killer, entity);
|
||||
}
|
||||
@@ -142,6 +146,7 @@ public final class AntarchyFabricEvents {
|
||||
Set<UUID> activeThisTick = new HashSet<>();
|
||||
for (ServerLevel level : server.getAllLevels()) {
|
||||
CavarynHordeManager.tick(level);
|
||||
com.craisinlord.antarchy.content.horde.CavarynCreatureSpawner.tick(level);
|
||||
tickInvertedPlayers(level, activeThisTick);
|
||||
tickDuctTapePlayers(level);
|
||||
tickIchorPlayers(level);
|
||||
|
||||
@@ -3,8 +3,11 @@ package com.craisinlord.antarchy.fabric;
|
||||
import com.craisinlord.antarchy.Antarchy;
|
||||
import com.craisinlord.antarchy.compat.infinity.InfinityCompatBridge;
|
||||
import net.lerariemann.infinity.util.InfinityMethods;
|
||||
import net.lerariemann.infinity.util.teleport.PortalCreator;
|
||||
import net.lerariemann.infinity.util.teleport.WarpLogic;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.server.level.ServerLevel;
|
||||
import net.minecraft.server.level.ServerPlayer;
|
||||
import net.minecraft.util.RandomSource;
|
||||
|
||||
@@ -44,4 +47,14 @@ public final class FabricInfinityCompat implements InfinityCompatBridge {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean createPhysicalPortal(ServerLevel level, BlockPos anyPortalBlockPos, ResourceLocation dimensionId) {
|
||||
try {
|
||||
return PortalCreator.modifyOnInitialCollision(dimensionId, level, anyPortalBlockPos);
|
||||
} catch (Throwable throwable) {
|
||||
Antarchy.LOGGER.error("[Antarchy] Failed to convert a portal frame into an Infinity portal to {}", dimensionId, throwable);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
+4
-4
@@ -1017,7 +1017,7 @@ public final class AntarchyFabricItems {
|
||||
new Item.Properties()
|
||||
.rarity(Rarity.EPIC)
|
||||
.fireResistant()
|
||||
.durability(ArmorItem.Type.HELMET.getDurability(41))
|
||||
.durability(ArmorItem.Type.HELMET.getDurability(62))
|
||||
));
|
||||
|
||||
|
||||
@@ -1028,7 +1028,7 @@ public final class AntarchyFabricItems {
|
||||
new Item.Properties()
|
||||
.rarity(Rarity.EPIC)
|
||||
.fireResistant()
|
||||
.durability(ArmorItem.Type.CHESTPLATE.getDurability(41))
|
||||
.durability(ArmorItem.Type.CHESTPLATE.getDurability(62))
|
||||
));
|
||||
|
||||
|
||||
@@ -1039,7 +1039,7 @@ public final class AntarchyFabricItems {
|
||||
new Item.Properties()
|
||||
.rarity(Rarity.EPIC)
|
||||
.fireResistant()
|
||||
.durability(ArmorItem.Type.LEGGINGS.getDurability(41))
|
||||
.durability(ArmorItem.Type.LEGGINGS.getDurability(62))
|
||||
));
|
||||
|
||||
|
||||
@@ -1050,7 +1050,7 @@ public final class AntarchyFabricItems {
|
||||
new Item.Properties()
|
||||
.rarity(Rarity.EPIC)
|
||||
.fireResistant()
|
||||
.durability(ArmorItem.Type.BOOTS.getDurability(41))
|
||||
.durability(ArmorItem.Type.BOOTS.getDurability(62))
|
||||
));
|
||||
|
||||
|
||||
|
||||
+3
-3
@@ -60,7 +60,7 @@ import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeConfiguratio
|
||||
import com.craisinlord.antarchy.content.worldgen.cavaryn.ChitinSpikeFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.BedBugNestFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.BedBugSurfaceClusterFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.CloudSeaCalciteFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.elythia.ElythiaCloudFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.LucidAntiwaterPoolFeature;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisBiomeSource;
|
||||
import com.craisinlord.antarchy.content.worldgen.thoraxis.ThoraxisDuneConfiguration;
|
||||
@@ -744,8 +744,8 @@ public final class AntarchyFabricMisc {
|
||||
() -> new ThoraxisBloodCrystalFeature(ThoraxisBloodCrystalConfiguration.CODEC));
|
||||
|
||||
|
||||
public static final DeferredHolder<Feature<?>, CloudSeaCalciteFeature> CLOUD_SEA_CALCITE_BANKS = FEATURES.register("cloud_sea_calcite_banks",
|
||||
() -> new CloudSeaCalciteFeature(NoneFeatureConfiguration.CODEC));
|
||||
public static final DeferredHolder<Feature<?>, ElythiaCloudFeature> ELYTHIA_CLOUDS = FEATURES.register("elythia_clouds",
|
||||
() -> new ElythiaCloudFeature(NoneFeatureConfiguration.CODEC));
|
||||
|
||||
|
||||
public static final DeferredHolder<Feature<?>, BedBugNestFeature> BED_BUG_NEST = FEATURES.register("bed_bug_nest",
|
||||
|
||||
+3
@@ -76,6 +76,9 @@ public final class AntarchyFabricSounds {
|
||||
public static final DeferredHolder<SoundEvent, SoundEvent> ELYTHIA_FIREFLY_AMBIENT = registerSoundEvent("ambient.elythia.firefly");
|
||||
|
||||
|
||||
public static final DeferredHolder<SoundEvent, SoundEvent> ELYTHIA_OURANWOOD_FOREST_AMBIENT = registerSoundEvent("ambient.elythia.ouranwood_forest");
|
||||
|
||||
|
||||
public static final DeferredHolder<SoundEvent, SoundEvent> MISSILE_SQUID_AMBIENT = registerSoundEvent("missile_squid_ambient");
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -60,7 +60,7 @@ public final class AntarchyFabricSpawnPlacements {
|
||||
SpawnPlacements.register(AntarchyFabricEntities.ALPHA_MANTIS.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, AlphaMantisEntity::checkAlphaMantisSpawnRules);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.MOLEVORE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, MolevoreEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.BED_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BedBugEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.STINK_BUG.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StinkBugEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.STINK_BUG.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, StinkBugEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.LUCID.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, LucidEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.SCORPION.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, ScorpionEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.BASILISK.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, BasiliskEntity::canSpawn);
|
||||
@@ -70,7 +70,7 @@ public final class AntarchyFabricSpawnPlacements {
|
||||
SpawnPlacements.register(AntarchyFabricEntities.LURKING_TERROR.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.LurkingTerrorEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.JERRY.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.JerryEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.TERMITE.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, net.minecraft.world.entity.animal.Animal::checkAnimalSpawnRules);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.ROLLY_POLLY.get(), SpawnPlacementTypes.ON_GROUND, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.RollyPollyEntity::canSpawn);
|
||||
SpawnPlacements.register(AntarchyFabricEntities.ROLLY_POLLY.get(), SpawnPlacementTypes.NO_RESTRICTIONS, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES, com.craisinlord.antarchy.content.entity.RollyPollyEntity::canSpawn);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,6 +10,7 @@
|
||||
"WaterlikeFluidLivingEntityMixin",
|
||||
"WaterlikeFluidItemEntityMixin",
|
||||
"AntimetalInversionMixin",
|
||||
"BrewingStandCustomIngredientMixin",
|
||||
"ElytraStartFlyingMixin",
|
||||
"ElytraFallFlyingMixin",
|
||||
"BloodglassEquipMixin",
|
||||
|
||||
Reference in new issue
Block a user