Newertech/MML
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the floating nuke

Browse Source 
Made the egg cursed
This commit is contained in:
Madeline McWhorter
2026-06-19 14:00:59 -05:00
parent 1b120edd93
commit e1a9260c79
5 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
.idea/workspace.xml generated
View File

@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="21afa9bb-6936-4dba-b025-44007f88dd40" name="Changes" comment="added an improved sound loader that can load from the .modsounds folder inside of the game directory. Added textures and sounds to the nuke!"> <list default="true" id="21afa9bb-6936-4dba-b025-44007f88dd40" name="Changes" comment="Fixed the nuke rendering not being added">
<change afterPath="$PROJECT_DIR$/src/net/minecraft/src/mml/Render/RenderNukePrimed.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/EntityList.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/EntityList.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/net/minecraft/src/EntityEgg.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/EntityEgg.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/EntityTracker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/EntityTracker.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/net/minecraft/src/EntityTNTPrimed.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/EntityTNTPrimed.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/EntityTrackerEntry.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/EntityTrackerEntry.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/Explosion.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/Explosion.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/NetClientHandler.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/NetClientHandler.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/RenderManager.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/RenderManager.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/World.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/World.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/mml/Blocks/BlockNuke.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/mml/Blocks/BlockNuke.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/net/minecraft/src/mml/Blocks/BlockNuke.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/mml/Blocks/BlockNuke.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/net/minecraft/src/mml/Entities/EntityNukePrimed.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/mml/Entities/EntityNukePrimed.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/net/minecraft/src/mml/Entities/EntityNukePrimed.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/net/minecraft/src/mml/Entities/EntityNukePrimed.java" afterDir="false" />
</list> </list>
@@ -60,7 +54,7 @@
<configuration name="Minecraft Client" type="Application" factoryName="Application"> <configuration name="Minecraft Client" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.mcphackers.launchwrapper.Launch" /> <option name="MAIN_CLASS_NAME" value="org.mcphackers.launchwrapper.Launch" />
<module name="minecraft" /> <module name="minecraft" />
<option name="PROGRAM_PARAMETERS" value="--username Player --uuid - --session - --version 1.5.2 --gameDir . --assetsDir .\assets --assetIndex 1.4 --accessToken - --userProperties {} --userType legacy --versionType snapshot --skinProxy pre-1.8" /> <option name="PROGRAM_PARAMETERS" value="--username Madeline51 --uuid - --session - --version 1.5.2 --gameDir . --assetsDir .\assets --assetIndex 1.4 --accessToken - --userProperties {} --userType legacy --versionType snapshot --skinProxy pre-1.8" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/game" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/game" />
<method v="2"> <method v="2">
<option name="Make" enabled="true" /> <option name="Make" enabled="true" />
@@ -85,7 +79,7 @@
<workItem from="1781711683576" duration="10131000" /> <workItem from="1781711683576" duration="10131000" />
<workItem from="1781724230644" duration="29000" /> <workItem from="1781724230644" duration="29000" />
<workItem from="1781839713575" duration="12853000" /> <workItem from="1781839713575" duration="12853000" />
<workItem from="1781883552661" duration="7561000" /> <workItem from="1781883552661" duration="10743000" />
</task> </task>
<task id="LOCAL-00001" summary="add a BlockRegister class to let rev not shoot himself trying to register blocks"> <task id="LOCAL-00001" summary="add a BlockRegister class to let rev not shoot himself trying to register blocks">
<option name="closed" value="true" /> <option name="closed" value="true" />
@@ -111,7 +105,15 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1781853278308</updated> <updated>1781853278308</updated>
</task> </task>
<option name="localTasksCounter" value="4" /> <task id="LOCAL-00004" summary="Fixed the nuke rendering not being added">
<option name="closed" value="true" />
<created>1781892094309</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1781892094309</updated>
</task>
<option name="localTasksCounter" value="5" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@@ -121,6 +123,7 @@
<MESSAGE value="add a BlockRegister class to let rev not shoot himself trying to register blocks" /> <MESSAGE value="add a BlockRegister class to let rev not shoot himself trying to register blocks" />
<MESSAGE value="added a nuke" /> <MESSAGE value="added a nuke" />
<MESSAGE value="added an improved sound loader that can load from the .modsounds folder inside of the game directory. Added textures and sounds to the nuke!" /> <MESSAGE value="added an improved sound loader that can load from the .modsounds folder inside of the game directory. Added textures and sounds to the nuke!" />
<option name="LAST_COMMIT_MESSAGE" value="added an improved sound loader that can load from the .modsounds folder inside of the game directory. Added textures and sounds to the nuke!" /> <MESSAGE value="Fixed the nuke rendering not being added" />
<option name="LAST_COMMIT_MESSAGE" value="Fixed the nuke rendering not being added" />
</component> </component>
</project> </project>

13
src/net/minecraft/src/EntityEgg.java
View File

@@ -26,7 +26,7 @@ public class EntityEgg extends EntityThrowable {
for(int var3 = 0; var3 < var2; ++var3) { for(int var3 = 0; var3 < var2; ++var3) {
EntityChicken var4 = new EntityChicken(this.worldObj); EntityChicken var4 = new EntityChicken(this.worldObj);
var4.setGrowingAge(-24000); var4.setGrowingAge(1);
var4.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F); var4.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
this.worldObj.spawnEntityInWorld(var4); this.worldObj.spawnEntityInWorld(var4);
} }
@@ -37,7 +37,18 @@ public class EntityEgg extends EntityThrowable {
} }
if(!this.worldObj.isRemote) { if(!this.worldObj.isRemote) {
EntityChicken var4 = new EntityChicken(this.worldObj);
EntityChicken var5 = new EntityChicken(this.worldObj);
EntityChicken var6 = new EntityChicken(this.worldObj);
EntityChicken var7 = new EntityChicken(this.worldObj);
var4.setGrowingAge(1);
var4.setLocationAndAngles(this.posX, this.posY, this.posZ, this.rotationYaw, 0.0F);
this.worldObj.spawnEntityInWorld(var4);
this.setDead(); this.setDead();
} }
} }

5
src/net/minecraft/src/EntityTNTPrimed.java
View File

@@ -17,7 +17,7 @@ public class EntityTNTPrimed extends Entity {
this.setPosition(var2, var4, var6); this.setPosition(var2, var4, var6);
float var9 = (float)(Math.random() * (double)((float)Math.PI) * 2.0D); float var9 = (float)(Math.random() * (double)((float)Math.PI) * 2.0D);
this.motionX = (double)(-((float)Math.sin((double)var9)) * 0.02F); this.motionX = (double)(-((float)Math.sin((double)var9)) * 0.02F);
this.motionY = (double)0.2F; this.motionY = (double)-0.2F;
this.motionZ = (double)(-((float)Math.cos((double)var9)) * 0.02F); this.motionZ = (double)(-((float)Math.cos((double)var9)) * 0.02F);
this.fuse = 80; this.fuse = 80;
this.prevPosX = var2; this.prevPosX = var2;
@@ -49,8 +49,9 @@ public class EntityTNTPrimed extends Entity {
if(this.onGround) { if(this.onGround) {
this.motionX *= (double)0.7F; this.motionX *= (double)0.7F;
this.motionZ *= (double)0.7F; this.motionZ *= (double)0.7F;
this.motionY *= -0.5D; this.motionY *= -0D;
} }
System.out.println(this.motionY);
if(this.fuse-- <= 0) { if(this.fuse-- <= 0) {
this.setDead(); this.setDead();

1
src/net/minecraft/src/mml/Blocks/BlockNuke.java
View File

@@ -59,6 +59,7 @@ public class BlockNuke extends Block {
var1.spawnEntityInWorld(var7); var1.spawnEntityInWorld(var7);
var1.playSoundAtEntity(var7, "mod.beep", 1.0F, 1.0F); var1.playSoundAtEntity(var7, "mod.beep", 1.0F, 1.0F);
System.out.println("SPAWNING TNT NOW!");
} }
} }

14
src/net/minecraft/src/mml/Entities/EntityNukePrimed.java
View File

@@ -47,6 +47,8 @@ public class EntityNukePrimed extends Entity {
this.prevPosY = this.posY; this.prevPosY = this.posY;
this.prevPosZ = this.posZ; this.prevPosZ = this.posZ;
this.motionY -= 0.04D;
this.moveEntity(this.motionX, this.motionY, this.motionZ); this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= (double)0.98F; this.motionX *= (double)0.98F;
@@ -60,17 +62,13 @@ public class EntityNukePrimed extends Entity {
this.motionY *= -0.5D; this.motionY *= -0.5D;
} }
this.moveEntity(this.motionX, this.motionY, this.motionZ);
// Spawn smoke fizz while ticking down on the client side
if (this.worldObj.isRemote) {
this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ, 0.0D, 0.0D, 0.0D);
}
if (this.fuse-- <= 0) { if (this.fuse-- <= 0) {
this.setDead(); this.setDead();
if (!this.worldObj.isRemote) { if (!this.worldObj.isRemote) {
this.explode(); this.explode();
} else {
this.worldObj.spawnParticle("smoke", this.posX, this.posY + 0.5D, this.posZ , 0.0D, 0.0D, 0.0D);
} }
} }
@@ -82,11 +80,9 @@ public class EntityNukePrimed extends Entity {
} }
protected void writeEntityToNBT(NBTTagCompound var1) { protected void writeEntityToNBT(NBTTagCompound var1) {
var1.setByte("Fuse", (byte)this.fuse);
} }
protected void readEntityFromNBT(NBTTagCompound var1) { protected void readEntityFromNBT(NBTTagCompound var1) {
this.fuse = var1.getByte("Fuse");
} }
public float getShadowSize() { public float getShadowSize() {