Skip to content

Commit

Permalink
Updating to version 1.3
Browse files Browse the repository at this point in the history
- Fixed a softlock with the font renderer
- Changed disabled message
  • Loading branch information
Scribble authored Feb 26, 2022
2 parents bb25f62 + baa8776 commit 043b1dd
Show file tree
Hide file tree
Showing 20 changed files with 419 additions and 462 deletions.
154 changes: 77 additions & 77 deletions Randomness 1.12.2 extreme - Oh no.tsv

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ plugins {

apply plugin: "net.minecraftforge.gradle.forge"
apply plugin: 'org.spongepowered.mixin'
version = "1.2"
version = "1.3"
group = "de.scribble.lp.killtherng" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "KilltheRNG-1.12.2"
archivesBaseName = "KillTheRNG-1.12.2"

minecraft {
version = project.forgeVersion
Expand Down
107 changes: 32 additions & 75 deletions src/main/java/de/scribble/lp/killtherng/UltimateRandomness.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ public class UltimateRandomness {
public CustomRandom blockDropItemChance=new CustomRandom("blockDropItemChance", "If a drop should be dropped", true);
public CustomRandom blockDropPosition=new CustomRandom("blockDropPosition", "Where the spawned item should spawn", true);
public CustomRandom checkAndDropBeetroot=new CustomRandom("checkAndDropBeetroot", "Chance per tick of dropping beetroot if block below isn't sustainable for beetroot", true);
public CustomRandom brewingStandParticlePosition=new CustomRandom("brewingStandParticlePosition", "Get the X of the position of a particle of a brewing stand", true);
public CustomRandom brewingStandParticlePositionX=new CustomRandom("brewingStandParticlePositionX", "Get the X of the position of a particle of a brewing stand", true);
public CustomRandom brewingStandParticlePositionY=new CustomRandom("brewingStandParticlePositionY", "Get the Y of the position of a particle of a brewing stand", true);
public CustomRandom brewingStandParticlePositionZ=new CustomRandom("brewingStandParticlePositionZ", "Get the Z of the position of a particle of a brewing stand", true);
public CustomRandom cauldronFillWIthRain=new CustomRandom("cauldronFillWIthRain", "Chance of a cauldron increasing the water level during rain", true);
public CustomRandom chorusGrow=new CustomRandom("chorusGrow", "Random direction a chorus flower grows", true);
public CustomRandom chorusGrowDirection=new CustomRandom("chorusGrowDirection", "Random direction a chorus flower grows", true);
Expand All @@ -24,85 +26,41 @@ public class UltimateRandomness {
public CustomRandom cocoaGrow=new CustomRandom("cocoaGrow", "Chance for cocoa to grow", true);
public CustomRandom cropDrop=new CustomRandom("cropDrop", "Chance for a crop to drop + quantity", true);
public CustomRandom cropGrow=new CustomRandom("cropGrow", "Chance for a crop to grow", true);
public CustomRandom random_347=new CustomRandom("random_347", "null", true);
public CustomRandom deadBushDrop=new CustomRandom("deadBushDrop", "Quantity of dead bush drop", true);
public CustomRandom seedFromDoublePlant=new CustomRandom("seedFromDoublePlant", "If a seed is dropped from a double grass", true);
public CustomRandom dragoneggTeleportPos=new CustomRandom("dragoneggTeleportPos", "The position of the dragon egg after the player interacts with it", true);
public CustomRandom lavaFlow=new CustomRandom("lavaFlow", "If lava should spread", true);
public CustomRandom random_475=new CustomRandom("random_475", "null", true);
public CustomRandom random_476=new CustomRandom("random_476", "null", true);
public CustomRandom random_477=new CustomRandom("random_477", "null", true);
public CustomRandom random_478=new CustomRandom("random_478", "null", true);
public CustomRandom random_502=new CustomRandom("random_502", "null", true);
public CustomRandom random_503=new CustomRandom("random_503", "null", true);
public CustomRandom random_504=new CustomRandom("random_504", "null", true);
public CustomRandom random_505=new CustomRandom("random_505", "null", true);
public CustomRandom random_506=new CustomRandom("random_506", "null", true);
public CustomRandom random_507=new CustomRandom("random_507", "null", true);
public CustomRandom random_549=new CustomRandom("random_549", "null", true);
public CustomRandom random_550=new CustomRandom("random_550", "null", true);
public CustomRandom random_551=new CustomRandom("random_551", "null", true);
public CustomRandom random_552=new CustomRandom("random_552", "null", true);
public CustomRandom random_553=new CustomRandom("random_553", "null", true);
public CustomRandom random_554=new CustomRandom("random_554", "null", true);
public CustomRandom random_555=new CustomRandom("random_555", "null", true);
public CustomRandom random_556=new CustomRandom("random_556", "null", true);
public CustomRandom random_557=new CustomRandom("random_557", "null", true);
public CustomRandom random_558=new CustomRandom("random_558", "null", true);
public CustomRandom random_486=new CustomRandom("random_486", "null", true);
public CustomRandom random_487=new CustomRandom("random_487", "null", true);
public CustomRandom random_533=new CustomRandom("random_533", "null", true);
public CustomRandom random_534=new CustomRandom("random_534", "null", true);
public CustomRandom random_535=new CustomRandom("random_535", "null", true);
public CustomRandom random_536=new CustomRandom("random_536", "null", true);
public CustomRandom random_537=new CustomRandom("random_537", "null", true);
public CustomRandom random_538=new CustomRandom("random_538", "null", true);
public CustomRandom random_539=new CustomRandom("random_539", "null", true);
public CustomRandom random_540=new CustomRandom("random_540", "null", true);
public CustomRandom random_541=new CustomRandom("random_541", "null", true);
public CustomRandom enchantementTableParticleChance=new CustomRandom("enchantementTableParticleChance", "If enchantement table particle spawns", true);
public CustomRandom enchantementTableParticlePosX=new CustomRandom("enchantementTableParticlePosX", "Get the X of the enchantment table particle", true);
public CustomRandom enchantementTableParticlePosY=new CustomRandom("enchantementTableParticlePosY", "Get the Y of the enchantment table particle", true);
public CustomRandom enchantementTableParticlePosZ=new CustomRandom("enchantementTableParticlePosZ", "Get the Z of the enchantment table particle", true);
public CustomRandom enderChestParticlePos=new CustomRandom("enderChestParticlePos", "Where the ender chest particle spawns", true);
public CustomRandom endGatewayParticlePos=new CustomRandom("endGatewayParticlePos", "Where the end gateway particle spawns", true);
public CustomRandom endPortalParticlePosX=new CustomRandom("endPortalParticlePosX", "Get the X of the end portal particle", true);
public CustomRandom endPortalParticlePosZ=new CustomRandom("endPortalParticlePosZ", "Get the X of the end portal particle", true);
public CustomRandom endRodParticlePos=new CustomRandom("endRodParticlePos", "Where the end rod particle spawns", true);
public CustomRandom endRodParticlePosChance=new CustomRandom("endRodParticlePosChance", "Chance for the end rod particle to spawn", true);
public CustomRandom fallingBlockParticleActivate=new CustomRandom("fallingBlockParticleActivate", "Chance of a falling block particle", true);
public CustomRandom fallingBlockParticlePos=new CustomRandom("fallingBlockParticlePos", "Position of falling block particle", true);
public CustomRandom fireSpreading=new CustomRandom("fireSpreading", "Chance whether fire can spread", true);
public CustomRandom random_372=new CustomRandom("random_372", "null", true);
public CustomRandom random_373=new CustomRandom("random_373", "null", true);
public CustomRandom random_374=new CustomRandom("random_374", "null", true);
public CustomRandom random_375=new CustomRandom("random_375", "null", true);
public CustomRandom random_376=new CustomRandom("random_376", "null", true);
public CustomRandom random_377=new CustomRandom("random_377", "null", true);
public CustomRandom random_378=new CustomRandom("random_378", "null", true);
public CustomRandom random_379=new CustomRandom("random_379", "null", true);
public CustomRandom random_380=new CustomRandom("random_380", "null", true);
public CustomRandom random_381=new CustomRandom("random_381", "null", true);
public CustomRandom random_382=new CustomRandom("random_382", "null", true);
public CustomRandom random_383=new CustomRandom("random_383", "null", true);
public CustomRandom random_384=new CustomRandom("random_384", "null", true);
public CustomRandom random_385=new CustomRandom("random_385", "null", true);
public CustomRandom random_386=new CustomRandom("random_386", "null", true);
public CustomRandom random_387=new CustomRandom("random_387", "null", true);
public CustomRandom random_388=new CustomRandom("random_388", "null", true);
public CustomRandom random_389=new CustomRandom("random_389", "null", true);
public CustomRandom random_390=new CustomRandom("random_390", "null", true);
public CustomRandom random_391=new CustomRandom("random_391", "null", true);
public CustomRandom random_392=new CustomRandom("random_392", "null", true);
public CustomRandom random_368=new CustomRandom("random_368", "null", true);
public CustomRandom random_369=new CustomRandom("random_369", "null", true);
public CustomRandom random_370=new CustomRandom("random_370", "null", true);
public CustomRandom random_362=new CustomRandom("random_362", "null", true);
public CustomRandom random_363=new CustomRandom("random_363", "null", true);
public CustomRandom random_364=new CustomRandom("random_364", "null", true);
public CustomRandom random_365=new CustomRandom("random_365", "null", true);
public CustomRandom random_366=new CustomRandom("random_366", "null", true);
public CustomRandom random_367=new CustomRandom("random_367", "null", true);
public CustomRandom random_559=new CustomRandom("random_559", "null", true);
public CustomRandom random_401=new CustomRandom("random_401", "null", true);
public CustomRandom random_402=new CustomRandom("random_402", "null", true);
public CustomRandom random_403=new CustomRandom("random_403", "null", true);
public CustomRandom random_437=new CustomRandom("random_437", "null", true);
public CustomRandom random_436=new CustomRandom("random_436", "null", true);
public CustomRandom fireSoundChance=new CustomRandom("fireSoundChance", "Chance if fire makes a sound", true);
public CustomRandom fireSound=new CustomRandom("fireSound", "Something about fire sound", true);
public CustomRandom fireParticlePosX=new CustomRandom("fireParticlePosX", "Get the X of a fire particle", true);
public CustomRandom fireParticlePosY=new CustomRandom("fireParticlePosY", "Get the Y of a fire particle", true);
public CustomRandom fireParticlePosZ=new CustomRandom("fireParticlePosZ", "Get the Z of a fire particle", true);
public CustomRandom catchFireChance=new CustomRandom("catchFireChance", "Chance for a block to catch on fire", true);
public CustomRandom catchFireThing=new CustomRandom("catchFireThing", "dunno", true);
public CustomRandom fireThing=new CustomRandom("fireThing", "dunno", true);
public CustomRandom frostedIceMeltChance=new CustomRandom("frostedIceMeltChance", "Chance for frosted ice to melt", true);
public CustomRandom furnaceParticlePos=new CustomRandom("furnaceParticlePos", "Offset of the position of the furnace particles in the Y axis", true);
public CustomRandom furnaceSound=new CustomRandom("furnaceSound", "Chance for the furnace to crackle", true);
public CustomRandom glowstoneDrop=new CustomRandom("glowstoneDrop", "Quantity of glowstone drop", true);
public CustomRandom bonusGlowstoneDrop=new CustomRandom("bonusGlowstoneDrop", "Quantity of bonus glowstone drop", true);
public CustomRandom bonemealGrassFlower=new CustomRandom("bonemealGrassFlower", "If a flower should be added when bonemealing grass", true);
public CustomRandom bonemealGrassPos=new CustomRandom("bonemealGrassPos", "The position where the grass should grow", true);
public CustomRandom grassSpreadPos=new CustomRandom("grassSpreadPos", "Determines the next block position for grass to spread", true);
public CustomRandom gravelDropFlint=new CustomRandom("gravelDropFlint", "If gravel frops flint or itself", true);
public CustomRandom random_457=new CustomRandom("random_457", "null", true);
public CustomRandom hugeMushroomDrop=new CustomRandom("hugeMushroomDrop", "Quantity of huge mushroom drop", true);
public CustomRandom jukeboxRecordDrop=new CustomRandom("jukeboxRecordDrop", "Position of the record when a jukebox releases it", true);
public CustomRandom leafDropSapling2=new CustomRandom("leafDropSapling2", "Chance of a sapling dropped", true);
public CustomRandom leafDropSapling=new CustomRandom("leafDropSapling", "Chance of a sapling dropped", true);
Expand All @@ -120,11 +78,10 @@ public class UltimateRandomness {
public CustomRandom liquidDripParticleActivate=new CustomRandom("liquidDripParticleActivate", "If a drip particle should spawn", true);
public CustomRandom liquidDripParticle=new CustomRandom("liquidDripParticle", "Position of drip particle", true);
public CustomRandom liquidExtinguishSound=new CustomRandom("liquidExtinguishSound", "Pitch of the sound when combining water and lava", true);
public CustomRandom math_random_21=new CustomRandom("math_random_21", "null", true);
public CustomRandom math_random_22=new CustomRandom("math_random_22", "null", true);
public CustomRandom lavaParticlePos=new CustomRandom("lavaParticlePos", "Postion of lava particle", true);
public CustomRandom magmaExtinguish=new CustomRandom("magmaExtinguish", "Pitch of the sound when water flows over magma", true);
public CustomRandom random_458=new CustomRandom("random_458", "null", true);
public CustomRandom random_459=new CustomRandom("random_459", "null", true);
public CustomRandom melonDrop=new CustomRandom("melonDrop", "Quantity of melon drop", true);
public CustomRandom bonusMelonDrop=new CustomRandom("bonusMelonDrop", "Quantity of bonus melon drop", true);
public CustomRandom random_393=new CustomRandom("random_393", "null", true);
public CustomRandom random_394=new CustomRandom("random_394", "null", true);
public CustomRandom random_357=new CustomRandom("random_357", "null", true);
Expand Down Expand Up @@ -220,7 +177,7 @@ public class UltimateRandomness {
public CustomRandom random_465=new CustomRandom("random_465", "null", true);
public CustomRandom random_1365=new CustomRandom("random_1365", "null", false);
public CustomRandom portalSoundTrigger=new CustomRandom("portalSoundTrigger", "Pitch of wooshing sounds when entering a nether portal", true);
public CustomRandom random_1265=new CustomRandom("random_1265", "null", true);
public CustomRandom fontRendererObfuscation=new CustomRandom("fontRendererObfuscation", "Chooses a seed for the obfuscated text", false);
public CustomRandom chooseRandomSeed=new CustomRandom("chooseRandomSeed", "Sets the world seed if nothing was put in", false);
public CustomRandom random_1474=new CustomRandom("random_1474", "null", true);
public CustomRandom random_1475=new CustomRandom("random_1475", "null", true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ public static void sendHelp(String name, long timesCalled, long seed) {
sender.sendMessage(new TextComponentString(clientRandom.getDescription()));
sender.sendMessage(new TextComponentString(""));
if(!clientRandom.isEnabled()) {
sender.sendMessage(new TextComponentString(ChatFormatting.RED+"This variable has been disabled, setting a seed will not do anything."));
sender.sendMessage(new TextComponentString(ChatFormatting.RED+"You can still view some information"));
sender.sendMessage(new TextComponentString(ChatFormatting.RED+"This variable has been disabled, since it causes bugs or softlocks if it is not random."));
sender.sendMessage(new TextComponentString(ChatFormatting.RED+"Setting a seed will not do anything, but you can still view some information"));
}
sender.sendMessage(seedTextComponentClient);
sender.sendMessage(seedTextComponentServer);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,29 @@ public class MixinBlockBrewingStand {
* Get the X of the position of a particle of a brewing stand
*/
@Redirect(method = "randomDisplayTick(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextFloat()F", ordinal = 0))
public float redirect_brewingStandParticlePosition_1(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
public float redirect_brewingStandParticlePositionX_1(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePositionX.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePositionX.nextFloat();
// return rand.nextFloat();
}

/**
* Get the Y of the position of a particle of a brewing stand
*/
@Redirect(method = "randomDisplayTick(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextFloat()F", ordinal = 1))
public float redirect_brewingStandParticlePosition_2(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
public float redirect_brewingStandParticlePositionY_2(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePositionY.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePositionY.nextFloat();
// return rand.nextFloat();
}

/**
* Get the Z of the position of a particle of a brewing stand
*/
@Redirect(method = "randomDisplayTick(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Ljava/util/Random;)V", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextFloat()F", ordinal = 2))
public float redirect_brewingStandParticlePosition_3(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePosition.nextFloat();
public float redirect_brewingStandParticlePositionZ_3(Random rand) {
return KillTheRNG.randomness.brewingStandParticlePositionZ.nextFloat();
// KillTheRNG.randomness.brewingStandParticlePositionZ.nextFloat();
// return rand.nextFloat();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
public class MixinBlockDeadBush {

/**
* null
* Quantity of dead bush drop
*/
@Redirect(method = "quantityDropped(Ljava/util/Random;)I", at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 0))
public int redirect_random_347_1(Random rand, int i) {
return KillTheRNG.randomness.random_347.nextInt(i);
// KillTheRNG.randomness.random_347.nextInt(i);
public int redirect_deadBushDrop_1(Random rand, int i) {
return KillTheRNG.randomness.deadBushDrop.nextInt(i);
// KillTheRNG.randomness.deadBushDrop.nextInt(i);
// return rand.nextInt(i);
}

Expand Down
Loading

0 comments on commit 043b1dd

Please sign in to comment.