Skip to content

Commit 3fecf2e

Browse files
committed
optimize
1 parent 9eed4a2 commit 3fecf2e

8 files changed

Lines changed: 155 additions & 66 deletions

src/main/java/com/adccadc/rust/block/CustomDoorBlock.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/com/adccadc/rust/block/CustomPlateBlock.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/com/adccadc/rust/block/CustomTrapdoorBlock.java

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/main/java/com/adccadc/rust/block/Modblocks.java

Lines changed: 36 additions & 36 deletions
Large diffs are not rendered by default.
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.adccadc.rust.block;
2+
3+
import net.minecraft.block.BlockState;
4+
import net.minecraft.block.ChainBlock;
5+
import net.minecraft.block.Oxidizable;
6+
import net.minecraft.block.PaneBlock;
7+
import net.minecraft.server.world.ServerWorld;
8+
import net.minecraft.util.math.BlockPos;
9+
import net.minecraft.util.math.random.Random;
10+
11+
public class OxidizableChainBlock extends ChainBlock implements Oxidizable {
12+
//public static final MapCodec<OxidizableBlock> CODEC =
13+
private final OxidationLevel oxidationLevel;
14+
15+
public OxidizableChainBlock(OxidationLevel oxidationLevel, Settings settings) {
16+
super(settings);
17+
this.oxidationLevel = oxidationLevel;
18+
}
19+
20+
protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
21+
this.tickDegradation(state, world, pos, random);
22+
}
23+
24+
protected boolean hasRandomTicks(BlockState state) {
25+
return Oxidizable.getIncreasedOxidationBlock(state.getBlock()).isPresent();
26+
}
27+
28+
public OxidationLevel getDegradationLevel() {
29+
return this.oxidationLevel;
30+
}
31+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package com.adccadc.rust.block;
2+
3+
import net.minecraft.block.BlockState;
4+
import net.minecraft.block.LanternBlock;
5+
import net.minecraft.block.Oxidizable;
6+
import net.minecraft.block.PaneBlock;
7+
import net.minecraft.server.world.ServerWorld;
8+
import net.minecraft.util.math.BlockPos;
9+
import net.minecraft.util.math.random.Random;
10+
11+
public class OxidizableLanternBlock extends LanternBlock implements Oxidizable {
12+
//public static final MapCodec<OxidizableBlock> CODEC =
13+
private final OxidationLevel oxidationLevel;
14+
15+
public OxidizableLanternBlock(OxidationLevel oxidationLevel, Settings settings) {
16+
super(settings);
17+
this.oxidationLevel = oxidationLevel;
18+
}
19+
20+
protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
21+
this.tickDegradation(state, world, pos, random);
22+
}
23+
24+
protected boolean hasRandomTicks(BlockState state) {
25+
return Oxidizable.getIncreasedOxidationBlock(state.getBlock()).isPresent();
26+
}
27+
28+
public OxidationLevel getDegradationLevel() {
29+
return this.oxidationLevel;
30+
}
31+
}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.adccadc.rust.block;
2+
3+
import com.mojang.serialization.MapCodec;
4+
import net.minecraft.block.*;
5+
import net.minecraft.server.world.ServerWorld;
6+
import net.minecraft.util.math.BlockPos;
7+
import net.minecraft.util.math.random.Random;
8+
9+
public class OxidizablePaneBlock extends PaneBlock implements Oxidizable {
10+
//public static final MapCodec<OxidizableBlock> CODEC =
11+
private final Oxidizable.OxidationLevel oxidationLevel;
12+
13+
public OxidizablePaneBlock(Oxidizable.OxidationLevel oxidationLevel, AbstractBlock.Settings settings) {
14+
super(settings);
15+
this.oxidationLevel = oxidationLevel;
16+
}
17+
18+
protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
19+
this.tickDegradation(state, world, pos, random);
20+
}
21+
22+
protected boolean hasRandomTicks(BlockState state) {
23+
return Oxidizable.getIncreasedOxidationBlock(state.getBlock()).isPresent();
24+
}
25+
26+
public Oxidizable.OxidationLevel getDegradationLevel() {
27+
return this.oxidationLevel;
28+
}
29+
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.adccadc.rust.block;
2+
3+
import net.minecraft.block.*;
4+
import net.minecraft.server.world.ServerWorld;
5+
import net.minecraft.util.math.BlockPos;
6+
import net.minecraft.util.math.random.Random;
7+
8+
public class OxidizableWeightedPressurePlateBlock extends WeightedPressurePlateBlock implements Oxidizable {
9+
//public static final MapCodec<OxidizableBlock> CODEC =
10+
private final OxidationLevel oxidationLevel;
11+
12+
public OxidizableWeightedPressurePlateBlock(Integer weight, BlockSetType type, OxidationLevel oxidationLevel, Settings settings) {
13+
super(weight, type, settings);
14+
this.oxidationLevel = oxidationLevel;
15+
}
16+
17+
protected void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) {
18+
this.tickDegradation(state, world, pos, random);
19+
}
20+
21+
protected boolean hasRandomTicks(BlockState state) {
22+
return Oxidizable.getIncreasedOxidationBlock(state.getBlock()).isPresent();
23+
}
24+
25+
public OxidationLevel getDegradationLevel() {
26+
return this.oxidationLevel;
27+
}
28+
}

0 commit comments

Comments
 (0)