From a364cbb12837e2c641e5cc24d07524afb4960dea Mon Sep 17 00:00:00 2001 From: p2vman Date: Mon, 26 May 2025 15:07:13 +0300 Subject: [PATCH] move --- .idea/codeStyles/Project.xml | 7 ++ .idea/codeStyles/codeStyleConfig.xml | 5 ++ .../vmodaddon/IPhysicsTrackController.java | 8 --- .../vmodaddon/ISimpleWheelController.java | 6 -- .../{vmodaddon => vmodextras}/Config.java | 8 ++- .../{vmodaddon => vmodextras}/IValidator.java | 2 +- .../{vmodaddon => vmodextras}/Validator.java | 2 +- .../{vmodaddon => vmodextras}/Vmodaddon.java | 12 ++-- .../block/CompactBackupBlock.java | 4 +- .../block/CompactBackupBlockEntity.java | 8 +-- .../block/TrackBackupBlock.java | 4 +- .../block/TrackBackupBlockEntity.java | 60 ++++++++++++++++-- .../eptaproject/vmodextras/item/ToolKit.java | 34 ++++++++++ .../{vmodaddon => vmodextras}/mixin/A.java | 2 +- .../mixin/ITransformer.java | 2 +- .../mixin/InstanceHolder.java | 2 +- .../mixin/KotlinOptimizationTransformer.java | 2 +- .../mixin/MixinPlugin.java | 4 +- .../mixin/Transformers.java | 2 +- .../mixin/package-info.java | 2 +- .../mixins/BlockPaletteHashMapV1Mixin.java | 10 +-- .../PhysicsTrackControllerAccessor.java | 2 +- .../mixins/PhysicsTrackControllerMixin.java | 20 +----- .../mixins/SimpleWheelControllerAccessor.java | 2 +- .../mixins/SimpleWheelControllerMixin.java | 6 +- .../vmodextras/mixins/TrackToolkitMixin.java | 9 +++ .../vmodextras/trackwork/IController.java | 10 +++ .../trackwork/IPhysicsTrackController.java | 7 ++ .../trackwork/ISimpleWheelController.java | 6 ++ .../vmodextras/util/IBlockEntityClear.java | 8 +++ .../util/ModRegistry.java | 2 +- .../blockstates/track_b.json | 0 .../{vmodaddon => vmoextras}/lang/en_us.json | 0 .../models/block/track_b.json | 0 .../models/item/track_b.json | 0 .../textures/block/track_b.png | Bin .../vs_mass/all.json | 4 +- src/main/resources/vmodaddon.mixins.json | 4 +- 38 files changed, 189 insertions(+), 77 deletions(-) create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 src/main/java/space/eptaproject/vmodaddon/IPhysicsTrackController.java delete mode 100644 src/main/java/space/eptaproject/vmodaddon/ISimpleWheelController.java rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/Config.java (92%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/IValidator.java (90%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/Validator.java (96%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/Vmodaddon.java (93%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/block/CompactBackupBlock.java (87%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/block/CompactBackupBlockEntity.java (96%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/block/TrackBackupBlock.java (87%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/block/TrackBackupBlockEntity.java (70%) create mode 100644 src/main/java/space/eptaproject/vmodextras/item/ToolKit.java rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/A.java (86%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/ITransformer.java (84%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/InstanceHolder.java (94%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/KotlinOptimizationTransformer.java (97%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/MixinPlugin.java (96%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/Transformers.java (87%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixin/package-info.java (61%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixins/BlockPaletteHashMapV1Mixin.java (87%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixins/PhysicsTrackControllerAccessor.java (93%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixins/PhysicsTrackControllerMixin.java (60%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixins/SimpleWheelControllerAccessor.java (93%) rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/mixins/SimpleWheelControllerMixin.java (80%) create mode 100644 src/main/java/space/eptaproject/vmodextras/mixins/TrackToolkitMixin.java create mode 100644 src/main/java/space/eptaproject/vmodextras/trackwork/IController.java create mode 100644 src/main/java/space/eptaproject/vmodextras/trackwork/IPhysicsTrackController.java create mode 100644 src/main/java/space/eptaproject/vmodextras/trackwork/ISimpleWheelController.java create mode 100644 src/main/java/space/eptaproject/vmodextras/util/IBlockEntityClear.java rename src/main/java/space/eptaproject/{vmodaddon => vmodextras}/util/ModRegistry.java (98%) rename src/main/resources/assets/{vmodaddon => vmoextras}/blockstates/track_b.json (100%) rename src/main/resources/assets/{vmodaddon => vmoextras}/lang/en_us.json (100%) rename src/main/resources/assets/{vmodaddon => vmoextras}/models/block/track_b.json (100%) rename src/main/resources/assets/{vmodaddon => vmoextras}/models/item/track_b.json (100%) rename src/main/resources/assets/{vmodaddon => vmoextras}/textures/block/track_b.png (100%) rename src/main/resources/data/{vmodaddon => vmodextras}/vs_mass/all.json (56%) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..919ce1f --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/src/main/java/space/eptaproject/vmodaddon/IPhysicsTrackController.java b/src/main/java/space/eptaproject/vmodaddon/IPhysicsTrackController.java deleted file mode 100644 index 05129a6..0000000 --- a/src/main/java/space/eptaproject/vmodaddon/IPhysicsTrackController.java +++ /dev/null @@ -1,8 +0,0 @@ -package space.eptaproject.vmodaddon; - -import space.eptaproject.vmodaddon.mixins.PhysicsTrackControllerAccessor; - -public interface IPhysicsTrackController extends PhysicsTrackControllerAccessor { - void SetRawDamperCoefficient(float delta); - float GetRawDamperCoefficient(); -} diff --git a/src/main/java/space/eptaproject/vmodaddon/ISimpleWheelController.java b/src/main/java/space/eptaproject/vmodaddon/ISimpleWheelController.java deleted file mode 100644 index 2516b5b..0000000 --- a/src/main/java/space/eptaproject/vmodaddon/ISimpleWheelController.java +++ /dev/null @@ -1,6 +0,0 @@ -package space.eptaproject.vmodaddon; - -import space.eptaproject.vmodaddon.mixins.SimpleWheelControllerAccessor; - -public interface ISimpleWheelController extends SimpleWheelControllerAccessor { -} diff --git a/src/main/java/space/eptaproject/vmodaddon/Config.java b/src/main/java/space/eptaproject/vmodextras/Config.java similarity index 92% rename from src/main/java/space/eptaproject/vmodaddon/Config.java rename to src/main/java/space/eptaproject/vmodextras/Config.java index 2a78cc5..2d6ef31 100644 --- a/src/main/java/space/eptaproject/vmodaddon/Config.java +++ b/src/main/java/space/eptaproject/vmodextras/Config.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon; +package space.eptaproject.vmodextras; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import it.unimi.dsi.fastutil.objects.ObjectImmutableList; @@ -16,6 +16,7 @@ public class Config { public static final ForgeConfigSpec.ConfigValue RESOURCE_LOCATION; public static final ForgeConfigSpec.ConfigValue Suspension_Stiffness_LIMIT; + public static final ForgeConfigSpec.ConfigValue Suspension_Stiffness_delta; public static List parsedList = new ObjectArrayList<>(); private static List> ITEM = new ObjectImmutableList<>(new ArrayList<>()); @@ -62,6 +63,11 @@ public class Config { .comment("track suspension stiffness") .defineInRange("SuspensionStiffness", 4, 1, 20); + Suspension_Stiffness_delta = builder + .comment("track suspension stiffness delta") + .defineInRange("suspension_stiffness_delta", 1d, 0.10d, 1d); + + builder.pop(); COMMON_CONFIG = builder.build(); } diff --git a/src/main/java/space/eptaproject/vmodaddon/IValidator.java b/src/main/java/space/eptaproject/vmodextras/IValidator.java similarity index 90% rename from src/main/java/space/eptaproject/vmodaddon/IValidator.java rename to src/main/java/space/eptaproject/vmodextras/IValidator.java index 56bbde7..e66e6aa 100644 --- a/src/main/java/space/eptaproject/vmodaddon/IValidator.java +++ b/src/main/java/space/eptaproject/vmodextras/IValidator.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon; +package space.eptaproject.vmodextras; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; diff --git a/src/main/java/space/eptaproject/vmodaddon/Validator.java b/src/main/java/space/eptaproject/vmodextras/Validator.java similarity index 96% rename from src/main/java/space/eptaproject/vmodaddon/Validator.java rename to src/main/java/space/eptaproject/vmodextras/Validator.java index aff286a..cd247d4 100644 --- a/src/main/java/space/eptaproject/vmodaddon/Validator.java +++ b/src/main/java/space/eptaproject/vmodextras/Validator.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon; +package space.eptaproject.vmodextras; import lombok.ToString; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/space/eptaproject/vmodaddon/Vmodaddon.java b/src/main/java/space/eptaproject/vmodextras/Vmodaddon.java similarity index 93% rename from src/main/java/space/eptaproject/vmodaddon/Vmodaddon.java rename to src/main/java/space/eptaproject/vmodextras/Vmodaddon.java index 07db39f..8bdccd0 100644 --- a/src/main/java/space/eptaproject/vmodaddon/Vmodaddon.java +++ b/src/main/java/space/eptaproject/vmodextras/Vmodaddon.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon; +package space.eptaproject.vmodextras; import com.mojang.logging.LogUtils; import net.minecraft.world.item.*; @@ -18,11 +18,11 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.registries.RegistryObject; import org.slf4j.Logger; -import space.eptaproject.vmodaddon.block.CompactBackupBlock; -import space.eptaproject.vmodaddon.block.CompactBackupBlockEntity; -import space.eptaproject.vmodaddon.block.TrackBackupBlock; -import space.eptaproject.vmodaddon.block.TrackBackupBlockEntity; -import space.eptaproject.vmodaddon.util.ModRegistry; +import space.eptaproject.vmodextras.block.CompactBackupBlock; +import space.eptaproject.vmodextras.block.CompactBackupBlockEntity; +import space.eptaproject.vmodextras.block.TrackBackupBlock; +import space.eptaproject.vmodextras.block.TrackBackupBlockEntity; +import space.eptaproject.vmodextras.util.ModRegistry; @Mod(Vmodaddon.MODID) public class Vmodaddon { diff --git a/src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlock.java b/src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlock.java similarity index 87% rename from src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlock.java rename to src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlock.java index 1447287..66cea60 100644 --- a/src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlock.java +++ b/src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlock.java @@ -1,9 +1,9 @@ -package space.eptaproject.vmodaddon.block; +package space.eptaproject.vmodextras.block; import com.simibubi.create.foundation.block.IBE; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import space.eptaproject.vmodaddon.Vmodaddon; +import space.eptaproject.vmodextras.Vmodaddon; public class CompactBackupBlock extends Block implements IBE { diff --git a/src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlockEntity.java b/src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlockEntity.java similarity index 96% rename from src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlockEntity.java rename to src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlockEntity.java index 0e9bbec..1789848 100644 --- a/src/main/java/space/eptaproject/vmodaddon/block/CompactBackupBlockEntity.java +++ b/src/main/java/space/eptaproject/vmodextras/block/CompactBackupBlockEntity.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.block; +package space.eptaproject.vmodextras.block; import edn.stratodonut.drivebywire.wire.ShipWireNetworkManager; import edn.stratodonut.trackwork.tracks.forces.PhysicsTrackController; @@ -13,9 +13,9 @@ import org.joml.Vector3d; import org.joml.Vector3dc; import org.valkyrienskies.core.api.ships.ServerShip; import org.valkyrienskies.mod.common.VSGameUtilsKt; -import space.eptaproject.vmodaddon.IPhysicsTrackController; -import space.eptaproject.vmodaddon.ISimpleWheelController; -import space.eptaproject.vmodaddon.Vmodaddon; +import space.eptaproject.vmodextras.trackwork.IPhysicsTrackController; +import space.eptaproject.vmodextras.trackwork.ISimpleWheelController; +import space.eptaproject.vmodextras.Vmodaddon; public class CompactBackupBlockEntity extends BlockEntity { diff --git a/src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlock.java b/src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlock.java similarity index 87% rename from src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlock.java rename to src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlock.java index ddc4b41..45c710a 100644 --- a/src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlock.java +++ b/src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlock.java @@ -1,9 +1,9 @@ -package space.eptaproject.vmodaddon.block; +package space.eptaproject.vmodextras.block; import com.simibubi.create.foundation.block.IBE; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntityType; -import space.eptaproject.vmodaddon.Vmodaddon; +import space.eptaproject.vmodextras.Vmodaddon; public class TrackBackupBlock extends Block implements IBE { diff --git a/src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlockEntity.java b/src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlockEntity.java similarity index 70% rename from src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlockEntity.java rename to src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlockEntity.java index 95503e5..ca12231 100644 --- a/src/main/java/space/eptaproject/vmodaddon/block/TrackBackupBlockEntity.java +++ b/src/main/java/space/eptaproject/vmodextras/block/TrackBackupBlockEntity.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.block; +package space.eptaproject.vmodextras.block; import edn.stratodonut.trackwork.tracks.forces.PhysicsTrackController; import edn.stratodonut.trackwork.tracks.forces.SimpleWheelController; @@ -10,17 +10,65 @@ import org.joml.Vector3d; import org.joml.Vector3dc; import org.valkyrienskies.core.api.ships.ServerShip; import org.valkyrienskies.mod.common.VSGameUtilsKt; -import space.eptaproject.vmodaddon.IPhysicsTrackController; -import space.eptaproject.vmodaddon.ISimpleWheelController; -import space.eptaproject.vmodaddon.Vmodaddon; +import space.eptaproject.vmodextras.trackwork.IPhysicsTrackController; +import space.eptaproject.vmodextras.trackwork.ISimpleWheelController; +import space.eptaproject.vmodextras.Vmodaddon; +import space.eptaproject.vmodextras.util.IBlockEntityClear; -public class TrackBackupBlockEntity extends BlockEntity { +public class TrackBackupBlockEntity extends BlockEntity implements IBlockEntityClear { public TrackBackupBlockEntity(BlockPos p_155229_, BlockState p_155230_) { super(Vmodaddon.MY_BLOCK_ENTITY.get(), p_155229_, p_155230_); } + public CompoundTag tag = new CompoundTag(); + + @Override + public boolean clear() { + try { + CompoundTag local = tag.copy(); + if (local.contains("SimpleWheelController")) { + CompoundTag SimpleWheelControllerTag = new CompoundTag(); + + SimpleWheelControllerTag.putFloat("SuspensionStiffness", 1); + { + CompoundTag suspensionAdjust = new CompoundTag(); + + suspensionAdjust.putDouble("x", 0); + suspensionAdjust.putDouble("y", 1); + suspensionAdjust.putDouble("z", 0); + + SimpleWheelControllerTag.put("suspensionAdjust", suspensionAdjust); + } + + tag.put("SimpleWheelController", SimpleWheelControllerTag); + } + + if (local.contains("PhysicsTrackController")) { + CompoundTag PhysicsTrackControllerTag = new CompoundTag(); + + PhysicsTrackControllerTag.putFloat("SuspensionStiffness", 1); + { + CompoundTag suspensionAdjust = new CompoundTag(); + + + suspensionAdjust.putDouble("x", 0); + suspensionAdjust.putDouble("y", 1); + suspensionAdjust.putDouble("z", 0); + + PhysicsTrackControllerTag.put("suspensionAdjust", suspensionAdjust); + } + + tag.put("PhysicsTrackController", PhysicsTrackControllerTag); + } + return true; + } catch (Exception e) { + return false; + } + } + @Override protected void saveAdditional(CompoundTag tag) { + this.tag = tag; super.saveAdditional(tag); ServerShip ship = (ServerShip) VSGameUtilsKt.getShipObjectManagingPos(this.level, getBlockPos()); if (ship != null) { @@ -46,6 +94,7 @@ public class TrackBackupBlockEntity extends BlockEntity { tag.put("PhysicsTrackController", PhysicsTrackControllerTag); } } + { SimpleWheelController simpleWheelController = ship.getAttachment(SimpleWheelController.class); ISimpleWheelController controller = (ISimpleWheelController) simpleWheelController; @@ -73,6 +122,7 @@ public class TrackBackupBlockEntity extends BlockEntity { @Override public void load(CompoundTag tag) { + this.tag = tag; super.load(tag); ServerShip ship = (ServerShip) VSGameUtilsKt.getShipObjectManagingPos(this.level, getBlockPos()); diff --git a/src/main/java/space/eptaproject/vmodextras/item/ToolKit.java b/src/main/java/space/eptaproject/vmodextras/item/ToolKit.java new file mode 100644 index 0000000..4c1be41 --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/item/ToolKit.java @@ -0,0 +1,34 @@ +package space.eptaproject.vmodextras.item; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.world.level.Level; + +public class ToolKit extends Item { + public ToolKit(Item.Properties properties) { + super(properties); + } + + @Override + public InteractionResult onItemUseFirst(ItemStack stack, UseOnContext context) { + Player player = context.getPlayer(); + if (player != null && player.mayBuild()) { + Level level = context.getLevel(); + BlockPos pos = context.getClickedPos(); + CompoundTag nbt = stack.getTag(); + + + } else { + return InteractionResult.PASS; + } + } + + public enum Mode { + CLEAR + } +} diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/A.java b/src/main/java/space/eptaproject/vmodextras/mixin/A.java similarity index 86% rename from src/main/java/space/eptaproject/vmodaddon/mixin/A.java rename to src/main/java/space/eptaproject/vmodextras/mixin/A.java index d2c8cf4..0ec4681 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/A.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/A.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/ITransformer.java b/src/main/java/space/eptaproject/vmodextras/mixin/ITransformer.java similarity index 84% rename from src/main/java/space/eptaproject/vmodaddon/mixin/ITransformer.java rename to src/main/java/space/eptaproject/vmodextras/mixin/ITransformer.java index cd8a23b..5fb22a9 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/ITransformer.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/ITransformer.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/InstanceHolder.java b/src/main/java/space/eptaproject/vmodextras/mixin/InstanceHolder.java similarity index 94% rename from src/main/java/space/eptaproject/vmodaddon/mixin/InstanceHolder.java rename to src/main/java/space/eptaproject/vmodextras/mixin/InstanceHolder.java index e693e55..8b5f961 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/InstanceHolder.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/InstanceHolder.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/KotlinOptimizationTransformer.java b/src/main/java/space/eptaproject/vmodextras/mixin/KotlinOptimizationTransformer.java similarity index 97% rename from src/main/java/space/eptaproject/vmodaddon/mixin/KotlinOptimizationTransformer.java rename to src/main/java/space/eptaproject/vmodextras/mixin/KotlinOptimizationTransformer.java index b121e54..f28e8bb 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/KotlinOptimizationTransformer.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/KotlinOptimizationTransformer.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.*; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/MixinPlugin.java b/src/main/java/space/eptaproject/vmodextras/mixin/MixinPlugin.java similarity index 96% rename from src/main/java/space/eptaproject/vmodaddon/mixin/MixinPlugin.java rename to src/main/java/space/eptaproject/vmodextras/mixin/MixinPlugin.java index 2229bee..928a150 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/MixinPlugin.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/MixinPlugin.java @@ -1,7 +1,5 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.Type; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/Transformers.java b/src/main/java/space/eptaproject/vmodextras/mixin/Transformers.java similarity index 87% rename from src/main/java/space/eptaproject/vmodaddon/mixin/Transformers.java rename to src/main/java/space/eptaproject/vmodextras/mixin/Transformers.java index 1028ea3..70d56fe 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/Transformers.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/Transformers.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixin/package-info.java b/src/main/java/space/eptaproject/vmodextras/mixin/package-info.java similarity index 61% rename from src/main/java/space/eptaproject/vmodaddon/mixin/package-info.java rename to src/main/java/space/eptaproject/vmodextras/mixin/package-info.java index cc3eaa7..98db722 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixin/package-info.java +++ b/src/main/java/space/eptaproject/vmodextras/mixin/package-info.java @@ -1,4 +1,4 @@ @ApiStatus.Experimental -package space.eptaproject.vmodaddon.mixin; +package space.eptaproject.vmodextras.mixin; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixins/BlockPaletteHashMapV1Mixin.java b/src/main/java/space/eptaproject/vmodextras/mixins/BlockPaletteHashMapV1Mixin.java similarity index 87% rename from src/main/java/space/eptaproject/vmodaddon/mixins/BlockPaletteHashMapV1Mixin.java rename to src/main/java/space/eptaproject/vmodextras/mixins/BlockPaletteHashMapV1Mixin.java index a50be5c..09b5a28 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixins/BlockPaletteHashMapV1Mixin.java +++ b/src/main/java/space/eptaproject/vmodextras/mixins/BlockPaletteHashMapV1Mixin.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixins; +package space.eptaproject.vmodextras.mixins; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.CrudeIncrementalIntIdentityHashBiMap; @@ -13,10 +13,10 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import space.eptaproject.vmodaddon.IValidator; -import space.eptaproject.vmodaddon.Validator; -import space.eptaproject.vmodaddon.mixin.KotlinOptimizationTransformer; -import space.eptaproject.vmodaddon.mixin.Transformers; +import space.eptaproject.vmodextras.IValidator; +import space.eptaproject.vmodextras.Validator; +import space.eptaproject.vmodextras.mixin.KotlinOptimizationTransformer; +import space.eptaproject.vmodextras.mixin.Transformers; @Mixin(BlockPaletteHashMapV1.class) @Transformers(transformers = {KotlinOptimizationTransformer.class}) diff --git a/src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerAccessor.java b/src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerAccessor.java similarity index 93% rename from src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerAccessor.java rename to src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerAccessor.java index fc629df..24b51b4 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerAccessor.java +++ b/src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerAccessor.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixins; +package space.eptaproject.vmodextras.mixins; import edn.stratodonut.trackwork.tracks.forces.PhysicsTrackController; import org.joml.Vector3dc; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerMixin.java b/src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerMixin.java similarity index 60% rename from src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerMixin.java rename to src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerMixin.java index ad1c55c..6310347 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixins/PhysicsTrackControllerMixin.java +++ b/src/main/java/space/eptaproject/vmodextras/mixins/PhysicsTrackControllerMixin.java @@ -1,31 +1,17 @@ -package space.eptaproject.vmodaddon.mixins; +package space.eptaproject.vmodextras.mixins; import edn.stratodonut.trackwork.tracks.forces.PhysicsTrackController; import org.joml.Math; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.Unique; -import space.eptaproject.vmodaddon.Config; -import space.eptaproject.vmodaddon.IPhysicsTrackController; +import space.eptaproject.vmodextras.Config; +import space.eptaproject.vmodextras.trackwork.IPhysicsTrackController; @Mixin(PhysicsTrackController.class) public abstract class PhysicsTrackControllerMixin implements IPhysicsTrackController { @Shadow private volatile float suspensionStiffness; - @Unique - private volatile float damperCoefficient = 0; - - @Override - public void SetRawDamperCoefficient(float delta) { - this.damperCoefficient = delta; - } - - @Override - public float GetRawDamperCoefficient() { - return damperCoefficient; - } - /** * @author * @reason diff --git a/src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerAccessor.java b/src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerAccessor.java similarity index 93% rename from src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerAccessor.java rename to src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerAccessor.java index f77cd80..154aff0 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerAccessor.java +++ b/src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerAccessor.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.mixins; +package space.eptaproject.vmodextras.mixins; import edn.stratodonut.trackwork.tracks.forces.SimpleWheelController; import org.joml.Vector3dc; diff --git a/src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerMixin.java b/src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerMixin.java similarity index 80% rename from src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerMixin.java rename to src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerMixin.java index 76e5a3d..92de571 100644 --- a/src/main/java/space/eptaproject/vmodaddon/mixins/SimpleWheelControllerMixin.java +++ b/src/main/java/space/eptaproject/vmodextras/mixins/SimpleWheelControllerMixin.java @@ -1,12 +1,12 @@ -package space.eptaproject.vmodaddon.mixins; +package space.eptaproject.vmodextras.mixins; import edn.stratodonut.trackwork.tracks.forces.SimpleWheelController; import org.joml.Math; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Shadow; -import space.eptaproject.vmodaddon.Config; -import space.eptaproject.vmodaddon.ISimpleWheelController; +import space.eptaproject.vmodextras.Config; +import space.eptaproject.vmodextras.trackwork.ISimpleWheelController; @Mixin(SimpleWheelController.class) public abstract class SimpleWheelControllerMixin implements ISimpleWheelController { diff --git a/src/main/java/space/eptaproject/vmodextras/mixins/TrackToolkitMixin.java b/src/main/java/space/eptaproject/vmodextras/mixins/TrackToolkitMixin.java new file mode 100644 index 0000000..b20c1f3 --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/mixins/TrackToolkitMixin.java @@ -0,0 +1,9 @@ +package space.eptaproject.vmodextras.mixins; + +import edn.stratodonut.trackwork.items.TrackToolkit; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(TrackToolkit.class) +public class TrackToolkitMixin { + +} diff --git a/src/main/java/space/eptaproject/vmodextras/trackwork/IController.java b/src/main/java/space/eptaproject/vmodextras/trackwork/IController.java new file mode 100644 index 0000000..a07dec4 --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/trackwork/IController.java @@ -0,0 +1,10 @@ +package space.eptaproject.vmodextras.trackwork; + +import org.joml.Vector3dc; + +public interface IController { + float getSuspensionStiffness(); + void setSuspensionStiffness(float val); + Vector3dc getSuspensionAdjust(); + void setSuspensionAdjust(Vector3dc vector3d); +} diff --git a/src/main/java/space/eptaproject/vmodextras/trackwork/IPhysicsTrackController.java b/src/main/java/space/eptaproject/vmodextras/trackwork/IPhysicsTrackController.java new file mode 100644 index 0000000..9e7ca67 --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/trackwork/IPhysicsTrackController.java @@ -0,0 +1,7 @@ +package space.eptaproject.vmodextras.trackwork; + +import space.eptaproject.vmodextras.mixins.PhysicsTrackControllerAccessor; + +public interface IPhysicsTrackController extends PhysicsTrackControllerAccessor, IController { + +} diff --git a/src/main/java/space/eptaproject/vmodextras/trackwork/ISimpleWheelController.java b/src/main/java/space/eptaproject/vmodextras/trackwork/ISimpleWheelController.java new file mode 100644 index 0000000..a631120 --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/trackwork/ISimpleWheelController.java @@ -0,0 +1,6 @@ +package space.eptaproject.vmodextras.trackwork; + +import space.eptaproject.vmodextras.mixins.SimpleWheelControllerAccessor; + +public interface ISimpleWheelController extends SimpleWheelControllerAccessor, IController { +} diff --git a/src/main/java/space/eptaproject/vmodextras/util/IBlockEntityClear.java b/src/main/java/space/eptaproject/vmodextras/util/IBlockEntityClear.java new file mode 100644 index 0000000..a9c134f --- /dev/null +++ b/src/main/java/space/eptaproject/vmodextras/util/IBlockEntityClear.java @@ -0,0 +1,8 @@ +package space.eptaproject.vmodextras.util; + +public interface IBlockEntityClear { + boolean clear(); + default boolean reset() { + return clear(); + } +} diff --git a/src/main/java/space/eptaproject/vmodaddon/util/ModRegistry.java b/src/main/java/space/eptaproject/vmodextras/util/ModRegistry.java similarity index 98% rename from src/main/java/space/eptaproject/vmodaddon/util/ModRegistry.java rename to src/main/java/space/eptaproject/vmodextras/util/ModRegistry.java index c27f880..2cfc352 100644 --- a/src/main/java/space/eptaproject/vmodaddon/util/ModRegistry.java +++ b/src/main/java/space/eptaproject/vmodextras/util/ModRegistry.java @@ -1,4 +1,4 @@ -package space.eptaproject.vmodaddon.util; +package space.eptaproject.vmodextras.util; import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap; import lombok.Getter; diff --git a/src/main/resources/assets/vmodaddon/blockstates/track_b.json b/src/main/resources/assets/vmoextras/blockstates/track_b.json similarity index 100% rename from src/main/resources/assets/vmodaddon/blockstates/track_b.json rename to src/main/resources/assets/vmoextras/blockstates/track_b.json diff --git a/src/main/resources/assets/vmodaddon/lang/en_us.json b/src/main/resources/assets/vmoextras/lang/en_us.json similarity index 100% rename from src/main/resources/assets/vmodaddon/lang/en_us.json rename to src/main/resources/assets/vmoextras/lang/en_us.json diff --git a/src/main/resources/assets/vmodaddon/models/block/track_b.json b/src/main/resources/assets/vmoextras/models/block/track_b.json similarity index 100% rename from src/main/resources/assets/vmodaddon/models/block/track_b.json rename to src/main/resources/assets/vmoextras/models/block/track_b.json diff --git a/src/main/resources/assets/vmodaddon/models/item/track_b.json b/src/main/resources/assets/vmoextras/models/item/track_b.json similarity index 100% rename from src/main/resources/assets/vmodaddon/models/item/track_b.json rename to src/main/resources/assets/vmoextras/models/item/track_b.json diff --git a/src/main/resources/assets/vmodaddon/textures/block/track_b.png b/src/main/resources/assets/vmoextras/textures/block/track_b.png similarity index 100% rename from src/main/resources/assets/vmodaddon/textures/block/track_b.png rename to src/main/resources/assets/vmoextras/textures/block/track_b.png diff --git a/src/main/resources/data/vmodaddon/vs_mass/all.json b/src/main/resources/data/vmodextras/vs_mass/all.json similarity index 56% rename from src/main/resources/data/vmodaddon/vs_mass/all.json rename to src/main/resources/data/vmodextras/vs_mass/all.json index 6ab9dfa..84363f7 100644 --- a/src/main/resources/data/vmodaddon/vs_mass/all.json +++ b/src/main/resources/data/vmodextras/vs_mass/all.json @@ -1,11 +1,11 @@ [ { - "block": "vmodaddon:ship_void", + "block": "vmodextras:ship_void", "mass": 0.0, "friction": 0.0 }, { - "block": "vmodaddon:track_b", + "block": "vmodextras:track_b", "mass": 40.0, "friction": 0.0 } diff --git a/src/main/resources/vmodaddon.mixins.json b/src/main/resources/vmodaddon.mixins.json index 376f2b5..af80bb1 100644 --- a/src/main/resources/vmodaddon.mixins.json +++ b/src/main/resources/vmodaddon.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "space.eptaproject.vmodaddon.mixins", + "package": "space.eptaproject.vmodextras.mixins", "compatibilityLevel": "JAVA_8", "refmap": "vmodaddon.refmap.json", "mixins": [ @@ -11,5 +11,5 @@ "injectors": { "defaultRequire": 1 }, - "plugin": "space.eptaproject.vmodaddon.mixin.MixinPlugin" + "plugin": "space.eptaproject.vmodextras.mixin.MixinPlugin" }