mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-08-28 16:22:18 +00:00
Code Issues Releases Wiki Activity

Don't propagate adjacent redstone signals for computers (#549)

Browse Source 
[PatchWork] Also updated patchwork format information
This commit is contained in:
Merith-TK 2021-02-22 10:22:01 -08:00
parent 076d572831
commit 51ca5e620c
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
patchwork.md
View File

@ -9,7 +9,9 @@ SubScript // Desc of commit
``` ```
If a edit that is present in CC:T is not needed, I will skip over it. If a edit that is present in CC:T is not needed, I will skip over it.
Any and all references to an issue number, are to be found on CC:T's repo. not this oen Any and all references to an issue number, are to be found on CC:T's repo.
Lines that are found above a commit in this log like this one, (excluding this one) are comments about how i had to implement things that are not a simple 1:1 (excluding fabric/forge differences) conversion
```md ```md
5155e18de279a193c558aa029963486fd1294769 5155e18de279a193c558aa029963486fd1294769
@ -104,3 +106,19 @@ Fix io.open documentation
Well, that was silly. Well, that was silly.
``` ```
I set the default properties for computers as `Block.GLASS` and then set their strength to `2F` and their soundgroup to stone
```
8472112fc1eaad18ed6ed2c6c62b040fe421e81a
Don't propagate adjacent redstone signals for computers (#549)
Minecraft propagates "strong" redstone signals (such as those directly
from comparators or repeaters) through solid blocks. This includes
computers, which is a little annoying as it means one cannot feed
redstone wire from one side and a repeater from another.
This changes computers to not propagate strong redstone signals, in the
same way transparent blocks like glass do.
Closes #548.
```

10
src/main/java/dan200/computercraft/shared/ComputerCraftRegistry.java
View File

@ -55,6 +55,7 @@ import dan200.computercraft.shared.turtle.items.ItemTurtle;
import dan200.computercraft.shared.turtle.upgrades.*; import dan200.computercraft.shared.turtle.upgrades.*;
import dan200.computercraft.shared.util.FixedPointTileEntityType; import dan200.computercraft.shared.util.FixedPointTileEntityType;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.block.Material; import net.minecraft.block.Material;
@ -68,6 +69,7 @@ import net.minecraft.item.ItemGroup;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandler; import net.minecraft.screen.ScreenHandler;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.Registry;
@ -121,8 +123,12 @@ public final class ComputerCraftRegistry {
public static final BlockCable CABLE = register("cable", new BlockCable(emProperties())); public static final BlockCable CABLE = register("cable", new BlockCable(emProperties()));
private static Block.Settings properties() { private static Block.Settings properties() {
return FabricBlockSettings.copyOf(Blocks.STONE) //return FabricBlockSettings.copyOf(Blocks.GLASS)
.strength(2); // .strength(2);
return AbstractBlock.Settings.of(Material.GLASS)
.strength(2F)
.sounds(BlockSoundGroup.STONE)
.nonOpaque();
} }
private static Block.Settings turtleProperties() { private static Block.Settings turtleProperties() {