Skip to content

Commit

Permalink
Removed encased chain cogwheel and linked transmitter
Browse files Browse the repository at this point in the history
But it works now!
  • Loading branch information
sashafiesta committed May 14, 2024
1 parent 49913dc commit 83f6815
Show file tree
Hide file tree
Showing 20 changed files with 16 additions and 1,345 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import com.hlysine.create_connected.content.parallelgearbox.ParallelGearboxRenderer;
import com.hlysine.create_connected.content.shearpin.ShearPinBlockEntity;
import com.hlysine.create_connected.content.sequencedpulsegenerator.SequencedPulseGeneratorBlockEntity;
import com.hlysine.create_connected.content.linkedtransmitter.LinkedAnalogLeverBlockEntity;
import com.hlysine.create_connected.content.linkedtransmitter.LinkedAnalogLeverRenderer;
import com.hlysine.create_connected.content.linkedtransmitter.LinkedTransmitterBlockEntity;

//import com.hlysine.create_connected.content.linkedtransmitter.LinkedAnalogLeverBlockEntity;
//import com.hlysine.create_connected.content.linkedtransmitter.LinkedAnalogLeverRenderer;
//import com.hlysine.create_connected.content.linkedtransmitter.LinkedTransmitterBlockEntity;
import static com.hlysine.create_connected.CreateConnected.REGISTRATE;

import com.simibubi.create.content.decoration.copycat.CopycatBlockEntity;
Expand Down Expand Up @@ -120,6 +119,7 @@ public class CCBlockEntityTypes {
.validBlocks(CCBlocks.SEQUENCED_PULSE_GENERATOR)
.register();

/*
public static final BlockEntityEntry<LinkedTransmitterBlockEntity> LINKED_TRANSMITTER = REGISTRATE
.blockEntity("linked_transmitter", LinkedTransmitterBlockEntity::new)
.transform(b -> {CCBlocks.LINKED_BUTTONS.values().forEach(b::validBlock);return b;})
Expand All @@ -133,7 +133,7 @@ public class CCBlockEntityTypes {
.validBlocks(CCBlocks.LINKED_ANALOG_LEVER)
.renderer(() -> LinkedAnalogLeverRenderer::new)
.register();

*/
public static void register() {}

}
8 changes: 4 additions & 4 deletions src/main/java/com/hlysine/create_connected/CCBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
import com.hlysine.create_connected.content.brake.BrakeBlock;
import com.hlysine.create_connected.content.brassgearbox.BrassGearboxBlock;
import com.hlysine.create_connected.content.centrifugalclutch.CentrifugalClutchBlock;
import com.hlysine.create_connected.content.chaincogwheel.ChainCogwheelBlock;
//import com.hlysine.create_connected.content.chaincogwheel.ChainCogwheelBlock;
import com.hlysine.create_connected.content.freewheelclutch.FreewheelClutchBlock;
import com.hlysine.create_connected.content.overstressclutch.OverstressClutchBlock;
import com.hlysine.create_connected.content.parallelgearbox.ParallelGearboxBlock;
import com.hlysine.create_connected.content.shearpin.ShearPinBlock;
import com.hlysine.create_connected.content.sequencedpulsegenerator.SequencedPulseGeneratorBlock;
import com.hlysine.create_connected.content.linkedtransmitter.*;
//import com.hlysine.create_connected.content.linkedtransmitter.*;
import com.hlysine.create_connected.content.WrenchableBlock;

import com.simibubi.create.AllBlocks;
Expand Down Expand Up @@ -259,7 +259,7 @@ public class CCBlocks {
.register();

////////////////////////////////////////////////////////////////

/*
public static final Map<BlockSetType, BlockEntry<LinkedButtonBlock>> LINKED_BUTTONS = new HashMap<>();
static {
Expand Down Expand Up @@ -297,7 +297,7 @@ public class CCBlocks {
.onRegister(PreciseItemUseOverrides::addBlock)
//.blockstate(CCBlockStateGen.linkedLever(Create.asResource("block/analog_lever/block"),Create.asResource("block/analog_lever/block")))
.register();

*/
public static final BlockEntry<WrenchableBlock> EMPTY_FAN_CATALYST = REGISTRATE.block("empty_fan_catalyst", WrenchableBlock::new)
.initialProperties(() -> Blocks.IRON_BLOCK)
.properties(p -> p
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/hlysine/create_connected/CCItems.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.hlysine.create_connected;

import com.hlysine.create_connected.content.linkedtransmitter.LinkedTransmitterItem;
//import com.hlysine.create_connected.content.linkedtransmitter.LinkedTransmitterItem;
import com.hlysine.create_connected.content.sixwaygearbox.VerticalSixWayGearboxItem;
import com.hlysine.create_connected.content.brassgearbox.VerticalBrassGearboxItem;
import com.hlysine.create_connected.content.parallelgearbox.VerticalParallelGearboxItem;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/hlysine/create_connected/CCPonders.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class CCPonders {
static final PonderRegistrationHelper HELPER = new PonderRegistrationHelper(CreateConnected.ID);

public static void register() {
HELPER.forComponents(CCBlocks.ENCASED_CHAIN_COGWHEEL)
.addStoryBoard("chain_cogwheel", ChainCogwheelScenes::chainCogwheelAsRelay, AllPonderTags.KINETIC_RELAYS);
//HELPER.forComponents(CCBlocks.ENCASED_CHAIN_COGWHEEL)
// .addStoryBoard("chain_cogwheel", ChainCogwheelScenes::chainCogwheelAsRelay, AllPonderTags.KINETIC_RELAYS);
HELPER.forComponents(CCBlocks.INVERTED_CLUTCH)
.addStoryBoard("inverted_clutch", InvertedClutchScenes::invertedClutch, AllPonderTags.KINETIC_RELAYS);
HELPER.forComponents(CCBlocks.INVERTED_GEARSHIFT)
Expand All @@ -27,16 +27,16 @@ public static void register() {
.addStoryBoard("parallel_gearbox", ParallelGearboxScenes::parallelGearbox, AllPonderTags.KINETIC_RELAYS);
HELPER.forComponents(CCBlocks.SEQUENCED_PULSE_GENERATOR)
.addStoryBoard("sequenced_pulse_generator", SequencedPulseGeneratorScenes::pulseGenerator, AllPonderTags.REDSTONE);
HELPER.forComponents(CCItems.LINKED_TRANSMITTER)
.addStoryBoard("linked_transmitter", LinkedTransmitterScenes::linkedTransmitter, AllPonderTags.REDSTONE);
//HELPER.forComponents(CCItems.LINKED_TRANSMITTER)
// .addStoryBoard("linked_transmitter", LinkedTransmitterScenes::linkedTransmitter, AllPonderTags.REDSTONE);

PonderRegistry.TAGS.forTag(AllPonderTags.KINETIC_RELAYS)
.add(CCBlocks.ENCASED_CHAIN_COGWHEEL)
//.add(CCBlocks.ENCASED_CHAIN_COGWHEEL)
.add(CCBlocks.INVERTED_CLUTCH)
.add(CCBlocks.INVERTED_GEARSHIFT)
.add(CCBlocks.PARALLEL_GEARBOX);
PonderRegistry.TAGS.forTag(AllPonderTags.REDSTONE)
.add(CCBlocks.SEQUENCED_PULSE_GENERATOR)
.add(CCItems.LINKED_TRANSMITTER);
;//.add(CCItems.LINKED_TRANSMITTER);
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 83f6815

Please sign in to comment.