Update 2.0.0 - Pretty Sweet Update

.gitignore

@@ -1,7 +1,11 @@
 # gradle
 
 .gradle/
-build/
+build/classes/
+build/generated/
+build/libs/
+build/resources/
+build/tmp/
 out/
 classes/
 

build.gradle

@@ -15,6 +15,8 @@ minecraft {
 
 repositories {
 	maven { url "https://jitpack.io" }
+	maven { url "http://server.bbkr.space/artifactory/libs-release" }
+	maven { url 'https://maven.blamejared.com' }
 }
 
 dependencies {
@@ -23,11 +25,20 @@ dependencies {
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	// Fabric API. This is technically optional, but you probably want it anyway.
 	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-	// You may need to force-disable transitiveness on them.
+
+	modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}"	
+
+	modImplementation "com.github.Draylar:maybe-data:${maybedata_version}"
+    include "com.github.Draylar:maybe-data:${maybedata_version}"
+	modImplementation "eu.midnightdust:midnight-hats:${midnighthats_version}"
+    include "eu.midnightdust:midnight-hats:${midnighthats_version}"
+
+	modImplementation ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
+	include ("me.sargunvohra.mcmods:autoconfig1u:${project.auto_config_version}")
+	modImplementation ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
+	include ("me.shedaniel.cloth:config-2:${project.cloth_config_version}")
+	modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}")
 }
 
 processResources {

gradle.properties

@@ -8,10 +8,20 @@ org.gradle.jvmargs=-Xmx1G
 	loader_version=0.9.1+build.205
 
 # Mod Properties
-	mod_version = 1.0.4
+	mod_version = 2.0.0
 	maven_group = eu.midnightdust.motschen
 	archives_base_name = dishes
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.17.2+build.396-1.16
+	fabric_version=0.17.2+build.396-1.16
+	patchouli_version=1.16-40-FABRIC
+	maybedata_version=1.0.0-1.16.2
+
+	# Config stuff
+	auto_config_version = 3.2.0-unstable
+	cloth_config_version = 4.7.0-unstable
+	mod_menu_version = 1.14.6+build.31
+
+	# MidnightHats
+	midnighthats_version=1.0.2

src/main/java/eu/midnightdust/motschen/dishes/DishesClient.java

@@ -1,14 +1,20 @@
 package eu.midnightdust.motschen.dishes;
 
+import eu.midnightdust.motschen.dishes.entities.client.IceCreamTraderRenderer;
+import eu.midnightdust.motschen.dishes.init.CropInit;
+import eu.midnightdust.motschen.dishes.init.IceCreamTraderInit;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.RenderLayer;
 
 public class DishesClient implements ClientModInitializer {
 
     @Override
     public void onInitializeClient() {
-        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DishesMain.TomatoBush);
-        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DishesMain.LettuceBush);
+        EntityRendererRegistry.INSTANCE.register(IceCreamTraderInit.ICE_CREAM_TRADER, (dispatcher, context) -> new IceCreamTraderRenderer(dispatcher));
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),CropInit.TomatoBush);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),CropInit.LettuceBush);
+        BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getCutout(),DishesMain.BirthdayCake);
     }
 }

src/main/java/eu/midnightdust/motschen/dishes/block/Cake.java

@@ -0,0 +1,62 @@
+package eu.midnightdust.motschen.dishes.block;
+
+import eu.midnightdust.motschen.dishes.block.blockentity.BirthdayCakeBlockEntity;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.state.StateManager;
+import net.minecraft.state.property.Properties;
+import net.minecraft.world.BlockView;
+
+import java.util.function.ToIntFunction;
+
+public class Cake extends CakeBlock implements BlockEntityProvider {
+
+    public Cake() {
+        super(FabricBlockSettings.copy(Blocks.CAKE).lightLevel(createLightLevelFromBlockState(15)));
+        this.setDefaultState(this.stateManager.getDefaultState().with(BITES, 0));
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
+        return super.getPlacementState(itemPlacementContext)
+                .with(BITES, 0);
+    }
+
+    @Override
+    protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
+        builder.add(BITES);
+    }
+
+    @Override
+    public BlockEntity createBlockEntity(BlockView world) {
+        return new BirthdayCakeBlockEntity();
+    }
+
+    private static ToIntFunction<BlockState> createLightLevelFromBlockState(int litLevel) {
+        return (blockState) -> {
+            if (blockState.get(Properties.BITES) == 0) {
+                return 15;
+            }
+            if (blockState.get(Properties.BITES) == 1) {
+                return 14;
+            }
+            else if (blockState.get(Properties.BITES) == 2) {
+                return 13;
+            }
+            else if (blockState.get(Properties.BITES) == 3) {
+                return 13;
+            }
+            else if (blockState.get(Properties.BITES) == 4) {
+                return 12;
+            }
+            else if (blockState.get(Properties.BITES) == 5) {
+                return 12;
+            }
+            else {
+                return 11;
+            }
+        };
+    }
+}

src/main/java/eu/midnightdust/motschen/dishes/Dish.java → src/main/java/eu/midnightdust/motschen/dishes/block/Dish.java

@@ -1,54 +1,55 @@
-package eu.midnightdust.motschen.dishes;
+package eu.midnightdust.motschen.dishes.block;
 
+import eu.midnightdust.motschen.dishes.DishesMain;
+import eu.midnightdust.motschen.dishes.blockstates.DishBites;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.state.StateManager;
+import net.minecraft.state.property.IntProperty;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.shape.VoxelShape;
-import net.minecraft.util.shape.VoxelShapes;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldView;
 
-import static net.minecraft.state.property.Properties.BITES;
-
 public class Dish extends HorizontalFacingBlock {
 
+    public static final IntProperty DISH_BITES = DishBites.DISH_BITES;
     private static final VoxelShape NORTH_SHAPE;
     private static final VoxelShape EAST_SHAPE;
     private static final VoxelShape SOUTH_SHAPE;
     private static final VoxelShape WEST_SHAPE;
 
     public Dish() {
-        super(FabricBlockSettings.copy(Blocks.CAKE).nonOpaque().sounds(BlockSoundGroup.STONE));
-        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(BITES, 0));
+        super(FabricBlockSettings.copy(Blocks.STONE).nonOpaque().sounds(BlockSoundGroup.STONE));
+        this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(DISH_BITES, 0));
     }
 
     public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         if (player.getHungerManager().isNotFull()) {
-            switch (state.get(BITES)) {
-                case 0: world.setBlockState(pos, state.with(BITES, 1));
-                        player.getHungerManager().add(2, 4);
-                        return ActionResult.SUCCESS;
-                case 1: world.setBlockState(pos, state.with(BITES, 2));
-                        player.getHungerManager().add(2, 4);
-                        return ActionResult.SUCCESS;
-                case 2: world.setBlockState(pos, state.with(BITES, 3));
-                        player.getHungerManager().add(2, 4);
-                        return ActionResult.SUCCESS;
-                case 3: world.setBlockState(pos, state.with(BITES, 4));
-                        player.getHungerManager().add(2, 4);
-                        return ActionResult.SUCCESS;
-                case 4: world.setBlockState(pos,DishesMain.Plate.getDefaultState());
-                        player.getHungerManager().add(2, 1);
-                        return ActionResult.SUCCESS;
+            switch (state.get(DISH_BITES)) {
+                case 0: world.setBlockState(pos, state.with(DISH_BITES, 1));
+                    player.getHungerManager().add(2, 4);
+                    return ActionResult.SUCCESS;
+                case 1: world.setBlockState(pos, state.with(DISH_BITES, 2));
+                    player.getHungerManager().add(2, 4);
+                    return ActionResult.SUCCESS;
+                case 2: world.setBlockState(pos, state.with(DISH_BITES, 3));
+                    player.getHungerManager().add(2, 4);
+                    return ActionResult.SUCCESS;
+                case 3: world.setBlockState(pos, state.with(DISH_BITES, 4));
+                    player.getHungerManager().add(2, 4);
+                    return ActionResult.SUCCESS;
+                case 4: world.setBlockState(pos, DishesMain.Plate.getDefaultState());
+                    player.getHungerManager().add(2, 1);
+                    return ActionResult.SUCCESS;
             }
             return ActionResult.SUCCESS;
         }
@@ -61,13 +62,12 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
     public BlockState getPlacementState(ItemPlacementContext itemPlacementContext) {
         return super.getPlacementState(itemPlacementContext)
                 .with(FACING, itemPlacementContext.getPlayerFacing().getOpposite())
-                .with(BITES, 0);
+                .with(DISH_BITES, 0);
     }
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(FACING);
-        builder.add(BITES);
+        builder.add(FACING, DISH_BITES);
     }
     @Override
     public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext context) {
@@ -87,18 +87,6 @@ public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos
         SOUTH_SHAPE = shape;
         WEST_SHAPE = shape;
     }
-    private static VoxelShape rotate(Direction from, Direction to, VoxelShape shape) {
-        VoxelShape[] buffer = new VoxelShape[]{ shape, VoxelShapes.empty() };
-
-        int times = (to.getHorizontal() - from.getHorizontal() + 4) % 4;
-        for (int i = 0; i < times; i++) {
-            buffer[0].forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> buffer[1] = VoxelShapes.union(buffer[1], VoxelShapes.cuboid(1-maxZ, minY, minX, 1-minZ, maxY, maxX)));
-            buffer[0] = buffer[1];
-            buffer[1] = VoxelShapes.empty();
-        }
-
-        return buffer[0];
-    }
     public boolean canPlaceAt(BlockState state, WorldView worldView, BlockPos pos) {
         return !worldView.isAir(pos.down());
     }

src/main/java/eu/midnightdust/motschen/dishes/block/Lettuce.java

@@ -0,0 +1,23 @@
+package eu.midnightdust.motschen.dishes.block;
+
+import eu.midnightdust.motschen.dishes.init.CropInit;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.CropBlock;
+import net.minecraft.item.ItemConvertible;
+
+public class Lettuce extends CropBlock {
+
+    public Lettuce() {
+        super(FabricBlockSettings.copy(Blocks.CARROTS));
+    }
+
+    @Override
+    @Environment(EnvType.CLIENT)
+    protected ItemConvertible getSeedsItem() {
+        return CropInit.LettuceBush;
+    }
+}
+