adjusting for usability

This commit is contained in:
Halbear
2026-05-27 22:13:12 +01:00
parent 8bf3c2bccf
commit 68e923e644
6 changed files with 35 additions and 8 deletions
+22 -1
View File
@@ -9,6 +9,9 @@ buildscript {
classpath 'org.spongepowered:mixingradle:0.7.+' classpath 'org.spongepowered:mixingradle:0.7.+'
} }
} }
plugins {
id 'maven-publish'
}
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'org.spongepowered.mixin' apply plugin: 'org.spongepowered.mixin'
apply plugin: 'eclipse' apply plugin: 'eclipse'
@@ -18,6 +21,9 @@ group = 'net.halbear.hvf'
archivesBaseName = 'hals_vehicle_framework' archivesBaseName = 'hals_vehicle_framework'
java.toolchain.languageVersion = JavaLanguageVersion.of(8) java.toolchain.languageVersion = JavaLanguageVersion.of(8)
mixin{
add sourceSets.main, "hals_vehicle_framework.mixin-refmap.json"
}
minecraft { minecraft {
mappings channel: 'snapshot', version: '20210309-1.16.5' mappings channel: 'snapshot', version: '20210309-1.16.5'
@@ -54,7 +60,7 @@ minecraft {
] ]
mods { mods {
hem { hals_vehicle_framework {
source sourceSets.main source sourceSets.main
} }
} }
@@ -74,3 +80,18 @@ tasks.named('jar', Jar).configure {
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.16.5-36.2.26' minecraft 'net.minecraftforge:forge:1.16.5-36.2.26'
} }
publishing {
publications {
mavenJava(MavenPublication) {
from components.java
groupId = 'net.halbear.hvf'
artifactId = 'hals_vehicle_framework'
version = '1.0'
}
}
repositories {
maven {
url = layout.buildDirectory.dir("repo")
}
}
}
@@ -32,9 +32,11 @@ public class VehicleBaseRenderer<T extends VehicleBaseEntity, M extends EntityMo
private final String TextureLocation; private final String TextureLocation;
private final Map<String, String> STATE_BASED_TEXTURE_LOCATIONS = new HashMap<>(); private final Map<String, String> STATE_BASED_TEXTURE_LOCATIONS = new HashMap<>();
private final String MODID;
protected VehicleBaseRenderer(EntityRendererManager renderManager, M[] DefaultModels, String TextureLocation) { protected VehicleBaseRenderer(EntityRendererManager renderManager, M[] DefaultModels, String TextureLocation, String MODID) {
super(renderManager); super(renderManager);
this.MODID = MODID;
this.TextureLocation = TextureLocation; this.TextureLocation = TextureLocation;
STATE_BASED_TEXTURE_LOCATIONS.put("DEFAULT",TextureLocation); STATE_BASED_TEXTURE_LOCATIONS.put("DEFAULT",TextureLocation);
STATE_BASED_MODELS.put("DEFAULT",DefaultModels); STATE_BASED_MODELS.put("DEFAULT",DefaultModels);
@@ -112,6 +114,6 @@ public class VehicleBaseRenderer<T extends VehicleBaseEntity, M extends EntityMo
@Override @Override
@Nonnull @Nonnull
public ResourceLocation getEntityTexture(T entity) { public ResourceLocation getEntityTexture(T entity) {
return new ResourceLocation(Halsvehicleframework.MOD_ID,STATE_BASED_TEXTURE_LOCATIONS.get(RenderState)); return new ResourceLocation(this.MODID,STATE_BASED_TEXTURE_LOCATIONS.get(RenderState));
} }
} }
@@ -198,12 +198,14 @@ public class VehicleBaseEntity extends Entity {
@Override @Override
protected void readAdditional(CompoundNBT compound) { protected void readAdditional(CompoundNBT compound) {
if (compound.contains("CustomNBTData")) {
this.dataManager.set(VEHICLE_SYNCHED_PARAMETERS, compound.getCompound("VehicleData"));
}
} }
@Override @Override
protected void writeAdditional(CompoundNBT compound) { protected void writeAdditional(CompoundNBT compound) {
compound.put("VehicleData", this.dataManager.get(VEHICLE_SYNCHED_PARAMETERS));
} }
@Override @Override
@@ -2,6 +2,7 @@ package net.halbear.hvf.UsageExamples.Aeroplane.Renderer;
import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.matrix.MatrixStack;
import net.halbear.hvf.Entity.VehicleBaseEntity; import net.halbear.hvf.Entity.VehicleBaseEntity;
import net.halbear.hvf.Halsvehicleframework;
import net.halbear.hvf.UsageExamples.Aeroplane.Renderer.Models.AeroplaneModel; import net.halbear.hvf.UsageExamples.Aeroplane.Renderer.Models.AeroplaneModel;
import net.halbear.hvf.Entity.Renderer.VehicleBaseRenderer; import net.halbear.hvf.Entity.Renderer.VehicleBaseRenderer;
import net.halbear.hvf.UsageExamples.Aeroplane.Renderer.Models.DamagedPlane; import net.halbear.hvf.UsageExamples.Aeroplane.Renderer.Models.DamagedPlane;
@@ -15,7 +16,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
public class AeroplaneRenderer extends VehicleBaseRenderer { public class AeroplaneRenderer extends VehicleBaseRenderer {
public AeroplaneRenderer(EntityRendererManager renderManagerIn) { public AeroplaneRenderer(EntityRendererManager renderManagerIn) {
super(renderManagerIn, new EntityModel<?>[]{new AeroplaneModel()},"textures/entities/biplaneupdated.png"); super(renderManagerIn, new EntityModel<?>[]{new AeroplaneModel()},"textures/entities/biplaneupdated.png", Halsvehicleframework.MOD_ID);
AddRendererState("DAMAGED",new EntityModel<?>[]{new DamagedPlane()}); AddRendererState("DAMAGED",new EntityModel<?>[]{new DamagedPlane()});
AddRendererState("SUPER_DAMAGED",new EntityModel<?>[]{new DamagedPlane()},"textures/entities/biplaneupdated_DAMAGED.png"); AddRendererState("SUPER_DAMAGED",new EntityModel<?>[]{new DamagedPlane()},"textures/entities/biplaneupdated_DAMAGED.png");
} }
@@ -1,6 +1,7 @@
package net.halbear.hvf.UsageExamples.Airboat.Renderer; package net.halbear.hvf.UsageExamples.Airboat.Renderer;
import net.halbear.hvf.Entity.Renderer.VehicleBaseRenderer; import net.halbear.hvf.Entity.Renderer.VehicleBaseRenderer;
import net.halbear.hvf.Halsvehicleframework;
import net.minecraft.client.renderer.entity.EntityRendererManager; import net.minecraft.client.renderer.entity.EntityRendererManager;
import net.minecraft.client.renderer.entity.model.EntityModel; import net.minecraft.client.renderer.entity.model.EntityModel;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@@ -10,6 +11,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
public class AirboatRenderer extends VehicleBaseRenderer { public class AirboatRenderer extends VehicleBaseRenderer {
public AirboatRenderer(EntityRendererManager renderManagerIn) { public AirboatRenderer(EntityRendererManager renderManagerIn) {
super(renderManagerIn, new EntityModel<?>[]{new AirboatModel()},"textures/entities/airboat.png" ); super(renderManagerIn, new EntityModel<?>[]{new AirboatModel()},"textures/entities/airboat.png",Halsvehicleframework.MOD_ID );
} }
} }
@@ -25,7 +25,7 @@ import static net.halbear.hvf.Util.Client.VehicleCameraSettings.GetCameraOffsets
@Mixin(ActiveRenderInfo.class) @Mixin(ActiveRenderInfo.class)
public abstract class CameraMixin { public abstract class CameraMixin {
@Inject(method = {"update", "func_216772_a"}, at = @At(value = "TAIL"),cancellable = true, remap = true) @Inject(method = {"update", "func_216772_a","setup"}, at = @At(value = "TAIL"),cancellable = true, remap = true)
private void update(IBlockReader currentRenderedLevel, Entity entity, boolean isDetached, boolean isMirrored, float partialTicks, CallbackInfo ci){ private void update(IBlockReader currentRenderedLevel, Entity entity, boolean isDetached, boolean isMirrored, float partialTicks, CallbackInfo ci){
if(entity.isPassenger() && Minecraft.getInstance().gameSettings.getPointOfView() != PointOfView.FIRST_PERSON) { if(entity.isPassenger() && Minecraft.getInstance().gameSettings.getPointOfView() != PointOfView.FIRST_PERSON) {
ITag<EntityType<?>> myEntityTag = EntityTypeTags.getTagById(new ResourceLocation("forge", "hvf_camera_affected_vehicle").toString()); ITag<EntityType<?>> myEntityTag = EntityTypeTags.getTagById(new ResourceLocation("forge", "hvf_camera_affected_vehicle").toString());