Skip to content

Commit 398fa9b

Browse files
committed
reduce more tarkin redundancy
1 parent 804ce85 commit 398fa9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+199
-338
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions

projects/pswg/src/main/java/com/parzivail/pswg/Client.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,19 @@ public void onInitializeClient()
254254
ModelRegistry.register(SwgBlocks.Crate.GraySegmented, true, ModelLoader.loadP3D(DynamicBakedModel.CacheMethod.BLOCKSTATE_KEY, Resources.id("block/segmented_crate"), Resources.id("block/model/segmented_crate/gray"), Resources.id("block/model/segmented_crate/gray_particle")));
255255
ModelRegistry.register(SwgBlocks.Crate.GrayPanel, true, ModelLoader.loadP3D(DynamicBakedModel.CacheMethod.BLOCKSTATE_KEY, Resources.id("block/segmented_crate"), Resources.id("block/model/segmented_crate/gray_panel"), Resources.id("block/model/segmented_crate/gray_panel_particle")));
256256

257-
ModelRegistry.register(SwgBlocks.Misc.ThermalDetonatorBlock, false, ModelLoader.loadPicklingP3D(Resources.id("block/model/thermal_detonator_block"), Resources.id("block/model/thermal_detonator_block"),
258-
Resources.id("block/thermal_detonator/thermal_detonator_block"), Resources.id("block/thermal_detonator/thermal_detonator_block_2"),
259-
Resources.id("block/thermal_detonator/thermal_detonator_block_3"), Resources.id("block/thermal_detonator/thermal_detonator_block_4"),
260-
Resources.id("block/thermal_detonator/thermal_detonator_block_5")));
257+
ModelRegistry.register(
258+
SwgBlocks.Misc.ThermalDetonatorBlock,
259+
true,
260+
ModelLoader.loadPicklingP3D(
261+
Resources.id("block/model/thermal_detonator_block"),
262+
Resources.id("block/model/thermal_detonator_block"),
263+
Resources.id("block/thermal_detonator/thermal_detonator_block"),
264+
Resources.id("block/thermal_detonator/thermal_detonator_block_2"),
265+
Resources.id("block/thermal_detonator/thermal_detonator_block_3"),
266+
Resources.id("block/thermal_detonator/thermal_detonator_block_4"),
267+
Resources.id("block/thermal_detonator/thermal_detonator_block_5")
268+
)
269+
);
261270

262271
ModelRegistry.register(SwgBlocks.Crate.ImperialCorrugatedCrate, true, ModelLoader.loadP3D(DynamicBakedModel.CacheMethod.BLOCKSTATE_KEY, Resources.id("block/corrugated_crate"), Resources.id("block/model/corrugated_crate/imperial"), Resources.id("block/model/corrugated_crate/imperial_particle")));
263272
ModelRegistry.register(SwgBlocks.Crate.MedicalCorrugatedCrate, true, ModelLoader.loadP3D(DynamicBakedModel.CacheMethod.BLOCKSTATE_KEY, Resources.id("block/corrugated_crate"), Resources.id("block/model/corrugated_crate/medical"), Resources.id("block/model/corrugated_crate/medical_particle")));

projects/pswg/src/main/java/com/parzivail/pswg/container/SwgBlocks.java

Lines changed: 69 additions & 41 deletions
Large diffs are not rendered by default.

projects/pswg/src/main/java/com/parzivail/pswg/container/SwgTags.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package com.parzivail.pswg.container;
22

33
import com.parzivail.pswg.Resources;
4-
import com.parzivail.pswg.entity.BlasterBoltEntity;
54
import net.minecraft.block.Block;
6-
import net.minecraft.entity.Entity;
75
import net.minecraft.entity.EntityType;
86
import net.minecraft.entity.damage.DamageType;
97
import net.minecraft.item.Item;
@@ -14,12 +12,7 @@ public class SwgTags
1412
{
1513
public static class Blocks
1614
{
17-
public static final TagKey<Block> DESERT_SAND = register("desert_sand");
18-
public static final TagKey<Block> DESERT_SANDSTONE = register("desert_sandstone");
19-
public static final TagKey<Block> JAPOR_LOG = register("japor_log");
20-
public static final TagKey<Block> SEQUOIA_LOG = register("sequoia_log");
2115
public static final TagKey<Block> SLIDING_DOORS = register("sliding_doors");
22-
public static final TagKey<Block> TATOOINE_LOG = register("tatooine_log");
2316
public static final TagKey<Block> BLASTER_DESTROY = register("blaster_destroy");
2417
public static final TagKey<Block> BLASTER_EXPLODE = register("blaster_explode");
2518
public static final TagKey<Block> BLASTER_REFLECT = register("blaster_reflect");
@@ -32,12 +25,6 @@ private static TagKey<Block> register(String id)
3225

3326
public static class Items
3427
{
35-
public static final TagKey<Item> DESERT_SAND = register("desert_sand");
36-
public static final TagKey<Item> DESERT_SANDSTONE = register("desert_sandstone");
37-
public static final TagKey<Item> JAPOR_LOG = register("japor_log");
38-
public static final TagKey<Item> SEQUOIA_LOG = register("sequoia_log");
39-
public static final TagKey<Item> TATOOINE_LOG = register("tatooine_log");
40-
4128
private static TagKey<Item> register(String id)
4229
{
4330
return TagKey.of(RegistryKeys.ITEM, Resources.id(id));

projects/pswg/src/main/java/com/parzivail/pswg/mixin/CactusBlockMixin.java

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"parent":"minecraft:block/cube_column","textures":{"side":"pswg:block/air_vent_side","end":"pswg:block/air_vent_top"}}
1+
{"parent":"minecraft:block/cube_column","textures":{"side":"pswg:block/air_vent","end":"pswg:block/air_vent_top"}}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"parent":"minecraft:block/cube_all","textures":{"all":"pswg:block/loose_desert_sand"}}
1+
{"parent":"minecraft:block/cube_all","textures":{"all":"pswg:block/desert_sand"}}
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)