Skip to content

Commit 2b3df05

Browse files
matthewperiutmatthewperiut
committed
1.21.3
1 parent 65d7101 commit 2b3df05

File tree

9 files changed

+84
-15
lines changed

9 files changed

+84
-15
lines changed

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "architectury-plugin" version "3.4-SNAPSHOT"
3-
id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
3+
id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
44
}
55

66
architectury {

‎common/src/main/java/com/slaincow/factoryblocks/block/RegisterBlocks.java

+9-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import net.minecraft.item.Item;
1616
import net.minecraft.item.ItemGroups;
1717
import net.minecraft.registry.Registries;
18+
import net.minecraft.registry.RegistryKey;
19+
import net.minecraft.registry.RegistryKeys;
1820
import net.minecraft.util.Identifier;
1921

2022
import java.util.ArrayList;
@@ -42,19 +44,21 @@ private static void addFactoryBlock(String nameID, Type type)
4244
private static void addFactoryBlock(String nameID, Type type, boolean include)
4345
{
4446
Identifier blockID = Identifier.of(MODID, nameID);
47+
RegistryKey<Block> blockKey = RegistryKey.of(RegistryKeys.BLOCK, blockID);
48+
RegistryKey<Item> itemKey = RegistryKey.of(RegistryKeys.ITEM, blockID);
4549

4650
Registrar<Block> blocks = MANAGER.get().get(Registries.BLOCK);
4751
RegistrySupplier<Block> blockSupplier;
4852

4953
switch (type) {
50-
default -> blockSupplier = blocks.register(blockID, () -> new BaseFactoryBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK)));
51-
case baseFan -> blockSupplier = blocks.register(blockID, () -> new BaseFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK)));
52-
case redFan -> blockSupplier = blocks.register(blockID, () -> new RedstoneFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK)));
53-
case mediumFan -> blockSupplier = blocks.register(blockID, () -> new MediumFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK)));
54+
default -> blockSupplier = blocks.register(blockID, () -> new BaseFactoryBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).registryKey(blockKey)));
55+
case baseFan -> blockSupplier = blocks.register(blockID, () -> new BaseFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).registryKey(blockKey)));
56+
case redFan -> blockSupplier = blocks.register(blockID, () -> new RedstoneFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).registryKey(blockKey)));
57+
case mediumFan -> blockSupplier = blocks.register(blockID, () -> new MediumFanBlock(AbstractBlock.Settings.copy(Blocks.IRON_BLOCK).registryKey(blockKey)));
5458
}
5559

5660
Registrar<Item> items = MANAGER.get().get(Registries.ITEM);
57-
itemSuppliers.add(items.register(blockID, () -> new TooltipBlockItem(blockSupplier.get(), new Item.Settings().arch$tab(ItemGroups.BUILDING_BLOCKS), nameID + ".tooltip")));
61+
itemSuppliers.add(items.register(blockID, () -> new TooltipBlockItem(blockSupplier.get(), new Item.Settings().arch$tab(ItemGroups.BUILDING_BLOCKS).registryKey(itemKey), nameID + ".tooltip")));
5862
}
5963

6064
public static void register()

‎common/src/main/resources/assets/factory_blocks/lang/en_us.json

+50
Original file line numberDiff line numberDiff line change
@@ -2,151 +2,201 @@
22
"item.factory_blocks.debug": "Debug Item (will be removed)",
33
"subtitles.factory_block.metal_sound": "Metal Sound",
44
"block.factory_blocks.test_block": "Test Block",
5+
"item.factory_blocks.test_block": "Test Block",
56

67
"block.factory_blocks.factory": "Factory Block",
8+
"item.factory_blocks.factory": "Factory Block",
79
"item.factory_blocks.factory.tooltip": "Dotted Rusty Plate",
810

911
"block.factory_blocks.rust": "Factory Block",
12+
"item.factory_blocks.rust": "Factory Block",
1013
"item.factory_blocks.rust.tooltip": "Rusty Plate",
1114

1215
"block.factory_blocks.vrust": "Factory Block",
16+
"item.factory_blocks.vrust": "Factory Block",
1317
"item.factory_blocks.vrust.tooltip": "Very Rusty Plate",
1418

1519
"block.factory_blocks.srust": "Factory Block",
20+
"item.factory_blocks.srust": "Factory Block",
1621
"item.factory_blocks.srust.tooltip": "Slightly Rusty Plate",
1722

1823
"block.factory_blocks.wireframe": "Factory Block",
24+
"item.factory_blocks.wireframe": "Factory Block",
1925
"item.factory_blocks.wireframe.tooltip": "Wireframe",
2026

2127
"block.factory_blocks.pwireframe": "Factory Block",
28+
"item.factory_blocks.pwireframe": "Factory Block",
2229
"item.factory_blocks.pwireframe.tooltip": "Purple Wireframe",
2330

2431
"block.factory_blocks.hazard": "Factory Block",
32+
"item.factory_blocks.hazard": "Factory Block",
2533
"item.factory_blocks.hazard.tooltip": "Yellow-Black Caution Stripes",
2634

2735
"block.factory_blocks.hazardo": "Factory Block",
36+
"item.factory_blocks.hazardo": "Factory Block",
2837
"item.factory_blocks.hazardo.tooltip": "Orange-White Caution Stripes",
2938

3039
"block.factory_blocks.circuit": "Factory Block",
40+
"item.factory_blocks.circuit": "Factory Block",
3141
"item.factory_blocks.circuit.tooltip": "Circuit",
3242

3343
"block.factory_blocks.metalbox": "Factory Block",
44+
"item.factory_blocks.metalbox": "Factory Block",
3445
"item.factory_blocks.metalbox.tooltip": "Metal Box",
3546

3647
"block.factory_blocks.gcircuit": "Factory Block",
48+
"item.factory_blocks.gcircuit": "Factory Block",
3749
"item.factory_blocks.gcircuit.tooltip": "Gold-Plated Circuit",
3850

3951
"block.factory_blocks.pgcircuit": "Factory Block",
52+
"item.factory_blocks.pgcircuit": "Factory Block",
4053
"item.factory_blocks.pgcircuit.tooltip": "Gold-Framed Purple Circuit",
4154

4255
"block.factory_blocks.grinder": "Factory Block",
56+
"item.factory_blocks.grinder": "Factory Block",
4357
"item.factory_blocks.grinder.tooltip": "Grinder",
4458

4559
"block.factory_blocks.old_vents": "Factory Block",
60+
"item.factory_blocks.old_vents": "Factory Block",
4661
"item.factory_blocks.old_vents.tooltip": "Old Vents",
4762

4863
"block.factory_blocks.rust_plates": "Factory Block",
64+
"item.factory_blocks.rust_plates": "Factory Block",
4965
"item.factory_blocks.rust_plates.tooltip": "Segmented Rusty Plates",
5066

5167
"block.factory_blocks.bcircuit": "Factory Block",
68+
"item.factory_blocks.bcircuit": "Factory Block",
5269
"item.factory_blocks.bcircuit.tooltip": "Blue-Framed Circuit",
5370

5471
"block.factory_blocks.ice": "Factory Block",
72+
"item.factory_blocks.ice": "Factory Block",
5573
"item.factory_blocks.ice.tooltip": "Ice Ice Ice",
5674

5775
"block.factory_blocks.mosaic": "Factory Block",
76+
"item.factory_blocks.mosaic": "Factory Block",
5877
"item.factory_blocks.mosaic.tooltip": "Blue Circuit",
5978

6079
"block.factory_blocks.bwireframe": "Factory Block",
80+
"item.factory_blocks.bwireframe": "Factory Block",
6181
"item.factory_blocks.bwireframe.tooltip": "Blue Wireframe",
6282

6383
"block.factory_blocks.rusty_scaffold": "Factory Block",
84+
"item.factory_blocks.rusty_scaffold": "Factory Block",
6485
"item.factory_blocks.rusty_scaffold.tooltip": "Rusty Scaffold",
6586

6687
"block.factory_blocks.large_pipes": "Factory Block",
88+
"item.factory_blocks.large_pipes": "Factory Block",
6789
"item.factory_blocks.large_pipes.tooltip": "Large Pipes",
6890

6991
"block.factory_blocks.small_pipes": "Factory Block",
92+
"item.factory_blocks.small_pipes": "Factory Block",
7093
"item.factory_blocks.small_pipes.tooltip": "Small Pipes",
7194

7295
"block.factory_blocks.vent": "Factory Block",
96+
"item.factory_blocks.vent": "Factory Block",
7397
"item.factory_blocks.vent.tooltip": "Vent",
7498

7599
"block.factory_blocks.gvent": "Factory Block",
100+
"item.factory_blocks.gvent": "Factory Block",
76101
"item.factory_blocks.gvent.tooltip": "Glowing Vent",
77102

78103
"block.factory_blocks.insulation": "Factory Block",
104+
"item.factory_blocks.insulation": "Factory Block",
79105
"item.factory_blocks.insulation.tooltip": "Insulation",
80106

81107
"block.factory_blocks.gears": "Factory Block",
108+
"item.factory_blocks.gears": "Factory Block",
82109
"item.factory_blocks.gears.tooltip": "Gears & Flywheels",
83110

84111
"block.factory_blocks.caution": "Factory Block",
112+
"item.factory_blocks.caution": "Factory Block",
85113
"item.factory_blocks.caution.tooltip": "Rusty Scaffold",
86114

87115
"block.factory_blocks.cables": "Factory Block",
116+
"item.factory_blocks.cables": "Factory Block",
88117
"item.factory_blocks.cables.tooltip": "Cables",
89118

90119
"block.factory_blocks.rust_bplates": "Factory Block",
120+
"item.factory_blocks.rust_bplates": "Factory Block",
91121
"item.factory_blocks.rust_bplates.tooltip": "Rusty Bolted Plates",
92122

93123
"block.factory_blocks.grate": "Factory Block",
124+
"item.factory_blocks.grate": "Factory Block",
94125
"item.factory_blocks.grate.tooltip": "Grate",
95126

96127
"block.factory_blocks.rgrate": "Factory Block",
128+
"item.factory_blocks.rgrate": "Factory Block",
97129
"item.factory_blocks.rgrate.tooltip": "Rusty Grate",
98130

99131
"block.factory_blocks.hex": "Factory Block",
132+
"item.factory_blocks.hex": "Factory Block",
100133
"item.factory_blocks.hex.tooltip": "Massive Hexagonal",
101134

102135
"block.factory_blocks.wgpanel": "Factory Block",
136+
"item.factory_blocks.wgpanel": "Factory Block",
103137
"item.factory_blocks.wgpanel.tooltip": "Extremely Corroded Panels",
104138

105139
"block.factory_blocks.wopanel": "Factory Block",
140+
"item.factory_blocks.wopanel": "Factory Block",
106141
"item.factory_blocks.wopanel.tooltip": "Extremely Rusted Panels",
107142

108143
"block.factory_blocks.sturdy": "Factory Block",
144+
"item.factory_blocks.sturdy": "Factory Block",
109145
"item.factory_blocks.sturdy.tooltip": "Sturdy",
110146

111147
"block.factory_blocks.megacell": "Factory Block",
148+
"item.factory_blocks.megacell": "Factory Block",
112149
"item.factory_blocks.megacell.tooltip": "Megacell Battery",
113150

114151
"block.factory_blocks.exhaust": "Factory Block",
152+
"item.factory_blocks.exhaust": "Factory Block",
115153
"item.factory_blocks.exhaust.tooltip": "Exhaust Plating",
116154

117155
"block.factory_blocks.engineer": "Factory Block",
156+
"item.factory_blocks.engineer": "Factory Block",
118157
"item.factory_blocks.engineer.tooltip": "Engineer's Pipes",
119158

120159
"block.factory_blocks.scaffold": "Factory Block",
160+
"item.factory_blocks.scaffold": "Factory Block",
121161
"item.factory_blocks.scaffold.tooltip": "Large Rusty Scaffold",
122162

123163
"block.factory_blocks.piping": "Factory Block",
164+
"item.factory_blocks.piping": "Factory Block",
124165
"item.factory_blocks.piping.tooltip": "Piping",
125166

126167
"block.factory_blocks.large_plating": "Factory Block",
168+
"item.factory_blocks.large_plating": "Factory Block",
127169
"item.factory_blocks.large_plating.tooltip": "Sloppy Plating",
128170

129171
"block.factory_blocks.fan_side": "Factory Block",
172+
"item.factory_blocks.fan_side": "Factory Block",
130173
"item.factory_blocks.fan_side.tooltip": "Smooth Metal",
131174

132175
"block.factory_blocks.fan": "Factory Block",
176+
"item.factory_blocks.fan": "Factory Block",
133177
"item.factory_blocks.fan.tooltip": "Fan (Redstone Powered)",
134178

135179
"block.factory_blocks.fan_on": "Factory Block",
180+
"item.factory_blocks.fan_on": "Factory Block",
136181
"item.factory_blocks.fan_on.tooltip": "Fan (Always On)",
137182

138183
"block.factory_blocks.fan_four": "Factory Block",
184+
"item.factory_blocks.fan_four": "Factory Block",
139185
"item.factory_blocks.fan_four.tooltip": "Fan (Redstone Four Sided)",
140186

141187
"block.factory_blocks.fan_four_on": "Factory Block",
188+
"item.factory_blocks.fan_four_on": "Factory Block",
142189
"item.factory_blocks.fan_four_on.tooltip": "Fan (Always On Four Sided)",
143190

144191
"block.factory_blocks.fan_malfunction": "Factory Block",
192+
"item.factory_blocks.fan_malfunction": "Factory Block",
145193
"item.factory_blocks.fan_malfunction.tooltip": "Fan (Redstone Malfunctioning)",
146194

147195
"block.factory_blocks.fan_malfunction_on": "Factory Block",
196+
"item.factory_blocks.fan_malfunction_on": "Factory Block",
148197
"item.factory_blocks.fan_malfunction_on.tooltip": "Fan (Always On Malfunctioning)",
149198

150199
"block.factory_blocks.medium_fan": "Factory Block",
200+
"item.factory_blocks.medium_fan": "Factory Block",
151201
"item.factory_blocks.medium_fan.tooltip": "Medium Fan"
152202
}

‎fabric/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ publishing {
7070
}
7171
}
7272

73+
base {
74+
archivesName = rootProject.archives_base_name + "-fabric-" + minecraft_version
75+
}
76+
7377
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
7478
repositories {
7579
// Add repositories to publish to here.

‎fabric/src/main/resources/fabric.mod.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
},
2626
"depends": {
2727
"fabricloader": ">=0.15.10",
28-
"minecraft": [">=1.21", "<=1.21.1"],
28+
"minecraft": ">=1.21.2",
2929
"fabric-api": "*"
3030
},
3131
"suggests": {

‎gradle.properties

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
org.gradle.jvmargs=-Xmx2048M
22

3-
minecraft_version=1.21.1
3+
minecraft_version=1.21.3
44
enabled_platforms=fabric,neoforge
55

66
mod_version=1.3.2
77
maven_group=com.slaincow.factoryblocks
88
archives_base_name=factory_blocks
99

10-
architectury_version=13.0.8
10+
#https://www.curseforge.com/minecraft/mc-mods/architectury-api/files/all?page=1&pageSize=20
11+
architectury_version=14.0.4
1112

13+
#https://fabricmc.net/develop/
1214
fabric_loader_version=0.16.9
13-
fabric_api_version=0.107.0+1.21.1
14-
yarn_mappings=1.21.1+build.3
15+
fabric_api_version=0.107.0+1.21.3
16+
yarn_mappings=1.21.3+build.2
1517

16-
neoforge_version=21.1.73
18+
#https://projects.neoforged.net/neoforged/neoforge
19+
neoforge_version=21.3.10-beta

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎neoforge/build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,15 @@ configurations {
3131
developmentNeoForge.extendsFrom common
3232
}
3333

34+
repositories {
35+
maven { url "https://maven.neoforged.net/" }
36+
}
37+
3438
dependencies {
3539
neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
3640
// Remove the next line if you don't want to depend on the API
3741
modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
38-
42+
3943
common(project(path: ":common", configuration: "namedElements")) { transitive false }
4044
shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
4145
}
@@ -81,6 +85,10 @@ publishing {
8185
}
8286
}
8387

88+
base {
89+
archivesName = rootProject.archives_base_name + "-neoforge-" + minecraft_version
90+
}
91+
8492
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
8593
repositories {
8694
// Add repositories to publish to here.

‎neoforge/src/main/resources/META-INF/neoforge.mods.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ logoFile = "assets/factory_blocks/icon.png"
1616
[[dependencies.chisel]]
1717
modId="minecraft"
1818
type="required"
19-
versionRange="[1.21,1.21.1]"
19+
versionRange="[1.21.2,)"
2020

2121
[[dependencies.chisel]]
2222
modId="neoforge"

0 commit comments

Comments
 (0)