peter/old-beacon
1
0
Fork 0
mirror of https://github.com/peter-tanner/old-beacon.git synced 2024-11-30 11:10:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed unneeded inject and vars, cleanup imports

Browse Source
This commit is contained in:
Peter 2020-12-13 00:06:06 +08:00
parent 4f745d0b70
commit 1c32a62c08
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/io/github/npc_strider/oldbeacon/OldBeacon.java
View File

@ -1,6 +1,5 @@
package io.github.npc_strider.oldbeacon;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@ -27,10 +26,16 @@ public class OldBeacon implements ModInitializer {
Properties p = new Properties();
Path file = Paths.get("config/oldbeacon.cfg");
InputStream is = null;
IDLE_ANIM = true; //Defaults
try {
is = new FileInputStream(file.toString());
try {
p.load(is);
IDLE_ANIM = p.getProperty("idle_anim").toLowerCase().trim().equals("false") ? false : true;
} catch (IOException ex) {
System.out.println("Old beacon: cannot read config!");
ex.printStackTrace();
@ -47,7 +52,6 @@ public class OldBeacon implements ModInitializer {
ex_.printStackTrace();
}
}
IDLE_ANIM = p.getProperty("idle_anim").toLowerCase().trim().equals("true") ? true : false;
//
};

39
src/main/java/io/github/npc_strider/oldbeacon/mixin/BeaconMixin.java
View File

@ -1,5 +1,12 @@
package io.github.npc_strider.oldbeacon.mixin;
import java.util.LinkedList;
import java.util.List;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import io.github.npc_strider.oldbeacon.OldBeacon;
import net.minecraft.block.entity.BeaconBlockEntity;
import net.minecraft.client.model.ModelPart;
import net.minecraft.client.render.OverlayTexture;
@ -7,26 +14,12 @@ import net.minecraft.client.render.RenderLayer;
import net.minecraft.client.render.VertexConsumer;
import net.minecraft.client.render.VertexConsumerProvider;
import net.minecraft.client.render.block.entity.BeaconBlockEntityRenderer;
import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
import net.minecraft.client.util.math.MatrixStack;
import net.minecraft.client.util.math.Vector3f;
import net.minecraft.entity.boss.BossBar.Color;
import net.minecraft.util.Identifier;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Quaternion;
import java.util.LinkedList;
import java.util.List;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Coerce;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import io.github.npc_strider.oldbeacon.OldBeacon;
@Mixin(BeaconBlockEntityRenderer.class)
public class BeaconMixin {
@Shadow static final Identifier BEAM_TEXTURE = new Identifier("textures/entity/beacon_beam.png"); //"textures/misc/beam.png" //Not going to bother trying to reimplement the old beacon beam - have to modify code for it to accept alpha channel?
@ -37,20 +30,12 @@ public class BeaconMixin {
private static final Identifier NETHER_STAR_TEXTURE = new Identifier("textures/misc/beacon.png");
private static final RenderLayer NETHER_STAR = RenderLayer.getEntityCutoutNoCull(NETHER_STAR_TEXTURE); // Originally 'END_CRYSTAL'
private static final float SINE_45_DEGREES = (float)Math.sin(0.7853981633974483D);
private ModelPart core = new ModelPart(64, 32, 32, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
private ModelPart frame = new ModelPart(64, 32, 0, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
private ModelPart bottom = new ModelPart(64, 32, 0, 16).addCuboid(-6.0F, 0.0F, -6.0F, 12.0F, 4.0F, 12.0F);
private final ModelPart core = new ModelPart(64, 32, 32, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
private final ModelPart frame = new ModelPart(64, 32, 0, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
// private final ModelPart bottom = new ModelPart(64, 32, 0, 16).addCuboid(-6.0F, 0.0F, -6.0F, 12.0F, 4.0F, 12.0F); // Don't need this - refers to the bedrock base of the END_CRYSTAL
@Inject(
at = @At("HEAD"),
method = "BeaconBlockEntityRenderer()V"
)
public BeaconBlockEntityRenderer(BlockEntityRenderDispatcher blockEntityRenderDispatcher) { // For some reason you have to ignore the error during debugging? Everything seems to work.
super(blockEntityRenderDispatcher);
this.frame = new ModelPart(64, 32, 0, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
this.core = new ModelPart(64, 32, 32, 0).addCuboid(-4.0F, -4.0F, -4.0F, 8.0F, 8.0F, 8.0F);
this.bottom = new ModelPart(64, 32, 0, 16).addCuboid(-6.0F, 0.0F, -6.0F, 12.0F, 4.0F, 12.0F);
};
//Not going to inject this.core, this.frame, this.bottom in public BeaconBlockEntityRenderer.
// Code prevented clean compile, and it seems like we didn't need it anyway? (I'm a java noob) It still functions correctly ingame. Going to just define these constants now ^^^ rather than in this function.
//Why am I not using injects ?
// I'm using overrides for the render for several reasons