Skip to content

Commit 02c7c61

Browse files
RunemoroRunemoro
committed
Refactor utils
1 parent bc9c663 commit 02c7c61

58 files changed

Lines changed: 395 additions & 446 deletions

Some content is hidden

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

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ processResources {
7575
task generatePocketSchematics(dependsOn: jar, type: JavaExec, group: "dimdoors") {
7676
classpath = files('build/libs/dimdoors.jar')
7777
classpath += sourceSets.main.runtimeClasspath
78-
main = "com.zixiken.dimdoors.shared.util.PocketSchematicGenerator"
78+
main = "com.zixiken.dimdoors.shared.tools.PocketSchematicGenerator"
79+
//noinspection GroovyAssignabilityCheck (IntelliJ is wrong)
7980
args "src/main/resources/assets/dimdoors/pockets/schematic"
8081
}

‎src/main/java/com/zixiken/dimdoors/DimDoors.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.zixiken.dimdoors;
22

3-
import com.zixiken.dimdoors.shared.commands.PocketCommand;
3+
import com.zixiken.dimdoors.shared.commands.CommandPocket;
44
import com.zixiken.dimdoors.shared.commands.CommandDimTeleport;
55
import com.zixiken.dimdoors.shared.DDConfig;
66
import com.zixiken.dimdoors.shared.DDProxyCommon;
@@ -72,7 +72,7 @@ public void serverLoad(FMLServerStartingEvent event) {
7272

7373
private void registerCommands(FMLServerStartingEvent event) {
7474
event.registerServerCommand(new CommandDimTeleport());
75-
event.registerServerCommand(new PocketCommand());
75+
event.registerServerCommand(new CommandPocket());
7676
}
7777

7878
public static boolean isClient() {

‎src/main/java/com/zixiken/dimdoors/client/DDProxyClient.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.zixiken.dimdoors.shared.DDProxyCommon;
44
import com.zixiken.dimdoors.shared.entities.EntityMonolith;
5-
import com.zixiken.dimdoors.shared.entities.RenderMonolith;
65
import com.zixiken.dimdoors.shared.tileentities.TileEntityEntranceRift;
76
import com.zixiken.dimdoors.shared.tileentities.TileEntityFloatingRift;
87
import net.minecraft.client.Minecraft;

src/main/java/com/zixiken/dimdoors/shared/entities/ModelMonolith.java renamed to src/main/java/com/zixiken/dimdoors/client/ModelMonolith.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
package com.zixiken.dimdoors.shared.entities;
1+
package com.zixiken.dimdoors.client;
22

33
import java.util.Random;
44

5+
import com.zixiken.dimdoors.shared.entities.EntityMonolith;
56
import net.minecraftforge.fml.relauncher.Side;
67
import net.minecraftforge.fml.relauncher.SideOnly;
78
import org.lwjgl.opengl.GL11;
@@ -21,14 +22,14 @@ public ModelMonolith() {
2122
textureHeight = 256;
2223

2324
wholeMonolith = new ModelRenderer(this, 0, 0);
24-
wholeMonolith.addBox(-24F,-108F/1.3F, -6F, 48, 108, 12);
25+
wholeMonolith.addBox(-24F, -108F / 1.3F, -6F, 48, 108, 12);
2526
}
2627

2728
@Override
2829
public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
2930
EntityMonolith monolith = (EntityMonolith) entityIn;
3031

31-
setRotationAngles(0, 0, 0, 0, 0,0, monolith);
32+
setRotationAngles(0, 0, 0, 0, 0, 0, monolith);
3233
GL11.glScalef(monolith.getRenderSizeModifier(), monolith.getRenderSizeModifier(), monolith.getRenderSizeModifier());
3334
wholeMonolith.render(scale);
3435
}

‎src/main/java/com/zixiken/dimdoors/client/ParticleRiftEffect.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.zixiken.dimdoors.client;
22

3-
import com.zixiken.dimdoors.shared.util.WorldUtils;
3+
import ddutils.WorldUtils;
44
import com.zixiken.dimdoors.shared.world.DimDoorDimensions;
55
import net.minecraft.client.particle.ParticleSimpleAnimated;
66
import net.minecraft.client.renderer.BufferBuilder;

src/main/java/com/zixiken/dimdoors/shared/entities/RenderMonolith.java renamed to src/main/java/com/zixiken/dimdoors/client/RenderMonolith.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
package com.zixiken.dimdoors.shared.entities;
1+
package com.zixiken.dimdoors.client;
22

33
import com.zixiken.dimdoors.DimDoors;
4+
import com.zixiken.dimdoors.client.ModelMonolith;
5+
import com.zixiken.dimdoors.shared.entities.EntityMonolith;
46
import net.minecraft.client.Minecraft;
57
import net.minecraft.client.renderer.OpenGlHelper;
68
import net.minecraft.client.renderer.entity.RenderLiving;

‎src/main/java/com/zixiken/dimdoors/client/TileEntityEntranceRiftRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import com.zixiken.dimdoors.DimDoors;
99
import com.zixiken.dimdoors.shared.tileentities.TileEntityEntranceRift;
10-
import com.zixiken.dimdoors.shared.util.RGBA;
10+
import ddutils.render.RGBA;
1111
import net.minecraft.client.renderer.*;
1212
import net.minecraft.client.renderer.vertex.*;
1313
import net.minecraft.util.EnumFacing;

‎src/main/java/com/zixiken/dimdoors/shared/DDProxyCommon.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import com.zixiken.dimdoors.shared.world.DimDoorDimensions;
1010
import com.zixiken.dimdoors.shared.world.ModBiomes;
1111
import net.minecraft.util.ResourceLocation;
12-
import net.minecraft.world.WorldProvider;
13-
import net.minecraftforge.client.IRenderHandler;
1412
import net.minecraftforge.common.MinecraftForge;
1513
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
1614
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;

‎src/main/java/com/zixiken/dimdoors/shared/EventHandler.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public static void onPlayerJoinWorld(EntityJoinWorldEvent event) {
3030
@SubscribeEvent(priority = EventPriority.LOWEST) // don't let other mods do something based on the event
3131
public static void onLivingHurt(LivingHurtEvent event) {
3232
Entity entity = event.getEntity();
33-
if (entity.dimension == DimDoorDimensions.LIMBO.getId() && event.getSource() == DamageSource.FALL) {
34-
event.setCanceled(true);// no fall damage in LIMBO
33+
if (entity.dimension == DimDoorDimensions.limbo.getId() && event.getSource() == DamageSource.FALL) {
34+
event.setCanceled(true);// no fall damage in limbo
3535
}
3636
}
3737

‎src/main/java/com/zixiken/dimdoors/shared/SchematicHandler.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.zixiken.dimdoors.shared;
22

33
import com.zixiken.dimdoors.shared.pockets.PocketTemplate;
4-
import com.zixiken.dimdoors.shared.util.MathUtils;
5-
import com.zixiken.dimdoors.shared.util.Schematic;
4+
import ddutils.math.MathUtils;
5+
import ddutils.schem.Schematic;
66
import com.google.gson.JsonArray;
77
import com.google.gson.JsonElement;
88
import com.google.gson.JsonObject;
@@ -22,13 +22,12 @@
2222
import java.util.logging.Level;
2323
import java.util.logging.Logger;
2424

25-
import com.zixiken.dimdoors.shared.util.SchematicConverter;
25+
import com.zixiken.dimdoors.shared.tools.SchematicConverter;
2626
import net.minecraft.nbt.NBTTagCompound;
2727
import net.minecraft.nbt.CompressedStreamTools;
2828
import org.apache.commons.io.IOUtils;
2929

3030
/**
31-
*
3231
* @author Robijnvogel
3332
*/
3433
public class SchematicHandler { // TODO: make this more general (not dimdoors-related)
@@ -134,7 +133,7 @@ private static List<PocketTemplate> loadTemplatesFromJson(String jsonString) {
134133
try {
135134
schematicNBT = CompressedStreamTools.readCompressed(schematicDataStream);
136135
if (!schematicNBT.hasKey("Version")) {
137-
schematic = SchematicConverter.loadOldDimDoorSchematicFromNBT(schematicNBT, template.getName());
136+
schematic = SchematicConverter.convertSchematic(schematicNBT, template.getName());
138137
} else {
139138
schematic = Schematic.loadFromNBT(schematicNBT, template.getName());
140139
}
@@ -151,7 +150,7 @@ private static List<PocketTemplate> loadTemplatesFromJson(String jsonString) {
151150
}
152151

153152
if (schematic != null
154-
&& (schematic.getWidth() > (template.getSize() + 1) * 16 || schematic.getLength() > (template.getSize() + 1) * 16)) {
153+
&& (schematic.width > (template.getSize() + 1) * 16 || schematic.length > (template.getSize() + 1) * 16)) {
155154
schematic = null;
156155
DimDoors.log.warn("Schematic " + template.getName() + " was bigger than specified in its json file and therefore wasn't loaded");
157156
}
@@ -235,7 +234,6 @@ public PocketTemplate getTemplate(String group, String name) {
235234
return templates.get(index);
236235
}
237236

238-
239237
/**
240238
* Gets a random template matching certain criteria.
241239
*

0 commit comments

Comments
 (0)