Skip to content

Commit

Permalink
1.20.1
Browse files Browse the repository at this point in the history
4.2.5

Fix wall torch rendering
Update Gradle 8.5
Update Loom 1.5
  • Loading branch information
xanthian committed Jan 19, 2024
1 parent b01d51f commit 2485ea1
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'maven-publish'
}

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.15.3
loader_version=0.15.6
#Fabric api
fabric_version=0.91.0+1.20.1
# Mod Properties
mod_version=4.2
mod_version=4.2.5
maven_group=xanthian
archives_base_name=vsas

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/xanthian/vsas/blocks/RedstoneTorches.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public static void registerRedstoneTorchBlocks() {

private static void initTorchBlock(String torchName, Block torch, String wallTorchName, Block wallTorch) {
Identifier identifier = new Identifier(Initialise.MOD_ID, torchName);
Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName);
MOD_REDSTONE_TORCHES.put(identifier, torch);
MOD_REDSTONE_TORCHES.put(identifier2, wallTorch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch);
Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN));
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/net/xanthian/vsas/blocks/SoulTorches.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ public static void registerSoulTorchBlocks() {

private static void initTorchBlock(String torchName, Block torch, String wallTorchName, Block wallTorch) {
Identifier identifier = new Identifier(Initialise.MOD_ID, torchName);
Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName);
MOD_SOUL_TORCHES.put(identifier, torch);
MOD_SOUL_TORCHES.put(identifier2, wallTorch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch);
Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/net/xanthian/vsas/blocks/Torches.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

public class Torches {

public static Map<Identifier, Block> MOD_TORCHES = Maps.newHashMap();
public static final Block ACACIA_TORCH = new VariantTorchBlock();
public static final Block WALL_ACACIA_TORCH = new VariantWallTorchBlock();
public static final Block BAMBOO_TORCH = new VariantTorchBlock();
Expand All @@ -36,7 +37,6 @@ public class Torches {
public static final Block WALL_SPRUCE_TORCH = new VariantWallTorchBlock();
public static final Block WARPED_TORCH = new VariantTorchBlock();
public static final Block WALL_WARPED_TORCH = new VariantWallTorchBlock();
public static Map<Identifier, Block> MOD_TORCHES = Maps.newHashMap();

public static void registerTorchBlocks() {
initTorchBlock("torches/acacia_torch", ACACIA_TORCH, "torches/wall_acacia_torch", WALL_ACACIA_TORCH);
Expand All @@ -53,7 +53,9 @@ public static void registerTorchBlocks() {

private static void initTorchBlock(String torchName, Block torch, String wallTorchName, Block wallTorch) {
Identifier identifier = new Identifier(Initialise.MOD_ID, torchName);
Identifier identifier2 = new Identifier(Initialise.MOD_ID, wallTorchName);
MOD_TORCHES.put(identifier, torch);
MOD_TORCHES.put(identifier2, wallTorch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, torchName), torch);
Registry.register(Registries.BLOCK, new Identifier(Initialise.MOD_ID, wallTorchName), wallTorch);
Registry.register(Registries.ITEM, new Identifier(Initialise.MOD_ID, torchName), new VerticallyAttachableBlockItem(torch, wallTorch, new FabricItemSettings(), Direction.DOWN));
Expand Down

0 comments on commit 2485ea1

Please sign in to comment.