surprise beta 9 update!
This commit is contained in:
craisinlord committed
1 parent
49cf0100cf
commit
e265d68526
77 files changed
+806
-146
No files matched your search
@@ -479,8 +479,8 @@ public final class AntarchyToolsConfig {
|
||||
// Critter Cage
|
||||
|
||||
b.push("critterCage");
|
||||
CRITTER_CAGE_MAX_CAPTURABLE_WIDTH = b.comment("Maximum capturable entity width/depth based on the live hitbox, in blocks.").defineInRange("maxCapturableWidth", 1.15D, 0.1D, 64.0D);
|
||||
CRITTER_CAGE_MAX_CAPTURABLE_HEIGHT = b.comment("Maximum capturable entity height based on the live hitbox, in blocks.").defineInRange("maxCapturableHeight", 1.15D, 0.1D, 64.0D);
|
||||
CRITTER_CAGE_MAX_CAPTURABLE_WIDTH = b.comment("Maximum capturable entity width/depth based on the live hitbox, in blocks.").defineInRange("maxCapturableWidth", 1.65D, 0.1D, 64.0D);
|
||||
CRITTER_CAGE_MAX_CAPTURABLE_HEIGHT = b.comment("Maximum capturable entity height based on the live hitbox, in blocks.").defineInRange("maxCapturableHeight", 1.65D, 0.1D, 64.0D);
|
||||
b.pop();
|
||||
|
||||
|
||||
|
||||
+10
@@ -210,6 +210,12 @@ public final class AntarchyNeoForgeClient {
|
||||
: net.minecraft.world.level.GrassColor.getDefaultColor(),
|
||||
AntarchyNeoforgeBlocks.SPIDER_LILY.get()
|
||||
);
|
||||
event.register(
|
||||
(state, level, pos, tintIndex) -> level != null && pos != null
|
||||
? BiomeColors.getAverageGrassColor(level, pos)
|
||||
: net.minecraft.world.level.GrassColor.getDefaultColor(),
|
||||
AntarchyNeoforgeBlocks.POTTED_SPIDER_LILY.get()
|
||||
);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
@@ -505,11 +511,13 @@ public final class AntarchyNeoForgeClient {
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.OURANWOOD_DOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.OURANWOOD_TRAPDOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.OURANWOOD_ACORN_BLOCK.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_OURANWOOD_ACORN.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_LEAVES.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_HANGING_PEACH.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_DOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_TRAPDOOR.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PEACH_SAPLING.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_PEACH_SAPLING.get(), RenderType.cutout());
|
||||
// ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.OURANWOOD_VINE.get(), RenderType.cutout());
|
||||
// ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.OURANWOOD_VINE_PLANT.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.DUPLICATOR_SAPLING.get(), RenderType.cutout());
|
||||
@@ -517,7 +525,9 @@ public final class AntarchyNeoForgeClient {
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.PINK_MILKWEED.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CAMELLIA.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.SPIDER_LILY.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_SPIDER_LILY.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.LOTUS.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.POTTED_LOTUS.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.GIANT_LILY_PAD.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.HUSHWEED.get(), RenderType.cutout());
|
||||
ItemBlockRenderTypes.setRenderLayer(AntarchyNeoforgeBlocks.CRITTER_CAGE_BLOCK.get(), RenderType.cutout());
|
||||
|
||||
+3
@@ -43,6 +43,9 @@ public final class DorrieJumpClientHandler {
|
||||
boolean pressingCharge = AntarchyKeyBindings.DORRIE_CHARGE_JUMP.isDown();
|
||||
if (pressingCharge != wasPressingCharge) {
|
||||
PacketDistributor.sendToServer(new DorrieChargeJumpPayload(pressingCharge));
|
||||
if (!pressingCharge && player.getVehicle() instanceof DorrieEntity dorrie) {
|
||||
dorrie.applyJumpImpulseClient();
|
||||
}
|
||||
wasPressingCharge = pressingCharge;
|
||||
}
|
||||
}
|
||||
|
||||
+28
@@ -49,6 +49,10 @@ import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
import net.neoforged.neoforge.common.ItemAbilities;
|
||||
import net.neoforged.neoforge.common.NeoForge;
|
||||
import net.neoforged.neoforge.common.NeoForgeMod;
|
||||
import net.minecraft.world.entity.npc.VillagerProfession;
|
||||
import net.minecraft.world.entity.npc.VillagerTrades;
|
||||
import net.minecraft.world.item.trading.ItemCost;
|
||||
import net.minecraft.world.item.trading.MerchantOffer;
|
||||
import net.neoforged.neoforge.event.AddReloadListenerEvent;
|
||||
import net.neoforged.neoforge.event.brewing.RegisterBrewingRecipesEvent;
|
||||
import net.neoforged.neoforge.event.entity.EntityAttributeModificationEvent;
|
||||
@@ -58,6 +62,8 @@ import net.neoforged.neoforge.event.entity.player.PlayerEvent;
|
||||
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.neoforged.neoforge.event.level.BlockEvent;
|
||||
import net.neoforged.neoforge.event.tick.EntityTickEvent;
|
||||
import net.neoforged.neoforge.event.village.VillagerTradesEvent;
|
||||
import net.neoforged.neoforge.event.village.WandererTradesEvent;
|
||||
import net.neoforged.neoforge.event.tick.PlayerTickEvent;
|
||||
import net.neoforged.neoforge.event.tick.ServerTickEvent;
|
||||
import com.craisinlord.antarchy.content.item.MinersDreamExcavationManager;
|
||||
@@ -118,6 +124,28 @@ public final class AntarchyNeoForgeEvents {
|
||||
NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::handleStartTracking);
|
||||
NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::handleDreamSandLogout);
|
||||
NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::registerReloadListeners);
|
||||
NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::onVillagerTrades);
|
||||
NeoForge.EVENT_BUS.addListener(AntarchyNeoForgeEvents::onWandererTrades);
|
||||
}
|
||||
|
||||
static void onVillagerTrades(VillagerTradesEvent event) {
|
||||
if (event.getType() == VillagerProfession.FARMER) {
|
||||
event.getTrades().get(1).add(emeraldForItems(AntarchyObjects.CORN.get(), 20, 16, 2));
|
||||
} else if (event.getType() == VillagerProfession.BUTCHER) {
|
||||
event.getTrades().get(1).add(emeraldForItems(AntarchyObjects.COOKED_CORNDOG.get(), 5, 16, 2));
|
||||
}
|
||||
}
|
||||
|
||||
static void onWandererTrades(WandererTradesEvent event) {
|
||||
event.getGenericTrades().add(itemsForEmerald(AntarchyObjects.CORN_SEEDS.get(), 1, 3, 12, 2));
|
||||
}
|
||||
|
||||
private static VillagerTrades.ItemListing emeraldForItems(Item item, int count, int maxUses, int villagerXp) {
|
||||
return (trader, random) -> new MerchantOffer(new ItemCost(item, count), new ItemStack(Items.EMERALD), maxUses, villagerXp, 0.05F);
|
||||
}
|
||||
|
||||
private static VillagerTrades.ItemListing itemsForEmerald(Item item, int emeraldCost, int count, int maxUses, int villagerXp) {
|
||||
return (trader, random) -> new MerchantOffer(new ItemCost(Items.EMERALD, emeraldCost), new ItemStack(item, count), maxUses, villagerXp, 0.05F);
|
||||
}
|
||||
|
||||
public static void onMissileSquidDeath(LivingDeathEvent event) {
|
||||
|
||||
+8
@@ -79,6 +79,8 @@ public final class AntarchyNeoforgeBlocks {
|
||||
() -> new OuranwoodLeavesBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_LEAVES).randomTicks()));
|
||||
public static final DeferredBlock<OuranwoodAcornBlock> OURANWOOD_ACORN_BLOCK = BLOCKS.register("ouranwood_acorn",
|
||||
() -> new OuranwoodAcornBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission()));
|
||||
public static final DeferredBlock<FlowerPotBlock> POTTED_OURANWOOD_ACORN = BLOCKS.register("potted_ouranwood_acorn",
|
||||
() -> new FlowerPotBlock(OURANWOOD_ACORN_BLOCK.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION)));
|
||||
// public static final DeferredBlock<OuranwoodVineBlock> OURANWOOD_VINE = BLOCKS.register("ouranwood_vine",
|
||||
// () -> OURANWOOD_VINE_INSTANCE);
|
||||
// public static final DeferredBlock<OuranwoodVinePlantBlock> OURANWOOD_VINE_PLANT = BLOCKS.register("ouranwood_vine_plant",
|
||||
@@ -91,10 +93,14 @@ public final class AntarchyNeoforgeBlocks {
|
||||
() -> new com.craisinlord.antarchy.content.block.CamelliaBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.PEONY)));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.SpiderLilyBlock> SPIDER_LILY = BLOCKS.register("spider_lily",
|
||||
() -> new com.craisinlord.antarchy.content.block.SpiderLilyBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.POPPY)));
|
||||
public static final DeferredBlock<FlowerPotBlock> POTTED_SPIDER_LILY = BLOCKS.register("potted_spider_lily",
|
||||
() -> new FlowerPotBlock(SPIDER_LILY.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION)));
|
||||
public static final DeferredBlock<GiantLilyPadBlock> GIANT_LILY_PAD = BLOCKS.register("giant_lily_pad",
|
||||
() -> new GiantLilyPadBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LILY_PAD)));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.LotusBlock> LOTUS = BLOCKS.register("lotus",
|
||||
() -> new com.craisinlord.antarchy.content.block.LotusBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SPORE_BLOSSOM)));
|
||||
public static final DeferredBlock<FlowerPotBlock> POTTED_LOTUS = BLOCKS.register("potted_lotus",
|
||||
() -> new FlowerPotBlock(LOTUS.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION)));
|
||||
public static final DeferredBlock<SeashellBlock> SEASHELL = BLOCKS.register("seashell",
|
||||
() -> new SeashellBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.TURTLE_EGG).noOcclusion()));
|
||||
public static final DeferredBlock<CritterCageBlock> CRITTER_CAGE_BLOCK = BLOCKS.register("critter_cage_block",
|
||||
@@ -139,6 +145,8 @@ public final class AntarchyNeoforgeBlocks {
|
||||
() -> new HangingPeachBlock(BlockBehaviour.Properties.of().noOcclusion().instabreak()));
|
||||
public static final DeferredBlock<com.craisinlord.antarchy.content.block.PeachSaplingBlock> PEACH_SAPLING = BLOCKS.register("peach_sapling",
|
||||
() -> new com.craisinlord.antarchy.content.block.PeachSaplingBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.OAK_SAPLING).randomTicks().noCollission()));
|
||||
public static final DeferredBlock<FlowerPotBlock> POTTED_PEACH_SAPLING = BLOCKS.register("potted_peach_sapling",
|
||||
() -> new FlowerPotBlock(PEACH_SAPLING.get(), BlockBehaviour.Properties.ofFullCopy(Blocks.POTTED_DANDELION)));
|
||||
public static final DeferredBlock<StandingSignBlock> PEACH_SIGN = BLOCKS.register("peach_sign",
|
||||
() -> new StandingSignBlock(AntarchyWoodTypes.PEACH, BlockBehaviour.Properties.ofFullCopy(Blocks.JUNGLE_SIGN)));
|
||||
public static final DeferredBlock<WallSignBlock> PEACH_WALL_SIGN = BLOCKS.register("peach_wall_sign",
|
||||
|
||||
+2
@@ -134,6 +134,8 @@ public class AntarchyNeoforgeCreativeModeTabs {
|
||||
event.accept(AntarchyNeoforgeItems.LUMEN_BUCKET.get());
|
||||
event.accept(AntarchyNeoforgeItems.CLOUD_BUCKET.get());
|
||||
event.accept(AntarchyNeoforgeItems.REVERIE_BOTTLE.get());
|
||||
event.accept(AntarchyNeoforgeItems.GLIMMER_BOTTLE.get());
|
||||
event.accept(AntarchyNeoforgeItems.CRITTER_CAGE.get());
|
||||
event.accept(AntarchyNeoforgeItems.ULTIMATE_PICKAXE.get());
|
||||
event.accept(AntarchyNeoforgeItems.ULTIMATE_AXE.get());
|
||||
event.accept(AntarchyNeoforgeItems.ULTIMATE_SHOVEL.get());
|
||||
|
||||
+1
-1
@@ -193,7 +193,7 @@ public final class AntarchyNeoforgeEntites {
|
||||
.build("caterpillar"));
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<ButterflyEntity>> BUTTERFLY = ENTITY_TYPES.register("butterfly",
|
||||
() -> EntityType.Builder.of(ButterflyEntity::new, MobCategory.AMBIENT)
|
||||
.sized(1.125F, 1.375F)
|
||||
.sized(1.125F, 0.6875F)
|
||||
.clientTrackingRange(8)
|
||||
.build("butterfly"));
|
||||
public static final DeferredHolder<EntityType<?>, EntityType<ReverieEntity>> REVERIE = ENTITY_TYPES.register("reverie",
|
||||
|
||||
-5
@@ -711,11 +711,6 @@ public final class AntarchyNeoforgeItems {
|
||||
.nutrition(2)
|
||||
.saturationModifier(0.1F)
|
||||
.build())));
|
||||
public static final DeferredItem<Item> CREEPING_HORROR_EGG_ITEM = ITEMS.register("creeping_horror_egg",
|
||||
() -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
public static final DeferredItem<Item> LURKING_TERROR_EGG_ITEM = ITEMS.register("lurking_terror_egg",
|
||||
() -> new MobComingSoonTooltipItem(new Item.Properties().rarity(Rarity.RARE)));
|
||||
|
||||
private AntarchyNeoforgeItems() {}
|
||||
|
||||
public static Collection<DeferredHolder<Item,? extends Item>> getItemEntries() {
|
||||
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:has_rare_seashell",
|
||||
"features": ["antarchy:seashell_patch_rare"],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
+6
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "neoforge:add_features",
|
||||
"biomes": "#antarchy:has_star_coral",
|
||||
"features": ["antarchy:star_coral_patch"],
|
||||
"step": "vegetal_decoration"
|
||||
}
|
||||
Reference in new issue
Block a user