Skip to content

Commit 8a3426c

Browse files
structure building mode & bump to 1.1
1 parent 592eb71 commit 8a3426c

File tree

7 files changed

+31
-4
lines changed

7 files changed

+31
-4
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ loader_version=0.16.0
1616

1717
# Mod Properties
1818
mod_id = trailiertales
19-
mod_version = 1.0.5
19+
mod_version = 1.1
2020
# protocol version must be changed after each update with dual env changes
2121
protocol_version = 1
2222
maven_group = net.frozenblock

src/main/java/net/frozenblock/trailiertales/TTPreLoadConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
package net.frozenblock.trailiertales;
32

43
import java.nio.file.Path;
@@ -7,6 +6,7 @@
76

87
public class TTPreLoadConstants {
98
public static final String MOD_ID = "trailiertales";
9+
public static final boolean STRUCTURE_BUILDING_MODE = true; // Only enable this while building structures.
1010

1111
@Contract(pure = true)
1212
public static @NotNull Path configPath(String name, boolean json5) {

src/main/java/net/frozenblock/trailiertales/block/SurveyorBlock.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.mojang.serialization.MapCodec;
44
import com.mojang.serialization.codecs.RecordCodecBuilder;
5+
import net.frozenblock.trailiertales.TTPreLoadConstants;
56
import net.frozenblock.trailiertales.block.entity.SurveyorBlockEntity;
67
import net.frozenblock.trailiertales.registry.TTBlockEntityTypes;
78
import net.minecraft.core.BlockPos;
@@ -88,6 +89,8 @@ protected int getDirectSignal(@NotNull BlockState state, BlockGetter level, Bloc
8889

8990
@Override
9091
protected int getSignal(@NotNull BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
92+
if (TTPreLoadConstants.STRUCTURE_BUILDING_MODE) return 0;
93+
9194
return state.getValue(POWERED) && state.getValue(FACING) == direction ? 15 : 0;
9295
}
9396

src/main/java/net/frozenblock/trailiertales/block/entity/SurveyorBlockEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.List;
44
import java.util.Optional;
5+
import net.frozenblock.trailiertales.TTPreLoadConstants;
56
import net.frozenblock.trailiertales.block.SurveyorBlock;
67
import net.frozenblock.trailiertales.registry.TTBlockEntityTypes;
78
import net.frozenblock.trailiertales.tag.TTEntityTags;
@@ -72,6 +73,8 @@ protected void saveAdditional(CompoundTag nbt, HolderLookup.Provider lookupProvi
7273
}
7374

7475
public void tickServer(ServerLevel serverLevel, BlockPos pos, BlockState state) {
76+
if (TTPreLoadConstants.STRUCTURE_BUILDING_MODE) return;
77+
7578
if (this.detectionCooldown <= 0) {
7679
this.detectionCooldown = 2;
7780

src/main/java/net/frozenblock/trailiertales/mixin/TTMixinPlugin.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.util.List;
44
import java.util.Set;
55
import net.frozenblock.lib.FrozenBools;
6+
import net.frozenblock.trailiertales.TTPreLoadConstants;
67
import net.frozenblock.trailiertales.config.TTMixinsConfig;
78
import org.jetbrains.annotations.Contract;
89
import org.jetbrains.annotations.NotNull;
@@ -40,7 +41,7 @@ public boolean shouldApplyMixin(String targetClassName, @NotNull String mixinCla
4041
if (mixinClassName.contains("surveyor.")) return this.mixinsConfig.surveyor;
4142

4243
if (mixinClassName.contains("datagen.")) return FrozenBools.IS_DATAGEN;
43-
44+
if (mixinClassName.contains("structure_building.")) return TTPreLoadConstants.STRUCTURE_BUILDING_MODE;
4445
return true;
4546
}
4647

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package net.frozenblock.trailiertales.mixin.structure_building.common;
2+
3+
import net.minecraft.world.level.block.CandleBlock;
4+
import net.minecraft.world.level.block.state.BlockBehaviour;
5+
import org.spongepowered.asm.mixin.Mixin;
6+
import org.spongepowered.asm.mixin.injection.At;
7+
import org.spongepowered.asm.mixin.injection.Inject;
8+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
9+
10+
@Mixin(CandleBlock.class)
11+
public class CandleBlockMixin {
12+
13+
@Inject(method = "<init>", at = @At("TAIL"))
14+
public void trailierTales$init(BlockBehaviour.Properties settings, CallbackInfo info) {
15+
CandleBlock candleBlock = CandleBlock.class.cast(this);
16+
candleBlock.registerDefaultState(candleBlock.defaultBlockState().setValue(CandleBlock.CANDLES, CandleBlock.MAX_CANDLES));
17+
}
18+
19+
}

src/main/resources/trailiertales.mixins.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"common.dawntrail.ShearsDispenseItemBehaviorMixin",
2626
"common.decorated_pot.DecoratedPotBlockEntityMixin",
2727
"common.surveyor.RedStoneWireBlockMixin",
28-
"datagen.common.feature_flag.FeatureFlagsMixin"
28+
"datagen.common.feature_flag.FeatureFlagsMixin",
29+
"structure_building.common.CandleBlockMixin"
2930
],
3031
"client": [
3132
"client.boat.BoatRendererMixin",

0 commit comments

Comments
 (0)