diff --git a/.gitignore b/.gitignore index f55a93c..9980266 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,6 @@ logs/ neo/runs/ common/src/generated/resources/.cache/ + +fabric/runs/ + diff --git a/CHANGELOG.md b/CHANGELOG.md index d09a51b..a3b7a9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 6.1.0 +### 21.4.0 -- 1.21.1 & Bee Compact \ No newline at end of file +- Update to Minecraft 1.21.4 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 976f6b2..77e31ca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,17 @@ plugins { - id("dev.nanite.mlp") version("0.3.0") + id("dev.nanite.mlp") version("0.4.2") id("java-library") id("maven-publish") - id("me.modmuss50.mod-publish-plugin") version "0.3.0" + id("me.modmuss50.mod-publish-plugin") version "0.8.1" id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0' } - java.toolchain.languageVersion = JavaLanguageVersion.of(21) multiLoader.root() { minecraftVersion.set(project.property("minecraft_version")) + parchmentMinecraftVersion.set(project.property("minecraft_version")) + parchmentVersion.set(project.property("parchment_version")) modID.set(project.property("mod_id")) splitSources.set(true) convertAccessWidener.set(true) diff --git a/buildSrc/src/main/groovy/multiloader.gradle b/buildSrc/src/main/groovy/multiloader.gradle index 88d6df8..d115304 100644 --- a/buildSrc/src/main/groovy/multiloader.gradle +++ b/buildSrc/src/main/groovy/multiloader.gradle @@ -74,4 +74,8 @@ publishing { artifactId project.getArchivesBaseName() } } +} + +jar { + duplicatesStrategy(DuplicatesStrategy.EXCLUDE) } \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/items/end_portal.json b/common/src/generated/resources/assets/jamd/items/end_portal.json new file mode 100644 index 0000000..3cce1a9 --- /dev/null +++ b/common/src/generated/resources/assets/jamd/items/end_portal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "jamd:block/end_portal" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/items/nether_portal.json b/common/src/generated/resources/assets/jamd/items/nether_portal.json new file mode 100644 index 0000000..f3fda78 --- /dev/null +++ b/common/src/generated/resources/assets/jamd/items/nether_portal.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "jamd:block/nether_portal" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/items/portal_block.json b/common/src/generated/resources/assets/jamd/items/portal_block.json new file mode 100644 index 0000000..df00acb --- /dev/null +++ b/common/src/generated/resources/assets/jamd/items/portal_block.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "jamd:block/portal_block" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/models/item/end_portal.json b/common/src/generated/resources/assets/jamd/models/item/end_portal.json deleted file mode 100644 index e62de9c..0000000 --- a/common/src/generated/resources/assets/jamd/models/item/end_portal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "jamd:block/end_portal" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/models/item/nether_portal.json b/common/src/generated/resources/assets/jamd/models/item/nether_portal.json deleted file mode 100644 index 5c89930..0000000 --- a/common/src/generated/resources/assets/jamd/models/item/nether_portal.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "jamd:block/nether_portal" -} \ No newline at end of file diff --git a/common/src/generated/resources/assets/jamd/models/item/portal_block.json b/common/src/generated/resources/assets/jamd/models/item/portal_block.json deleted file mode 100644 index 46ebaf2..0000000 --- a/common/src/generated/resources/assets/jamd/models/item/portal_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "jamd:block/portal_block" -} \ No newline at end of file diff --git a/common/src/generated/resources/data/jamd/dimension_type/end.json b/common/src/generated/resources/data/jamd/dimension_type/end.json index 28bb31f..87e1b86 100644 --- a/common/src/generated/resources/data/jamd/dimension_type/end.json +++ b/common/src/generated/resources/data/jamd/dimension_type/end.json @@ -11,10 +11,10 @@ "infiniburn": "#minecraft:infiniburn_end", "logical_height": 256, "min_y": 0, - "monster_spawn_block_light_limit": 0, + "monster_spawn_block_light_limit": 15, "monster_spawn_light_level": { "type": "minecraft:uniform", - "max_inclusive": 7, + "max_inclusive": 15, "min_inclusive": 0 }, "natural": false, diff --git a/common/src/generated/resources/data/jamd/dimension_type/mining.json b/common/src/generated/resources/data/jamd/dimension_type/mining.json index 5d542af..a658413 100644 --- a/common/src/generated/resources/data/jamd/dimension_type/mining.json +++ b/common/src/generated/resources/data/jamd/dimension_type/mining.json @@ -11,10 +11,10 @@ "infiniburn": "#minecraft:infiniburn_overworld", "logical_height": 384, "min_y": -64, - "monster_spawn_block_light_limit": 0, + "monster_spawn_block_light_limit": 15, "monster_spawn_light_level": { "type": "minecraft:uniform", - "max_inclusive": 7, + "max_inclusive": 15, "min_inclusive": 0 }, "natural": true, diff --git a/common/src/generated/resources/data/jamd/dimension_type/nether.json b/common/src/generated/resources/data/jamd/dimension_type/nether.json index 290beb6..fb76654 100644 --- a/common/src/generated/resources/data/jamd/dimension_type/nether.json +++ b/common/src/generated/resources/data/jamd/dimension_type/nether.json @@ -11,10 +11,10 @@ "infiniburn": "#minecraft:infiniburn_nether", "logical_height": 128, "min_y": 0, - "monster_spawn_block_light_limit": 0, + "monster_spawn_block_light_limit": 15, "monster_spawn_light_level": { "type": "minecraft:uniform", - "max_inclusive": 7, + "max_inclusive": 15, "min_inclusive": 0 }, "natural": false, diff --git a/common/src/generated/resources/data/jamd/recipe/end_portal_block.json b/common/src/generated/resources/data/jamd/recipe/end_portal_block.json index a2fbe83..6a2e5c7 100644 --- a/common/src/generated/resources/data/jamd/recipe/end_portal_block.json +++ b/common/src/generated/resources/data/jamd/recipe/end_portal_block.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": { - "item": "minecraft:end_stone" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } + "O": "minecraft:end_stone", + "P": "minecraft:diamond_pickaxe" }, "pattern": [ "OOO", diff --git a/common/src/generated/resources/data/jamd/recipe/nether_portal_block.json b/common/src/generated/resources/data/jamd/recipe/nether_portal_block.json index 59ff0e9..e64ec56 100644 --- a/common/src/generated/resources/data/jamd/recipe/nether_portal_block.json +++ b/common/src/generated/resources/data/jamd/recipe/nether_portal_block.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": { - "item": "minecraft:nether_bricks" - }, - "P": { - "item": "minecraft:netherite_pickaxe" - } + "O": "minecraft:nether_bricks", + "P": "minecraft:netherite_pickaxe" }, "pattern": [ "OOO", diff --git a/common/src/generated/resources/data/jamd/recipe/portal_block.json b/common/src/generated/resources/data/jamd/recipe/portal_block.json index 31cb5c0..809454b 100644 --- a/common/src/generated/resources/data/jamd/recipe/portal_block.json +++ b/common/src/generated/resources/data/jamd/recipe/portal_block.json @@ -2,12 +2,8 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "O": { - "item": "minecraft:obsidian" - }, - "P": { - "item": "minecraft:diamond_pickaxe" - } + "O": "minecraft:obsidian", + "P": "minecraft:diamond_pickaxe" }, "pattern": [ "OOO", diff --git a/common/src/generated/resources/data/jamd/worldgen/biome/end.json b/common/src/generated/resources/data/jamd/worldgen/biome/end.json index 34070c3..f0b7e59 100644 --- a/common/src/generated/resources/data/jamd/worldgen/biome/end.json +++ b/common/src/generated/resources/data/jamd/worldgen/biome/end.json @@ -1,8 +1,9 @@ { - "carvers": {}, + "carvers": [], "downfall": 0.5, "effects": { "fog_color": 10518688, + "music_volume": 1.0, "sky_color": 0, "water_color": 4159204, "water_fog_color": 329011 diff --git a/common/src/generated/resources/data/jamd/worldgen/biome/mining.json b/common/src/generated/resources/data/jamd/worldgen/biome/mining.json index fe40d42..9b100ab 100644 --- a/common/src/generated/resources/data/jamd/worldgen/biome/mining.json +++ b/common/src/generated/resources/data/jamd/worldgen/biome/mining.json @@ -1,8 +1,9 @@ { - "carvers": {}, + "carvers": [], "downfall": 0.4, "effects": { "fog_color": 12638463, + "music_volume": 1.0, "sky_color": 8103167, "water_color": 4445678, "water_fog_color": 270131 diff --git a/common/src/generated/resources/data/jamd/worldgen/biome/nether.json b/common/src/generated/resources/data/jamd/worldgen/biome/nether.json index a0d148c..a79673a 100644 --- a/common/src/generated/resources/data/jamd/worldgen/biome/nether.json +++ b/common/src/generated/resources/data/jamd/worldgen/biome/nether.json @@ -1,5 +1,5 @@ { - "carvers": {}, + "carvers": [], "downfall": 0.0, "effects": { "additions_sound": { @@ -14,12 +14,18 @@ "sound": "minecraft:ambient.nether_wastes.mood", "tick_delay": 6000 }, - "music": { - "max_delay": 24000, - "min_delay": 12000, - "replace_current_music": false, - "sound": "minecraft:music.nether.nether_wastes" - }, + "music": [ + { + "data": { + "max_delay": 24000, + "min_delay": 12000, + "replace_current_music": false, + "sound": "minecraft:music.nether.nether_wastes" + }, + "weight": 1 + } + ], + "music_volume": 1.0, "sky_color": 7254527, "water_color": 4159204, "water_fog_color": 329011 @@ -32,7 +38,14 @@ [], [], [], - [] + [ + "minecraft:ore_gravel_nether", + "minecraft:ore_blackstone", + "minecraft:ore_gold_nether", + "minecraft:ore_quartz_nether", + "minecraft:ore_ancient_debris_large", + "minecraft:ore_debris_small" + ] ], "has_precipitation": false, "spawn_costs": {}, diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java b/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java index 4c3fa3a..1812741 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java @@ -8,6 +8,10 @@ import com.unrealdinnerbone.trenzalore.lib.RLUtils; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; +import net.minecraft.world.entity.Display; +import net.minecraft.world.entity.EntityType; +import net.minecraft.world.level.timers.TimerCallback; +import net.minecraft.world.level.timers.TimerQueue; import org.slf4j.Logger; import java.io.IOException; diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/JAMDRegistry.java b/common/src/main/java/com/unrealdinnerbone/jamd/JAMDRegistry.java index 7772899..2a0ea57 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/JAMDRegistry.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/JAMDRegistry.java @@ -6,7 +6,10 @@ import com.unrealdinnerbone.jamd.block.*; import com.unrealdinnerbone.jamd.block.base.PortalTileEntity; import com.unrealdinnerbone.jamd.world.CustomFlatLevelSource; +import com.unrealdinnerbone.trenzalore.api.platform.services.ICreativeTabRegister; import com.unrealdinnerbone.trenzalore.api.platform.services.IRegistry; +import com.unrealdinnerbone.trenzalore.api.registry.BlockRegistryObjects; +import com.unrealdinnerbone.trenzalore.api.registry.ItemRegistryObjects; import com.unrealdinnerbone.trenzalore.api.registry.Regeneration; import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry; import com.unrealdinnerbone.trenzalore.api.registry.RegistryObjects; @@ -16,26 +19,30 @@ import net.minecraft.commands.synchronization.SingletonArgumentInfo; import net.minecraft.core.BlockPos; import net.minecraft.core.registries.Registries; +import net.minecraft.resources.ResourceKey; import net.minecraft.tags.BiomeTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.chunk.ChunkGenerator; import java.util.List; import java.util.function.BiFunction; +import java.util.function.Function; import java.util.function.Supplier; +import java.util.function.UnaryOperator; public class JAMDRegistry implements IRegistry { - private static final RegistryObjects BLOCKS = Regeneration.create(Registries.BLOCK); - private static final RegistryObjects ITEMS = Regeneration.create(Registries.ITEM); - private static final RegistryObjects> TILES = Regeneration.create(Registries.BLOCK_ENTITY_TYPE); - private static final RegistryObjects> CHUNK_GENERATORS = Regeneration.create(Registries.CHUNK_GENERATOR); + private static final BlockRegistryObjects BLOCKS = Regeneration.createBlockRegistry(JAMD.MOD_ID); + private static final ItemRegistryObjects ITEMS = Regeneration.createItemRegistry(JAMD.MOD_ID); + private static final RegistryObjects> TILES = Regeneration.create(JAMD.MOD_ID, Registries.BLOCK_ENTITY_TYPE); + private static final RegistryObjects> CHUNK_GENERATORS = Regeneration.create(JAMD.MOD_ID, Registries.CHUNK_GENERATOR); public static final RegistryEntry> CUSTOM_FLAT_LEVEL_SOURCE = CHUNK_GENERATORS.register("mining", () -> CustomFlatLevelSource.CODEC); @@ -46,14 +53,14 @@ public class JAMDRegistry implements IRegistry { public static final WorldType END = of("end", "end_portal", "end_portal", EndPortalBlock::new, EndBlockEntity::new, BiomeTags.IS_END); - private static WorldType of(String name, String blockName, String tileName, Supplier blockSupplier, BiFunction tileSupplier, TagKey biomeTagKey) { - RegistryEntry block = BLOCKS.register(blockName, blockSupplier); - return new WorldType(name, block, ITEMS.register(blockName, () -> new BlockItem(block.get(), new Item.Properties())), TILES.register(tileName, () -> Regeneration.createBlockEntityType(tileSupplier, block.get())), biomeTagKey); + private static WorldType of(String name, String blockName, String tileName, Function blockSupplier, Regeneration.BESuppler tileSupplier, TagKey biomeTagKey) { + RegistryEntry block = BLOCKS.register(blockName, blockSupplier, UnaryOperator.identity()); + return new WorldType(name, block, ITEMS.registerBlockItem(blockName, block, UnaryOperator.identity()), TILES.register(tileName, () -> Regeneration.createBEType(tileSupplier, block.getHolder().value())), biomeTagKey); } @Override - public void afterRegistered() { - Regeneration.addItemsToCreateTab(CreativeTabs.FUNCTIONAL_BLOCKS, List.of(OVERWORLD.getItem(), NETHER.getItem(), END.getItem())); + public void afterRegistered(ICreativeTabRegister register) { + register.addItemToCreativeTab(CreativeTabs.FUNCTIONAL_BLOCKS, List.of(OVERWORLD.getItem(), NETHER.getItem(), END.getItem())); } @Override diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java b/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java index 1930e51..0e847bd 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java @@ -121,13 +121,13 @@ public void export(MinecraftServer server) throws IllegalStateException, IOExcep List placedFeatures = getFeatures(server); for (PlacedFeature placedFeature : placedFeatures) { - boolean b = server.registryAccess().registryOrThrow(Registries.PLACED_FEATURE).wrapAsHolder(placedFeature).is(ingoredPlaceFeatures); + boolean b = server.registryAccess().lookupOrThrow(Registries.PLACED_FEATURE).wrapAsHolder(placedFeature).is(ingoredPlaceFeatures); if (!b && !placedFeature.feature().is(ingoredConfigFeatures)) { RegistryAccess.Frozen frozen = server.registryAccess(); ConfiguredFeature configuredFeatureReference = placedFeature.feature().value(); Feature feature1 = configuredFeatureReference.feature(); - ResourceLocation key1 = frozen.registryOrThrow(Registries.FEATURE).getKey(feature1); + ResourceLocation key1 = frozen.lookupOrThrow(Registries.FEATURE).getKey(feature1); FeatureTypeRegistry.getFeatureType(key1).ifPresentOrElse(iFeatureTypeCompact -> { try { oresCodecs.add(iFeatureTypeCompact.getOreCodec(configuredFeatureReference.config(), placedFeature.placement())); diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/block/EndPortalBlock.java b/common/src/main/java/com/unrealdinnerbone/jamd/block/EndPortalBlock.java index b5bb180..104dbaf 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/block/EndPortalBlock.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/block/EndPortalBlock.java @@ -2,11 +2,14 @@ import com.unrealdinnerbone.jamd.JAMDRegistry; import com.unrealdinnerbone.jamd.block.base.PortalBlock; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; public class EndPortalBlock extends PortalBlock { - public EndPortalBlock() { - super(JAMDRegistry.END); + public EndPortalBlock(Block.Properties properties) { + super(properties, JAMDRegistry.END); } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/block/NetherPortalBlock.java b/common/src/main/java/com/unrealdinnerbone/jamd/block/NetherPortalBlock.java index 32e0ac2..23ffc89 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/block/NetherPortalBlock.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/block/NetherPortalBlock.java @@ -2,11 +2,13 @@ import com.unrealdinnerbone.jamd.JAMDRegistry; import com.unrealdinnerbone.jamd.block.base.PortalBlock; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; public class NetherPortalBlock extends PortalBlock { - public NetherPortalBlock() { - super(JAMDRegistry.NETHER); + public NetherPortalBlock(Block.Properties properties) { + super(properties, JAMDRegistry.NETHER); } } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/block/OverworldPortalBlock.java b/common/src/main/java/com/unrealdinnerbone/jamd/block/OverworldPortalBlock.java index 07ebedd..114bab4 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/block/OverworldPortalBlock.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/block/OverworldPortalBlock.java @@ -2,11 +2,13 @@ import com.unrealdinnerbone.jamd.JAMDRegistry; import com.unrealdinnerbone.jamd.block.base.PortalBlock; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; public class OverworldPortalBlock extends PortalBlock { - public OverworldPortalBlock() { - super(JAMDRegistry.OVERWORLD); + public OverworldPortalBlock(Block.Properties properties) { + super(properties, JAMDRegistry.OVERWORLD); } } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalBlock.java b/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalBlock.java index 388fcfa..a839578 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalBlock.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalBlock.java @@ -8,6 +8,7 @@ import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.EntityBlock; @@ -26,8 +27,8 @@ public abstract class PortalBlock extends Block implements EntityBlock { private final WorldType type; - public PortalBlock(WorldType type) { - super(Properties.of().strength(5.0F, 6.0F).sound(SoundType.STONE).mapColor(MapColor.COLOR_BLUE)); + public PortalBlock(Block.Properties properties, WorldType type) { + super(properties); this.type = type; } @@ -48,7 +49,7 @@ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockP player.displayClientMessage(Component.literal("You can't teleport from this dimension"), true); } } - return InteractionResult.sidedSuccess(level.isClientSide); + return InteractionResult.SUCCESS; } } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalTileEntity.java b/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalTileEntity.java index ff7e675..7c32025 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalTileEntity.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/block/base/PortalTileEntity.java @@ -8,7 +8,7 @@ public abstract class PortalTileEntity extends BlockEntity { public PortalTileEntity(WorldType worldType, BlockPos blockPos, BlockState blockState) { - super(worldType.getBlockEntity().get(), blockPos, blockState); + super(worldType.getBlockEntity().getHolder().value(), blockPos, blockState); } } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java b/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java index 4191611..cd123c5 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java @@ -26,7 +26,7 @@ public static void teleport(Player playerEntity, ResourceKey toWorldKey, if (toWorld.getBlockState(portalLocation).isAir()) { toWorld.setBlockAndUpdate(portalLocation, registrySet.getBlock().get().defaultBlockState()); } - playerEntity.teleportTo(toWorld, portalLocation.getX() + 0.5, portalLocation.getY() + 1, portalLocation.getZ() + 0.5, Collections.emptySet(), playerEntity.getYRot(), playerEntity.getXRot()); + playerEntity.teleportTo(toWorld, portalLocation.getX() + 0.5, portalLocation.getY() + 1, portalLocation.getZ() + 0.5, Collections.emptySet(), playerEntity.getYRot(), playerEntity.getXRot(), true); }, () -> playerEntity.displayClientMessage(Component.translatable(JAMD.MOD_ID + ".invalid.pos"), true)); diff --git a/fabric/build.gradle b/fabric/build.gradle index c8b8ab1..d89ea19 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -9,6 +9,9 @@ multiLoader.fabric() { publishing.publications.mavenJava.from components.java +//sourceSets.main.resources { srcDir project(":common").file('src/generated/resources') } + + dependencies { modImplementation("com.unrealdinnerbone:trenzalore-fabric:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/JAMDData.java b/fabric/src/client/java/com/unrealdinnerbone/jamd/client/JAMDData.java similarity index 93% rename from fabric/src/main/java/com/unrealdinnerbone/jamd/data/JAMDData.java rename to fabric/src/client/java/com/unrealdinnerbone/jamd/client/JAMDData.java index b604dbd..8f8f925 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/JAMDData.java +++ b/fabric/src/client/java/com/unrealdinnerbone/jamd/client/JAMDData.java @@ -1,6 +1,14 @@ -package com.unrealdinnerbone.jamd.data; +package com.unrealdinnerbone.jamd.client; import com.unrealdinnerbone.jamd.JAMDRegistry; +import com.unrealdinnerbone.jamd.data.AdvancementProvider; +import com.unrealdinnerbone.jamd.data.BlockTagProvider; +import com.unrealdinnerbone.jamd.data.DRP; +import com.unrealdinnerbone.jamd.data.FeatureTagProvider; +import com.unrealdinnerbone.jamd.data.LangProvider; +import com.unrealdinnerbone.jamd.data.LootTableProvider; +import com.unrealdinnerbone.jamd.data.PlaceTagProvider; +import com.unrealdinnerbone.jamd.data.RecipeProvider; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.minecraft.core.HolderGetter; @@ -95,7 +103,7 @@ static void bootstrapDimensionType(BootstrapContext context) { 1.0F, new DimensionType.MonsterSettings(false, false, - UniformInt.of(0, 7), 0))); + UniformInt.of(0, 15), 15))); } } @@ -141,7 +149,7 @@ static void bootstrapDimensionType(BootstrapContext context) { 1.0F, new DimensionType.MonsterSettings(false, false, - UniformInt.of(0, 7), 0))); + UniformInt.of(0, 15), 15))); } } @@ -186,7 +194,7 @@ static void bootstrapDimensionType(BootstrapContext context) { 1.0F, new DimensionType.MonsterSettings(false, false, - UniformInt.of(0, 7), 0))); + UniformInt.of(0, 15), 15))); } } } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/ModelProvider.java b/fabric/src/client/java/com/unrealdinnerbone/jamd/client/ModelProvider.java similarity index 75% rename from fabric/src/main/java/com/unrealdinnerbone/jamd/data/ModelProvider.java rename to fabric/src/client/java/com/unrealdinnerbone/jamd/client/ModelProvider.java index 1a76d84..63efbe3 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/ModelProvider.java +++ b/fabric/src/client/java/com/unrealdinnerbone/jamd/client/ModelProvider.java @@ -1,10 +1,10 @@ -package com.unrealdinnerbone.jamd.data; +package com.unrealdinnerbone.jamd.client; import com.unrealdinnerbone.jamd.JAMDRegistry; +import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.data.models.BlockModelGenerators; -import net.minecraft.data.models.ItemModelGenerators; +import net.minecraft.client.data.models.BlockModelGenerators; +import net.minecraft.client.data.models.ItemModelGenerators; public class ModelProvider extends FabricModelProvider { diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java index 42875a6..a2f457a 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java @@ -19,7 +19,7 @@ public class AdvancementProvider extends FabricAdvancementProvider { - protected AdvancementProvider(FabricDataOutput output, CompletableFuture registryLookup) { + public AdvancementProvider(FabricDataOutput output, CompletableFuture registryLookup) { super(output, registryLookup); } @@ -28,7 +28,7 @@ public void generateAdvancement(HolderLookup.Provider lookup, Consumer registryLookup) { + public LangProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { super(dataOutput, registryLookup); } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/LootTableProvider.java b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/LootTableProvider.java index fab34a2..6b2bece 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/LootTableProvider.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/LootTableProvider.java @@ -9,7 +9,7 @@ public class LootTableProvider extends FabricBlockLootTableProvider { - protected LootTableProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { + public LootTableProvider(FabricDataOutput dataOutput, CompletableFuture registryLookup) { super(dataOutput, registryLookup); } diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/RecipeProvider.java b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/RecipeProvider.java index 82786d4..d498000 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/RecipeProvider.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/RecipeProvider.java @@ -6,11 +6,14 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Items; +import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.level.block.Blocks; import java.util.concurrent.CompletableFuture; @@ -23,30 +26,52 @@ public RecipeProvider(FabricDataOutput output, CompletableFuture> createRecipeKey(String name) { + return ResourceKey.create(Registries.RECIPE, JAMD.rl(name)); } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index e7ea16e..ec9867d 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -21,7 +21,7 @@ "com.unrealdinnerbone.jamd.fabric.JAMDFabric" ], "fabric-datagen": [ - "com.unrealdinnerbone.jamd.data.JAMDData" + "com.unrealdinnerbone.jamd.client.JAMDData" ] }, "depends": { diff --git a/gradle.properties b/gradle.properties index 00ca4b3..df37334 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -mod_version=5.1.0 +mod_version=24.4.0 maven_group=com.unrealdinnerbone curse_id=422981 mod_name=JAMD @@ -8,18 +8,20 @@ mod_id=jamd # Common -minecraft_version=1.21.1 +minecraft_version=1.21.4 # Forge #forge_version=49.0.13 -neo_version=21.1.4 +neo_version=21.4.12-beta -fabric_version=0.102.0+1.21.1 -fabric_loader_version=0.15.11 +parchment_version=2024.12.07 + +fabric_version=0.111.0+1.21.4 +fabric_loader_version=0.16.9 # Other -trenzalore_version=6.1.0 +trenzalore_version=21.4.4 # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..e48eca5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/build.gradle b/neo/build.gradle index 67722bb..605cef7 100644 --- a/neo/build.gradle +++ b/neo/build.gradle @@ -14,8 +14,8 @@ sourceSets.main.resources { srcDir project(":common").file('src/generated/resour dependencies { implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}") - api "mekanism:Mekanism:${mekanism_version}" - api "curse.maven:productivebees-377897:5611632" +// api "mekanism:Mekanism:${mekanism_version}" +// api "curse.maven:productivebees-377897:5611632" // api "blusunrize.immersiveengineering:ImmersiveEngineering:${immersive_engineering_version}" } diff --git a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java index 148a37c..852d5b5 100644 --- a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java +++ b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/JAMDNeo.java @@ -3,7 +3,6 @@ import com.unrealdinnerbone.jamd.JAMD; import com.unrealdinnerbone.jamd.api.FeatureTypeRegistry; import com.unrealdinnerbone.jamd.command.JamdCommand; -import com.unrealdinnerbone.jamd.neo.compact.MekenismOreCompact; import com.unrealdinnerbone.jamd.neo.compact.PBCompact; import net.neoforged.fml.common.Mod; import net.neoforged.neoforge.common.NeoForge; @@ -23,7 +22,7 @@ public JAMDNeo() { } public static void registerCompact() { - FeatureTypeRegistry.register("mekanism", "ore", MekenismOreCompact::new); +// FeatureTypeRegistry.register("mekanism", "ore", MekenismOreCompact::new); FeatureTypeRegistry.register("productivebees", List.of( "sand_nest", "snow_nest", diff --git a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java index 9c2223b..16c15b7 100644 --- a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java +++ b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/MekenismOreCompact.java @@ -1,18 +1,17 @@ -package com.unrealdinnerbone.jamd.neo.compact; - -import com.unrealdinnerbone.jamd.OresCodec; -import com.unrealdinnerbone.jamd.api.IFeatureTypeCompact; -import mekanism.common.world.ResizableOreFeatureConfig; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; - -import java.util.List; - -public class MekenismOreCompact implements IFeatureTypeCompact { - - @Override - public OresCodec parse(ResizableOreFeatureConfig config, List placementModifiers) { - return new OresCodec(config.size().getAsInt(), config.discardChanceOnAirExposure().getAsFloat(), placementModifiers, config.targetStates()); - } - -} +//package com.unrealdinnerbone.jamd.neo.compact; +// +//import com.unrealdinnerbone.jamd.OresCodec; +//import com.unrealdinnerbone.jamd.api.IFeatureTypeCompact; +//import mekanism.common.world.ResizableOreFeatureConfig; +//import net.minecraft.world.level.levelgen.placement.PlacementModifier; +// +//import java.util.List; +// +//public class MekenismOreCompact implements IFeatureTypeCompact { +// +// @Override +// public OresCodec parse(ResizableOreFeatureConfig config, List placementModifiers) { +// return new OresCodec(config.size().getAsInt(), config.discardChanceOnAirExposure().getAsFloat(), placementModifiers, config.targetStates()); +// } +// +//}