Skip to content

Commit d680977

Browse files
JiingyJiingy
authored
Merge pull request #83 from Jiingy/1.19.3
Early alpha release
2 parents 351449c + 2158e59 commit d680977

File tree

1,138 files changed

+18558
-7247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,138 files changed

+18558
-7247
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
# Update Me 😭
1+
### Jineric Mod
2+
This is a mod focussed on adding vanilla styled features to enhance and expand the player's experience
3+
4+
#### Extra Comments
5+
As of now, there is no current theme or plan, I just add whatever I think may be cool to have in the game

‎build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,11 @@ jar {
6969
def dataOutput = 'src/main/generated'
7070
loom {
7171
runs {
72-
datagen {
73-
server()
72+
datagenClient {
73+
inherit client
7474
name "Data Generation"
7575
vmArg "-Dfabric-api.datagen"
7676
vmArg "-Dfabric-api.datagen.output-dir=${file(dataOutput)}"
77-
// vmArg "-Dfabric-api.datagen.modid=${mod_id}"
7877

7978
runDir "build/datagen"
8079
}

‎gradle.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ org.gradle.parallel = true
44

55
# Fabric Properties
66
minecraft_version = 1.19.3
7-
yarn_mappings = 1.19.3+build.4
8-
loader_version = 0.14.12
7+
yarn_mappings = 1.19.3+build.5
8+
loader_version = 0.14.13
99

1010
#Fabric api
11-
fabric_version = 0.69.1+1.19.3
11+
fabric_version = 0.73.0+1.19.3
1212

1313
# Dependencies
1414

‎src/main/java/jingy/jineric/base/JinericClientMain.java‎

Lines changed: 8 additions & 129 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,17 @@
11
package jingy.jineric.base;
22

3-
import jingy.jineric.block.JinericBlocks;
43
import jingy.jineric.client.render.JinericElytraFeatureRenderer;
5-
import jingy.jineric.client.render.blockentity.GenericChestBlockEntityRenderer;
6-
import jingy.jineric.client.render.blockentity.RedstoneCampfireBlockEntityRenderer;
74
import jingy.jineric.client.render.entity.model.JinericEntityModelLayer;
85
import jingy.jineric.client.render.entity.model.TurtleSaddleModel;
9-
import jingy.jineric.entity.passive.manxloaghtan.ManxLoaghtanModel;
10-
import jingy.jineric.entity.passive.manxloaghtan.ManxLoaghtanWoolModel;
11-
import jingy.jineric.registry.ColorProviders;
12-
import jingy.jineric.registry.JinericBlockEntityType;
13-
import jingy.jineric.registry.JinericEntityModelLayers;
14-
import jingy.jineric.screen.JinericScreenHandlerType;
15-
import jingy.jineric.screen.RefineryScreen;
16-
import jingy.jineric.screen.ShulkerChestScreen;
6+
import jingy.jineric.registry.*;
177
import net.fabricmc.api.ClientModInitializer;
188
import net.fabricmc.api.EnvType;
199
import net.fabricmc.api.Environment;
20-
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
21-
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
2210
import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRendererRegistrationCallback;
23-
import net.fabricmc.fabric.impl.client.rendering.BlockEntityRendererRegistryImpl;
24-
import net.minecraft.client.gui.screen.ingame.HandledScreens;
25-
import net.minecraft.client.model.Dilation;
26-
import net.minecraft.client.model.TexturedModelData;
27-
import net.minecraft.client.render.RenderLayer;
2811
import net.minecraft.client.render.entity.ArmorStandEntityRenderer;
2912
import net.minecraft.client.render.entity.PlayerEntityRenderer;
3013
import net.minecraft.client.render.entity.TurtleEntityRenderer;
3114
import net.minecraft.client.render.entity.feature.SaddleFeatureRenderer;
32-
import net.minecraft.client.render.entity.model.TurtleEntityModel;
3315
import net.minecraft.util.Identifier;
3416

3517
@Environment(EnvType.CLIENT)
@@ -38,114 +20,14 @@ public class JinericClientMain implements ClientModInitializer {
3820
@Override
3921
public void onInitializeClient() {
4022
registerFeatureRenderers();
41-
ColorProviders.registerColorProviders();
42-
43-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.REDSTONE_CAMPFIRE, RedstoneCampfireBlockEntityRenderer::new);
44-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.ACACIA_CHEST, GenericChestBlockEntityRenderer::new);
45-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.BIRCH_CHEST, GenericChestBlockEntityRenderer::new);
46-
// BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.BOREAL_CHEST, GenericChestBlockEntityRenderer::new);
47-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.CRIMSON_CHEST, GenericChestBlockEntityRenderer::new);
48-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.DARK_OAK_CHEST, GenericChestBlockEntityRenderer::new);
49-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.JUNGLE_CHEST, GenericChestBlockEntityRenderer::new);
50-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.SPRUCE_CHEST, GenericChestBlockEntityRenderer::new);
51-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.WARPED_CHEST, GenericChestBlockEntityRenderer::new);
52-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.MANGROVE_CHEST, GenericChestBlockEntityRenderer::new);
53-
BlockEntityRendererRegistryImpl.register(JinericBlockEntityType.SHULKER_CHEST, GenericChestBlockEntityRenderer::new);
54-
55-
//TexturedModelData.of(TurtleEntityModel.getModelData(0, new Dilation(0.5F)), 128, 64)
56-
57-
//ENTITY MODEL LAYERS
58-
EntityModelLayerRegistry.TexturedModelDataProvider turtleSaddle = () -> TexturedModelData.of(TurtleEntityModel.getModelData(0, new Dilation(0.5F)), 128, 64);
59-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.TURTLE_SADDLE, turtleSaddle);
60-
// EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.TURTLE_SADDLE, TurtleEntityModel::getTexturedModelData);
61-
// EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.TURTLE_SADDLE, TurtleSaddleModel::getTexturedModelData);
62-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.MANX_LOAGHTAN, ManxLoaghtanModel::getTexturedModelData);
63-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayer.MANX_LOAGHTAN_WOOL, ManxLoaghtanWoolModel::getTexturedModelData);
64-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.ACACIA_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
65-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_ACACIA_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
66-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_ACACIA_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
67-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.BIRCH_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
68-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BIRCH_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
69-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BIRCH_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
70-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.BOREAL_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
71-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BOREAL_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
72-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_BOREAL_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
73-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.CRIMSON_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
74-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_CRIMSON_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
75-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_CRIMSON_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
76-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DARK_OAK_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
77-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_DARK_OAK_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
78-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_DARK_OAK_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
79-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.JUNGLE_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
80-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_JUNGLE_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
81-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_JUNGLE_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
82-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.SPRUCE_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
83-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_SPRUCE_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
84-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_SPRUCE_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
85-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.WARPED_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
86-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_WARPED_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
87-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_WARPED_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
88-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.MANGROVE_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
89-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_MANGROVE_CHEST_LEFT, GenericChestBlockEntityRenderer::getLeftDoubleTexturedModelData);
90-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.DOUBLE_MANGROVE_CHEST_RIGHT, GenericChestBlockEntityRenderer::getRightDoubleTexturedModelData);
91-
EntityModelLayerRegistry.registerModelLayer(JinericEntityModelLayers.SHULKER_CHEST, GenericChestBlockEntityRenderer::getSingleTexturedModelData);
92-
93-
//BLOCK RENDER LAYER MAPS
94-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.FIREWEED, RenderLayer.getCutout());
95-
// BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BOREAL_TRAPDOOR, RenderLayer.getCutout());
96-
// BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BOREAL_DOOR, RenderLayer.getCutout());
97-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.FULL_GRASS_BLOCK, RenderLayer.getCutout());
98-
// BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BOREAL_LEAVES, RenderLayer.getCutout());
99-
// BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BOREAL_SAPLING, RenderLayer.getCutout());
100-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.REDSTONE_LANTERN, RenderLayer.getCutout());
101-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.REDSTONE_CAMPFIRE, RenderLayer.getCutout());
102-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.SPRUCE_LADDER, RenderLayer.getCutout());
103-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BIRCH_LADDER, RenderLayer.getCutout());
104-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.MANGROVE_LADDER, RenderLayer.getCutout());
105-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.JUNGLE_LADDER, RenderLayer.getCutoutMipped());
106-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.ACACIA_LADDER, RenderLayer.getCutout());
107-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.WARPED_LADDER, RenderLayer.getCutout());
108-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.CRIMSON_LADDER, RenderLayer.getCutout());
109-
// BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.BOREAL_LADDER, RenderLayer.getCutout());
110-
BlockRenderLayerMap.INSTANCE.putBlock(JinericBlocks.DARK_OAK_LADDER, RenderLayer.getCutout());
111-
112-
// ClientSpriteRegistryCallback.event(TexturedRenderLayers.CHEST_ATLAS_TEXTURE).register(((atlasTexture, registry) -> {
113-
// registry.register(JinericChestType.ACACIA.texture);
114-
// registry.register(JinericChestType.ACACIA.textureLeft);
115-
// registry.register(JinericChestType.ACACIA.textureRight);
116-
// registry.register(JinericChestType.BIRCH.texture);
117-
// registry.register(JinericChestType.BIRCH.textureLeft);
118-
// registry.register(JinericChestType.BIRCH.textureRight);
119-
// registry.register(JinericChestType.BOREAL.texture);
120-
// registry.register(JinericChestType.BOREAL.textureLeft);
121-
// registry.register(JinericChestType.BOREAL.textureRight);
122-
// registry.register(JinericChestType.CRIMSON.texture);
123-
// registry.register(JinericChestType.CRIMSON.textureLeft);
124-
// registry.register(JinericChestType.CRIMSON.textureRight);
125-
// registry.register(JinericChestType.DARK_OAK.texture);
126-
// registry.register(JinericChestType.DARK_OAK.textureLeft);
127-
// registry.register(JinericChestType.DARK_OAK.textureRight);
128-
// registry.register(JinericChestType.JUNGLE.texture);
129-
// registry.register(JinericChestType.JUNGLE.textureLeft);
130-
// registry.register(JinericChestType.JUNGLE.textureRight);
131-
// registry.register(JinericChestType.SPRUCE.texture);
132-
// registry.register(JinericChestType.SPRUCE.textureLeft);
133-
// registry.register(JinericChestType.SPRUCE.textureRight);
134-
// registry.register(JinericChestType.WARPED.texture);
135-
// registry.register(JinericChestType.WARPED.textureLeft);
136-
// registry.register(JinericChestType.WARPED.textureRight);
137-
// registry.register(JinericChestType.MANGROVE.texture);
138-
// registry.register(JinericChestType.MANGROVE.textureLeft);
139-
// registry.register(JinericChestType.MANGROVE.textureRight);
140-
// registry.register(JinericChestType.SHULKER.texture);
141-
// }));
142-
143-
//SCREEN HANDLERS
144-
HandledScreens.register(JinericScreenHandlerType.SHULKER_CHEST, ShulkerChestScreen::new);
145-
HandledScreens.register(JinericScreenHandlerType.REFINERY, RefineryScreen::new);
23+
ColorProviders.register();
24+
JinericBlockEntityRenderer.register();
25+
JinericEntityRenderers.register();
26+
JinericScreenHandlerTypes.register();
27+
JinericBlockRenderLayerMap.register();
28+
JinericEntityModels.register();
14629
}
14730

148-
14931
private void registerFeatureRenderers() {
15032
LivingEntityFeatureRendererRegistrationCallback.EVENT.register((entityType, entityRenderer, registrationHelper, context) -> {
15133
if (entityRenderer instanceof ArmorStandEntityRenderer || entityRenderer instanceof PlayerEntityRenderer) {
@@ -163,7 +45,4 @@ turtleEntityRenderer, new TurtleSaddleModel(context.getPart(JinericEntityModelLa
16345
}
16446
}));
16547
}
166-
}
167-
//(EntityModel<? extends Entity & Saddleable>)
168-
//new TurtleEntityModel<>(context.getPart(JinericEntityModelLayer.TURTLE_SADDLE))
169-
//(FeatureRendererContext<Saddleable, ? super TurtleEntityModel<Saddleable>>) entityRenderer
48+
}

‎src/main/java/jingy/jineric/base/JinericMain.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import jingy.jineric.block.JinericBlocks;
44
import jingy.jineric.entity.JinericPaintingMotive;
5+
import jingy.jineric.entity.effect.JinericStatusEffects;
56
import jingy.jineric.item.JinericItemGroups;
67
import jingy.jineric.item.JinericItems;
78
import jingy.jineric.potion.JinericPotions;
@@ -10,7 +11,7 @@
1011
import jingy.jineric.registry.JinericBlockEntityType;
1112
import jingy.jineric.registry.JinericRegistries;
1213
import jingy.jineric.screen.JinericScreenHandlerType;
13-
import jingy.jineric.sound.JinericSounds;
14+
import jingy.jineric.sound.JinericSoundEvents;
1415
import net.fabricmc.api.ModInitializer;
1516
import net.minecraft.util.Identifier;
1617
import org.apache.logging.log4j.LogManager;
@@ -33,11 +34,13 @@ public void onInitialize() {
3334
JinericBlocks.blockRegistry();
3435
JinericItems.itemRegistry();
3536
JinericItemGroups.onInitialize();
36-
JinericSounds.register();
37+
// JinericSoundGroups.register();
38+
JinericSoundEvents.init();
3739
JinericPotions.registerPotions();
3840
JinericBlockEntityType.registerBlockEntities();
3941
RefiningRecipe.register();
4042
JinericRecipeType.register();
43+
JinericStatusEffects.registerStatusEffect();
4144
JinericScreenHandlerType.registerScreenHandlers();
4245

4346
System.out.println("Jineric Mod Main - Finished initialization");

‎src/main/java/jingy/jineric/block/FullGrassBlock.java‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
package jingy.jineric.block;
22

3+
import jingy.jineric.data.generators.world.JinericUndergroundConfiguredFeatures;
4+
import net.minecraft.block.BlockState;
35
import net.minecraft.block.Fertilizable;
46
import net.minecraft.block.GrassBlock;
7+
import net.minecraft.registry.RegistryKeys;
8+
import net.minecraft.server.world.ServerWorld;
9+
import net.minecraft.util.math.BlockPos;
10+
import net.minecraft.util.math.random.Random;
11+
import net.minecraft.world.gen.feature.ConfiguredFeature;
512

613
public class FullGrassBlock extends GrassBlock implements Fertilizable {
714
public FullGrassBlock(Settings settings) {
815
super(settings);
916
}
1017

11-
// @Override
12-
// public boolean isFertilizable(BlockView world, BlockPos pos, BlockState state, boolean isClient) {
13-
// return world.getBlockState(pos.up()).isAir();
14-
// }
18+
@Override
19+
public void grow(ServerWorld world, net.minecraft.util.math.random.Random random, BlockPos pos, BlockState state) {
20+
world.getRegistryManager()
21+
.getOptional(RegistryKeys.CONFIGURED_FEATURE)
22+
.flatMap(registry -> registry.getEntry(JinericUndergroundConfiguredFeatures.FULL_GRASS_PATCH_BONEMEAL))
23+
.ifPresent(reference -> ((ConfiguredFeature)reference.value()).generate(world, world.getChunkManager().getChunkGenerator(), random, pos.up()));
24+
}
1525

16-
// @Override
17-
// public void grow(ServerWorld world, net.minecraft.util.math.random.Random random, BlockPos pos, BlockState state) {
18-
// ((ConfiguredFeature) JinericUndergroundConfiguredFeatures.FULL_GRASS_PATCH_BONEMEAL.value())
19-
// .generate(world, world.getChunkManager().getChunkGenerator(), random, pos.up());
20-
// }
26+
@Override
27+
public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
28+
super.randomTick(state, world, pos, random);
29+
}
2130
}

0 commit comments

Comments
 (0)