Skip to content

Commit 9160321

Browse files
Byte-OracleByte-Oracle
committed
Updated to 1.20
1 parent ec7749c commit 9160321

35 files changed

Lines changed: 973 additions & 43 deletions

‎gradle.properties‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
44
# check these on https://modmuss50.me/fabric.html
55

6-
minecraft_version=1.19.4
7-
yarn_mappings=1.19.4+build.2
8-
loader_version=0.14.19
6+
minecraft_version=1.20
7+
yarn_mappings=1.20+build.1
8+
loader_version=0.14.21
99
# Mod Properties
10-
mod_version=1.19.4-0.2.6
10+
mod_version=1.20-0.2.6
1111
maven_group=PixelPacker
1212
archives_base_name=FishingRework
1313
# Dependencies
1414
# check this on https://modmuss50.me/fabric.html
15-
fabric_version=0.79.0+1.19.4
15+
fabric_version=0.83.0+1.20

‎oldsrc/1.19.2Src/main/java/pixelpacker/fishingrework/registers/BlockRegister.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212

1313
public class BlockRegister {
1414
//Crates
15-
public static final Block BASIC_CRATE = new BasicCrateBlock(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2.0f));
16-
public static final Block RESOURCE_CRATE = new ResourceCrateBlock(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).hardness(2.0f));
17-
public static final Block PLANTS_CRATE = new PlantsCrateBlock(FabricBlockSettings.of(Material.PLANT).sounds(BlockSoundGroup.AZALEA_LEAVES).hardness(.8f));
18-
public static final Block MOB_CRATE = new MobCrateBlock(FabricBlockSettings.of(Material.ORGANIC_PRODUCT).sounds(BlockSoundGroup.BONE).hardness(2.0f));
19-
public static final Block RARE_RESOURCE_CRATE = new RareResourceCrate(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).hardness(2.0f));
15+
public static final Block BASIC_CRATE = new BasicCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.WOOD).hardness(2.0f));
16+
public static final Block RESOURCE_CRATE = new ResourceCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.METAL).hardness(2.0f));
17+
public static final Block PLANTS_CRATE = new PlantsCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.AZALEA_LEAVES).hardness(.8f));
18+
public static final Block MOB_CRATE = new MobCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.BONE).hardness(2.0f));
19+
public static final Block RARE_RESOURCE_CRATE = new RareResourceCrate(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.METAL).hardness(2.0f));
2020

2121
//Fish Oil blocks
22-
public static final Block FISH_OIL_PLANKS = new Block(FabricBlockSettings.of(Material.WOOD).hardness(2.0f).sounds(BlockSoundGroup.WOOD).sounds(BlockSoundGroup.WOOD));
22+
public static final Block FISH_OIL_PLANKS = new Block(AbstractBlock.Settings.create().solid().hardness(2.0f).sounds(BlockSoundGroup.WOOD).sounds(BlockSoundGroup.WOOD));
2323
public static final Block FISH_OIL_STAIRS = new StairsBlock(FISH_OIL_PLANKS.getDefaultState(), AbstractBlock.Settings.copy(FISH_OIL_PLANKS));
24-
public static final Block FISH_OIL_FENCE = new FenceBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
25-
public static final Block FISH_OIL_FENCE_GATE = new FenceGateBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
26-
public static final Block FISH_OIL_SLAB = new SlabBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
24+
public static final Block FISH_OIL_FENCE = new FenceBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
25+
public static final Block FISH_OIL_FENCE_GATE = new FenceGateBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
26+
public static final Block FISH_OIL_SLAB = new SlabBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
2727

2828
public void registerBlocks(){
2929
//Crates

‎oldsrc/1.19.3Src/fishingrework/registers/BlockRegister.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ public class BlockRegister {
1818
public static final ItemGroup fishing_group = ItemGroupRegister.FISHING_GROUP;
1919

2020
//Crates
21-
public static final Block BASIC_CRATE = new BasicCrateBlock(FabricBlockSettings.of(Material.WOOD).sounds(BlockSoundGroup.WOOD).hardness(2.0f));
22-
public static final Block RESOURCE_CRATE = new ResourceCrateBlock(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).hardness(2.0f));
23-
public static final Block PLANTS_CRATE = new PlantsCrateBlock(FabricBlockSettings.of(Material.PLANT).sounds(BlockSoundGroup.AZALEA_LEAVES).hardness(.8f));
24-
public static final Block MOB_CRATE = new MobCrateBlock(FabricBlockSettings.of(Material.ORGANIC_PRODUCT).sounds(BlockSoundGroup.BONE).hardness(2.0f));
25-
public static final Block RARE_RESOURCE_CRATE = new RareResourceCrate(FabricBlockSettings.of(Material.METAL).sounds(BlockSoundGroup.METAL).hardness(2.0f));
21+
public static final Block BASIC_CRATE = new BasicCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.WOOD).hardness(2.0f));
22+
public static final Block RESOURCE_CRATE = new ResourceCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.METAL).hardness(2.0f));
23+
public static final Block PLANTS_CRATE = new PlantsCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.AZALEA_LEAVES).hardness(.8f));
24+
public static final Block MOB_CRATE = new MobCrateBlock(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.BONE).hardness(2.0f));
25+
public static final Block RARE_RESOURCE_CRATE = new RareResourceCrate(AbstractBlock.Settings.create().solid().sounds(BlockSoundGroup.METAL).hardness(2.0f));
2626

2727
//Fish Oil blocks
28-
public static final Block FISH_OIL_PLANKS = new Block(FabricBlockSettings.of(Material.WOOD).hardness(2.0f).sounds(BlockSoundGroup.WOOD).sounds(BlockSoundGroup.WOOD));
28+
public static final Block FISH_OIL_PLANKS = new Block(AbstractBlock.Settings.create().solid().hardness(2.0f).sounds(BlockSoundGroup.WOOD).sounds(BlockSoundGroup.WOOD));
2929
public static final Block FISH_OIL_STAIRS = new StairsBlock(FISH_OIL_PLANKS.getDefaultState(), AbstractBlock.Settings.copy(FISH_OIL_PLANKS));
30-
public static final Block FISH_OIL_FENCE = new FenceBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
31-
public static final Block FISH_OIL_FENCE_GATE = new FenceGateBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD), SoundEvents.BLOCK_FENCE_GATE_CLOSE, SoundEvents.BLOCK_FENCE_GATE_OPEN);
32-
public static final Block FISH_OIL_SLAB = new SlabBlock(FabricBlockSettings.of(Material.WOOD).strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
30+
public static final Block FISH_OIL_FENCE = new FenceBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
31+
public static final Block FISH_OIL_FENCE_GATE = new FenceGateBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD), SoundEvents.BLOCK_FENCE_GATE_CLOSE, SoundEvents.BLOCK_FENCE_GATE_OPEN);
32+
public static final Block FISH_OIL_SLAB = new SlabBlock(AbstractBlock.Settings.create().solid().strength(2.0f, 3.0f).sounds(BlockSoundGroup.WOOD));
3333

3434
public void registerBlocks(){
3535
//Crates

‎remappedSrc/pixelpacker/fishingrework/FishingRework.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package pixelpacker.fishingrework;
2+
3+
import net.fabricmc.api.ModInitializer;
4+
import pixelpacker.fishingrework.registers.*;
5+
6+
public class FishingRework implements ModInitializer {
7+
public static final String MODID = "fishingrework";
8+
9+
@Override
10+
public void onInitialize() {
11+
BlockRegister blockReg = new BlockRegister();
12+
ItemRegister itemReg = new ItemRegister();
13+
ItemGroupRegister itemGroupReg = new ItemGroupRegister();
14+
EffectsRegister effectsRegister = new EffectsRegister();
15+
16+
itemGroupReg.main();
17+
blockReg.registerBlocks();
18+
itemReg.registerItems();
19+
20+
effectsRegister.registerEffects();
21+
}
22+
}

‎remappedSrc/pixelpacker/fishingrework/FishingReworkClient.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package pixelpacker.fishingrework;
2+
3+
import net.fabricmc.api.ClientModInitializer;
4+
import pixelpacker.fishingrework.registers.ModelPredicateRegister;
5+
6+
public class FishingReworkClient implements ClientModInitializer {
7+
@Override
8+
public void onInitializeClient() {
9+
ModelPredicateRegister predicateRegister = new ModelPredicateRegister();
10+
predicateRegister.register();
11+
}
12+
}

‎remappedSrc/pixelpacker/fishingrework/blocks/crates/BasicCrateBlock.java‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
package pixelpacker.fishingrework.blocks.crates;
2+
3+
import net.minecraft.block.Block;
4+
import net.minecraft.block.BlockState;
5+
import net.minecraft.client.item.TooltipContext;
6+
import net.minecraft.entity.player.PlayerEntity;
7+
import net.minecraft.item.ItemStack;
8+
import net.minecraft.particle.ParticleEffect;
9+
import net.minecraft.particle.ParticleTypes;
10+
import net.minecraft.server.world.ServerWorld;
11+
import net.minecraft.sound.SoundCategory;
12+
import net.minecraft.sound.SoundEvent;
13+
import net.minecraft.sound.SoundEvents;
14+
import net.minecraft.state.StateManager;
15+
import net.minecraft.text.Text;
16+
import net.minecraft.util.Formatting;
17+
import net.minecraft.util.math.BlockPos;
18+
import net.minecraft.world.BlockView;
19+
import net.minecraft.world.World;
20+
import org.jetbrains.annotations.Nullable;
21+
import pixelpacker.fishingrework.registers.BlockRegister;
22+
import pixelpacker.fishingrework.util.LootTableGenerator;
23+
24+
import java.util.List;
25+
26+
public class BasicCrateBlock extends Block {
27+
public BasicCrateBlock(Settings settings){
28+
super(settings.hardness(1.9f));
29+
}
30+
31+
/**public List<Item> getLootCrateTable(){ return CrateLootTables.BASIC_CRATE; }
32+
33+
public int getTimesToLoot(){
34+
return 3;
35+
}
36+
**/
37+
@Override
38+
public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
39+
if (player.getServer() == null) {
40+
return;
41+
}
42+
if(world instanceof ServerWorld sWorld){
43+
//Randomizes Volume of sound effects
44+
float minPitch = .95f, maxPitch = 1.05f, volume = .5f;
45+
float pitch = LootTableGenerator.random.nextFloat((maxPitch - minPitch) + minPitch);
46+
47+
//Sounds
48+
playSound(pos, SoundEvents.BLOCK_WOOD_BREAK, volume, pitch, sWorld);
49+
playSound(pos, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, volume, pitch, sWorld);
50+
playSound(pos, SoundEvents.ENTITY_FIREWORK_ROCKET_TWINKLE, volume, pitch, sWorld);
51+
playSound(pos, SoundEvents.ENTITY_FIREWORK_ROCKET_BLAST, volume, pitch, sWorld);
52+
playSound(pos, SoundEvents.ENTITY_FIREWORK_ROCKET_BLAST, volume + 1f, pitch - .5f, sWorld);
53+
54+
//Particles
55+
spawnParticle(pos, 10, ParticleTypes.FIREWORK, sWorld);
56+
spawnParticle(pos, 5, ParticleTypes.POOF, sWorld);
57+
spawnParticle(pos, 5, ParticleTypes.EXPLOSION, sWorld);
58+
}
59+
60+
//Randomizes the amount of times that a crate will drop loot
61+
/**
62+
LootContext ctx = new LootContext.Builder(player.getServer().getWorld(player.getWorld().getRegistryKey())).random(Random.create()).build(LootContextTypes.EMPTY);
63+
LootTable table = LootTableGenerator.generateLootTable(getLootCrateTable());
64+
int timesToLoot = LootTableGenerator.random.nextInt(getTimesToLoot()), i = 0;
65+
while(i <= timesToLoot){
66+
i++;
67+
table.generateLoot(ctx, itemStack -> {
68+
World w = player.getEntityWorld();
69+
Block.dropStack(player.getWorld(), pos, itemStack);
70+
});
71+
}
72+
**/
73+
}
74+
private void playSound(BlockPos pos, SoundEvent soundEvent, float volume, float pitch, ServerWorld world){
75+
world.playSound(null, pos, soundEvent, SoundCategory.BLOCKS, volume, pitch);
76+
}
77+
78+
private void spawnParticle(BlockPos pos, int count, ParticleEffect particleType, ServerWorld world){
79+
world.spawnParticles(particleType, pos.getX(), pos.getY(), pos.getZ(), count, 0.5f, 0.5f, 0.5f, 0);
80+
}
81+
82+
@Override
83+
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
84+
tooltip.add(Text.translatable("block.fishingrework.basic_crate.tooltip_1").formatted(Formatting.YELLOW));
85+
tooltip.add(Text.translatable("block.fishingrework.basic_crate.tooltip_2").formatted(Formatting.YELLOW));
86+
}
87+
}

‎remappedSrc/pixelpacker/fishingrework/blocks/crates/MobCrateBlock.java‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package pixelpacker.fishingrework.blocks.crates;
2+
3+
import net.minecraft.client.item.TooltipContext;
4+
import net.minecraft.item.ItemStack;
5+
import net.minecraft.text.Text;
6+
import net.minecraft.util.Formatting;
7+
import net.minecraft.world.BlockView;
8+
import org.jetbrains.annotations.Nullable;
9+
10+
import java.util.List;
11+
12+
public class MobCrateBlock extends BasicCrateBlock{
13+
public MobCrateBlock(Settings settings) {
14+
super(settings);
15+
}
16+
/**
17+
@Override
18+
public List<Item> getLootCrateTable(){ return CrateLootTables.MOB_CRATE; }
19+
@Override
20+
public int getTimesToLoot(){
21+
return 5;
22+
}
23+
**/
24+
@Override
25+
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
26+
tooltip.add(Text.translatable("block.fishingrework.mob_crate.tooltip_1").formatted(Formatting.YELLOW));
27+
tooltip.add(Text.translatable("block.fishingrework.mob_crate.tooltip_2").formatted(Formatting.YELLOW));
28+
}
29+
}

‎remappedSrc/pixelpacker/fishingrework/blocks/crates/PlantsCrateBlock.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package pixelpacker.fishingrework.blocks.crates;
2+
3+
import net.minecraft.client.item.TooltipContext;
4+
import net.minecraft.item.ItemStack;
5+
import net.minecraft.text.Text;
6+
import net.minecraft.util.Formatting;
7+
import net.minecraft.world.BlockView;
8+
import org.jetbrains.annotations.Nullable;
9+
10+
import java.util.List;
11+
12+
public class PlantsCrateBlock extends BasicCrateBlock{
13+
14+
public PlantsCrateBlock(Settings settings) {
15+
super(settings);
16+
}
17+
/**
18+
@Override
19+
public List<Item> getLootCrateTable(){ return CrateLootTables.PLANT_CRATE; }
20+
@Override
21+
public int getTimesToLoot(){
22+
return 5;
23+
}
24+
**/
25+
@Override
26+
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
27+
tooltip.add(Text.translatable("block.fishingrework.plants_crate.tooltip_1").formatted(Formatting.YELLOW));
28+
tooltip.add(Text.translatable("block.fishingrework.plants_crate.tooltip_2").formatted(Formatting.YELLOW));
29+
}
30+
}

‎remappedSrc/pixelpacker/fishingrework/blocks/crates/RareResourceCrate.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package pixelpacker.fishingrework.blocks.crates;
2+
3+
import net.minecraft.client.item.TooltipContext;
4+
import net.minecraft.item.ItemStack;
5+
import net.minecraft.text.Text;
6+
import net.minecraft.util.Formatting;
7+
import net.minecraft.world.BlockView;
8+
import org.jetbrains.annotations.Nullable;
9+
10+
import java.util.List;
11+
12+
public class RareResourceCrate extends BasicCrateBlock{
13+
public RareResourceCrate(Settings settings) {
14+
super(settings);
15+
}
16+
/**
17+
@Override
18+
public List<Item> getLootCrateTable(){ return CrateLootTables.RARE_RESOURCES_CRATE; }
19+
@Override
20+
public int getTimesToLoot(){
21+
return 3;
22+
}
23+
**/
24+
25+
@Override
26+
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
27+
tooltip.add(Text.translatable("block.fishingrework.rare_resource_crate.tooltip_1").formatted(Formatting.YELLOW));
28+
tooltip.add(Text.translatable("block.fishingrework.rare_resource_crate.tooltip_2").formatted(Formatting.YELLOW));
29+
}
30+
}

‎remappedSrc/pixelpacker/fishingrework/blocks/crates/ResourceCrateBlock.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package pixelpacker.fishingrework.blocks.crates;
2+
3+
import net.minecraft.client.item.TooltipContext;
4+
import net.minecraft.item.ItemStack;
5+
import net.minecraft.text.Text;
6+
import net.minecraft.util.Formatting;
7+
import net.minecraft.world.BlockView;
8+
import org.jetbrains.annotations.Nullable;
9+
10+
import java.util.List;
11+
12+
public class ResourceCrateBlock extends BasicCrateBlock {
13+
public ResourceCrateBlock(Settings settings) {
14+
super(settings);
15+
}
16+
/**
17+
@Override
18+
public List<Item> getLootCrateTable(){ return CrateLootTables.RESOURCE_CRATE; }
19+
20+
@Override
21+
public int getTimesToLoot(){
22+
return 3;
23+
}
24+
**/
25+
@Override
26+
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
27+
tooltip.add(Text.translatable("block.fishingrework.resource_crate.tooltip_1").formatted(Formatting.YELLOW));
28+
tooltip.add(Text.translatable("block.fishingrework.resource_crate.tooltip_2").formatted(Formatting.YELLOW));
29+
}
30+
}

0 commit comments

Comments
 (0)