Compare commits

..

No commits in common. "main" and "1.21.4.final" have entirely different histories.

11 changed files with 18 additions and 46 deletions

View File

@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.10-SNAPSHOT'
id 'fabric-loom' version '1.9-SNAPSHOT'
id 'maven-publish'
}

View File

@ -4,14 +4,14 @@ org.gradle.parallel=true
# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.21.5
yarn_mappings=1.21.5+build.1
loader_version=0.16.10
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.1
loader_version=0.16.9
# Mod Properties
mod_version=1.21.5.0
mod_version=1.21.4.5
maven_group=de.jottyfan.quickiemod
archives_base_name=quickiemod
# Dependencies
fabric_version=0.119.6+1.21.5
fabric_version=0.110.5+1.21.4

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME

View File

@ -17,8 +17,6 @@ import net.minecraft.loot.context.LootWorldContext.Builder;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
/**
*
@ -47,9 +45,4 @@ public class BlockDirtSalpeter extends FallingBlock {
protected MapCodec<? extends FallingBlock> getCodec() {
return null;
}
@Override
public int getColor(BlockState state, BlockView world, BlockPos pos) {
return 0;
}
}

View File

@ -31,7 +31,6 @@ import net.minecraft.util.Identifier;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
/**
@ -123,9 +122,4 @@ public class BlockDrill extends FallingBlock implements BlockEntityProvider {
}
return ActionResult.PASS;
}
@Override
public int getColor(BlockState state, BlockView world, BlockPos pos) {
return 0;
}
}

View File

@ -13,8 +13,6 @@ import net.minecraft.loot.context.LootWorldContext.Builder;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.BlockView;
import net.minecraft.world.explosion.Explosion;
/**
@ -46,10 +44,4 @@ public class BlockPowder extends FallingBlock {
// TODO Auto-generated method stub
return null;
}
@Override
public int getColor(BlockState state, BlockView world, BlockPos pos) {
// TODO Auto-generated method stub
return 0;
}
}

View File

@ -15,9 +15,7 @@ import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.random.Random;
import net.minecraft.world.BlockView;
/**
*
@ -42,10 +40,4 @@ public class BlockSandSalpeter extends FallingBlock {
// TODO Auto-generated method stub
return null;
}
@Override
public int getColor(BlockState state, BlockView world, BlockPos pos) {
// TODO Auto-generated method stub
return 0;
}
}

View File

@ -16,7 +16,6 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.screen.ScreenHandler;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Identifier;
import net.minecraft.util.ItemScatterer;
@ -94,15 +93,15 @@ public class BlockStacker extends BlockWithEntity implements BlockEntityProvider
}
@Override
protected void onStateReplaced(BlockState state, ServerWorld world, BlockPos pos, boolean moved) {
if (state.getBlock() != world.getBlockState(pos).getBlock()) {
public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockState newState, boolean moved) {
if (state.getBlock() != newState.getBlock()) {
BlockEntity blockEntity = world.getBlockEntity(pos);
if (blockEntity instanceof BlockStackerEntity) {
ItemScatterer.spawn(world, pos, (BlockStackerEntity) blockEntity);
// update comparators
world.updateComparators(pos, this);
}
super.onStateReplaced(state, world, pos, moved);
super.onStateReplaced(state, world, pos, newState, moved);
}
}

View File

@ -8,6 +8,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.PickaxeItem;
import net.minecraft.item.ToolMaterial;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
@ -20,13 +21,13 @@ import net.minecraft.util.Identifier;
* @author jotty
*
*/
public class ToolQuickiepowderPickaxe extends Item implements ToolRangeable {
public class ToolQuickiepowderPickaxe extends PickaxeItem implements ToolRangeable {
public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 6, 6, 6 };
private final static ToolMaterial MATERIAL = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 2400, 7f, 1f, 15, ItemTags.DIAMOND_TOOL_MATERIALS);
public ToolQuickiepowderPickaxe(Identifier identifier) {
super(new Item.Settings().pickaxe(MATERIAL, 7F, -3.1F).useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)));
super(MATERIAL, 7F, -3.1F, new Item.Settings().useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)));
}
@Override

View File

@ -8,6 +8,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.PickaxeItem;
import net.minecraft.item.ToolMaterial;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
@ -20,13 +21,13 @@ import net.minecraft.util.Identifier;
* @author jotty
*
*/
public class ToolSpeedpowderPickaxe extends Item implements ToolRangeable {
public class ToolSpeedpowderPickaxe extends PickaxeItem implements ToolRangeable {
public static final int[] DEFAULT_HARVEST_RANGE = new int[] { 3, 3, 3 };
private final static ToolMaterial MATERIAL = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 800, 7.0F, 1.0F, 15, ItemTags.DIAMOND_TOOL_MATERIALS);
public ToolSpeedpowderPickaxe(Identifier identifier) {
super(new Item.Settings().pickaxe(MATERIAL, 7F, -3.1F).useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)));
super(MATERIAL, 7F, -3.1F, new Item.Settings().useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier)));
}
@Override

View File

@ -28,8 +28,8 @@
"mixins": [
],
"depends": {
"fabricloader": ">=0.16.10",
"minecraft": "~1.21.5",
"fabricloader": ">=0.16.9",
"minecraft": "~1.21.4",
"java": ">=21",
"fabric-api": "*"
},