Skip to content

Commit bbe7ae8

Browse files
authored
Railcannon aim
1 parent 06c6df7 commit bbe7ae8

File tree

11 files changed

+87
-85
lines changed

11 files changed

+87
-85
lines changed

src/main/java/survivalblock/amarong/client/AmarongClient.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package survivalblock.amarong.client;
22

33
import net.fabricmc.api.ClientModInitializer;
4-
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
54
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
65
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
76
import net.fabricmc.fabric.api.client.particle.v1.ParticleFactoryRegistry;
@@ -11,9 +10,7 @@
1110
import net.fabricmc.loader.api.FabricLoader;
1211
import net.minecraft.client.MinecraftClient;
1312
import net.minecraft.client.gui.screen.Screen;
14-
import net.minecraft.client.particle.GlowParticle;
1513
import net.minecraft.client.particle.SonicBoomParticle;
16-
import net.minecraft.client.render.RenderLayer;
1714
import net.minecraft.resource.ResourceType;
1815
import net.minecraft.text.Text;
1916
import survivalblock.amarong.client.compat.config.AmarongConfigScreen;
@@ -25,7 +22,6 @@
2522
import survivalblock.amarong.client.render.entity.WaterStreamEntityRenderer;
2623
import survivalblock.amarong.common.Amarong;
2724
import survivalblock.amarong.common.compat.config.AmarongConfig;
28-
import survivalblock.amarong.common.init.AmarongBlocks;
2925
import survivalblock.amarong.common.init.AmarongEntityTypes;
3026
import survivalblock.amarong.common.init.AmarongItems;
3127
import survivalblock.amarong.common.init.AmarongParticleTypes;
@@ -57,7 +53,6 @@ public void onInitializeClient() {
5753
ResourceManagerHelper.registerBuiltinResourcePack(AmarongClientUtil.SMOL_VERYLONGSWORD_PACK, modContainer, Text.translatable("resourcePack.amarong.smolverylongsword.name"), ResourcePackActivationType.NORMAL);
5854
ResourceManagerHelper.registerBuiltinResourcePack(AmarongClientUtil.OLD_TICKET_LAUNCHER_PACK, modContainer, Text.translatable("resourcePack.amarong.oldticketlauncher.name"), ResourcePackActivationType.NORMAL);
5955
ResourceManagerHelper.registerBuiltinResourcePack(AmarongClientUtil.AMETHYST_HANDLE_TICKET_LAUNCHER_PACK, modContainer, Text.translatable("resourcePack.amarong.amethysthandleticketlauncher.name"), ResourcePackActivationType.DEFAULT_ENABLED);
60-
ResourceManagerHelper.registerBuiltinResourcePack(AmarongClientUtil.OLD_CHUNK_AND_SHEET, modContainer, Text.translatable("resourcePack.amarong.oldchunkandsheet.name"), ResourcePackActivationType.NORMAL);
6156
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(STAFF_TRANSFORMATIONS_MANAGER);
6257
});
6358

src/main/java/survivalblock/amarong/client/AmarongClientUtil.java

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

88
import java.util.ArrayList;
99
import java.util.Set;
10-
import java.util.stream.Collectors;
1110

1211
// could just be called AmarongClientConstants at this point
1312
public class AmarongClientUtil {
@@ -23,15 +22,13 @@ public class AmarongClientUtil {
2322
public static final Identifier SMOL_VERYLONGSWORD_PACK = Amarong.id("smolverylongsword");
2423
public static final Identifier OLD_TICKET_LAUNCHER_PACK = Amarong.id("oldticketlauncher");
2524
public static final Identifier AMETHYST_HANDLE_TICKET_LAUNCHER_PACK = Amarong.id("amethysthandleticketlauncher");
26-
public static final Identifier OLD_CHUNK_AND_SHEET = Amarong.id("oldchunkandsheet");
2725

2826
static {
2927
ArrayList<Identifier> list = new ArrayList<>();
3028
list.add(NO_KALEIDOSCOPE_OVERLAY_PACK);
3129
list.add(SMOL_VERYLONGSWORD_PACK);
3230
list.add(OLD_TICKET_LAUNCHER_PACK);
3331
list.add(AMETHYST_HANDLE_TICKET_LAUNCHER_PACK);
34-
list.add(OLD_CHUNK_AND_SHEET);
3532
AMARONG_RESOURCE_PACKS = ImmutableSet.copyOf(list.stream().map(Identifier::toString).iterator());
3633
}
3734
}

src/main/java/survivalblock/amarong/client/compat/config/AmarongConfigScreen.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
import survivalblock.amarong.common.Amarong;
1515
import survivalblock.atmosphere.atmospheric_api.not_mixin.compat.config.ConfigPackScreen;
1616

17-
import java.util.function.Supplier;
18-
1917
@Environment(EnvType.CLIENT)
2018
public class AmarongConfigScreen extends Screen {
2119

src/main/java/survivalblock/amarong/common/datagen/AmarongDamageTypeGenerator.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22

33
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
44
import net.minecraft.entity.damage.DamageType;
5-
import net.minecraft.registry.RegistryKey;
65
import net.minecraft.registry.RegistryKeys;
76
import net.minecraft.registry.RegistryWrapper;
87
import survivalblock.amarong.common.init.AmarongDamageTypes;
98
import survivalblock.atmosphere.atmospheric_api.not_mixin.datagen.AtmosphericDynamicRegistryProvider;
109
import survivalblock.atmosphere.atmospheric_api.not_mixin.datagen.RegistryEntryLookupContainer;
1110

12-
import java.util.Map;
1311
import java.util.concurrent.CompletableFuture;
1412

1513
public class AmarongDamageTypeGenerator extends AtmosphericDynamicRegistryProvider<DamageType> {
@@ -20,8 +18,6 @@ public AmarongDamageTypeGenerator(FabricDataOutput output, CompletableFuture<Reg
2018

2119
@Override
2220
protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries, RegistryEntryLookupContainer container) {
23-
for (Map.Entry<RegistryKey<DamageType>, DamageType> entry : AmarongDamageTypes.asDamageTypes().entrySet()) {
24-
entries.add(entry.getKey(), entry.getValue());
25-
}
21+
AmarongDamageTypes.asDamageTypes().forEach(entries::add);
2622
}
2723
}

src/main/java/survivalblock/amarong/common/datagen/AmarongEnUsLangGenerator.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public void generateTranslations(RegistryWrapper.WrapperLookup registryLookup, T
6262
translationBuilder.add("resourcePack.amarong.smolverylongsword.name", "Smol Verylongsword");
6363
translationBuilder.add("resourcePack.amarong.oldticketlauncher.name", "Old Ticket Launcher");
6464
translationBuilder.add("resourcePack.amarong.amethysthandleticketlauncher.name", "Amethyst Handle Ticket Launcher");
65-
translationBuilder.add("resourcePack.amarong.oldchunkandsheet.name", "Old Chunk and Sheet Textures");
6665

6766
translationBuilder.add("dataPack.amarong.easy_core_duplication_pack.name", "Easy Amarong Core Duplication");
6867
translationBuilder.add("dataPack.amarong.amarong_hamer_recipe_pack.name", "Amarong Hammer Recipe");

0 commit comments

Comments
 (0)