projects/ChipiMod
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Compare commits

base: projects:72274c08f8818d452b167afe74913fb315d95a7e
Branches Tags
projects:main
projects:0.0.3
projects:0.0.2
projects:0.0.1
..
compare: projects:36e2b9a8866b98c095ef76e00bf461df76c39a6c
Branches Tags
projects:main
projects:0.0.3
projects:0.0.2
projects:0.0.1

No commits in common. "72274c08f8818d452b167afe74913fb315d95a7e" and "36e2b9a8866b98c095ef76e00bf461df76c39a6c" have entirely different histories.
72274c08f8 ... 36e2b9a886

48 changed files with 188 additions and 438 deletions
Show Stats Expand all files Collapse all files

270
CONTRIBUTING.md
View File

@ -1,270 +0,0 @@
# Contributing Guide (Java Style)
This project follows a strict, C/C++-style Java formatting rule set. The goal is to preserve intent, control flow clarity, and fast mental parsing. Please follow these rules for any Java changes.
If a tool or formatter fights these rules, the tool is wrong.
## Core Philosophy
- Java is written as if it were C/C++.
- Formatting must never change perceived control flow.
- Readability means fast, correct parsing in your head.
- Tools adapt to the codebase, not the other way around.
## Indentation & Whitespace
- Indentation: 4 spaces.
- No tabs.
- Avoid excessive vertical whitespace.
- Blank lines only when they add logical separation.
✅ Good:
```java
int sum(int a, int b) {
int r = a + b;
return r;
}
```
❌ Bad:
```java
int sum(int a, int b)
{
int r = a + b;
return r;
}
```
## Braces
- Braces are always required.
- Opening brace stays on the same line.
- Never rely on implicit scopes.
✅ Good:
```java
if (value == null) {
return;
}
```
❌ Bad:
```java
if (value == null)
{
return;
}
```
## Imports (Strict Rules)
### Never use fully-qualified class names inline
❌ Forbidden:
```java
net.minecraft.util.math.BlockPos pos = new net.minecraft.util.math.BlockPos(0, 0, 0);
```
✅ Required:
```java
import net.minecraft.util.math.BlockPos;
BlockPos pos = new BlockPos(0, 0, 0);
```
### Import grouping and ordering
1) Imports from external/other packages first.
2) Blank line.
3) Imports from this project (net.Chipperfluff.*) next.
Inside each block, order by:
1) Classes
2) Functions (static method imports)
3) Variables/constants (static field imports)
4) Enums
If there are no project imports, do not add a blank line.
## Method Signatures
- Method signatures must stay on one line.
- Do not break parameters across multiple lines.
- Long lines are acceptable; ambiguity is not.
✅ Good:
```java
void processUser(User user, int flags, boolean force, long timeout) {
...
}
```
❌ Bad:
```java
void processUser(
User user,
int flags,
boolean force,
long timeout
) {
...
}
```
## Function Calls & Argument Layout
### Default rule
- Single-line calls are preferred.
- Flat calls stay flat.
- Length alone is not a reason to wrap.
✅ Good:
```java
Color color = user.getProfile().getSettings().getTheme().getPrimaryColor();
```
### Multiline calls are allowed only when:
- The call is structural or declarative.
- Each argument is conceptually distinct.
- Nesting would otherwise hide meaning.
✅ Good (structural/declarative):
```java
BiomeModifications.addFeature(
BiomeSelectors.foundInOverworld(),
GenerationStep.Feature.UNDERGROUND_ORES,
RegistryKey.of(
RegistryKeys.PLACED_FEATURE,
new Identifier("chipi", "chipper_ore")
)
);
```
❌ Bad (no semantic gain):
```java
doThing(
a,
b,
c
);
```
## Chained Calls
- Flat chains stay on one line.
- Long or builder-style chains may be split vertically.
- Each chained step gets its own line.
✅ Good:
```java
builder
.withColor(theme.getPrimaryColor())
.withSize(32)
.enableShadow()
.build();
```
❌ Bad:
```java
builder.withColor(
theme.getPrimaryColor()
).withSize(
32
).enableShadow().build();
```
## Control Flow & Returns
- Early returns are encouraged.
- Avoid artificial nesting.
- Single-exit functions are not required.
✅ Good:
```java
void handle(User user) {
if (user == null) return;
if (!user.isActive()) return;
process(user);
}
```
❌ Bad:
```java
void handle(User user) {
if (user != null) {
if (user.isActive()) {
process(user);
}
}
}
```
## One-Liners
- One-liners allowed for simple guard clauses.
- No complex logic on one line.
✅ Allowed:
```java
if (value == null) return;
```
❌ Not allowed:
```java
if (a == b && c != d && flag && check()) doThing();
```
## Null Handling
- null is a valid, intentional state.
- Do not over-engineer around it.
- Prefer clarity over defensive clutter.
✅ Good:
```java
User user = findUser(id);
if (user == null) return;
```
## Logging & Debug Output
- Logging must be short and readable.
- Prefer System.out.println for quick diagnostics.
- Verbose logging only when justified.
✅ Good:
```java
System.out.println("Loaded structure: " + id);
```
## Autoformatters & Linters
Autoformatters must not:
- Break method signatures.
- Move braces to new lines.
- Introduce unwanted trailing newlines.
- Rewrap stable code repeatedly.
If a formatter fights these rules: disable or reconfigure it.
## Empty Methods
Empty methods or constructors must be written on one line:
```java
public static void register() {}
```
## Summary (Non-Negotiable)
- Java written with C/C++ structure.
- Compact signatures, explicit layout.
- Imports always used (no fully-qualified inline types).
- Multiline formatting only when it adds meaning.
- Formatting reflects logic, not fashion.

11
src/main/java/net/Chipperfluff/chipi/ChipiMod.java
View File

@ -1,24 +1,23 @@
package net.Chipperfluff.chipi;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.Chipperfluff.chipi.advancement.ModCriteria;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.command.CommandHandler;
import net.Chipperfluff.chipi.effect.ChipiBlessingEvents;
import net.Chipperfluff.chipi.effect.ChipiHungerHandler;
import net.Chipperfluff.chipi.effect.ModEffects;
import net.Chipperfluff.chipi.entity.MepEntity;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import net.Chipperfluff.chipi.entity.SpawnLogic;
import net.Chipperfluff.chipi.entity.MepEntity;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import net.Chipperfluff.chipi.item.ModItemGroups;
import net.Chipperfluff.chipi.item.ModItems;
import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
import net.Chipperfluff.chipi.server.ChipiServerEvents;
import net.Chipperfluff.chipi.sound.ModSounds;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.Chipperfluff.chipi.util.TickScheduler;
import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
public class ChipiMod implements ModInitializer {

7
src/main/java/net/Chipperfluff/chipi/advancement/ModCriteria.java
View File

@ -5,9 +5,14 @@ import net.minecraft.advancement.criterion.Criteria;
public class ModCriteria {
public static final PortalActivatedTrigger PORTAL_ACTIVATED = Criteria.register(new PortalActivatedTrigger());
public static final PortalDestroyedTrigger PORTAL_DESTROYED = Criteria.register(new PortalDestroyedTrigger());
public static final VoidConsumedTrigger VOID_CONSUMED_TRIGGER = Criteria.register(new VoidConsumedTrigger());
public static final VoidConsumedFireTrigger VOID_CONSUMED_FIRE_TRIGGER = Criteria.register(new VoidConsumedFireTrigger());
public static void register() {}
public static void register() {
// classload trigger
}
}

3
src/main/java/net/Chipperfluff/chipi/block/ChipperFrameBlock.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.block;
import net.Chipperfluff.chipi.advancement.ModCriteria;
import net.minecraft.block.BlockState;
import net.minecraft.block.PillarBlock;
import net.minecraft.entity.LivingEntity;
@ -8,8 +9,6 @@ import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.Chipperfluff.chipi.advancement.ModCriteria;
public class ChipperFrameBlock extends PillarBlock {
public ChipperFrameBlock(Settings settings) {

2
src/main/java/net/Chipperfluff/chipi/block/ChipperPortalBlock.java
View File

@ -15,6 +15,7 @@ import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import java.util.EnumSet;
public class ChipperPortalBlock extends Block {
@ -70,6 +71,7 @@ public class ChipperPortalBlock extends Block {
player.setOnGround(true);
}
public static BlockPos resolveSafeSpawn(ServerWorld targetWorld) {
BlockPos spawn = DEFAULT_SPAWN;
BlockPos under = spawn.down();

3
src/main/java/net/Chipperfluff/chipi/block/ChipperPortalShape.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.block;
import net.Chipperfluff.chipi.advancement.ModCriteria;
import net.minecraft.block.BlockState;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
@ -7,8 +8,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import net.Chipperfluff.chipi.advancement.ModCriteria;
public class ChipperPortalShape {
private final World world;

3
src/main/java/net/Chipperfluff/chipi/block/ModBlocks.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.block;
import net.Chipperfluff.chipi.ChipiMod;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
@ -10,8 +11,6 @@ import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
public class ModBlocks {
public static final Block VOID_BLOCK = Registry.register(

3
src/main/java/net/Chipperfluff/chipi/block/VoidBlock.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.block;
import net.Chipperfluff.chipi.advancement.ModCriteria;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.Entity;
@ -16,8 +17,6 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.Chipperfluff.chipi.advancement.ModCriteria;
public class VoidBlock extends Block {
public VoidBlock(Settings settings) {

7
src/main/java/net/Chipperfluff/chipi/client/ChipiClient.java
View File

@ -1,13 +1,12 @@
package net.Chipperfluff.chipi.client;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.minecraft.client.render.RenderLayer;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.client.entity.ModEntityRenderers;
import net.Chipperfluff.chipi.client.hud.ChipiStatusBar;
import net.Chipperfluff.chipi.util.ClientTickScheduler;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.minecraft.client.render.RenderLayer;
public class ChipiClient implements ClientModInitializer {

8
src/main/java/net/Chipperfluff/chipi/client/ModTooltips.java
View File

@ -1,14 +1,14 @@
package net.Chipperfluff.chipi.client;
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
import net.minecraft.text.Text;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.item.ModItems;
import net.fabricmc.fabric.api.client.item.v1.ItemTooltipCallback;
import net.minecraft.text.Text;
public final class ModTooltips {
private ModTooltips() {}
private ModTooltips() {
}
public static void register() {

5
src/main/java/net/Chipperfluff/chipi/client/entity/MepRenderer.java
View File

@ -1,14 +1,13 @@
package net.Chipperfluff.chipi.client.entity;
import net.Chipperfluff.chipi.ChipiMod;
import net.Chipperfluff.chipi.entity.MepEntity;
import net.minecraft.client.render.entity.BipedEntityRenderer;
import net.minecraft.client.render.entity.EntityRendererFactory;
import net.minecraft.client.render.entity.model.BipedEntityModel;
import net.minecraft.client.render.entity.model.EntityModelLayers;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
import net.Chipperfluff.chipi.entity.MepEntity;
public class MepRenderer extends BipedEntityRenderer<MepEntity, BipedEntityModel<MepEntity>> {
private static final Identifier TEXTURE = new Identifier(ChipiMod.MOD_ID, "textures/entity/mep.png");

3
src/main/java/net/Chipperfluff/chipi/client/entity/ModEntityRenderers.java
View File

@ -1,8 +1,7 @@
package net.Chipperfluff.chipi.client.entity;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
public class ModEntityRenderers {

3
src/main/java/net/Chipperfluff/chipi/client/entity/PlayerJrRenderer.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.client.entity;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import net.minecraft.client.network.AbstractClientPlayerEntity;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.entity.BipedEntityRenderer;
@ -10,8 +11,6 @@ import net.minecraft.client.util.DefaultSkinHelper;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
public class PlayerJrRenderer
extends BipedEntityRenderer<PlayerJrEntity, BipedEntityModel<PlayerJrEntity>> {

3
src/main/java/net/Chipperfluff/chipi/client/hud/ChipiStatusBar.java
View File

@ -1,13 +1,12 @@
package net.Chipperfluff.chipi.client.hud;
import net.Chipperfluff.chipi.item.ModItems;
import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.Chipperfluff.chipi.item.ModItems;
import static net.Chipperfluff.chipi.util.ChipiTrackedData.CHIPI_ENERGY;
public class ChipiStatusBar {

4
src/main/java/net/Chipperfluff/chipi/command/ChpCommand.java
View File

@ -4,6 +4,8 @@ import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.BoolArgumentType;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
import net.minecraft.command.CommandSource;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.server.command.CommandManager;
@ -12,8 +14,6 @@ import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
public class ChpCommand {
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {

4
src/main/java/net/Chipperfluff/chipi/command/CspCommand.java
View File

@ -3,6 +3,8 @@ package net.Chipperfluff.chipi.command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import com.mojang.brigadier.context.CommandContext;
import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
import net.minecraft.command.CommandSource;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.server.command.CommandManager;
@ -11,8 +13,6 @@ import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.Chipperfluff.chipi.world.gen.struct.ChipiStructures;
public class CspCommand {
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {

7
src/main/java/net/Chipperfluff/chipi/command/SpawnJrCommand.java
View File

@ -2,6 +2,10 @@ package net.Chipperfluff.chipi.command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import net.minecraft.command.argument.EntityArgumentType;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.command.ServerCommandSource;
@ -10,9 +14,6 @@ import net.minecraft.server.world.ServerWorld;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
public final class SpawnJrCommand {
public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {

3
src/main/java/net/Chipperfluff/chipi/effect/ModEffects.java
View File

@ -1,12 +1,11 @@
package net.Chipperfluff.chipi.effect;
import net.Chipperfluff.chipi.ChipiMod;
import net.minecraft.entity.effect.StatusEffect;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
public class ModEffects {
public static final StatusEffect CHIPI_BLESSING = new ChipiBlessingEffect();

6
src/main/java/net/Chipperfluff/chipi/effect/PregnantEffect.java
View File

@ -1,5 +1,7 @@
package net.Chipperfluff.chipi.effect;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.attribute.EntityAttributeInstance;
import net.minecraft.entity.attribute.EntityAttributes;
@ -9,10 +11,8 @@ import net.minecraft.entity.effect.StatusEffectCategory;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.UUID;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.entity.PlayerJrEntity;
import java.util.UUID;
public class PregnantEffect extends StatusEffect {

3
src/main/java/net/Chipperfluff/chipi/entity/MepEntity.java
View File

@ -3,7 +3,6 @@ package net.Chipperfluff.chipi.entity;
import net.minecraft.block.BlockState;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.StairsBlock;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.goal.*;
@ -82,7 +81,7 @@ public class MepEntity extends PathAwareEntity {
// === ATTACK OVERRIDE (AURA IMMUNITY) ===
@Override
public boolean tryAttack(Entity target) {
public boolean tryAttack(net.minecraft.entity.Entity target) {
if (target instanceof PlayerEntity player) {
if (ProtectionAuraHandler.hasAura(player)) {
return false; // chase but never hit

8
src/main/java/net/Chipperfluff/chipi/entity/ModEntities.java
View File

@ -1,9 +1,12 @@
package net.Chipperfluff.chipi.entity;
import net.Chipperfluff.chipi.entity.MepEntity;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.EntityType;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
@ -30,5 +33,6 @@ public final class ModEntities {
.build()
);
private ModEntities() {}
private ModEntities() {
}
}

1
src/main/java/net/Chipperfluff/chipi/entity/PlayerJrEntity.java
View File

@ -17,6 +17,7 @@ import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import java.util.UUID;
public class PlayerJrEntity extends PathAwareEntity {

9
src/main/java/net/Chipperfluff/chipi/entity/SpawnLogic.java
View File

@ -2,10 +2,10 @@ package net.Chipperfluff.chipi.entity;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.SpawnReason;
import net.minecraft.entity.SpawnRestriction;
@ -13,12 +13,14 @@ import net.minecraft.entity.mob.MobEntity;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.random.Random;
import net.minecraft.world.Heightmap;
import net.minecraft.world.ServerWorldAccess;
import net.minecraft.world.biome.Biome;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.math.Box;
public final class SpawnLogic {
@ -28,7 +30,8 @@ public final class SpawnLogic {
private static final RegistryKey<Biome> VOID_BIOME =
RegistryKey.of(RegistryKeys.BIOME, new Identifier("chipi", "void"));
private SpawnLogic() {}
private SpawnLogic() {
}
public static void register() {

3
src/main/java/net/Chipperfluff/chipi/item/MepMilkItem.java
View File

@ -1,14 +1,13 @@
package net.Chipperfluff.chipi.item;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.UseAction;
import net.minecraft.world.World;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.Chipperfluff.chipi.effect.ModEffects;
public class MepMilkItem extends Item {

1
src/main/java/net/Chipperfluff/chipi/item/ModFoodComponents.java
View File

@ -20,4 +20,5 @@ public class ModFoodComponents {
new FoodComponent.Builder()
.alwaysEdible()
.build();
}

11
src/main/java/net/Chipperfluff/chipi/item/ModItemGroups.java
View File

@ -1,5 +1,8 @@
package net.Chipperfluff.chipi.item;
import net.Chipperfluff.chipi.ChipiMod;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
@ -8,10 +11,6 @@ import net.minecraft.registry.Registry;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.item.music.ModMusicDiscs;
public class ModItemGroups {
public static final ItemGroup CHIPI_GROUP = Registry.register(
@ -60,5 +59,7 @@ public class ModItemGroups {
.build()
);
public static void register() {}
public static void register() {
// force class load
}
}

13
src/main/java/net/Chipperfluff/chipi/item/ModItems.java
View File

@ -1,16 +1,17 @@
package net.Chipperfluff.chipi.item;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.*;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
import net.Chipperfluff.chipi.block.ModBlocks;
import net.Chipperfluff.chipi.entity.ModEntities;
import net.Chipperfluff.chipi.item.armor.ChipperArmorMaterial;
import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
import net.minecraft.item.*;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.item.tool.ChipperToolMaterial;
import net.Chipperfluff.chipi.item.MepMilkItem;
public class ModItems {

7
src/main/java/net/Chipperfluff/chipi/item/PlayerMilkItem.java
View File

@ -1,5 +1,7 @@
package net.Chipperfluff.chipi.item;
import net.Chipperfluff.chipi.effect.ModEffects;
import net.Chipperfluff.chipi.sound.ModSounds;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.player.PlayerEntity;
@ -8,14 +10,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsage;
import net.minecraft.item.Items;
import net.minecraft.sound.SoundCategory;
import net.minecraft.text.Text;
import net.minecraft.util.Hand;
import net.minecraft.util.UseAction;
import net.minecraft.util.TypedActionResult;
import net.minecraft.world.World;
import net.Chipperfluff.chipi.effect.ModEffects;
import net.Chipperfluff.chipi.sound.ModSounds;
import net.minecraft.text.Text;
public class PlayerMilkItem extends Item {

4
src/main/java/net/Chipperfluff/chipi/item/armor/ChipperArmorMaterial.java
View File

@ -1,16 +1,16 @@
package net.Chipperfluff.chipi.item.armor;
import net.Chipperfluff.chipi.item.ModItems;
import net.minecraft.item.ArmorItem;
import net.minecraft.item.ArmorMaterial;
import net.minecraft.recipe.Ingredient;
import net.minecraft.sound.SoundEvent;
import net.minecraft.sound.SoundEvents;
import net.minecraft.util.Util;
import java.util.EnumMap;
import java.util.Map;
import net.Chipperfluff.chipi.item.ModItems;
public class ChipperArmorMaterial implements ArmorMaterial {
public static final ChipperArmorMaterial INSTANCE = new ChipperArmorMaterial();

5
src/main/java/net/Chipperfluff/chipi/item/armor/ProtectionAuraHandler.java
View File

@ -1,5 +1,6 @@
package net.Chipperfluff.chipi.armor;
import net.Chipperfluff.chipi.item.ModItems;
import net.minecraft.block.BlockState;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.StairsBlock;
@ -11,10 +12,8 @@ import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.Chipperfluff.chipi.item.ModItems;
import static net.Chipperfluff.chipi.server.ChipiServerEvents.CHIPI_DIMENSION_KEY;
import static net.Chipperfluff.chipi.util.ChipiTrackedData.CHIPI_ENERGY;
import static net.Chipperfluff.chipi.server.ChipiServerEvents.CHIPI_DIMENSION_KEY;
public final class ProtectionAuraHandler {

26
src/main/java/net/Chipperfluff/chipi/item/music/ModMusicDiscs.java
View File

@ -1,16 +1,16 @@
package net.Chipperfluff.chipi.item.music;
import net.Chipperfluff.chipi.ChipiMod;
import net.minecraft.item.Item;
import net.minecraft.item.MusicDiscItem;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.Identifier;
import java.util.LinkedHashMap;
import java.util.Map;
import net.Chipperfluff.chipi.ChipiMod;
public class ModMusicDiscs {
private static final Map<String, Item> DISCS = new LinkedHashMap<>();
@ -30,20 +30,20 @@ public class ModMusicDiscs {
Identifier identifier = new Identifier(ChipiMod.MOD_ID, id);
SoundEvent sound = Registry.register(
Registries.SOUND_EVENT,
identifier,
SoundEvent.of(identifier)
Registries.SOUND_EVENT,
identifier,
SoundEvent.of(identifier)
);
Item item = Registry.register(
Registries.ITEM,
identifier,
new MusicDiscItem(
def.comparatorOutput(),
sound,
new Item.Settings().maxCount(1),
toTicks(def.minutes(), def.seconds())
)
Registries.ITEM,
identifier,
new MusicDiscItem(
def.comparatorOutput(),
sound,
new Item.Settings().maxCount(1),
toTicks(def.minutes(), def.seconds())
)
);
DISCS.put(def.name(), item);

7
src/main/java/net/Chipperfluff/chipi/item/music/MusicDiscDef.java
View File

@ -1,3 +1,8 @@
package net.Chipperfluff.chipi.item.music;
public record MusicDiscDef(String name, int comparatorOutput, int minutes, int seconds) {}
public record MusicDiscDef(
String name,
int comparatorOutput,
int minutes,
int seconds
) {}

2
src/main/java/net/Chipperfluff/chipi/item/tool/ChipperToolMaterial.java
View File

@ -2,9 +2,9 @@ package net.Chipperfluff.chipi.item.tool;
import net.minecraft.item.ToolMaterial;
import net.minecraft.recipe.Ingredient;
import net.Chipperfluff.chipi.item.ModItems;
public enum ChipperToolMaterial implements ToolMaterial {
INSTANCE;

1
src/main/java/net/Chipperfluff/chipi/mixin/DataTrackerMixin.java
View File

@ -2,6 +2,7 @@ package net.Chipperfluff.chipi.mixin;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.data.TrackedData;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;

7
src/main/java/net/Chipperfluff/chipi/mixin/PlayerEntityMixin.java
View File

@ -1,6 +1,9 @@
package net.Chipperfluff.chipi.mixin;
import com.mojang.authlib.GameProfile;
import net.Chipperfluff.chipi.effect.ModEffects;
import net.Chipperfluff.chipi.effect.PregnantEffect;
import net.Chipperfluff.chipi.util.ChipiTrackedData;
import net.minecraft.entity.data.DataTracker;
import net.minecraft.entity.effect.StatusEffectInstance;
import net.minecraft.entity.player.PlayerEntity;
@ -13,10 +16,6 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import net.Chipperfluff.chipi.effect.ModEffects;
import net.Chipperfluff.chipi.effect.PregnantEffect;
import net.Chipperfluff.chipi.util.ChipiTrackedData;
@Mixin(PlayerEntity.class)
public abstract class PlayerEntityMixin {

25
src/main/java/net/Chipperfluff/chipi/server/ChipiServerEvents.java
View File

@ -1,35 +1,34 @@
package net.Chipperfluff.chipi.server;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.Chipperfluff.chipi.SpawnPlacedState;
import net.Chipperfluff.chipi.armor.ProtectionAuraHandler;
import net.Chipperfluff.chipi.block.ChipperPortalBlock;
import net.Chipperfluff.chipi.world.gen.ChipiDungeonGenerator;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
import net.fabricmc.fabric.api.event.player.UseEntityCallback;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.structure.StructurePlacementData;
import net.minecraft.structure.StructureTemplate;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.GameRules;
import net.minecraft.world.World;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.world.gen.GenerationStep;
import net.Chipperfluff.chipi.SpawnPlacedState;
import net.Chipperfluff.chipi.armor.ProtectionAuraHandler;
import net.Chipperfluff.chipi.block.ChipperPortalBlock;
import net.fabricmc.fabric.api.event.player.UseEntityCallback;
import net.minecraft.util.ActionResult;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.Chipperfluff.chipi.item.ModItems;
import net.Chipperfluff.chipi.world.gen.ChipiDungeonGenerator;
public final class ChipiServerEvents {

3
src/main/java/net/Chipperfluff/chipi/sound/ModSounds.java
View File

@ -1,12 +1,11 @@
package net.Chipperfluff.chipi.sound;
import net.Chipperfluff.chipi.ChipiMod;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.sound.SoundEvent;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.ChipiMod;
public class ModSounds {
public static final SoundEvent MEP_MILK = register("entity.mep.milk");

4
src/main/java/net/Chipperfluff/chipi/util/ChipiTrackedData.java
View File

@ -6,7 +6,9 @@ import net.minecraft.entity.data.TrackedDataHandlerRegistry;
import net.minecraft.entity.player.PlayerEntity;
public final class ChipiTrackedData {
public static final TrackedData<Float> CHIPI_ENERGY = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
public static final TrackedData<Float> CHIPI_ENERGY =
DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
private ChipiTrackedData() {}
}

1
src/main/java/net/Chipperfluff/chipi/util/ClientTickScheduler.java
View File

@ -2,6 +2,7 @@ package net.Chipperfluff.chipi.util;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.minecraft.client.MinecraftClient;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;

1
src/main/java/net/Chipperfluff/chipi/util/TickScheduler.java
View File

@ -2,6 +2,7 @@ package net.Chipperfluff.chipi.util;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
import net.minecraft.server.MinecraftServer;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;

104
src/main/java/net/Chipperfluff/chipi/world/gen/ChipiDungeonGenerator.java
View File

@ -1,12 +1,11 @@
package net.Chipperfluff.chipi.world.gen;
import net.minecraft.block.BlockState;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import net.Chipperfluff.chipi.world.gen.struct.CorridorEWStructure;
import net.Chipperfluff.chipi.world.gen.struct.CorridorNSStructure;
import net.Chipperfluff.chipi.world.gen.struct.RoomBaseStructure;
import net.minecraft.block.BlockState;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
public class ChipiDungeonGenerator {
@ -25,10 +24,13 @@ public class ChipiDungeonGenerator {
// Center-to-center step so corridors start 1 block inside the north room and end 1 block inside
// the south room.
private static final int STEP_Z = ROOM_EXTENT_SOUTH + CORRIDOR_LENGTH + ROOM_EXTENT_NORTH - 1; // 25
private static final int STEP_X = ROOM_EXTENT_EAST + CORRIDOR_LENGTH + ROOM_EXTENT_WEST - 1; // 25
private static final int STEP_Z =
ROOM_EXTENT_SOUTH + CORRIDOR_LENGTH + ROOM_EXTENT_NORTH - 1; // 25
private static final int STEP_X =
ROOM_EXTENT_EAST + CORRIDOR_LENGTH + ROOM_EXTENT_WEST - 1; // 25
private static final int ROWS_SOUTH = 40; // rows of rooms south of spawn (spawn room itself is already placed)
private static final int ROWS_SOUTH =
40; // rows of rooms south of spawn (spawn room itself is already placed)
private static final int COLS_EW = 40; // columns across X (split roughly evenly around center)
private ChipiDungeonGenerator() {}
@ -38,7 +40,8 @@ public class ChipiDungeonGenerator {
// Spawn is already placed. Fixed anchors (not relative to portal):
// first corridor origin, then the first generated room center is south of spawn.
BlockPos firstCorridorAnchor = new BlockPos(5, CORRIDOR_Y, 11);
BlockPos firstGeneratedRoomCenter = new BlockPos(5, ROOM_Y, 24); // explicit first floor anchor
BlockPos firstGeneratedRoomCenter =
new BlockPos(5, ROOM_Y, 24); // explicit first floor anchor
// First room/corridor use direct instances as requested.
RoomBaseStructure firstRoom = WorldMaster.getDefaultRoom();
@ -57,14 +60,16 @@ public class ChipiDungeonGenerator {
// Place rooms strictly southward (Z never decreases), across X in both directions.
for (int row = 0; row < ROWS_SOUTH; row++) {
for (int col = minCol; col <= maxCol; col++) {
int gridX = col; // grid 0,0 is the first generated room; -X -> negative gridX, +X -> positive gridX
int gridX =
col; // grid 0,0 is the first generated room; -X -> negative gridX, +X ->
// positive gridX
int gridY = row; // gridY increases southward only
BlockPos center = new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
);
BlockPos center =
new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
RoomBaseStructure room = WorldMaster.resolveRoom(ctx(world, gridX, gridY, center, null));
room.placeAt(world, center);
@ -79,19 +84,20 @@ public class ChipiDungeonGenerator {
int gridX = col;
int gridY = row;
BlockPos currentCenter = new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
);
BlockPos currentCenter =
new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
BlockPos anchorSouth = new BlockPos(
currentCenter.getX(),
CORRIDOR_Y,
currentCenter.getZ() + ROOM_EXTENT_SOUTH
);
BlockPos anchorSouth =
new BlockPos(
currentCenter.getX(),
CORRIDOR_Y,
currentCenter.getZ() + ROOM_EXTENT_SOUTH);
CorridorNSStructure corridorNS = WorldMaster.resolveCorridorNS(ctx(world, gridX, gridY, anchorSouth, null));
CorridorNSStructure corridorNS =
WorldMaster.resolveCorridorNS(ctx(world, gridX, gridY, anchorSouth, null));
corridorNS.placeAt(world, anchorSouth);
WorldMaster.afterPlaceCorridorNS(ctx(world, gridX, gridY, anchorSouth, corridorNS));
}
@ -103,19 +109,20 @@ public class ChipiDungeonGenerator {
int gridX = col;
int gridY = row;
BlockPos currentCenter = new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z)
);
BlockPos currentCenter =
new BlockPos(
firstGeneratedRoomCenter.getX() + (col * STEP_X),
ROOM_Y,
firstGeneratedRoomCenter.getZ() + (row * STEP_Z));
BlockPos anchorEast = new BlockPos(
currentCenter.getX() + ROOM_EXTENT_EAST,
CORRIDOR_Y,
currentCenter.getZ()
);
BlockPos anchorEast =
new BlockPos(
currentCenter.getX() + ROOM_EXTENT_EAST,
CORRIDOR_Y,
currentCenter.getZ());
CorridorEWStructure corridorEW = WorldMaster.resolveCorridorEW(ctx(world, gridX, gridY, anchorEast, null));
CorridorEWStructure corridorEW =
WorldMaster.resolveCorridorEW(ctx(world, gridX, gridY, anchorEast, null));
corridorEW.placeAt(world, anchorEast);
WorldMaster.afterPlaceCorridorEW(ctx(world, gridX, gridY, anchorEast, corridorEW));
}
@ -129,10 +136,18 @@ public class ChipiDungeonGenerator {
runInChipi(world, "fill 7 87 15 3 91 16 minecraft:air");
runInChipi(world, "setblock 4 88 15 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
runInChipi(world, "setblock 4 88 16 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
runInChipi(world, "setblock 6 88 15 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
runInChipi(world, "setblock 6 88 16 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
runInChipi(
world,
"setblock 4 88 15 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
runInChipi(
world,
"setblock 4 88 16 minecraft:deepslate_tile_stairs[facing=west,waterlogged=true]");
runInChipi(
world,
"setblock 6 88 15 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
runInChipi(
world,
"setblock 6 88 16 minecraft:deepslate_tile_stairs[facing=east,waterlogged=true]");
runInChipi(world, "fill 7 88 15 7 91 16 minecraft:deepslate_tiles");
runInChipi(world, "fill 3 88 16 3 91 15 minecraft:deepslate_tiles");
@ -165,11 +180,10 @@ public class ChipiDungeonGenerator {
private static void runInChipi(ServerWorld world, String command) {
world.getServer()
.getCommandManager()
.executeWithPrefix(
world.getServer().getCommandSource(),
"execute in chipi:chipi_dimension run " + command
);
.getCommandManager()
.executeWithPrefix(
world.getServer().getCommandSource(),
"execute in chipi:chipi_dimension run " + command);
}
private static DungeonContext ctx(ServerWorld world, int gridX, int gridY, BlockPos origin, ChipiStructure structure) {

4
src/main/java/net/Chipperfluff/chipi/world/gen/ChipiStructure.java
View File

@ -1,6 +1,6 @@
package net.Chipperfluff.chipi.world.gen;
import net.minecraft.block.Blocks;
import java.util.Optional;
import net.minecraft.block.entity.StructureBlockBlockEntity;
import net.minecraft.block.enums.StructureBlockMode;
import net.minecraft.server.world.ServerWorld;
@ -9,7 +9,7 @@ import net.minecraft.structure.StructureTemplate;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3i;
import java.util.Optional;
import net.minecraft.block.Blocks;
public abstract class ChipiStructure {

5
src/main/java/net/Chipperfluff/chipi/world/gen/WorldMaster.java
View File

@ -1,11 +1,10 @@
package net.Chipperfluff.chipi.world.gen;
import net.minecraft.block.Blocks;
import net.minecraft.util.math.BlockPos;
import net.Chipperfluff.chipi.world.gen.struct.CorridorEWStructure;
import net.Chipperfluff.chipi.world.gen.struct.CorridorNSStructure;
import net.Chipperfluff.chipi.world.gen.struct.RoomBaseStructure;
import net.minecraft.block.Blocks;
import net.minecraft.util.math.BlockPos;
public final class WorldMaster {

4
src/main/java/net/Chipperfluff/chipi/world/gen/struct/ChipiStructures.java
View File

@ -1,11 +1,11 @@
package net.Chipperfluff.chipi.world.gen.struct;
import net.Chipperfluff.chipi.world.gen.ChipiStructure; // <-- THIS WAS MISSING
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import net.Chipperfluff.chipi.world.gen.ChipiStructure; // <-- THIS WAS MISSING
public class ChipiStructures {
private static final Map<String, ChipiStructure> REGISTRY = new HashMap<>();

3
src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorEWStructure.java
View File

@ -1,8 +1,7 @@
package net.Chipperfluff.chipi.world.gen.struct;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.world.gen.ChipiStructure;
import net.minecraft.util.Identifier;
public class CorridorEWStructure extends ChipiStructure {

3
src/main/java/net/Chipperfluff/chipi/world/gen/struct/CorridorNSStructure.java
View File

@ -1,8 +1,7 @@
package net.Chipperfluff.chipi.world.gen.struct;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.world.gen.ChipiStructure;
import net.minecraft.util.Identifier;
public class CorridorNSStructure extends ChipiStructure {

3
src/main/java/net/Chipperfluff/chipi/world/gen/struct/RoomBaseStructure.java
View File

@ -1,8 +1,7 @@
package net.Chipperfluff.chipi.world.gen.struct;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.world.gen.ChipiStructure;
import net.minecraft.util.Identifier;
public class RoomBaseStructure extends ChipiStructure {

3
src/main/java/net/Chipperfluff/chipi/world/gen/struct/SpawnStructure.java
View File

@ -1,8 +1,7 @@
package net.Chipperfluff.chipi.world.gen.struct;
import net.minecraft.util.Identifier;
import net.Chipperfluff.chipi.world.gen.ChipiStructure;
import net.minecraft.util.Identifier;
public class SpawnStructure extends ChipiStructure {