Skip to content

Commit f3b71b6

Browse files
committed
Leacher update
1 parent 4c37d27 commit f3b71b6

File tree

11 files changed

+1055
-26
lines changed

11 files changed

+1055
-26
lines changed

src/generated/resources/assets/nuclearcraft/models/block/processor/leacher.json

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

src/generated/resources/assets/nuclearcraft/models/block/processor/leacher_powered.json

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

src/main/java/igentuman/nc/block/ProcessorBlock.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package igentuman.nc.block;
22

3-
import igentuman.nc.block.entity.energy.BatteryBE;
43
import igentuman.nc.block.entity.processor.NCProcessorBE;
54
import igentuman.nc.content.processors.Processors;
65
import igentuman.nc.setup.registration.NCProcessors;
@@ -40,19 +39,21 @@
4039
import net.minecraft.world.level.block.state.properties.DirectionProperty;
4140
import net.minecraft.world.phys.BlockHitResult;
4241
import net.minecraftforge.network.NetworkHooks;
42+
import org.jetbrains.annotations.NotNull;
4343
import org.jetbrains.annotations.Nullable;
4444

4545
import java.lang.reflect.InvocationTargetException;
4646
import java.util.List;
4747

48+
import static igentuman.nc.multiblock.fission.FissionReactor.TRANSPARENT_BLOCKS;
49+
4850
public class ProcessorBlock extends HorizontalDirectionalBlock implements EntityBlock {
4951
public static final DirectionProperty HORIZONTAL_FACING = FACING;
5052
public static final BooleanProperty ACTIVE = BlockStateProperties.POWERED;
5153
public ProcessorBlock() {
5254
this(Properties.of()
5355
.sound(SoundType.METAL)
5456
.strength(2.0f)
55-
.noOcclusion()
5657
.requiresCorrectToolForDrops());
5758
}
5859
public ProcessorBlock(Properties pProperties) {

src/main/java/igentuman/nc/datagen/blockstates/NCBlockStates.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,9 @@ private void energyBlocks() {
231231

232232
private void processors() {
233233
for(String name: PROCESSORS.keySet()) {
234+
if (name.equals("leacher")) {
235+
continue;
236+
}
234237
horizontalBlock(
235238
PROCESSORS.get(name).get(),
236239
st -> processorModel(st, sidedModel(PROCESSORS.get(name).get(),

src/main/java/igentuman/nc/setup/registration/NCProcessors.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@ private static void registerBlockEntities() {
6262

6363
private static void registerBlocks() {
6464
for(String name: Processors.all().keySet()) {
65-
PROCESSORS.put(name, BLOCKS.register(name, () -> new ProcessorBlock(PROCESSOR_BLOCK_PROPERTIES)));
65+
if(name.equals("leacher")) {
66+
PROCESSORS.put(name, BLOCKS.register(name, () -> new ProcessorBlock(BlockBehaviour.Properties.of().sound(SoundType.METAL).strength(2f).requiresCorrectToolForDrops().noOcclusion())));
67+
} else {
68+
PROCESSORS.put(name, BLOCKS.register(name, () -> new ProcessorBlock(PROCESSOR_BLOCK_PROPERTIES)));
69+
}
6670
PROCESSOR_BLOCKS_ITEMS.put(name, fromBlock(PROCESSORS.get(name)));
6771
}
6872
}

src/generated/resources/assets/nuclearcraft/blockstates/leacher.json renamed to src/main/resources/assets/nuclearcraft/blockstates/leacher.json

File renamed without changes.

0 commit comments

Comments
 (0)